Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

README.md

@@ -2,7 +2,7 @@
  * @Author: deng.yinping deng.yinping@muchinfo.cn
  * @Date: 2024-02-22 09:10:35
  * @LastEditors: deng.yinping deng.yinping@muchinfo.cn
- * @LastEditTime: 2024-02-22 09:10:49
+ * @LastEditTime: 2024-02-23 14:18:33
  * @FilePath: \test01c:\Workspaces\Code Git\MTP20_WEB_GLOBAL\README.md
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -42,3 +42,4 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
 
 https://blog.csdn.net/qq_40323256/article/details/123809155
 npx pbjs -t json-module -w commonjs -o src/services/socket/trade/protobuf/thj.js public/proto/thj.proto
+

src/packages/gstj/views/mine/Index.vue

@@ -98,7 +98,7 @@
                         <Iconfont icon="g-icon-sign">签约账户</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'hold-sign' }" v-if="authStatus === AuthStatus.Certified">
+                <!-- <Cell is-link :to="{ name: 'hold-sign' }" v-if="authStatus === AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-signing"> 代扣签约申请</Iconfont>
                     </template>
@@ -107,7 +107,7 @@
                     <template #title>
                         <Iconfont icon="g-icon-wallet">入金代扣申请</Iconfont>
                     </template>
-                </Cell>
+                </Cell> -->
                 <Cell is-link :to="{ name: 'mine-profile' }">
                     <template #title>
                         <Iconfont icon="g-icon-profile">个人信息</Iconfont>

src/packages/mobile/views/swap/list/Index.vue

@@ -66,7 +66,7 @@ const { router, getQueryString, setGlobalUrlParams } = useNavigation()
 const futuresStore = useFuturesStore()
 const userStore = useUserStore()
 const subscribe = quoteSocket.createSubscribe()
-const canBankSign = shallowRef(false)
+const canProtocolSign = shallowRef(false)
 const oem = service.getConfig('oem')
 const title = getQueryString('title')
 const titleName = computed(() => title ? decodeURIComponent(title) : props.marketSection?.displayname ?? '掉期贸易')
@@ -126,7 +126,7 @@ const columns: Model.TableColumn[] = [
 const rowClick = (row: Model.QuoteGoodsListRsp) => {
     /// 这里要去判断是否已经实名认证
     if (userStore.hasAuth) {
-        if (userStore.userInfo.usertype != 2 && !canBankSign.value) {
+        if (userStore.userInfo.usertype != 2 && !canProtocolSign.value) {
             showToast('请先通过“我的”-“合同签署”功能菜单签署相应的合同！')
         } else {
             setGlobalUrlParams(row)
@@ -145,6 +145,8 @@ const { run: initMdUserSwapProtocol } = useRequest(requestInitMdUserSwapProtocol
         memberUserId: getMemberUserId()
     },
     onSuccess: () => {
+        /// 可以交易
+        canProtocolSign.value = true
         /// 重新请求
         showToast('合同已提交签署请求，请耐心等待审核通过！')
     }
@@ -164,12 +166,12 @@ onActivated(() => {
         }
     }).then((res) => {
         if (oem === 'tjmd') { // 天津麦顿
-            canBankSign.value = res.data.some(e => e.protocolstatus === 4)
+            canProtocolSign.value = res.data.some(e => e.protocolstatus === 4)
         } else {
             if (res.data.length === 0) {
                 initMdUserSwapProtocol()
             } else {
-                canBankSign.value = res.data.some(e => e.protocolstatus === 4)
+                canProtocolSign.value = res.data.some(e => e.protocolstatus === 4)
             }
         }
     })

src/packages/pc/views/account/holddeposit/index.vue

@@ -16,7 +16,7 @@
         </template>
          <!-- 状态 -->
          <template #billresult="{ value }">
-            {{ value === 0 ? '扣费成功' : '扣费失败' }}
+            {{ getBillResultName(Number(value)) }}
         </template>
     </app-table>
     <component ref="componentRef" v-bind="{ selectedRow }" :is="componentMap.get(componentId)" @closed="closeComponent"
@@ -32,9 +32,10 @@ import { useComposeTable } from '@pc/components/base/table'
 import { useRequest } from '@/hooks/request'
 import { queryGtwithholddepositapply, queryGetGtwithholdsigninfo } from '@/services/api/bank'
 import { SignStatus } from '@/constants/bank'
+import { getBillResultName } from '@/constants/order'
+import { formatDate } from '@/filters'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
-import { formatDate } from '@/filters'
 
 const componentMap = new Map<string, unknown>([
     ['deposit', defineAsyncComponent(() => import('./components/deposit/index.vue'))],

src/packages/pc/views/account/holdsign/index.vue

@@ -81,14 +81,11 @@ const showComponent = ((componentName: string) => {
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'jfhm', label: ' 用户编号' },
     { prop: 'accountsignstatus', label: '账户签约状态' },
-    // { prop: 'yckfxe', label: '一次扣费限额' },
     { prop: 'xyqsrq', label: '协议签署日期' },
     { prop: 'xysxrq', label: '协议生效日期' },
     { prop: 'xydqrq', label: '协议到期日期' },
     { prop: 'kksjdw', label: '扣款单位时间' },
     { prop: 'kksjbc', label: '扣款时间步长' },
-    // { prop: 'kkzqnkfxe', label: '扣款周期内扣费限额' },
-    // { prop: 'kkzqnxzbs', label: '扣费周期内限制笔数' },
 ])
 
 </script>

src/packages/thj/views/mine/Index.vue

@@ -95,12 +95,12 @@
                         <Iconfont icon="g-icon-sign">签约账户</Iconfont>
                     </template>
                 </Cell>
-                <Cell is-link :to="{ name: 'account-protocol', query: { memberUserId: getMemberUserId() } }"
+                <!-- <Cell is-link :to="{ name: 'account-protocol', query: { memberUserId: getMemberUserId() } }"
                     v-if="userStore.userType != 2 && authStatus === AuthStatus.Certified">
                     <template #title>
                         <Iconfont icon="g-icon-order--line">合同签署</Iconfont>
                     </template>
-                </Cell>
+                </Cell> -->
                 <Cell is-link :to="{ name: 'mine-profile' }">
                     <template #title>
                         <Iconfont icon="g-icon-profile">公司信息</Iconfont>
@@ -148,10 +148,12 @@ import { useNavigation } from '@mobile/router/navigation'
 import { AuthStatus } from '@/constants/account'
 import { queryBankAccountSign } from '@/services/api/bank'
 import { useLoginStore, useAccountStore, useUserStore } from '@/stores'
+import { useRequest } from '@/hooks/request'
+import { getMemberUserId, getUserId } from '@/services/methods/user'
+import { queryMdUserSwapProtocol } from '@/services/api/swap'
+import { requestInitMdUserSwapProtocol } from '@/services/api/account'
 import eventBus from '@/services/bus'
 import Iconfont from '@/components/base/iconfont/index.vue'
-import { getMemberUserId } from '@/services/methods/user'
-import { queryMdUserSwapProtocol } from '@/services/api/swap'
 
 const { router, routerTo } = useNavigation()
 const loginStore = useLoginStore()
@@ -225,6 +227,19 @@ const userLogout = () => {
     })
 }
 
+/// 创建电子签合同
+const { run: initMdUserSwapProtocol } = useRequest(requestInitMdUserSwapProtocol, {
+    manual: true,
+    params: {
+        userId: getUserId(),
+        memberUserId: getMemberUserId()
+    },
+    onSuccess: () => {
+        /// 可以交易
+        canBankSign.value = true
+    }
+})
+
 onActivated(() => {
     if (authStatus.value !== AuthStatus.Certified) {
         userStore.getUserData()
@@ -243,8 +258,12 @@ onActivated(() => {
             userId: loginStore.userId
         }
     }).then((res) => {
-        /// 判断是否能签约
-        canBankSign.value = res.data.some(e => e.protocolstatus === 4)
+        if (res.data.length === 0) {
+            initMdUserSwapProtocol()
+        } else {
+            /// 判断是否能签约
+            canBankSign.value = res.data.some(e => e.protocolstatus === 4)
+        }
     })
 })
 </script>