Merge branch '银行根据配置来' of sckj/mz-cloud into master

ruoyi-ui-gljt/src/api/gljt/qxpz.js

@@ -42,3 +42,12 @@ export function delQxpz(id) {
     method: 'get'
   })
 }
+
+// 查询高龄津贴_区县配置信息列表
+export function getKhyh(query) {
+  return request({
+    url: '/gljt/qxpz/getKhyh',
+    method: 'get',
+    params: query
+  })
+}

ruoyi-ui-gljt/src/views/gljt/gljtBg/index.vue

@@ -554,14 +554,23 @@
                       : rules.khyh
                   "
                 >
-                  <el-cascader
-                    :disabled="form.lrId ? false : true"
-                    :props="props"
-                    :options="dict.tree.C0044"
-                    v-model="form.khyh"
-                    placeholder="请选择开户银行"
-                    clearable
-                  />
+                  <!--<el-cascader-->
+                    <!--:disabled="form.lrId ? false : true"-->
+                    <!--:props="props"-->
+                    <!--:options="dict.tree.C0044"-->
+                    <!--v-model="form.khyh"-->
+                    <!--placeholder="请选择开户银行"-->
+                    <!--clearable-->
+                  <!--/>-->
+                  <el-select v-model="form.khyh" placeholder="请选择开户银行">
+                    <el-option
+                      v-for="dict in khyhOpt"
+                      :key="dict.dictValue"
+                      :label="dict.dictLabel"
+                      :value="dict.dictValue"
+                    >
+                    </el-option>
+                  </el-select>
                 </el-form-item>
                 <el-form-item label="银行网点" prop="khwd">
                   <el-input
@@ -1091,6 +1100,9 @@ import {
 } from "@/api/gljt/gljtBg";
 import { chineseOne, idCard, Regular, Mobile } from "@/utils/regular";
 import { getQxDfPz } from "@/api/gljt/gljtSq";
+import {
+  getKhyh
+} from "@/api/gljt/qxpz";
 import { getAccessToken, idcard } from "../../../api/lnst/baiduUtil";
 import { getLrByZjhm } from "@/api/gljt/gljtLr";
 import sqXq from "../gljtSq/sqXq";
@@ -1128,6 +1140,7 @@ export default {
     return {
       oldData: null,
       glsqsjRange: [],
+      khyhOpt:[],
       pickerOptions: {
         shortcuts: [
           {
@@ -1622,6 +1635,28 @@ export default {
     this.getList();
   },
   methods: {
+    async getKhyh(){
+      let xzqh='';
+      if (this.form.xzqh !== null) {
+        if (Array.isArray(this.form.xzqh)) {
+          xzqh = this.form.xzqh[this.form.xzqh.length - 1];
+        } else {
+          let data = JSON.parse(this.form.xzqh);
+          xzqh = data[data.length - 1];
+        }
+      }
+      if(xzqh){
+        let res= await getKhyh({xzqh:xzqh})
+        this.khyhOpt=res.data;
+        // getKhyh({xzqh:xzqh}).then(res=>{
+        //   // console.log(res)
+        //   this.khyhOpt=res.data;
+        // })
+      }else{
+        this.khyhOpt=[];
+      }
+
+    },
     getCardYhk(data) {
       if (data && data.yhzh) {
         this.form.yhzh = data.yhzh;
@@ -1667,6 +1702,7 @@ export default {
             };
             this.oldData = JSON.parse(JSON.stringify(response.data));
             this.copyForm = this.deepCopy(this.form);
+            this.getKhyh();
             this.getQxDfPz();
           } else {
             // this.$modal.msgSuccess("修改成功");

ruoyi-ui-gljt/src/views/gljt/gljtSq/index.vue

@@ -523,6 +523,7 @@
                 <RegionCascaderSelect
                   v-model="form.xzqh"
                   style="width: 100%"
+                  @nodeData="changeXzqh"
                   valueProp="code"
                   :isDataRoot="true"
                 >
@@ -649,13 +650,22 @@
               </div>
               <div style="flex: 2" class="grid2">
                 <el-form-item label="开户银行" prop="khyh">
-                  <el-cascader
-                    :props="props"
-                    :options="dict.tree.C0044"
-                    v-model="form.khyh"
-                    placeholder="请选择开户银行"
-                    clearable
-                  />
+                  <!--<el-cascader-->
+                    <!--:props="props"-->
+                    <!--:options="dict.tree.C0044"-->
+                    <!--v-model="form.khyh"-->
+                    <!--placeholder="请选择开户银行"-->
+                    <!--clearable-->
+                  <!--/>-->
+                  <el-select v-model="form.khyh" placeholder="请选择开户银行">
+                    <el-option
+                      v-for="dict in khyhOpt"
+                      :key="dict.dictValue"
+                      :label="dict.dictLabel"
+                      :value="dict.dictValue"
+                    >
+                    </el-option>
+                  </el-select>
                 </el-form-item>
                 <el-form-item label="银行网点" prop="khwd">
                   <el-input v-model="form.khwd" placeholder="请输入银行网点" />
@@ -1317,6 +1327,9 @@ import {
   updateGljtLr,
   ocrQuery,
 } from "@/api/gljt/gljtLr";
+import {
+  getKhyh
+} from "@/api/gljt/qxpz";
 import sqXq from "./sqXq";
 import { mapState } from "vuex";
 import { encrypt_ECBdef } from "@/api/tool/sm4";
@@ -1354,6 +1367,7 @@ export default {
   },
   data() {
     return {
+      khyhOpt:[],
       isMqtt:false,
       hjOpt:[{label:'本地户籍',value:'0'},{label:'外地迁入',value:'1'}],
       glsqsjRange: [],
@@ -1901,6 +1915,32 @@ export default {
     // console.log(this.user.qxpz,'<---------qxpz');
   },
   methods: {
+    changeXzqh(){
+      this.form.khyh='';
+      this.getKhyh();
+    },
+    async getKhyh(){
+      let xzqh='';
+      if (this.form.xzqh !== null) {
+        if (Array.isArray(this.form.xzqh)) {
+          xzqh = this.form.xzqh[this.form.xzqh.length - 1];
+        } else {
+          let data = JSON.parse(this.form.xzqh);
+          xzqh = data[data.length - 1];
+        }
+      }
+      if(xzqh){
+        let res= await getKhyh({xzqh:xzqh})
+        this.khyhOpt=res.data;
+        // getKhyh({xzqh:xzqh}).then(res=>{
+        //   // console.log(res)
+        //   this.khyhOpt=res.data;
+        // })
+      }else{
+        this.khyhOpt=[];
+      }
+
+    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
@@ -2688,6 +2728,7 @@ export default {
       if (this.user.userData.dept.locationCode) {
         this.form.xzqh = [this.user.userData.dept.locationCode];
       }
+      this.getKhyh();
       this.getAccessToken();
 
       // if(this.saveSpr();)
@@ -2758,6 +2799,7 @@ export default {
           this.form.xjdxzqh = this.form.xjdxzqhCode
             ? JSON.stringify(this.form.xjdxzqhCode.split(","))
             : [];
+          this.getKhyh();
           //草稿、被拒绝、社区审核
           if (this.status == "4" || this.status == "0" || this.status == "50") {
             this.getSqShrxm();