Merge branch '消防安全问题处理' of sckj/mz-cloud into master

ruoyi-ui/src/views/business/fwjggl/afwjg/xfaqjcxx/index.vue

@@ -805,7 +805,8 @@
         accessoryIndex: 0,
         accessoryIs: false,
         openXQ: false,
-        submitFormLoading:false
+        submitFormLoading:false,
+        xzqh:null
       }
     },
     computed: {
@@ -900,14 +901,14 @@
         return this.selectDictLabel(this.dict.type[type], value)
       },
       changeIsSf(index) {
-        this.yljgJcxmxxList[index].bwsdjtqk = null
-        this.yljgJcxmxxList[index].zgcs = null
-        this.yljgJcxmxxList[index].fzr = null
-        this.yljgJcxmxxList[index].zgwcsx = null
-        this.yljgJcxmxxList[index].isWczg = null
-        this.yljgJcxmxxList[index].wczfsj = null
-        this.yljgJcxmxxList[index].zgwcqk = null
-        this.yljgJcxmxxList[index].fj = null
+        this.form.yljgJcxmxxList[index].bwsdjtqk = null
+        this.form.yljgJcxmxxList[index].zgcs = null
+        this.form.yljgJcxmxxList[index].fzr = null
+        this.form.yljgJcxmxxList[index].zgwcsx = null
+        this.form.yljgJcxmxxList[index].isWczg = null
+        this.form.yljgJcxmxxList[index].wczfsj = null
+        this.form.yljgJcxmxxList[index].zgwcqk = null
+        this.form.yljgJcxmxxList[index].fj = null
       },
       accessory(index, title, is) {
         if (is == 'true') {
@@ -1078,7 +1079,7 @@
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1
-        if (this.xzqh) {
+        if (this.xzqh&&this.xzqh.length>0) {
           this.queryParams.szxzqh = this.xzqh[this.xzqh.length - 1]
         } else {
           this.queryParams.szxzqh = null

ruoyi-ui/src/views/business/fwjggl/ajgsx/xfaqjcxx/index.vue

@@ -472,20 +472,20 @@
           <table>
             <tr>
               <td>统一社会信用代码</td>
-              <td>{{fixation.tyshxydm}}</td>
+              <td>{{form.tyshxydm}}</td>
               <td>单位名称</td>
-              <td>{{fixation.jgmc}}</td>
+              <td>{{form.jgmc}}</td>
             </tr>
             <tr>
               <td>单位所属行政区划</td>
-              <td>{{fixation.ssxzqh}}</td>
+              <td>{{form.ssxzqh}}</td>
               <td>兴办主体</td>
 <!--              <td>{{fixation.xbzt}}</td>-->
-              <td>{{translateDict('CH010',fixation.xbzt)}}</td>
+              <td>{{translateDict('CH010',form.xbzt)}}</td>
             </tr>
             <tr>
               <td>单位通信地址</td>
-              <td colspan="3">{{fixation.txdz}}</td>
+              <td colspan="3">{{form.txdz}}</td>
             </tr>
             <tr>
               <td>消防安全负责人姓名(法定代表人或主要负责人)</td>
@@ -805,7 +805,8 @@
         accessoryIndex: 0,
         accessoryIs: false,
         openXQ: false,
-        submitFormLoading:false
+        submitFormLoading:false,
+        xzqh:null,
       }
     },
     computed: {
@@ -900,14 +901,14 @@
         return this.selectDictLabel(this.dict.type[type], value)
       },
       changeIsSf(index) {
-        this.yljgJcxmxxList[index].bwsdjtqk = null
-        this.yljgJcxmxxList[index].zgcs = null
-        this.yljgJcxmxxList[index].fzr = null
-        this.yljgJcxmxxList[index].zgwcsx = null
-        this.yljgJcxmxxList[index].isWczg = null
-        this.yljgJcxmxxList[index].wczfsj = null
-        this.yljgJcxmxxList[index].zgwcqk = null
-        this.yljgJcxmxxList[index].fj = null
+        this.form.yljgJcxmxxList[index].bwsdjtqk = null
+        this.form.yljgJcxmxxList[index].zgcs = null
+        this.form.yljgJcxmxxList[index].fzr = null
+        this.form.yljgJcxmxxList[index].zgwcsx = null
+        this.form.yljgJcxmxxList[index].isWczg = null
+        this.form.yljgJcxmxxList[index].wczfsj = null
+        this.form.yljgJcxmxxList[index].zgwcqk = null
+        this.form.yljgJcxmxxList[index].fj = null
       },
       accessory(index, title, is) {
         if (is == 'true') {
@@ -1182,6 +1183,7 @@
               rules: rules
             }
           })
+          console.log(this.form.yljgJcxmxxList,'this.form.yljgJcxmxxList');
           this.copyForm=this.deepCopy({...this.form,pbqk:this.form.pbqk.join(',')})
           this.title = '修改消防安全自查'
         })

ruoyi-ui/src/views/organization/jggl/xfaqzcxx/index.vue

@@ -826,14 +826,14 @@
         return this.selectDictLabel(this.dict.type[type], value)
       },
       changeIsSf(index) {
-        this.yljgJcxmxxList[index].bwsdjtqk = null
-        this.yljgJcxmxxList[index].zgcs = null
-        this.yljgJcxmxxList[index].fzr = null
-        this.yljgJcxmxxList[index].zgwcsx = null
-        this.yljgJcxmxxList[index].isWczg = null
-        this.yljgJcxmxxList[index].wczfsj = null
-        this.yljgJcxmxxList[index].zgwcqk = null
-        this.yljgJcxmxxList[index].fj = null
+        this.form.yljgJcxmxxList[index].bwsdjtqk = null
+        this.form.yljgJcxmxxList[index].zgcs = null
+        this.form.yljgJcxmxxList[index].fzr = null
+        this.form.yljgJcxmxxList[index].zgwcsx = null
+        this.form.yljgJcxmxxList[index].isWczg = null
+        this.form.yljgJcxmxxList[index].wczfsj = null
+        this.form.yljgJcxmxxList[index].zgwcqk = null
+        this.form.yljgJcxmxxList[index].fj = null
       },
       accessory(index, title, is) {
         if (is == 'true') {