Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/finance/feeSettlement/columns.tsx

@@ -407,7 +407,8 @@ export const detailForm: FormSchema[] = [
             }
             GetClientBankList(data).then((res) => {
               res.data.forEach(item => {
-                item.showName = item.bankName + ' ' + item.account
+                item.bankAccountNo = item.bankAccountNo ? item.bankAccountNo :''
+                item.showName = item.bankName + ' ' + item.bankAccountNo
               })
               resolve(res)
             })
@@ -420,7 +421,7 @@ export const detailForm: FormSchema[] = [
         onChange: (e, obj) => {
           if (obj) {
             formModel.customerBankId = obj.id
-            formModel.customerAccount = obj.account
+            formModel.customerAccount = obj.bankAccountNo
           }
           if (!obj && !e) {
             formModel.customerBankId = ''
@@ -495,8 +496,9 @@ export const detailForm: FormSchema[] = [
             }
             getBankList(data).then(res => {
               res.data.forEach(item=>{
-                item.label = item.bankName + ' ' + item.account
-                item.value = item.bankName + ' ' + item.account
+                item.bankAccountNo = item.bankAccountNo ? item.bankAccountNo :''
+                item.label = item.bankName + ' ' + item.bankAccountNo
+                item.value = item.bankName + ' ' + item.bankAccountNo
               })
               bankList.value = res.data
             })

src/views/finance/paymentSettlement/paymentSettlementFree/columns.tsx

@@ -402,7 +402,8 @@ export const detailForm: FormSchema[] = [
             }
             GetClientBankList(data).then((res) => {
               res.data.forEach(item => {
-                item.showName = item.bankName + ' ' + item.account
+                item.bankAccountNo = item.bankAccountNo ? item.bankAccountNo :''
+                item.showName = item.bankName + ' ' + item.bankAccountNo
               })
               resolve(res)
             })
@@ -415,7 +416,7 @@ export const detailForm: FormSchema[] = [
         onChange: (e, obj) => {
           if (obj) {
             formModel.customerBankId = obj.id
-            formModel.customerAccount = obj.account
+            formModel.customerAccount = obj.bankAccountNo
           }
           if (!obj && !e) {
             formModel.customerBankId = ''
@@ -490,8 +491,9 @@ export const detailForm: FormSchema[] = [
             }
             getBankList(data).then(res => {
               res.data.forEach(item=>{
-                item.label = item.bankName + ' ' + item.account
-                item.value = item.bankName + ' ' + item.account
+                item.bankAccountNo = item.bankAccountNo ? item.bankAccountNo :''
+                item.label = item.bankName + ' ' + item.bankAccountNo
+                item.value = item.bankName + ' ' + item.bankAccountNo
               })
               bankList.value = res.data
             })

src/views/operation/invoiceIssue/detail/index.vue

@@ -340,18 +340,7 @@
                 </div>
                 <div class="right">
                     <BasicForm @register="registerForm">
-                        <template #email="{ model, field }">
-                            <a-input v-model:value="model.email" size="small"
-                                style="width: 50%;margin-right: 20px"></a-input>
-                            <a-switch checked-children="开" un-checked-children="关" size="small"
-                                v-model:checked="model.emailFlag" />
-                        </template>
-                        <template #cellPhoneNO="{ model, field }">
-                            <a-input v-model:value="model.cellPhoneNO" size="small"
-                                style="width: 50%;margin-right: 20px"></a-input>
-                            <a-switch checked-children="开" un-checked-children="关" size="small"
-                                v-model:checked="model.cellPhoneNOFlag" />
-                        </template>
+
                     </BasicForm>
                     <BasicTable @register="registerTable">
 
@@ -547,11 +536,13 @@ const detailForm = [
     {
         field: 'cellPhoneNOFlag',
         component: 'Input',
+        defaultValue: true,
         show: false,
         colProps: { span: 24 },
     },
     {
         field: 'emailFlag',
+        defaultValue: true,
         show: false,
         component: 'Input',
         colProps: { span: 24 },
@@ -560,14 +551,12 @@ const detailForm = [
         field: 'email',
         label: '邮箱',
         component: 'Input',
-        slot: 'email',
         colProps: { span: 24 },
     },
     {
         field: 'cellPhoneNO',
         label: '手机',
         component: 'Input',
-        slot: 'cellPhoneNO',
         colProps: { span: 24 },
     },
     {
@@ -579,7 +568,7 @@ const detailForm = [
         },
     },
     {
-        field: 'isSetRed',
+        field: 'isSetRedName',
         label: '是否冲红',
         component: 'Input',
         dynamicDisabled: true,
@@ -804,10 +793,10 @@ function getDetail() {
                 res.data.isLockedName = '否'
             }
             if (res.data.isSetRed) {
-                res.data.isSetRed = '是'
+                res.data.isSetRedName = '是'
                 res.data.invoiceType = '红票'
             } else {
-                res.data.isSetRed = '否'
+                res.data.isSetRedName = '否'
                 res.data.invoiceType = '正票'
             }
             if (res.data.invoiceNO) {
@@ -817,14 +806,6 @@ function getDetail() {
             }
             res.data.emailFlag = false
             res.data.cellPhoneNOFlag = false
-            res.data.pushModeValues.forEach(item => {
-                if (item == 1) {
-                    res.data.emailFlag = true
-                }
-                if (item == 2) {
-                    res.data.cellPhoneNOFlag = true
-                }
-            })
             res.data.applyAmount = numberThousandFormat(res.data.applyAmount, 2, false)
             res.data.otherInvoiceAmount = numberThousandFormat(res.data.otherInvoiceAmount, 2, false)
             res.data.invoiceAmount = numberThousandFormat(res.data.invoiceAmount, 2, false)