Merge branch 'v20' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL into v20

src/packages/mobile/views/bank/sign/components/edit/Index.vue

@@ -32,12 +32,12 @@
                         </template>
                         <template v-else-if="(item.fieldcode === 'bank_branch_name')">
                             <Field v-if="showExtendInfo(item)" name="OpenBankName" :label="item.fieldname"
-                                v-model="item.value" maxlength="50" right-icon="search"
+                                v-model="item.value" maxlength="100" right-icon="search"
                                 :placeholder="`请输入${item.fieldname}`" :rules="formRules.OpenBankName"
                                 @click-right-icon="showSearch = true" />
                         </template>
                         <template v-else-if="(item.fieldcode === '100')">
-                            <Field v-if="showExtendInfo(item)" name="OpenBankNo" :label="item.fieldname"
+                            <Field v-if="showExtendInfo(item)" type="number" name="OpenBankNo" :label="item.fieldname"
                                 v-model="item.value" maxlength="50" :placeholder="`请输入${item.fieldname}`"
                                 :rules="formRules.OpenBankNo" />
                         </template>

src/packages/pc/views/account/address/components/edit/index.vue

@@ -15,6 +15,9 @@
             <el-form-item label="联系电话" prop="PhoneNum">
                 <el-input placeholder="请输入" v-model="formData.PhoneNum" />
             </el-form-item>
+            <!-- <el-form-item label="证件号码" prop="CardNum">
+                <el-input placeholder="请输入" v-model="formData.CardNum" />
+            </el-form-item> -->
             <el-form-item class="el-form-item--row" label="收货地址" prop="area">
                 <app-region class="el-form-item--col" v-model:province="formData.ProvinceID"
                     v-model:city="formData.CityID" v-model:district="formData.DistrictID" />

src/packages/pc/views/account/sign/components/sign/index.vue

@@ -49,13 +49,13 @@
                 </template>
                 <template v-else-if="(item.fieldcode === '100')">
                     <el-form-item :label="item.fieldname" :prop="item.fieldcode" v-if="showExtendInfo(item)">
-                        <el-input maxlength="50" placeholder="请f输入" v-model="item.value" />
+                        <el-input maxlength="50" placeholder="请输入" v-model="item.value" />
                     </el-form-item>
                 </template>
                 <template v-else>
                     <el-form-item :label="item.fieldname" :prop="item.fieldcode" v-if="showExtendInfo(item)">
                         <el-input :readonly="item.fieldcode === 'legal_name' && userStore.userInfo?.legalpersonname != ''"
-                            maxlength="50" placeholder="请输入" v-model="item.value" />
+                        type="number" maxlength="50" placeholder="请输入" v-model="item.value" />
                     </el-form-item>
                 </template>
             </template>

src/packages/pc/views/query/inoutapply/history/index.vue

@@ -30,7 +30,7 @@ import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
 import { queryAccountInOutApply } from '@/services/api/bank'
-import { getInOutApplyStatusName, getInOutExecuteTypeName } from '@/constants/order'
+import { getInOutApplyStatusName, getInOutExecuteTypeName, getInOutApplyStatusList } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -38,19 +38,23 @@ const { filterOptons, getQueryParams } = useDataFilter<Model.AccountInOutApplyRe
 const filterDate = shallowRef<string[]>([])
 
 filterOptons.buttonList = [
-    { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
-    { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }
+    { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) },
+    { lable: '查询', className: 'el-button--info', onClick: () => onSearch() }
 ]
 
 filterOptons.selectList = [
     {
         key: 'querytype',
-        selectedValue: 2,
+        selectedValue: undefined,
         options: [
             { label: '出金', value: 1 },
             { label: '入金', value: 2 },
-        ],
-        locked: true,
+        ]
+    },
+    {
+        key: 'applystatus',
+        selectedValue: undefined,
+        options: getInOutApplyStatusList()
     }
 ]
 

src/packages/pc/views/query/inoutapply/list/index.vue

@@ -25,7 +25,7 @@ import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
 import { queryAccountInOutApply } from '@/services/api/bank'
-import { getInOutApplyStatusName, getInOutExecuteTypeName } from '@/constants/order'
+import { getInOutApplyStatusName, getInOutExecuteTypeName, getInOutApplyStatusList } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -33,17 +33,22 @@ const { filterOptons, getQueryParams } = useDataFilter<Model.AccountInOutApplyRe
 
 filterOptons.buttonList = [
     { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
+    { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }
 ]
 
 filterOptons.selectList = [
     {
         key: 'querytype',
-        selectedValue: 2,
+        selectedValue: undefined,
         options: [
             { label: '出金', value: 1 },
             { label: '入金', value: 2 },
-        ],
-        locked: true,
+        ]
+    },
+    {
+        key: 'applystatus',
+        selectedValue: undefined,
+        options: getInOutApplyStatusList()
     }
 ]
 

src/types/model/bank.d.ts

@@ -290,7 +290,8 @@ declare namespace Model {
         // 资金流水号：银行端流水号
         moneyticket: number
         // 资金操作类型 (AccountFundCmdOp)- 101:入金 102:入金手续费 103:出金 104:出金冻结 105:出金解冻 106:出金手续费 107:出金手续费冻结 108:出金手续费解冻 201:交易冻结 202:交易解冻 203:交易占用 204:交易解占用 205:交易手续费冻结 206:交易手续费解冻 207:交易手续费 208:交易货款 209:交易盈亏 301:交割冻结 302:交割解冻 303:交割手续费 304:交割手续费冻结 305:交割手续费解冻 306:交割货款 307:交割税款 401:结算盈亏 402:结算递延费 403:分润收入 404:延期分润 501:授信增加 502:授信减少 503:转积分 504:转入 505:转出 506:转出冻结 507:转出解冻 601:履约金额冻结 602:履约最大冻结 603:履约金额解冻 604:履约扣款 605:履约收款 606:履约违约手续费 607:履约违约收入 608:履约最大扣款 701:供应链金融冻结 702:供应链金融解冻 703:供应链金融最大冻结 704:供应链金融利息 705:供应链金融货款 706:供应链金融押金 707:供应链金融最大扣款 801:仓单贸易冻结 802:仓单贸易解冻 803:仓单贸易首付款 804:仓单贸易最大扣款 901:商城扣款冻结 902:商城扣款解冻 903:商城扣款 904:商城收款 1001:期权冻结 1002:期权解冻 1003:期权权力金 1004:期权手续费冻结 1005:期权手续费解冻 1006:期权手续费 1007:期权盈亏 1101:营销扣款 1102:营销收款
-        operatetypename: string; // 资金操作类型名称(显示)
+        operatetypename: string; 
+        // 资金操作类型名称(显示)
         operatetype: number
         // 关联单号
         relationorderid: string