From 3bf9ce21e72c153a75275a7d7d74ae24c12292bb Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Thu, 19 Jan 2023 14:29:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AE=80=E6=98=93=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95--=E8=AE=A2=E9=87=91=E6=94=B6=E5=8F=96--=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E6=96=B9=E5=BC=8F=E4=B8=BA=E8=BD=AC=E8=B4=A6=E6=97=B6?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=94=B6=E6=AC=BE=E9=93=B6=E8=A1=8C=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81=E6=94=B6=E6=AC=BE=E9=93=B6=E8=A1=8C=E7=AD=89?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xunidingdanFlow/dingjinshouqu.vue         | 16 +++++------
 .../xunidingdanFlow/dingjinshouquEdit.vue     | 28 +++++++++----------
 .../xunidingdanFlow/dingjinshouquInfo.vue     | 16 +++++------
 .../xunidingdan/xunidingjinAdd.vue            | 28 +++++++++----------
 .../xunidingdan/xunidingjininfo.vue           | 16 +++++------
 5 files changed, 50 insertions(+), 54 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue
index 04dd889c62..dc10c1cad3 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue
@@ -90,13 +90,13 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-show="temp.payTypeKey === '03'">
             <el-col :span="3" class="tleftb">
-              <span v-show="temp.payTypeKey === '03'">付款账号后4位</span>
+              <span>付款账号后4位</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span v-show="temp.payTypeKey === '03'">{{ temp.payNumber }}</span>
+                <span>{{ temp.payNumber }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -108,12 +108,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span>采购系统</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
-                <span>{{ temp.purchaseSystemName }}</span>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -126,15 +122,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
+              <span>采购系统</span>
             </el-col>
             <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.purchaseSystemName }}</span>
+              </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
             </el-col>
             <el-col :span="5">
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-show="temp.payTypeKey === '03'">
             <el-col :span="3" class="tleftb">
               <span>收款银行账号</span>
             </el-col>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue
index 3e3488d943..0bfec556c6 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue
@@ -91,13 +91,13 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-show="temp.payTypeKey === '03'">
             <el-col :span="3" class="tleftb">
-              <span v-show="temp.payTypeKey === '03'"><span class="icon">*</span>付款账号后4位</span>
+              <span><span class="icon">*</span>付款账号后4位</span>
             </el-col>
             <el-col :span="5">
               <el-form-item prop="payNumber">
-                <el-input v-show="temp.payTypeKey === '03'" v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
+                <el-input v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -109,14 +109,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>采购系统</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="purchaseSystemName">
-                <el-select v-model="temp.purchaseSystemName" class="addinputw" placeholder="" @change="changePurchaseSystemName">
-                  <el-option v-for="item in purchase_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"/>
-                </el-select>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -129,20 +123,26 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
+              <span><span class="icon">*</span>采购系统</span>
             </el-col>
             <el-col :span="5">
+              <el-form-item prop="purchaseSystemName">
+                <el-select v-model="temp.purchaseSystemName" class="addinputw" placeholder="" @change="changePurchaseSystemName">
+                  <el-option v-for="item in purchase_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"/>
+                </el-select>
+              </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
             </el-col>
             <el-col :span="5">
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-show="temp.payTypeKey === '03'">
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>收款银行账号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="collectionNumber">
+              <el-form-item>
                 <el-select v-model="temp.collectionNumber" class="addinputw" filterable clearable placeholder="" @change="changeProBankAccValue">
                   <el-option v-for="item in ProBankAcc_list" :key="item.accountSid" :label="item.bankAccount" :value="item.bankAccount"/>
                 </el-select>
@@ -157,10 +157,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>收款银行</span>
+              <span>收款银行</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="collectionBank">
+              <el-form-item>
                 <span>{{ temp.collectionBank }}</span>
               </el-form-item>
             </el-col>
@@ -290,8 +290,6 @@ export default {
         deposit: [{ required: true, message: '订金金额不能为空', trigger: 'blur' }],
         payDate: [{ required: true, message: '付款日期不能为空', trigger: 'change' }],
         payType: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
-        collectionBank: [{ required: true, message: '收款银行不能为空', trigger: 'change' }],
-        collectionNumber: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }],
         purchaseSystemName: [{ required: true, message: '采购系统不能为空', trigger: 'change' }]
       }
       // ------------------------------------
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue
index 7eae63e250..0518b00130 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue
@@ -88,13 +88,13 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-show="temp.payTypeKey === '03'">
             <el-col :span="3" class="tleftb">
-              <span v-show="temp.payTypeKey === '03'">付款账号后4位</span>
+              <span>付款账号后4位</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span v-show="temp.payTypeKey === '03'">{{ temp.payNumber }}</span>
+                <span>{{ temp.payNumber }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -106,12 +106,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span>采购系统</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
-                <span>{{ temp.purchaseSystemName }}</span>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -124,15 +120,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
+              <span>采购系统</span>
             </el-col>
             <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.purchaseSystemName }}</span>
+              </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
             </el-col>
             <el-col :span="5">
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-show="temp.payTypeKey === '03'">
             <el-col :span="3" class="tleftb">
               <span>收款银行账号</span>
             </el-col>
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue
index 5bca9d325e..024ee98cc7 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue
@@ -92,13 +92,13 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-show="temp.payTypeKey === '03'">
             <el-col :span="3" class="tleftb">
-              <span v-show="temp.payTypeKey === '03'"><span class="icon">*</span>付款账号后4位</span>
+              <span><span class="icon">*</span>付款账号后4位</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <el-input v-show="temp.payTypeKey === '03'" v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
+                <el-input v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -110,14 +110,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>采购系统</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="purchaseSystemName">
-                <el-select v-model="temp.purchaseSystemName" class="addinputw" placeholder="" @change="changePurchaseSystemName">
-                  <el-option v-for="item in purchase_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"/>
-                </el-select>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -130,20 +124,26 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
+              <span><span class="icon">*</span>采购系统</span>
             </el-col>
             <el-col :span="5">
+              <el-form-item prop="purchaseSystemName">
+                <el-select v-model="temp.purchaseSystemName" class="addinputw" placeholder="" @change="changePurchaseSystemName">
+                  <el-option v-for="item in purchase_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"/>
+                </el-select>
+              </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
             </el-col>
             <el-col :span="5">
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-show="temp.payTypeKey === '03'">
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>收款银行账号</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="collectionNumber">
+              <el-form-item>
                 <el-select v-model="temp.collectionNumber" class="addinputw" filterable clearable placeholder="" @change="changeProBankAccValue">
                   <el-option v-for="item in ProBankAcc_list" :key="item.accountSid" :label="item.bankAccount" :value="item.bankAccount"/>
                 </el-select>
@@ -158,10 +158,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span><span class="icon">*</span>收款银行</span>
+              <span>收款银行</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item prop="collectionBank">
+              <el-form-item>
                 <span>{{ temp.collectionBank }}</span>
               </el-form-item>
             </el-col>
@@ -292,8 +292,6 @@ export default {
         deposit: [{ required: true, message: '订金金额不能为空', trigger: 'blur' }],
         payDate: [{ required: true, message: '付款日期不能为空', trigger: 'change' }],
         payType: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
-        collectionBank: [{ required: true, message: '收款银行不能为空', trigger: 'change' }],
-        collectionNumber: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }],
         purchaseSystemName: [{ required: true, message: '采购系统不能为空', trigger: 'change' }]
       }
     }
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
index 5d154ce628..ce232dc723 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
@@ -88,13 +88,13 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-show="temp.payTypeKey === '03'">
             <el-col :span="3" class="tleftb">
-              <span v-show="temp.payTypeKey === '03'">付款账号后4位</span>
+              <span>付款账号后4位</span>
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span v-show="temp.payTypeKey === '03'">{{ temp.payNumber }}</span>
+                <span>{{ temp.payNumber }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
@@ -106,12 +106,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span>采购系统</span>
             </el-col>
             <el-col :span="5">
-              <el-form-item>
-                <span>{{ temp.purchaseSystemName }}</span>
-              </el-form-item>
             </el-col>
           </el-row>
           <el-row>
@@ -124,15 +120,19 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
+              <span>采购系统</span>
             </el-col>
             <el-col :span="5">
+              <el-form-item>
+                <span>{{ temp.purchaseSystemName }}</span>
+              </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
             </el-col>
             <el-col :span="5">
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-show="temp.payTypeKey === '03'">
             <el-col :span="3" class="tleftb">
               <span>收款银行账号</span>
             </el-col>