Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountAdd.vue

@@ -100,9 +100,9 @@
         </van-popup>
         <van-field label="客户编号" v-if="accountType=='银行存款'&&(form.bankType=='1'||form.bankType=='2')" required :rules="[{ required: true , message:'请输入客户编号' }]" v-model="form.cifNo" placeholder="请输入客户编号" input-align="right" label-width="auto"/>
         <van-field label="账簿号" v-if="accountType=='银行存款'&&villageAccountType=='多级账簿'" required :rules="[{ required: true , message:'请输入账簿号' }]" v-model="form.accountNo" placeholder="请输入账簿号" input-align="right" label-width="auto"/>
-        <van-field label="管控类型" required :rules="[{ required: true , message:'请选择管控类型' }]" v-if="accountType=='银行存款'&&form.bankType==2&&villageAccountType=='多级账簿'">
+        <van-field label="管控类型" v-if="accountType=='银行存款'&&form.bankType==2&&villageAccountType=='多级账簿'">
           <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.managementControlType" @change="onConfirmManagementControlType">
+            <van-radio-group direction="horizontal" v-model="form.managementControlType" @change="onConfirmManagementControlType" required :rules="[{ required: true , message:'请选择管控类型' }]">
               <van-radio name="1">账簿余额</van-radio>
               <van-radio name="2">中心账簿</van-radio>
             </van-radio-group>
@@ -313,7 +313,13 @@
           bankType:null,
           status: "0",
         },
-        form:{}
+        form:{
+          accountType: "102",
+          bankUseType:"1",
+          bankAccountType: "1",
+          villageAccountType: "2",
+          status: "N",
+        }
       };
     },
     created() {
@@ -400,11 +406,17 @@
         this.showBankDeposit = false
         this.$set(this.form, "bankName", val.bankDeposit);
         this.$set(this.form, "paymentLines", val.payeePaymentLines);
+        this.$set(this.form, "alternateField10", val.institutionNumber);
       },
       onConfirmTaccountId(val){
         this.showTaccountId = false
         this.taccountId = val.text
         this.$set(this.form, "taccountId", val.value);
+        this.$set(this.form, "cifNo", val.cifNo);
+        this.$set(this.form, "accountName", val.payee);
+        this.$set(this.form, "managementControlType", val.managementControlType);
+        this.$set(this.form, "accountPassword", val.accountPassword);
+        this.$set(this.form, "centralBookId", val.centralBookId);
         this.taccountIdOptions.map(res => {
           if(res.id==val.value){
             if(this.form.villageAccountType === '3'){

src/views/onlineHome/bankAgriculture/paymentAccount/paymentAccountModify.vue

@@ -100,9 +100,9 @@
         </van-popup>
         <van-field label="客户编号" v-if="accountType=='银行存款'&&(form.bankType=='1'||form.bankType=='2')" required :rules="[{ required: true , message:'请输入客户编号' }]" v-model="form.cifNo" placeholder="请输入客户编号" input-align="right" label-width="auto"/>
         <van-field label="账簿号" v-if="accountType=='银行存款'&&villageAccountType=='多级账簿'" required :rules="[{ required: true , message:'请输入账簿号' }]" v-model="form.accountNo" placeholder="请输入账簿号" input-align="right" label-width="auto"/>
-        <van-field label="管控类型" required :rules="[{ required: true , message:'请选择管控类型' }]" v-if="accountType=='银行存款'&&form.bankType==2&&villageAccountType=='多级账簿'">
+        <van-field label="管控类型" v-if="accountType=='银行存款'&&form.bankType==2&&villageAccountType=='多级账簿'">
           <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.managementControlType" @change="onConfirmManagementControlType">
+            <van-radio-group direction="horizontal" v-model="form.managementControlType" @change="onConfirmManagementControlType" required :rules="[{ required: true , message:'请选择管控类型' }]">
               <van-radio name="1">账簿余额</van-radio>
               <van-radio name="2">中心账簿</van-radio>
             </van-radio-group>
@@ -313,7 +313,13 @@
           bankType:null,
           status: "0",
         },
-        form:{}
+        form:{
+          accountType: "102",
+          bankUseType:"1",
+          bankAccountType: "1",
+          villageAccountType: "2",
+          status: "N",
+        }
       };
     },
     created() {
@@ -457,11 +463,17 @@
         this.showBankDeposit = false
         this.$set(this.form, "bankName", val.bankDeposit);
         this.$set(this.form, "paymentLines", val.payeePaymentLines);
+        this.$set(this.form, "alternateField10", val.institutionNumber);
       },
       onConfirmTaccountId(val){
         this.showTaccountId = false
         this.taccountId = val.text
         this.$set(this.form, "taccountId", val.value);
+        this.$set(this.form, "cifNo", val.cifNo);
+        this.$set(this.form, "accountName", val.payee);
+        this.$set(this.form, "managementControlType", val.managementControlType);
+        this.$set(this.form, "accountPassword", val.accountPassword);
+        this.$set(this.form, "centralBookId", val.centralBookId);
         this.taccountIdOptions.map(res => {
           if(res.id==val.value){
             if(this.form.villageAccountType === '3'){

src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue

@@ -100,9 +100,9 @@
         </van-popup>
         <van-field label="客户编号" v-if="accountType=='银行存款'&&(form.bankType=='1'||form.bankType=='2')" required :rules="[{ required: true , message:'请输入客户编号' }]" v-model="form.cifNo" placeholder="请输入客户编号" input-align="right" label-width="auto"/>
         <van-field label="账簿号" v-if="accountType=='银行存款'&&villageAccountType=='多级账簿'" required :rules="[{ required: true , message:'请输入账簿号' }]" v-model="form.accountNo" placeholder="请输入账簿号" input-align="right" label-width="auto"/>
-        <van-field label="管控类型" required :rules="[{ required: true , message:'请选择管控类型' }]" v-if="accountType=='银行存款'&&form.bankType==2&&villageAccountType=='多级账簿'">
+        <van-field label="管控类型" v-if="accountType=='银行存款'&&form.bankType==2&&villageAccountType=='多级账簿'">
           <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.managementControlType" @change="onConfirmManagementControlType">
+            <van-radio-group direction="horizontal" v-model="form.managementControlType" @change="onConfirmManagementControlType" required :rules="[{ required: true , message:'请选择管控类型' }]">
               <van-radio name="1">账簿余额</van-radio>
               <van-radio name="2">中心账簿</van-radio>
             </van-radio-group>
@@ -311,7 +311,13 @@
           bankType:null,
           status: "0",
         },
-        form:{}
+        form:{
+          accountType: "102",
+          bankUseType:"1",
+          bankAccountType: "1",
+          villageAccountType: "2",
+          status: "N",
+        }
       };
     },
     created() {
@@ -410,7 +416,10 @@
         console.log(val)
         this.$set(this.form, "taccountId", val.value);
         this.$set(this.form, "cifNo", val.cifNo);
-        this.$set(this.form, "accountNo", val.accountNo);
+        this.$set(this.form, "accountName", val.payee);
+        this.$set(this.form, "managementControlType", val.managementControlType);
+        this.$set(this.form, "accountPassword", val.accountPassword);
+        this.$set(this.form, "centralBookId", val.centralBookId);
         this.taccountIdOptions.map(res => {
           if(res.id==val.value){
             if(this.form.villageAccountType === '3'){

src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue

@@ -100,9 +100,9 @@
         </van-popup>
         <van-field label="客户编号" v-if="accountType=='银行存款'&&(form.bankType=='1'||form.bankType=='2')" required :rules="[{ required: true , message:'请输入客户编号' }]" v-model="form.cifNo" placeholder="请输入客户编号" input-align="right" label-width="auto"/>
         <van-field label="账簿号" v-if="accountType=='银行存款'&&villageAccountType=='多级账簿'" required :rules="[{ required: true , message:'请输入账簿号' }]" v-model="form.accountNo" placeholder="请输入账簿号" input-align="right" label-width="auto"/>
-        <van-field label="管控类型" required :rules="[{ required: true , message:'请选择管控类型' }]" v-if="accountType=='银行存款'&&form.bankType==2&&villageAccountType=='多级账簿'">
+        <van-field label="管控类型" v-if="accountType=='银行存款'&&form.bankType==2&&villageAccountType=='多级账簿'">
           <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.managementControlType" @change="onConfirmManagementControlType">
+            <van-radio-group direction="horizontal" v-model="form.managementControlType" @change="onConfirmManagementControlType" required :rules="[{ required: true , message:'请选择管控类型' }]">
               <van-radio name="1">账簿余额</van-radio>
               <van-radio name="2">中心账簿</van-radio>
             </van-radio-group>
@@ -311,7 +311,13 @@
           bankType:null,
           status: "0",
         },
-        form:{}
+        form:{
+          accountType: "102",
+          bankUseType:"1",
+          bankAccountType: "1",
+          villageAccountType: "2",
+          status: "N",
+        }
       };
     },
     created() {
@@ -466,7 +472,10 @@
         console.log(val)
         this.$set(this.form, "taccountId", val.value);
         this.$set(this.form, "cifNo", val.cifNo);
-        this.$set(this.form, "accountNo", val.accountNo);
+        this.$set(this.form, "accountName", val.payee);
+        this.$set(this.form, "managementControlType", val.managementControlType);
+        this.$set(this.form, "accountPassword", val.accountPassword);
+        this.$set(this.form, "centralBookId", val.centralBookId);
         this.taccountIdOptions.map(res => {
           if(res.id==val.value){
             if(this.form.villageAccountType === '3'){