Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL

src/business/bank/index.ts

@@ -125,6 +125,7 @@ export function useDoBankSign() {
     /// 查询签约银行信息
     const request = queryCusBankSignBank().then((res) => {
         if (res.data.length) {
+            console.log(res.data)
             const data = res.data[0]
             cusSignBank.value = data
             formData.Currency = data.currency

src/mock/router.ts

@@ -417,7 +417,7 @@ const appmenu = {
                     {
                         authType: 1,
                         sort: 2,
-                        title: '收获地址管理',
+                        title: '收货地址管理',
                         code: 'account_address',
                         url: 'address',
                         urlType: 1,

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

@@ -60,10 +60,6 @@ const formRules: FormRules = {
     ReceiptType: [{ required: true, message: '请选择发票类型' }],
     UserName: [{ required: true, message: '请输入发票抬头', trigger: 'blur' }],
     TaxpayerID: [{ required: true, message: '请输入税号', trigger: 'blur' }],
-    // ReceiptBank: [{ required: true, message: '请输入开户银行', trigger: 'blur' }],
-    // ReceiptAccount: [{ required: true, message: '请输入银行账号', trigger: 'blur' }],
-    // Address: [{ required: true, message: '请输入企业地址', trigger: 'blur' }],
-    // ContactInfo: [{ required: true, message: '请输入企业电话', trigger: 'blur' }],
 }
 
 const onCancel = (isRefresh = false) => {

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

@@ -12,8 +12,8 @@
             <el-form-item label="银行卡号" prop="BankAccountNo">
                 <el-input name="BankAccountNo" placeholder="银行卡账户名" v-model="formData.BankAccountNo" :rules="formRules.BankAccountNo"/>
             </el-form-item>
-            <el-form-item label="姓名" prop="AccountName">
-                <el-input name="AccountName" placeholder="银行卡账户名" v-model="formData.AccountName" :rules="formRules.AccountName"/>
+            <el-form-item label="姓名" prop="BankAccountName">
+                <el-input name="BankAccountName" placeholder="银行卡账户名" v-model="formData.BankAccountName" :rules="formRules.BankAccountName"/>
             </el-form-item>
             <el-form-item label="支行名称" prop="BranchBankName">
                 <el-input name="BranchBankName" placeholder="请输入银行卡支行名称" v-model="formData.OpenBankName" :rules="formRules.OpenBankName"/>
@@ -51,11 +51,12 @@ const formRules: FormRules = {
     BankAccountNo: [{
         required: true,
         message: '请输入银行卡账号',
-        validator: (val) => {
-            if (validateRules.bankcardno.validate(val)) {
-                return true
+        validator: (rule, value, callback) => {
+            if (validateRules.bankcardno.validate(value)) {
+                callback()
+            } else {
+                callback(new Error(validateRules.bankcardno.message))
             }
-            return validateRules.bankcardno.message
         }
     }],
     BankAccountName: [{

src/services/http/index.ts

@@ -243,7 +243,7 @@ export default new (class {
                     return Promise.resolve(res as T)
                 }
                 const { getErrorInfoByCode } = useErrorInfoStore()
-                const msg = getErrorInfoByCode(res.RetCode)
+                const msg = getErrorInfoByCode(res.Status)
                 const error = String(res.RetDesc || res.RetCode || res.Status)
                 return Promise.reject(msg ?? error)
             }