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

README.md

@@ -1,31 +1,44 @@
+<!--
+ * @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
+ * @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
+-->
 # mtp2_h5_plus
 
 ## Project setup
+
 ```
 npm install
 ```
 
 ### Compiles and hot-reloads for development
+
 ```
 npm run serve
 ```
 
 ### Compiles and minifies for production
+
 ```
 npm run build
 ```
 
 ### Lints and fixes files
+
 ```
 npm run lint
 ```
 
 ### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
 
+See [Configuration Reference](https://cli.vuejs.org/config/).
 
 ## 注意事项
-除 ./src/packages 文件夹内禁止引入UI组件库
+
+除 ./src/packages 文件夹内禁止引入 UI 组件库
 
 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
+npx pbjs -t json-module -w commonjs -o src/services/socket/trade/protobuf/thj.js public/proto/thj.proto

public/config/appconfig.json

@@ -2,7 +2,7 @@
   "appId": "com.muchinfo.app",
   "version": "1.0.5",
   "versionCode": "10005",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "apiUrl": "http://192.168.31.205:8080/cfg?key=test_205",
   "modules": [
     "register",
     "delivery"

src/business/bank/index.ts

@@ -499,7 +499,7 @@ export function useDoYJFGetWithholdSignInSMSVCode() {
         UserID: useStore.userInfo.userid,
         LoginID: loginStore.loginId,
         ClientSerialNo: v4(),
-        Yckfxe: '0.00',
+        Yckfxe: '500000.00',
         Kkzqnkfxe: '0.00', 
         Kkzqnxzbs: '0',
         Kksjbc: '99'

src/constants/order.ts

@@ -62,6 +62,13 @@ export enum TradeStatus {
     LoginOut = 7
 }
 
+/// 代扣处理结果
+export enum BillResult {
+    Success = 0,
+    Failure = 1,
+    InProcess = 2
+}
+
 /**
  * 获取买卖方向列表
  * @returns 
@@ -553,4 +560,25 @@ export function getTransferApplyStatusList() {
 export function getTransferApplyStatusName(value: number) {
     const enums = getTransferApplyStatusList()
     return getEnumTypeName(enums, value)
+}
+
+/**
+ * 获取代扣扣费列表
+ * @returns 
+ */
+export function getBillResultList() {
+    return [
+        { label: '扣费成功', value: BillResult.Success },
+        { label: '扣费失败', value: BillResult.Failure },
+        { label: '处理中', value: BillResult.InProcess },
+    ]
+}
+
+/**
+ * 获取代扣扣费名称
+ * @returns 
+ */
+export function getBillResultName(value: number) {
+    const enums = getBillResultList()
+    return getEnumTypeName(enums, value)
 }

src/packages/gstj/views/holdbank/holddeposit/Index.vue

@@ -19,7 +19,7 @@
                             <h5>{{ formatDecimal(item.billamount) }}</h5>
                         </div>
                         <div class="right">
-                            <span>{{ item.billresult === '0' ? '扣费成功' : '扣费失败' }}</span>
+                            <span>{{ getBillResultName(Number(item.billresult)) }}</span>
                         </div>
                     </div>
                     <div class="g-order-list__content">
@@ -55,6 +55,7 @@ import { useRequest } from '@/hooks/request'
 import { SignStatus } from '@/constants/bank'
 import { Calendar, Cell } from 'vant'
 import { queryGtwithholddepositapply, queryGetGtwithholdsigninfo } from '@/services/api/bank'
+import { getBillResultName } from '@/constants/order'
 import moment from 'moment'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
@@ -92,11 +93,15 @@ const onConfirm = ([start, end]: Date[]) => {
 }
 
 const onRefresh = () => {
-    const [begindate, enddate] = dateRange.value
-    run({
-        begindate: formatDate(begindate, 'YYYYMMDD'),
-        enddate: formatDate(enddate, 'YYYYMMDD')
-    })
+    if (dateRange.value.length != 0) {
+        const [begindate, enddate] = dateRange.value
+        run({
+            begindate: formatDate(begindate, 'YYYYMMDD'),
+            enddate: formatDate(enddate, 'YYYYMMDD')
+        })
+    } else {
+        run()
+    }
 }
 </script>
 

src/packages/gstj/views/holdbank/holddeposit/components/apply/Index.vue

@@ -69,8 +69,8 @@ const formRules: { [key: string]: FieldRule[] } = {
         required: true,
         message: '请输入代扣金额',
         validator: (val) => {
-            if (val >= 500000) {
-                return '代扣金额不能大于 50 万'
+            if (val > 500000) {
+                return '代扣金额不能超过50万'
             }
             return true
         }

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

@@ -39,7 +39,17 @@ const billAmount = ref(0.0)
 /// 备注
 const Remark = ref('')
 const formRules: FormRules = {
-    BillAmount: [{ required: true, message: '请输入入金金额' }],
+    BillAmount: [{ 
+        required: true, 
+        message: '请输入代扣金额',
+            validator: (rule, value, callback) => {
+                if (value > 500000) {
+                    callback(new Error('代扣金额不能超过50万'))
+                } else {
+                    callback()
+                }
+            } 
+    }],
 }
 
 const onCancel = () => {

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

@@ -87,7 +87,6 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    // { prop: 'billingsnum', label: '流水号' },
     { prop: 'dgjfhm', label: '扣费账号' },
     { prop: 'deductionbnum', label: '扣费批次号' },
     { prop: 'billamount', label: '入金代扣金额' },

src/types/model/user.d.ts

@@ -341,6 +341,20 @@ declare namespace Model {
         /// 合同签署小程序URL
         signUrl: string
     }
+    
+    /// 按用户 ID 和机构 ID 创建机构交易协议申请信息 - 请求
+    interface InitMdUserSwapProtocolReq {
+        /// 所属会员ID
+        memberUserId?: number
+        /// 用户ID
+        userId?: number
+    }
+
+    /// 按用户 ID 和机构 ID 创建机构交易协议申请信息 - 回应
+    interface InitMdUserSwapProtocolRsp {
+        /// code
+        code: string
+    }
 
     /// 按用户 ID 和机构 ID 创建机构交易协议申请信息 - 请求
     interface InitMdUserSwapProtocolReq {