From cc1a4d730937faca45279827fbc9789b3ce94f12 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Mon, 30 May 2022 11:56:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E5=86=9Capp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../paymentAccount/paymentAccountAdd.vue        |  6 +++++-
 .../paymentAccount/paymentAccountModify.vue     |  5 ++++-
 .../paymentApproval/approvalAdd.vue             | 15 ++++++++++++---
 .../paymentApproval/approvalAdd11.vue           | 16 ++++++++++++----
 .../paymentApproval/approvalAdd12.vue           | 17 +++++++++++++----
 .../paymentApproval/approvalAdd2.vue            | 15 ++++++++++++---
 .../paymentApproval/approvalDetail.vue          |  2 +-
 .../paymentApproval/approvalDetail11.vue        |  2 +-
 .../paymentApproval/approvalDetail12.vue        |  2 +-
 .../paymentApproval/approvalDetail2.vue         |  2 +-
 .../paymentApproval/approvalModify.vue          | 15 ++++++++++++---
 .../paymentApproval/approvalModify11.vue        | 15 ++++++++++++---
 .../paymentApproval/approvalModify12.vue        | 17 +++++++++++++----
 .../paymentApproval/approvalModify2.vue         | 15 ++++++++++++---
 14 files changed, 111 insertions(+), 33 deletions(-)

diff --git a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
index dcfd834d..ad5cd484 100644
--- a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
@@ -199,7 +199,7 @@
           />
         </van-popup>
         <van-field label="开户银行地址" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入开户银行地址' }]" v-model="form.site" placeholder="请输入开户银行地址" input-align="right" label-width="auto" required/>
-        <van-field label="支付口令" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入支付口令' }]" v-model="form.accountPassword" placeholder="请输入支付口令" input-align="right" label-width="auto" required/>
+        <van-field label="支付口令" v-if="accountType=='银行存款'" name="validator" :rules="[{ validator , message:'支付口令：请输入六位以上数字' }]" v-model="form.accountPassword" placeholder="请输入支付口令" input-align="right" label-width="auto" required/>
         <van-field label="账户类型" v-if="accountType=='银行存款'" required>
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.bankAccountType" required :rules="[{ required: true , message:'请选择账户类型' }]">
@@ -321,6 +321,9 @@
       this.getDetail();
     },
     methods: {
+      validator(val){
+        return /^\d{6,}$/.test(val);
+      },
       getDetail(){
         // 账户类型
         this.houseGetDicts("account_type_cashier").then((res) => {
@@ -350,6 +353,7 @@
         });
       },
       getTaList(){
+
         let params= {
           // 分页
           pageNum: 1,
diff --git a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue
index e57657d0..4de3a362 100644
--- a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue
@@ -199,7 +199,7 @@
           />
         </van-popup>
         <van-field label="开户银行地址" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入开户银行地址' }]" v-model="form.site" placeholder="请输入开户银行地址" input-align="right" label-width="auto" required/>
-        <van-field label="支付口令" v-if="accountType=='银行存款'" :rules="[{ required: true , message:'请输入支付口令' }]" v-model="form.accountPassword" placeholder="请输入支付口令" input-align="right" label-width="auto" required/>
+        <van-field label="支付口令" v-if="accountType=='银行存款'" name="validator" :rules="[{ validator , message:'支付口令：请输入六位以上数字' }]" v-model="form.accountPassword" placeholder="请输入支付口令" input-align="right" label-width="auto" required/>
         <van-field label="账户类型" v-if="accountType=='银行存款'" required >
           <template #right-icon>
             <van-radio-group direction="horizontal" v-model="form.bankAccountType" required :rules="[{ required: true , message:'请选择账户类型' }]">
@@ -321,6 +321,9 @@
       this.getDetail();
     },
     methods: {
+      validator(val){
+        return /^\d{6,}$/.test(val);
+      },
       getDetail(){
         getAccount(this.$route.query.id).then((response) => {
           // 账户类型
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
index 75f6c355..c8921241 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -67,6 +67,7 @@
           </template>
         </van-field>
         <van-field
+          v-if="form.approvalMode==1"
           readonly
           clickable
           label="审批流程"
@@ -436,9 +437,17 @@
         });
       },
       onConfirmTemplate(data){
-        this.form.approvalTemplateName = data.name
-        this.form.approvalTemplateId = data.id
-        this.showtemplate = false;
+        selectApprovalByTemplateId(data.id).then(res => {
+          this.showtemplate = false;
+          if(res.approvalDetails.length>0){
+            this.form.approvalTemplateName = data.name
+            this.form.approvalTemplateId = data.id
+          }else{
+            this.form.approvalTemplateName = null
+            this.form.approvalTemplateId = null
+            this.$notify({ type: 'danger', message: '此流程无节点，无法选择！' });
+          }
+        })
       },
       getNowDate(){
         var _this = this;
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
index c26fc94b..4ffba09d 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
@@ -76,6 +76,7 @@
           </template>
         </van-field>
         <van-field
+          v-if="form.approvalMode==1"
           readonly
           clickable
           label="审批流程"
@@ -389,9 +390,17 @@
         });
       },
       onConfirmTemplate(data){
-        this.form.approvalTemplateName = data.name
-        this.form.approvalTemplateId = data.id
-        this.showtemplate = false;
+        selectApprovalByTemplateId(data.id).then(res => {
+          this.showtemplate = false;
+          if(res.approvalDetails.length>0){
+            this.form.approvalTemplateName = data.name
+            this.form.approvalTemplateId = data.id
+          }else{
+            this.form.approvalTemplateName = null
+            this.form.approvalTemplateId = null
+            this.$notify({ type: 'danger', message: '此流程无节点，无法选择！' });
+          }
+        })
       },
       getNowDate(){
         var _this = this;
@@ -730,7 +739,6 @@
                       })
 
                     })
-
                   });
                 })
             }else{
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue
index fb66edca..cfccf871 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue
@@ -67,6 +67,7 @@
           </template>
         </van-field>
         <van-field
+          v-if="form.approvalMode==1"
           readonly
           clickable
           label="审批流程"
@@ -203,7 +204,7 @@
             @cancel="showpayer = false"
           />
         </van-popup>
-        <van-field :rules="[{ required: true , message:'请输入汇票号码' }]" required label="汇票号码" v-model="form.payerAccount" placeholder="请输入汇票号码" input-align="right" label-width="auto"/>
+        <van-field readonly :rules="[{ required: true , message:'请输入汇票号码' }]" required label="汇票号码" v-model="form.payerAccount" input-align="right" label-width="auto"/>
         <van-field
           readonly
           label="出票金额（元）"
@@ -436,9 +437,17 @@
         });
       },
       onConfirmTemplate(data){
-        this.form.approvalTemplateName = data.name
-        this.form.approvalTemplateId = data.id
-        this.showtemplate = false;
+        selectApprovalByTemplateId(data.id).then(res => {
+          this.showtemplate = false;
+          if(res.approvalDetails.length>0){
+            this.form.approvalTemplateName = data.name
+            this.form.approvalTemplateId = data.id
+          }else{
+            this.form.approvalTemplateName = null
+            this.form.approvalTemplateId = null
+            this.$notify({ type: 'danger', message: '此流程无节点，无法选择！' });
+          }
+        })
       },
       getNowDate(){
         var _this = this;
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
index 1ea1b5d0..7c42fdb9 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
@@ -76,6 +76,7 @@
           </template>
         </van-field>
         <van-field
+          v-if="form.approvalMode==1"
           readonly
           clickable
           label="审批流程"
@@ -427,9 +428,17 @@
         });
       },
       onConfirmTemplate(data){
-        this.form.approvalTemplateName = data.name
-        this.form.approvalTemplateId = data.id
-        this.showtemplate = false;
+        selectApprovalByTemplateId(data.id).then(res => {
+          this.showtemplate = false;
+          if(res.approvalDetails.length>0){
+            this.form.approvalTemplateName = data.name
+            this.form.approvalTemplateId = data.id
+          }else{
+            this.form.approvalTemplateName = null
+            this.form.approvalTemplateId = null
+            this.$notify({ type: 'danger', message: '此流程无节点，无法选择！' });
+          }
+        })
       },
       getNowDate(){
         var _this = this;
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
index a22f1f35..b077e6e2 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail.vue
@@ -26,7 +26,7 @@
           </van-radio-group>
         </template>
       </van-field>
-      <van-field readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
+      <van-field v-if="form.approvalMode==1" readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
index be8bfb53..41b2032f 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail11.vue
@@ -26,7 +26,7 @@
           </van-radio-group>
         </template>
       </van-field>
-      <van-field readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
+      <van-field v-if="form.approvalMode==1" readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue
index 909ce38c..52bad3ae 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail12.vue
@@ -25,7 +25,7 @@
           </van-radio-group>
         </template>
       </van-field>
-      <van-field readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
+      <van-field v-if="form.approvalMode==1" readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue
index bd922ff5..4832fc0a 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2.vue
@@ -26,7 +26,7 @@
           </van-radio-group>
         </template>
       </van-field>
-      <van-field readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
+      <van-field v-if="form.approvalMode==1" readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
index 98d38cb8..36f1af7b 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify.vue
@@ -76,6 +76,7 @@
           </template>
         </van-field>
         <van-field
+          v-if="form.approvalMode==1"
           readonly
           clickable
           label="审批流程"
@@ -442,9 +443,17 @@
     methods: {
 
       onConfirmTemplate(data){
-        this.form.approvalTemplateName = data.name
-        this.form.approvalTemplateId = data.id
-        this.showtemplate = false;
+        selectApprovalByTemplateId(data.id).then(res => {
+          this.showtemplate = false;
+          if(res.approvalDetails.length>0){
+            this.form.approvalTemplateName = data.name
+            this.form.approvalTemplateId = data.id
+          }else{
+            this.form.approvalTemplateName = null
+            this.form.approvalTemplateId = null
+            this.$notify({ type: 'danger', message: '此流程无节点，无法选择！' });
+          }
+        })
       },
       getDictionaries(){
         getTransfer(this.$route.query.id).then((response) => {
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue
index 87f0be43..1ea20951 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue
@@ -76,6 +76,7 @@
           </template>
         </van-field>
         <van-field
+          v-if="form.approvalMode==1"
           readonly
           clickable
           label="审批流程"
@@ -372,9 +373,17 @@
     },
     methods: {
       onConfirmTemplate(data){
-        this.form.approvalTemplateName = data.name
-        this.form.approvalTemplateId = data.id
-        this.showtemplate = false;
+        selectApprovalByTemplateId(data.id).then(res => {
+          this.showtemplate = false;
+          if(res.approvalDetails.length>0){
+            this.form.approvalTemplateName = data.name
+            this.form.approvalTemplateId = data.id
+          }else{
+            this.form.approvalTemplateName = null
+            this.form.approvalTemplateId = null
+            this.$notify({ type: 'danger', message: '此流程无节点，无法选择！' });
+          }
+        })
       },
       initProjectInfo(){
         let _this = this
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue
index 1d9a66f7..8fb20fbe 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue
@@ -76,6 +76,7 @@
           </template>
         </van-field>
         <van-field
+          v-if="form.approvalMode==1"
           readonly
           clickable
           label="审批流程"
@@ -211,7 +212,7 @@
             @cancel="showpayer = false"
           />
         </van-popup>
-        <van-field :rules="[{ required: true , message:'请输入汇票号码' }]" required label="汇票号码" v-model="form.payerAccount" placeholder="请输入汇票号码" input-align="right" label-width="auto"/>
+        <van-field readonly :rules="[{ required: true , message:'请输入汇票号码' }]" required label="汇票号码" v-model="form.payerAccount" input-align="right" label-width="auto"/>
         <van-field
           readonly
           label="出票金额（元）"
@@ -428,9 +429,17 @@
     },
     methods: {
       onConfirmTemplate(data){
-        this.form.approvalTemplateName = data.name
-        this.form.approvalTemplateId = data.id
-        this.showtemplate = false;
+        selectApprovalByTemplateId(data.id).then(res => {
+          this.showtemplate = false;
+          if(res.approvalDetails.length>0){
+            this.form.approvalTemplateName = data.name
+            this.form.approvalTemplateId = data.id
+          }else{
+            this.form.approvalTemplateName = null
+            this.form.approvalTemplateId = null
+            this.$notify({ type: 'danger', message: '此流程无节点，无法选择！' });
+          }
+        })
       },
       initProjectInfo(){
         let _this = this
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue
index 43419374..b4ae8211 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify2.vue
@@ -76,6 +76,7 @@
           </template>
         </van-field>
         <van-field
+          v-if="form.approvalMode==1"
           readonly
           clickable
           label="审批流程"
@@ -442,9 +443,17 @@
     },
     methods: {
       onConfirmTemplate(data){
-        this.form.approvalTemplateName = data.name
-        this.form.approvalTemplateId = data.id
-        this.showtemplate = false;
+        selectApprovalByTemplateId(data.id).then(res => {
+          this.showtemplate = false;
+          if(res.approvalDetails.length>0){
+            this.form.approvalTemplateName = data.name
+            this.form.approvalTemplateId = data.id
+          }else{
+            this.form.approvalTemplateName = null
+            this.form.approvalTemplateId = null
+            this.$notify({ type: 'danger', message: '此流程无节点，无法选择！' });
+          }
+        })
       },
       getDictionaries(){
         getTransfer(this.$route.query.id).then((response) => {