From 5783172c381a4fe6e7c769f3f1d78bd6bdf4c0e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Fri, 24 Sep 2021 18:24:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collectionAccount/collectionAdd.vue       | 158 ++++++++--------
 .../collectionAccount/collectionModify.vue    | 152 ++++++++--------
 .../paymentAccount/paymentAccountAdd.vue      | 168 +++++++++---------
 .../paymentAccount/paymentAccountList.vue     |   2 +-
 .../paymentAccount/paymentAccountModify.vue   | 138 +++++++-------
 .../paymentApproval/approvalProcess.vue       |  10 +-
 6 files changed, 330 insertions(+), 298 deletions(-)

diff --git a/src/views/onlineHome/bankAgriculture/collectionAccount/collectionAdd.vue b/src/views/onlineHome/bankAgriculture/collectionAccount/collectionAdd.vue
index 2af6e33e..73645f2e 100644
--- a/src/views/onlineHome/bankAgriculture/collectionAccount/collectionAdd.vue
+++ b/src/views/onlineHome/bankAgriculture/collectionAccount/collectionAdd.vue
@@ -10,81 +10,88 @@
         <p style="font-weight: bold;">添加支付收款账户</p>
       </template>
     </van-nav-bar>
-    <p class="main_title">基础信息</p>
-    <div class="main_box">
-      <van-field label="收款方" v-model="form.payee" placeholder="请输入收款方" input-align="right" label-width="auto"/>
-      <van-field label="收款账户" v-model="form.payeeAccount" placeholder="请输入收款账户" input-align="right" label-width="auto"/>
-      <van-field
-        readonly
-        clickable
-        label="所属银行"
-        placeholder="请选择"
-        v-model="bankType"
-        @click="showBankType = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showBankType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="bankTypeOptions"
-          @confirm="onConfirmBankType"
-          @cancel="showBankType = false"
+
+    <van-form @submit="goAdd" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
+      <p class="main_title">基础信息</p>
+      <div class="main_box">
+        <van-field label="收款方" required :rules="[{ required: true , message:'请输入收款方' }]" v-model="form.payee" placeholder="请输入收款方" input-align="right" label-width="auto"/>
+        <van-field label="收款账户" required :rules="[{ required: true , message:'请输入收款账户' }]" v-model="form.payeeAccount" placeholder="请输入收款账户" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="所属银行"
+          placeholder="请选择"
+          v-model="bankType"
+          @click="showBankType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择所属银行' }]"
         />
-      </van-popup>
-      <van-field label="开户银行" v-model="form.bankDeposit" placeholder="请输入开户银行" input-align="right" label-width="auto"/>
-    </div>
+        <van-popup v-model="showBankType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="bankTypeOptions"
+            @confirm="onConfirmBankType"
+            @cancel="showBankType = false"
+          />
+        </van-popup>
+        <van-field label="开户银行" required :rules="[{ required: true , message:'请输入开户银行' }]" v-model="form.bankDeposit" placeholder="请输入开户银行" input-align="right" label-width="auto"/>
+      </div>
 
-    <div class="main_box" style="margin-top: 10px;">
-      <van-field label="备注" v-model="form.remark" type="textarea" placeholder="请输入备注" input-align="right" rows="3" label-width="auto"/>
-    </div>
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field label="备注" v-model="form.remark" type="textarea" placeholder="请输入备注" input-align="right" rows="3" label-width="auto"/>
+      </div>
 
-    <div class="main_box" style="margin-top: 10px;">
-      <van-cell title="账户类型">
-        <template #right-icon>
-          <van-radio-group direction="horizontal" v-model="form.accountType">
-            <van-radio name="1">公户</van-radio>
-            <van-radio name="2">私户</van-radio>
-          </van-radio-group>
-        </template>
-      </van-cell>
-      <van-field
-        readonly
-        clickable
-        label="收款人类型"
-        placeholder="请选择"
-        v-model="payeeType"
-        @click="showPayeeType = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showPayeeType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="payeeTypeOptions"
-          @confirm="onConfirmPayeeType"
-          @cancel="showPayeeType = false"
+      <div class="main_box" style="margin-top: 10px;">
+        <van-cell title="账户类型" required>
+          <template #right-icon>
+            <van-radio-group direction="horizontal" required :rules="[{ required: true , message:'请选择账户类型' }]" v-model="form.accountType">
+              <van-radio name="1">公户</van-radio>
+              <van-radio name="2">私户</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
+        <van-field
+          readonly
+          clickable
+          label="收款人类型"
+          placeholder="请选择"
+          v-model="payeeType"
+          @click="showPayeeType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择收款人类型' }]"
         />
-      </van-popup>
-      <van-cell title="数据状态">
-        <template #right-icon>
-          <van-radio-group direction="horizontal" v-model="form.status">
-            <van-radio name="0">正常</van-radio>
-            <van-radio name="1">停用</van-radio>
-          </van-radio-group>
-        </template>
-      </van-cell>
-    </div>
-    <div style="padding: 16px 0;">
-      <van-row>
-        <van-col span="24" align="center">
-          <van-button type="info" native-type="submit" @click="goAdd" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
-        </van-col>
-      </van-row>
-      <div class="clear"></div>
-    </div>
+        <van-popup v-model="showPayeeType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="payeeTypeOptions"
+            @confirm="onConfirmPayeeType"
+            @cancel="showPayeeType = false"
+          />
+        </van-popup>
+        <van-cell title="数据状态" required>
+          <template #right-icon>
+            <van-radio-group direction="horizontal" required :rules="[{ required: true , message:'请选择数据状态' }]" v-model="form.status">
+              <van-radio name="0">正常</van-radio>
+              <van-radio name="1">停用</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
+      </div>
+      <div style="padding: 16px 0;">
+        <van-row>
+          <van-col span="24" align="center">
+            <van-button type="info" native-type="submit" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </div>
+    </van-form>
   </div>
 </template>
 
@@ -96,7 +103,10 @@
       return {
         showBankType:false,
         showPayeeType:false,
-        form:{},
+        form:{
+          accountType:'1',
+          status:'0'
+        },
 
         bankType:'',
         payeeType:'',
@@ -137,6 +147,10 @@
         });
 
       },
+      getError(e){
+        console.log(e)
+        this.$notify({ type: 'danger', message: e.errors[0].message });
+      },
       onConfirmBankType(data){
         this.bankType = data.text;
         this.form.bankType = data.value;
diff --git a/src/views/onlineHome/bankAgriculture/collectionAccount/collectionModify.vue b/src/views/onlineHome/bankAgriculture/collectionAccount/collectionModify.vue
index 1043969b..adc8bf2a 100644
--- a/src/views/onlineHome/bankAgriculture/collectionAccount/collectionModify.vue
+++ b/src/views/onlineHome/bankAgriculture/collectionAccount/collectionModify.vue
@@ -10,81 +10,87 @@
         <p style="font-weight: bold;">修改支付收款账户</p>
       </template>
     </van-nav-bar>
-    <p class="main_title">基础信息</p>
-    <div class="main_box">
-      <van-field label="收款方" v-model="form.payee" placeholder="请输入收款方" input-align="right" label-width="auto"/>
-      <van-field label="收款账户" v-model="form.payeeAccount" placeholder="请输入收款账户" input-align="right" label-width="auto"/>
-      <van-field
-        readonly
-        clickable
-        label="所属银行"
-        placeholder="请选择"
-        v-model="bankType"
-        @click="showBankType = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showBankType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="bankTypeOptions"
-          @confirm="onConfirmBankType"
-          @cancel="showBankType = false"
+    <van-form @submit="goAdd" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
+      <p class="main_title">基础信息</p>
+      <div class="main_box">
+        <van-field label="收款方" required :rules="[{ required: true , message:'请输入收款方' }]" v-model="form.payee" placeholder="请输入收款方" input-align="right" label-width="auto"/>
+        <van-field label="收款账户" required :rules="[{ required: true , message:'请输入收款账户' }]" v-model="form.payeeAccount" placeholder="请输入收款账户" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="所属银行"
+          placeholder="请选择"
+          v-model="bankType"
+          @click="showBankType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择所属银行' }]"
         />
-      </van-popup>
-      <van-field label="开户银行" v-model="form.bankDeposit" placeholder="请输入开户银行" input-align="right" label-width="auto"/>
-    </div>
+        <van-popup v-model="showBankType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="bankTypeOptions"
+            @confirm="onConfirmBankType"
+            @cancel="showBankType = false"
+          />
+        </van-popup>
+        <van-field label="开户银行" required :rules="[{ required: true , message:'请输入开户银行' }]" v-model="form.bankDeposit" placeholder="请输入开户银行" input-align="right" label-width="auto"/>
+      </div>
 
-    <div class="main_box" style="margin-top: 10px;">
-      <van-field label="备注" v-model="form.remark" type="textarea" placeholder="请输入备注" input-align="right" rows="3" label-width="auto"/>
-    </div>
+      <div class="main_box" style="margin-top: 10px;">
+        <van-field label="备注" v-model="form.remark" type="textarea" placeholder="请输入备注" input-align="right" rows="3" label-width="auto"/>
+      </div>
 
-    <div class="main_box" style="margin-top: 10px;">
-      <van-cell title="账户类型">
-        <template #right-icon>
-          <van-radio-group direction="horizontal" v-model="form.accountType">
-            <van-radio name="1">公户</van-radio>
-            <van-radio name="2">私户</van-radio>
-          </van-radio-group>
-        </template>
-      </van-cell>
-      <van-field
-        readonly
-        clickable
-        label="收款人类型"
-        placeholder="请选择"
-        v-model="payeeType"
-        @click="showPayeeType = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showPayeeType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="payeeTypeOptions"
-          @confirm="onConfirmPayeeType"
-          @cancel="showPayeeType = false"
+      <div class="main_box" style="margin-top: 10px;">
+        <van-cell title="账户类型" required>
+          <template #right-icon>
+            <van-radio-group direction="horizontal" required :rules="[{ required: true , message:'请选择账户类型' }]" v-model="form.accountType">
+              <van-radio name="1">公户</van-radio>
+              <van-radio name="2">私户</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
+        <van-field
+          readonly
+          clickable
+          label="收款人类型"
+          placeholder="请选择"
+          v-model="payeeType"
+          @click="showPayeeType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择收款人类型' }]"
         />
-      </van-popup>
-      <van-cell title="数据状态">
-        <template #right-icon>
-          <van-radio-group direction="horizontal" v-model="form.status">
-            <van-radio name="0">正常</van-radio>
-            <van-radio name="1">停用</van-radio>
-          </van-radio-group>
-        </template>
-      </van-cell>
-    </div>
-    <div style="padding: 16px 0;">
-      <van-row>
-        <van-col span="24" align="center">
-          <van-button type="info" native-type="submit" @click="goAdd" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
-        </van-col>
-      </van-row>
-      <div class="clear"></div>
-    </div>
+        <van-popup v-model="showPayeeType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="payeeTypeOptions"
+            @confirm="onConfirmPayeeType"
+            @cancel="showPayeeType = false"
+          />
+        </van-popup>
+        <van-cell title="数据状态" required>
+          <template #right-icon>
+            <van-radio-group direction="horizontal" required :rules="[{ required: true , message:'请选择数据状态' }]" v-model="form.status">
+              <van-radio name="0">正常</van-radio>
+              <van-radio name="1">停用</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
+      </div>
+      <div style="padding: 16px 0;">
+        <van-row>
+          <van-col span="24" align="center">
+            <van-button type="info" native-type="submit" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </div>
+    </van-form>
   </div>
 </template>
 
@@ -128,6 +134,10 @@
         });
 
       },
+      getError(e){
+        console.log(e)
+        this.$notify({ type: 'danger', message: e.errors[0].message });
+      },
       onConfirmBankType(data){
         this.bankType = data.text;
         this.form.bankType = data.value;
diff --git a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd.vue b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd.vue
index 6e69bbe8..ca0f6f61 100644
--- a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd.vue
@@ -10,72 +10,76 @@
         <p style="font-weight: bold;">添加出纳账户设置</p>
       </template>
     </van-nav-bar>
-    <p class="main_title">基础信息</p>
-    <div class="main_box">
-      <van-field
-        readonly
-        clickable
-        label="账户类型"
-        placeholder="请选择"
-        v-model="accountType"
-        @click="showAccountType = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showAccountType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="typeDictionaries"
-          @confirm="onConfirmType"
-          @cancel="showAccountType = false"
+    <van-form @submit="goModify" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
+      <p class="main_title">基础信息</p>
+      <div class="main_box">
+        <van-field
+          readonly
+          clickable
+          label="账户类型"
+          placeholder="请选择"
+          v-model="accountType"
+          @click="showAccountType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
         />
-      </van-popup>
-      <van-field label="账户名称" v-model="form.accountName" placeholder="请输入账户名称" input-align="right" label-width="auto"/>
-      <van-field
-        readonly
-        clickable
-        label="关联科目"
-        placeholder="请选择"
-        v-model="subjectDeatil"
-        @click="showSubjectId = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showSubjectId" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="subjectDictionaries"
-          @confirm="onConfirmSubject"
-          @cancel="showSubjectId = false"
+        <van-popup v-model="showAccountType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="typeDictionaries"
+            @confirm="onConfirmType"
+            @cancel="showAccountType = false"
+          />
+        </van-popup>
+        <van-field label="账户名称" required :rules="[{ required: true , message:'请输入账户名称' }]" v-model="form.accountName" placeholder="请输入账户名称" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="关联科目"
+          placeholder="请选择"
+          v-model="subjectDeatil"
+          @click="showSubjectId = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择关联科目' }]"
         />
-      </van-popup>
-      <van-field label="银行账户" v-model="form.bankAccountNumber" placeholder="请输入银行账户" input-align="right" label-width="auto"/>
-      <van-field label="开户银行" v-model="form.bankName" placeholder="请输入开户银行" input-align="right" label-width="auto"/>
-      <van-field label="联行号" v-model="form.paymentLines" placeholder="请输入联行号" input-align="right" label-width="auto"/>
-      <van-field label="操作员代码" v-model="form.operatorCode" placeholder="请输入操作员代码" input-align="right" label-width="auto"/>
-      <van-field label="企业编码" v-model="form.enterpriseCode" placeholder="请输入企业编码" input-align="right" label-width="auto"/>
-      <van-field label="开户银行地址" v-model="form.site" placeholder="请输入开户银行地址" input-align="right" label-width="auto"/>
-      <van-field label="账户密码" v-model="form.accountPassword" placeholder="请输入账户密码" input-align="right" label-width="auto"/>
-      <van-field label="初始余额" v-model="form.initialBalance" placeholder="请输入初始余额" input-align="right" label-width="auto"/>
-      <van-cell title="是否停用">
-        <template #right-icon>
-          <van-radio-group direction="horizontal" v-model="form.status">
-            <van-radio name="Y">是</van-radio>
-            <van-radio name="N">否</van-radio>
-          </van-radio-group>
-        </template>
-      </van-cell>
-    </div>
-    <div style="padding: 16px 0;">
-      <van-row>
-        <van-col span="24" align="center">
-          <van-button type="info" native-type="submit" @click="goModify" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
-        </van-col>
-      </van-row>
-      <div class="clear"></div>
-    </div>
+        <van-popup v-model="showSubjectId" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="subjectDictionaries"
+            @confirm="onConfirmSubject"
+            @cancel="showSubjectId = false"
+          />
+        </van-popup>
+        <van-field label="银行账户" v-model="form.bankAccountNumber" placeholder="请输入银行账户" input-align="right" label-width="auto"/>
+        <van-field label="开户银行" v-model="form.bankName" placeholder="请输入开户银行" input-align="right" label-width="auto"/>
+        <van-field label="联行号" v-model="form.paymentLines" placeholder="请输入联行号" input-align="right" label-width="auto"/>
+        <van-field label="操作员代码" v-model="form.operatorCode" placeholder="请输入操作员代码" input-align="right" label-width="auto"/>
+        <van-field label="企业编码" v-model="form.enterpriseCode" placeholder="请输入企业编码" input-align="right" label-width="auto"/>
+        <van-field label="开户银行地址" v-model="form.site" placeholder="请输入开户银行地址" input-align="right" label-width="auto"/>
+        <van-field label="账户密码" v-model="form.accountPassword" placeholder="请输入账户密码" input-align="right" label-width="auto"/>
+        <van-field label="初始余额" v-model="form.initialBalance" required :rules="[{ required: true , message:'请输入初始余额' }]" placeholder="请输入初始余额" input-align="right" label-width="auto"/>
+        <van-cell title="是否停用">
+          <template #right-icon>
+            <van-radio-group direction="horizontal" v-model="form.status">
+              <van-radio name="Y">是</van-radio>
+              <van-radio name="N">否</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
+      </div>
+      <div style="padding: 16px 0;">
+        <van-row>
+          <van-col span="24" align="center">
+            <van-button type="info" native-type="submit" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </div>
+    </van-form>
   </div>
 </template>
 
@@ -101,7 +105,7 @@
         jglxDictionaries:[],
         subjectDictionaries:[],
         typeDictionaries:[],
-        subjectDeatil:[],
+        subjectDeatil:'',
 
         form:{}
       };
@@ -111,27 +115,21 @@
     },
     methods: {
       getDetail(){
-          // 账户类型
-          this.houseGetDicts("account_type_cashier").then((res) => {
-            for (var i = 0; i < res.data.length; i++) {
-              this.typeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
-            }
-          });
-          getSubjectDetail().then((res) => {
-            for (var i = 0; i < res.rows.length; i++) {
-              this.subjectDictionaries.push({text: res.rows[i].subjectNameAll, value: res.rows[i].subjectId});
-            }
-          });
-      },
-      selectSubject(datas, value) {
-        var actions = [];
-        Object.keys(datas).some((key) => {
-          if (datas[key].subjectId == ('' + value)) {
-            actions.push(datas[key].subjectNameAll);
-            return true;
+        // 账户类型
+        this.houseGetDicts("account_type_cashier").then((res) => {
+          for (var i = 0; i < res.data.length; i++) {
+            this.typeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+          }
+        });
+        getSubjectDetail().then((res) => {
+          for (var i = 0; i < res.rows.length; i++) {
+            this.subjectDictionaries.push({text: res.rows[i].subjectNameAll, value: res.rows[i].subjectId});
           }
-        })
-        return actions.join('');
+        });
+      },
+      getError(e){
+        console.log(e)
+        this.$notify({ type: 'danger', message: e.errors[0].message });
       },
       onConfirmSubject(data){
         this.subjectDeatil = data.text;
diff --git a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountList.vue b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountList.vue
index e4bb6290..39796022 100644
--- a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountList.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountList.vue
@@ -30,7 +30,7 @@
               <p><span><i>￥</i>{{item.balance}}</span></p>
             </template>
             <template #default>
-              <p>{{item.bankAccountNumber}}</p>
+              <p>{{item.bankAccountNumber == null || item.bankAccountNumber == '' ? '&nbsp;':item.bankAccountNumber}}</p>
               <p style="font-size: 12px;font-weight: normal;color: #878787;">
                 {{item.accountName}}
                 <i style="margin-right: 1rem;"></i>
diff --git a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountModify.vue b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountModify.vue
index f50ae6a8..94981203 100644
--- a/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountModify.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountModify.vue
@@ -7,75 +7,79 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加出纳账户设置</p>
+        <p style="font-weight: bold;">修改付款账户信息</p>
       </template>
     </van-nav-bar>
-    <p class="main_title">基础信息</p>
-    <div class="main_box">
-      <van-field
-        readonly
-        clickable
-        label="账户类型"
-        placeholder="请选择"
-        v-model="accountType"
-        @click="showAccountType = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showAccountType" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="typeDictionaries"
-          @confirm="onConfirmType"
-          @cancel="showAccountType = false"
+    <van-form @submit="goModify" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
+      <p class="main_title">基础信息</p>
+      <div class="main_box">
+        <van-field
+          readonly
+          clickable
+          label="账户类型"
+          placeholder="请选择"
+          v-model="accountType"
+          @click="showAccountType = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
         />
-      </van-popup>
-      <van-field label="账户名称" v-model="form.accountName" placeholder="请输入账户名称" input-align="right" label-width="auto"/>
-      <van-field
-        readonly
-        clickable
-        label="关联科目"
-        placeholder="请选择"
-        v-model="subjectDeatil"
-        @click="showSubjectId = true"
-        input-align="right"
-        right-icon="arrow-down"
-        label-width="auto"
-      />
-      <van-popup v-model="showSubjectId" position="bottom">
-        <van-picker
-          show-toolbar
-          :columns="subjectDictionaries"
-          @confirm="onConfirmSubject"
-          @cancel="showSubjectId = false"
+        <van-popup v-model="showAccountType" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="typeDictionaries"
+            @confirm="onConfirmType"
+            @cancel="showAccountType = false"
+          />
+        </van-popup>
+        <van-field label="账户名称" required :rules="[{ required: true , message:'请输入账户名称' }]" v-model="form.accountName" placeholder="请输入账户名称" input-align="right" label-width="auto"/>
+        <van-field
+          readonly
+          clickable
+          label="关联科目"
+          placeholder="请选择"
+          v-model="subjectDeatil"
+          @click="showSubjectId = true"
+          input-align="right"
+          right-icon="arrow-down"
+          label-width="auto"
+          required
+          :rules="[{ required: true , message:'请选择关联科目' }]"
         />
-      </van-popup>
-      <van-field label="银行账户" v-model="form.bankAccountNumber" placeholder="请输入银行账户" input-align="right" label-width="auto"/>
-      <van-field label="开户银行" v-model="form.bankName" placeholder="请输入开户银行" input-align="right" label-width="auto"/>
-      <van-field label="联行号" v-model="form.paymentLines" placeholder="请输入联行号" input-align="right" label-width="auto"/>
-      <van-field label="操作员代码" v-model="form.operatorCode" placeholder="请输入操作员代码" input-align="right" label-width="auto"/>
-      <van-field label="企业编码" v-model="form.enterpriseCode" placeholder="请输入企业编码" input-align="right" label-width="auto"/>
-      <van-field label="开户银行地址" v-model="form.site" placeholder="请输入开户银行地址" input-align="right" label-width="auto"/>
-      <van-field label="账户密码" v-model="form.accountPassword" placeholder="请输入账户密码" input-align="right" label-width="auto"/>
-      <van-field label="初始余额" v-model="form.initialBalance" placeholder="请输入初始余额" input-align="right" label-width="auto"/>
-      <van-cell title="是否停用">
-        <template #right-icon>
-          <van-radio-group direction="horizontal" v-model="form.status">
-            <van-radio name="Y">是</van-radio>
-            <van-radio name="N">否</van-radio>
-          </van-radio-group>
-        </template>
-      </van-cell>
-    </div>
-    <div style="padding: 16px 0;">
-      <van-row>
-        <van-col span="24" align="center">
-          <van-button type="info" native-type="submit" @click="goModify" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
-        </van-col>
-      </van-row>
-      <div class="clear"></div>
-    </div>
+        <van-popup v-model="showSubjectId" position="bottom">
+          <van-picker
+            show-toolbar
+            :columns="subjectDictionaries"
+            @confirm="onConfirmSubject"
+            @cancel="showSubjectId = false"
+          />
+        </van-popup>
+        <van-field label="银行账户" v-model="form.bankAccountNumber" placeholder="请输入银行账户" input-align="right" label-width="auto"/>
+        <van-field label="开户银行" v-model="form.bankName" placeholder="请输入开户银行" input-align="right" label-width="auto"/>
+        <van-field label="联行号" v-model="form.paymentLines" placeholder="请输入联行号" input-align="right" label-width="auto"/>
+        <van-field label="操作员代码" v-model="form.operatorCode" placeholder="请输入操作员代码" input-align="right" label-width="auto"/>
+        <van-field label="企业编码" v-model="form.enterpriseCode" placeholder="请输入企业编码" input-align="right" label-width="auto"/>
+        <van-field label="开户银行地址" v-model="form.site" placeholder="请输入开户银行地址" input-align="right" label-width="auto"/>
+        <van-field label="账户密码" v-model="form.accountPassword" placeholder="请输入账户密码" input-align="right" label-width="auto"/>
+        <van-field label="初始余额" required :rules="[{ required: true , message:'请输入初始余额' }]" v-model="form.initialBalance" placeholder="请输入初始余额" input-align="right" label-width="auto"/>
+        <van-cell title="是否停用">
+          <template #right-icon>
+            <van-radio-group direction="horizontal" v-model="form.status">
+              <van-radio name="Y">是</van-radio>
+              <van-radio name="N">否</van-radio>
+            </van-radio-group>
+          </template>
+        </van-cell>
+      </div>
+      <div style="padding: 16px 0;">
+        <van-row>
+          <van-col span="24" align="center">
+            <van-button type="info" native-type="submit" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
+      </div>
+    </van-form>
   </div>
 </template>
 
@@ -128,6 +132,10 @@
           this.form = response.data;
         });
       },
+      getError(e){
+        console.log(e)
+        this.$notify({ type: 'danger', message: e.errors[0].message });
+      },
       selectSubject(datas, value) {
         var actions = [];
         Object.keys(datas).some((key) => {
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess.vue
index 8388e943..3bb2f6bd 100644
--- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess.vue
+++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalProcess.vue
@@ -19,8 +19,10 @@
           <van-col span="6" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
           <van-col span="18" class="textBlue">已申请
             <van-row>
-              <van-col span="10" style="padding: 0;" v-show="processList.已申请">{{processList.申请人}}</van-col>
-              <van-col span="14" style="padding: 0;" v-show="processList.已申请">{{processList.申请时间}}</van-col>
+              <van-col span="24" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">{{processList.申请人}}</van-col>
+            </van-row>
+            <van-row>
+              <van-col span="24" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">{{processList.申请时间}}</van-col>
             </van-row>
           </van-col>
         </van-row>
@@ -35,14 +37,14 @@
             <p v-show="processList.乡镇审批==2" class="textBlue">乡镇审批</p>
             <p v-show="processList.乡镇审批==3" class="textRed">乡镇审批</p>
             <van-row>
-              <van-col span="24" style="padding: 0;" v-if="processList.待申请==2">
+              <van-col span="24" style="padding: 0;" v-if="processList.乡镇审批人!=null&&processList.乡镇审批人!=''">
                 <p v-show="processList.乡镇审批==1">审批人：{{processList.乡镇审批人}}</p>
                 <p v-show="processList.乡镇审批==2" class="textBlue">审批人：{{processList.乡镇审批人}}</p>
                 <p v-show="processList.乡镇审批==3" class="textRed">审批人：{{processList.乡镇审批人}}</p>
               </van-col>
             </van-row>
             <van-row>
-              <van-col span="24" style="padding: 0;" v-if="processList.待申请==2">
+              <van-col span="24" style="padding: 0;" v-if="processList.乡镇审批时间!=null&&processList.乡镇审批时间!=''">
                 <p v-show="processList.乡镇审批==1">审批时间：{{processList.乡镇审批时间}}</p>
                 <p v-show="processList.乡镇审批==2" class="textBlue">审批时间：{{processList.乡镇审批时间}}</p>
                 <p v-show="processList.乡镇审批==3" class="textRed">审批时间：{{processList.乡镇审批时间}}</p>