产交个人资料优化

src/views/user/accountSetting/index.vue

@@ -9,7 +9,7 @@
     />
     <van-cell title="用户资料修改" v-if="memberType==1" to="userInformation" is-link icon="points" />
     <van-cell title="用户资料修改" v-if="memberType==2" to="companyInformation" is-link icon="points" />
-    <van-cell title="银行账户信息修改" to="bankInformation" is-link icon="credit-pay" />
+<!--    <van-cell title="银行账户信息修改" to="bankInformation" is-link icon="credit-pay" />-->
     <van-cell title="密码修改" to="passWordInformation" is-link icon="lock" />
   </div>
 </template>

src/views/user/accountSetting/userInformation/companyInformation.vue

@@ -10,7 +10,7 @@
     <van-form @submit="submitForm">
       <van-field v-model="tel" readonly type="tel" label="手机号" placeholder="请输入手机号" required :rules="[{ required:true }]" >
         <template #extra >
-          <p style="color: #007e72">修改手机号</p>
+          <p style="color: #007e72" onclick="window.location='phoneInformation'">修改手机号</p>
         </template>
       </van-field>
 <!--      <van-field value="15314031621" label="密码" placeholder="请输入密码" required :rules="[{ required:true }]"/>-->
@@ -81,6 +81,96 @@
           <van-uploader :after-read="afterReadKHZM" :before-delete="deleteFileKHZM" v-model="fileListKHZM" multiple :max-count="1" />
         </template>
       </van-field>
+
+      <van-field v-model="userForm.bankCardName" label="开户姓名" placeholder="请输入姓名" required :rules="[{ required:true }]"/>
+      <van-field v-model="userForm.bankCardNum" label="开户账号" placeholder="请输入开户账号" required :rules="[{ required:true }]"/>
+
+      <van-field
+        v-model="accountType"
+        is-link
+        readonly
+        required
+        :rules="[{ required:true }]"
+        label="账户类型"
+        placeholder="请选择账户类型"
+        @click="showAccountType = true"
+      />
+      <van-popup v-model:show="showAccountType" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="dictLabel"
+          :columns="accountTypeOption"
+          @confirm="onConfirmAccountType"
+          @cancel="showAccountType = false"
+        />
+      </van-popup>
+
+      <van-divider>银行信息</van-divider>
+      <van-field
+        v-model="bankType"
+        is-link
+        readonly
+        required
+        :rules="[{ required:true }]"
+        label="所属银行"
+        placeholder="请选择所属银行"
+        @click="showBankType = true"
+      />
+      <van-popup v-model:show="showBankType" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="dictLabel"
+          :columns="bankTypeOption"
+          @confirm="onConfirmBankType"
+          @cancel="showArea = false"
+        />
+      </van-popup>
+
+      <van-field
+        v-model="sheng"
+        is-link
+        readonly
+        label="开户省市"
+        placeholder="请选择开户省市"
+        @click="showSheng = true"
+      />
+      <van-popup v-model:show="showSheng" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="label"
+          :columns="shengOption"
+          @confirm="onConfirmSheng"
+          @cancel="showSheng = false"
+        />
+      </van-popup>
+
+      <van-field v-model="userForm.bankDeposit" label="关键词" placeholder="请输入开户行地址关键词"/>
+      <van-field
+        v-model="userForm.bankAddress"
+        label="开户银行"
+        placeholder="请输入开户银行"
+        required
+        :rules="[{ required:true }]"
+        readonly
+        @click="showBankAddress = true"
+      >
+        <template #button>
+          <van-button size="small" type="primary" native-type="button" @click="searchBankAddress">点击检索</van-button>
+        </template>
+      </van-field>
+      <van-popup v-model:show="showBankAddress" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="bankDeposit"
+          :columns="bankAddressOption"
+          @confirm="onConfirmBankAddress"
+          @cancel="showBankAddress = false"
+        />
+      </van-popup>
+
+
+      <van-field v-model="userForm.payeePaymentLines" label="联行号" placeholder="请输入开户银行" required :rules="[{ required:true }]"/>
+
       <div class="submit" v-if="activitiStatus != '1'">
         <van-button round block type="info" color="#007E72" native-type="submit" style="width: 90%;margin: 0 auto;">保存</van-button>
       </div>
@@ -90,9 +180,9 @@
 
 <script>
 import { getInfo } from "@/api/login/index";
-import { getMember , base64Attach , userUpdate , showUserImg , deleteUserImg} from "@/api/user/index";
+import {getMember, base64Attach, userUpdate, showUserImg, deleteUserImg, options} from "@/api/user/index";
 import {Dialog} from "vant";
-import {base64Upload} from "@/api/register";
+import {base64Upload, depositList, realtimeBackList} from "@/api/register";
 export default {
   name: "companyInformation",
   data() {
@@ -134,11 +224,32 @@ export default {
         accountOpenCert:'',
       },
       userInfo:[],
-      upLoadList:[]
+      upLoadList:[],
+      bankTypeOption:[],
+      sheng:'',
+      shi:'',
+      bankType:'',
+      accountType:'',
+      bankDeposit:'',
+      showBankType:false,
+      showSheng :false,
+      shengOption:options,
+      showShi :false,
+      shiOption:[],
+      showBankAddress :false,
+      accountTypeOption:[],
+      showAccountType :false,
+      bankAddressOption:[],
     };
   },
   created() {
     this.height = document.body.clientHeight
+    this.getDicts("bank_type_all").then(response => {
+      this.bankTypeOption = response.data;
+    });
+    this.getDicts("bank_account_type").then(response => {
+      this.accountTypeOption = response.data;
+    });
     this.getInfo()
     this.getDicts("company_nature").then(res => {
       console.log(res);
@@ -149,6 +260,40 @@ export default {
     });
   },
   methods: {
+    searchBankAddress(){
+      let data = {
+        sheng:this.form.sheng,
+        shi:this.form.shi,
+        bankType:this.form.bankType,
+        bankDeposit:this.form.bankDeposit,
+      }
+      depositList(data).then(response => {
+        if (response.rows.length<1){
+          if (this.form.sheng==''||this.form.shi==''){
+            this.$toast({
+              icon: 'fail', // 找到自己需要的图标
+              message: '请选择省市',
+              duration:"1000",
+            })
+            return;
+          }
+          if (this.form.bankDeposit==''){
+            this.$toast({
+              icon: 'fail', // 找到自己需要的图标
+              message: '请输入关键词',
+              duration:"1000",
+            })
+            return;
+          }
+          realtimeBackList(data).then(response2 => {
+            console.log(response2)
+            this.bankAddressOption = response2.data;
+          });
+        }else{
+          this.bankAddressOption = response.rows;
+        }
+      });
+    },
     onConfirmCompany(value,index){
       console.log(value)
       this.companyNameValue = value;
@@ -178,7 +323,16 @@ export default {
           // this.userForm.companyCapital = response.data.companyCapital;
           // // this.userForm.companyLicense = response.data.companyLicense;
           // this.userForm.address = response.data.address;
+
+
           this.userForm = response.data;
+          this.bankType = this.selectDictLabel(this.bankTypeOption,response.data.bankType);
+          this.accountType = this.selectDictLabel(this.accountTypeOption,response.data.accountType);
+          this.userForm.bankCardName = response.data.bankCardName;
+          this.userForm.bankCardNum = response.data.bankCardNum;
+          this.userForm.bankAddress = response.data.bankAddress;
+          this.userForm.id = response.data.id;
+
           this.activitiStatus = response.data.activitiStatus;
 
           if (response.data.accountOpenCert!=''){
@@ -312,7 +466,33 @@ export default {
               })
         }
       });
-    }
+    },
+    onConfirmBankType(value){
+      this.showBankType = false;
+      this.form.bankAddress = '';
+      this.form.payeePaymentLines = '';
+      this.bankType = value.dictLabel;
+      this.form.bankType = value.dictValue;
+    },
+    onConfirmSheng(value){
+      console.log(value)
+      this.showSheng = false;
+      this.form.sheng = value[0];
+      this.form.shi = value[1];
+      this.sheng = value.join('/');
+    },
+    onConfirmBankAddress(value){
+      console.log(value)
+      this.form.bankAddress = value.bankDeposit;
+      this.form.payeePaymentLines = value.payeePaymentLines;
+      this.showBankAddress = false;
+    },
+    onConfirmAccountType(value){
+      console.log(value)
+      this.form.accountType = value.dictValue;
+      this.accountType = value.dictLabel;
+      this.showAccountType = false;
+    },
   },
 };
 </script>

src/views/user/accountSetting/userInformation/userInformation.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" :style="{height:height+'px'}">
+  <div class="app-container">
     <van-nav-bar
       title="资料修改"
       left-arrow
@@ -26,8 +26,99 @@
           <van-uploader :after-read="afterReadYHK" :before-delete="deleteFileYHK" v-model="fileListYHK" multiple :max-count="1" />
         </template>
       </van-field>
+
+
+      <van-field v-model="userForm.bankCardName" label="开户姓名" placeholder="请输入姓名" required :rules="[{ required:true }]"/>
+      <van-field v-model="userForm.bankCardNum" label="开户账号" placeholder="请输入开户账号" required :rules="[{ required:true }]"/>
+
+      <van-field
+        v-model="accountType"
+        is-link
+        readonly
+        required
+        :rules="[{ required:true }]"
+        label="账户类型"
+        placeholder="请选择账户类型"
+        @click="showAccountType = true"
+      />
+      <van-popup v-model:show="showAccountType" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="dictLabel"
+          :columns="accountTypeOption"
+          @confirm="onConfirmAccountType"
+          @cancel="showAccountType = false"
+        />
+      </van-popup>
+
+      <van-divider>银行信息</van-divider>
+      <van-field
+        v-model="bankType"
+        is-link
+        readonly
+        required
+        :rules="[{ required:true }]"
+        label="所属银行"
+        placeholder="请选择所属银行"
+        @click="showBankType = true"
+      />
+      <van-popup v-model:show="showBankType" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="dictLabel"
+          :columns="bankTypeOption"
+          @confirm="onConfirmBankType"
+          @cancel="showArea = false"
+        />
+      </van-popup>
+
+      <van-field
+        v-model="sheng"
+        is-link
+        readonly
+        label="开户省市"
+        placeholder="请选择开户省市"
+        @click="showSheng = true"
+      />
+      <van-popup v-model:show="showSheng" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="label"
+          :columns="shengOption"
+          @confirm="onConfirmSheng"
+          @cancel="showSheng = false"
+        />
+      </van-popup>
+
+      <van-field v-model="userForm.bankDeposit" label="关键词" placeholder="请输入开户行地址关键词"/>
+      <van-field
+        v-model="userForm.bankAddress"
+        label="开户银行"
+        placeholder="请输入开户银行"
+        required
+        :rules="[{ required:true }]"
+        readonly
+        @click="showBankAddress = true"
+      >
+        <template #button>
+          <van-button size="small" type="primary" native-type="button" @click="searchBankAddress">点击检索</van-button>
+        </template>
+      </van-field>
+      <van-popup v-model:show="showBankAddress" position="bottom">
+        <van-picker
+          show-toolbar
+          value-key="bankDeposit"
+          :columns="bankAddressOption"
+          @confirm="onConfirmBankAddress"
+          @cancel="showBankAddress = false"
+        />
+      </van-popup>
+
+
+      <van-field v-model="userForm.payeePaymentLines" label="联行号" placeholder="请输入开户银行" required :rules="[{ required:true }]"/>
+
       <div class="submit" v-if="activitiStatus != '1'">
-        <van-button round block type="info" color="#007E72" native-type="submit" >保存</van-button>
+        <van-button round block type="info" color="#007E72" native-type="submit" style="width: 90%;margin: 0 auto;" >保存</van-button>
       </div>
     </van-form>
   </div>
@@ -35,7 +126,7 @@
 
 <script>
 import { getInfo } from "@/api/login/index";
-import { getMember , base64Attach , userUpdate , showUserImg , deleteUserImg} from "@/api/user/index";
+import {getMember, base64Attach, userUpdate, showUserImg, deleteUserImg, options} from "@/api/user/index";
 import {Dialog} from "vant";
 import {base64Upload} from "@/api/register";
 export default {
@@ -63,11 +154,32 @@ export default {
       userInfo:[],
       upLoadList:[],
       fileListSFZ:[],
-      fileListYHK:[]
+      fileListYHK:[],
+      bankTypeOption:[],
+      sheng:'',
+      shi:'',
+      bankType:'',
+      accountType:'',
+      bankDeposit:'',
+      showBankType:false,
+      showSheng :false,
+      shengOption:options,
+      showShi :false,
+      shiOption:[],
+      showBankAddress :false,
+      accountTypeOption:[],
+      showAccountType :false,
+      bankAddressOption:[],
     };
   },
   created() {
     this.height = document.body.clientHeight;
+    this.getDicts("bank_type_all").then(response => {
+      this.bankTypeOption = response.data;
+    });
+    this.getDicts("bank_account_type").then(response => {
+      this.accountTypeOption = response.data;
+    });
     this.getInfo();
   },
   methods: {
@@ -84,6 +196,13 @@ export default {
           this.tel = response.data.phone;
           this.activitiStatus = response.data.activitiStatus;
 
+          this.bankType = this.selectDictLabel(this.bankTypeOption,response.data.bankType);
+          this.accountType = this.selectDictLabel(this.accountTypeOption,response.data.accountType);
+          this.userForm.bankCardName = response.data.bankCardName;
+          this.userForm.bankCardNum = response.data.bankCardNum;
+          this.userForm.bankAddress = response.data.bankAddress;
+
+
           if (response.data.idCardPic!=''){
             this.fileListSFZ = [{
               url:'/api'+response.data.idCardPic,
@@ -169,9 +288,38 @@ export default {
             message: '修改成功',
             confirmButtonText: '确定',
           })
+            .then(() => {
+              this.onClickLeft()
+            })
         }
       });
-    }
+    },
+    onConfirmBankType(value){
+      this.showBankType = false;
+      this.form.bankAddress = '';
+      this.form.payeePaymentLines = '';
+      this.bankType = value.dictLabel;
+      this.form.bankType = value.dictValue;
+    },
+    onConfirmSheng(value){
+      console.log(value)
+      this.showSheng = false;
+      this.form.sheng = value[0];
+      this.form.shi = value[1];
+      this.sheng = value.join('/');
+    },
+    onConfirmBankAddress(value){
+      console.log(value)
+      this.form.bankAddress = value.bankDeposit;
+      this.form.payeePaymentLines = value.payeePaymentLines;
+      this.showBankAddress = false;
+    },
+    onConfirmAccountType(value){
+      console.log(value)
+      this.form.accountType = value.dictValue;
+      this.accountType = value.dictLabel;
+      this.showAccountType = false;
+    },
   },
 };
 </script>
@@ -179,13 +327,14 @@ export default {
 <style scoped lang="scss">
 .app-container {
   background-color: #FFF;
+  padding-bottom: 3rem;
 }
 .submit{
   position: fixed;
-  bottom: 5%;
-  width: 90%;
-  left: 5%;
-  background-color: #FFFFFF;
+  bottom: 0;
+  width: 100%;
+  padding: 5% 0;
+  background-color: #F9F9F9;
   p{
     text-align: center;
     margin-bottom: 0.2rem;

src/views/user/index.vue

@@ -62,7 +62,8 @@ export default {
       activitiStatus:'',
       instanceId:'',
       historyList:[],
-      openView:false
+      openView:false,
+      memberType:0
     };
   },
   created() {
@@ -113,6 +114,7 @@ export default {
           this.phone = response.data.phone;
           this.activitiStatus = response.data.activitiStatus;
           this.instanceId = response.data.instanceId;
+          this.memberType = response.data.memberType;
           this.getHistoryList()
         });
       });