Merge branch '单-补贴老人资金受理' of sckj/mz-cloud into master

ruoyi-ui/src/views/business/tsxdxm/cwgl/index.vue

@@ -4,8 +4,8 @@
       <el-form-item label="项目名称">
         <BizDict :value="queryParams.xmId" :parmar="parmar" @changeData="changeDataMcSelect" :isCoom="true" :isLoding="true"></BizDict>
       </el-form-item>
-      <el-form-item label="行政区划" prop="xzqh" class="contenrFlex" v-if="!isIF">
-        <RegionCascaderSelect v-model="queryParams.xzqh" endLevel="2" :isDataRoot="true" style="width: 100%"></RegionCascaderSelect>
+      <el-form-item label="行政区划" prop="xzqhId" class="contenrFlex" v-if="!isIF">
+        <RegionCascaderSelect v-model="xzqhId" endLevel="2" :isDataRoot="true" style="width: 100%"></RegionCascaderSelect>
       </el-form-item>
       <el-form-item label="申请人身份证号" prop="sqrsfz" label-width="110px">
         <el-input v-model="queryParams.sqrsfz" placeholder="请输入申请人身份证号" clearable @keyup.enter.native="handleQuery" />
@@ -232,7 +232,7 @@
         <el-button type="primary" @click="downForm('second')" v-if="activeName== 'first'&&form.id!= null">下一步</el-button>
         <el-button type="primary" @click="upForm('second')" v-if="activeName== 'third'&&form.id!= null">上一步</el-button>
         <el-button type="primary" @click="downForm1('third')" v-if="activeName=='second'&&form.id!= null">下一步</el-button>
-        
+
 
         <!-- <el-button type="primary" @click="changeTabs('first')" v-if="activeName=='second'&&form.id!= null">上一步</el-button>
         <el-button type="primary" @click="changeTabs('second')" v-if="activeName=='first'&&form.id!= null">下一步</el-button>
@@ -242,7 +242,7 @@
       </div>
     </el-dialog>
 
-    
+
     <!-- 家庭养老床位建设质量管理详情信息对话框 -->
     <el-dialog v-dialog-drag title="家庭养老床位建设质量管理详情信息" :visible.sync="openXQ" width="700px" custom-class="custom2"
       :append-to-body="true">
@@ -337,9 +337,9 @@
             <tr>
               <td>验收人员姓名</td>
               <td>{{ form.ysryxm }}</td>
-             
+
             </tr>
-            
+
           </table>
           <h3>配备智能化产品</h3>
           <npbzncp :jtId="jtId" :cyjlform="form" :isComponent="false" class="bg-height"></npbzncp>
@@ -506,6 +506,7 @@ export default {
       },
       jtId: null,
       activeName: 'first',
+      xzqhId: [],
       arr: ['sqrsfz','sqrxm','yjkzpsr', 'snqk','jtzz','jtmj','jdshrxm','jdshyj','mzshrxm','mzshyj'],
       arr1: ['pgslhgzfx','ysjf','pgjgmc','pgrxm',],
       isIF:false,
@@ -632,10 +633,10 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-       if (this.xzqh) {
-        this.queryParams.xzqh = this.xzqh[this.xzqh.length - 1]
+      if (this.xzqhId) {
+        this.queryParams.xzqh = this.xzqhId[this.xzqhId.length - 1];
       } else {
-        this.queryParams.xzqh = null
+        this.queryParams.xzqh = null;
       }
       this.getList();
     },
@@ -643,6 +644,7 @@ export default {
     resetQuery() {
       this.xzqh = [];
       this.resetForm("queryForm");
+      this.xzqhId = [];
       this.handleQuery();
     },
     // 多选框选中数据
@@ -714,7 +716,7 @@ export default {
           type: 'warning'
         });
     },
-   
+
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate((valid, object) => {