Merge branch 'dev'

@@ -381,4 +381,7 @@
   /deep/.el-radio__label {
     display: none;
   }
+  /deep/.el-table .cell {
+    line-height: 16px;
+  }
 </style>

 <!--
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-08-11 16:48:17
+ * @LastEditTime: 2023-10-09 10:21:32
 -->
 <template>
   <transition name="msgbox-fade" v-if="myShow">
@@ -14,7 +14,7 @@
           </div>
           <svg-icon icon-class='close' class="closeStyle" @click="onCancel" />
         </div>
-        <div class="mask-content" ref='contentRef' :style="{ 'height': contentHeight }">
+        <div class="mask-content" ref='contentRef'>
           <component :is="editItem" ref='childRef' @loading='loadingFn' :key="key" :formData='formData' />
         </div>
         <div class="ls-mask-footer" v-if='btnShow'>

@@ -94,7 +94,10 @@
       };
     },
     created () {
-      this.loadData();
+      this.loadData()
+      if (this.$parent.addRepairRecord) {
+        this.columns.unshift({ prop: "cz", label: "操作" });
+      }
     },
     methods: {
       /**
@@ -102,9 +105,6 @@
        * @author: renchao
        */
       loadData () {
-        if (this.$parent.addRepairRecord) {
-          this.columns.unshift({ prop: "cz", label: "操作" });
-        }
         getCfdjList({
           bdcdyid: this.bdcdyid,
           qllx: this.qllx,

@@ -91,7 +91,7 @@
         qsztList: datas.columns().qsztList,
         checkList: datas.columns().checkList,
         //传递参数
-          bdcdyid: this.$route.query.bdcdyid,
+        bdcdyid: this.$route.query.bdcdyid,
         qllx: this.$route.query.qllx,
         //列表数据
         tableData: [],
@@ -102,7 +102,10 @@
       };
     },
     created () {
-      this.loadData();
+      this.loadData()
+      if (this.$parent.addRepairRecord) {
+        this.columns.unshift({ prop: "cz", label: "操作" });
+      }
     },
     methods: {
       /**
@@ -110,9 +113,6 @@
        * @author: renchao
        */
       loadData () {
-        if (this.$parent.addRepairRecord) {
-          this.columns.unshift({ prop: "cz", label: "操作" });
-        }
         getDiyaqList({
           bdcdyid: this.bdcdyid,
           qllx: this.qllx,

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-25 17:12:43
+ * @LastEditTime: 2023-10-09 10:35:11
 -->
 <template>
   <div class="djxxTable">
@@ -85,7 +85,7 @@
         qsztList: datas.columns().qsztList,
         checkList: datas.columns().checkList,
         //传递参数
-         bdcdyid: this.$route.query.bdcdyid,
+        bdcdyid: this.$route.query.bdcdyid,
         qllx: this.$route.query.qllx,
         //列表数据
         tableData: [],
@@ -96,7 +96,10 @@
       };
     },
     created () {
-      this.loadData();
+      this.loadData()
+      if (this.$parent.addRepairRecord) {
+        this.columns.unshift({ prop: "cz", label: "操作" });
+      }
     },
     methods: {
       /**
@@ -104,9 +107,7 @@
        * @author: renchao
        */
       loadData () {
-        if (this.$parent.addRepairRecord) {
-          this.columns.unshift({ prop: "cz", label: "操作" });
-        }
+
         getDiyiqList({
           bdcdyid: this.bdcdyid,
           qllx: this.qllx,

@@ -92,7 +92,7 @@
         qsztList: datas.columns().qsztList,
         checkList: datas.columns().checkList,
         //传递参数
-          bdcdyid: this.$route.query.bdcdyid,
+        bdcdyid: this.$route.query.bdcdyid,
         qllx: this.$route.query.qllx,
         //列表数据
         tableData: [],
@@ -103,7 +103,10 @@
       };
     },
     created () {
-      this.loadData();
+      this.loadData()
+      if (this.$parent.addRepairRecord) {
+        this.columns.unshift({ prop: "cz", label: "操作" });
+      }
     },
     methods: {
       /**
@@ -111,9 +114,6 @@
        * @author: renchao
        */
       loadData () {
-        if (this.$parent.addRepairRecord) {
-          this.columns.unshift({ prop: "cz", label: "操作" });
-        }
         getFdcq2List({
           bdcdyid: this.bdcdyid,
           qllx: this.qllx,

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-22 09:49:24
+ * @LastEditTime: 2023-10-09 10:50:50
 -->
 <template>
   <div class="djxxTable">
-    <djbDetail :title="title" :shows="shows" :propsParam="propsParam"
+    <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
       :columns="columns" :tableData="tableData" />
   </div>
 </template>
@@ -34,6 +34,9 @@
     },
     created () {
       this.loadData();
+      if (this.$parent.addRepairRecord) {
+        this.columns.unshift({ prop: "cz", label: "操作" });
+      }
     },
     methods: {
       /**
@@ -41,9 +44,6 @@
        * @author: renchao
        */
       loadData (checkList = []) {
-        if (this.$parent.addRepairRecord) {
-          this.columns.unshift({ prop: "cz", label: "操作" });
-        }
         getCfdjList({
           bdcdyid: this.propsParam.bdcdyid,
           qllx: this.propsParam.qllx,
@@ -63,10 +63,9 @@
               }
             });
             if (this.tableData.length < datas.columns().emptycolNum) {
-              this.emptycolNum =
-                datas.columns().emptycolNum - this.tableData.length;
+              this.$refs.djbDetail.emptycolNum = datas.columns().emptycolNum - this.tableData.length
             } else {
-              this.emptycolNum = 0;
+              this.$refs.djbDetail.emptycolNum = 0
             }
           }
         })

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-19 09:47:05
+ * @LastEditTime: 2023-10-09 10:18:46
 -->
 <template>
   <div class="clxx">
     <!-- 材料预览 -->
     <div class="clyl-box">
       <div class="menu-tree">
-        <!-- <el-button
-          type="primary"
-          native-type="submit"
-          @click="viewDetail"
-          style="width: 100%; margin-top: 10px" v-if="tableData.length > 0">申请材料目录</el-button> -->
         <div class="item">
           材料目录({{ tableData.length }})
           <div style="margin-top: 10px">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-22 09:50:12
+ * @LastEditTime: 2023-10-09 10:44:26
 -->
 <template>
   <div class="djxxTable">
-    <djbDetail :title="title" :shows="shows" :propsParam="propsParam"
+    <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
       :columns="columns" :tableData="tableData" />
   </div>
 </template>
@@ -34,6 +34,9 @@
     },
     created () {
       this.loadData();
+      if (this.$parent.addRepairRecord) {
+        this.columns.unshift({ prop: "cz", label: "操作" });
+      }
     },
     methods: {
       /**
@@ -41,9 +44,6 @@
        * @author: renchao
        */
       loadData (checkList = []) {
-        if (this.$parent.addRepairRecord) {
-          this.columns.unshift({ prop: "cz", label: "操作" });
-        }
         getDiyaqList({
           bdcdyid: this.propsParam.bdcdyid,
           qllx: this.propsParam.qllx,
@@ -57,10 +57,9 @@
               item.dybdclx = getDictLeabel(item.dybdclx, "A27");
             });
             if (this.tableData.length < datas.columns().emptycolNum) {
-              this.emptycolNum =
-                datas.columns().emptycolNum - this.tableData.length;
+              this.$refs.djbDetail.emptycolNum = datas.columns().emptycolNum - this.tableData.length;
             } else {
-              this.emptycolNum = 0;
+              this.$refs.djbDetail.emptycolNum = 0
             }
           }
         })

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-22 09:50:28
+ * @LastEditTime: 2023-10-09 10:44:45
 -->
 <template>
   <div class="djxxTable">
-    <djbDetail :title="title" :shows="shows" :propsParam="propsParam"
+    <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
       :columns="columns" :tableData="tableData" />
   </div>
 </template>
@@ -33,13 +33,13 @@
       };
     },
     created () {
-      this.loadData();
+      this.loadData()
+      if (this.$parent.addRepairRecord) {
+        this.columns.unshift({ prop: "cz", label: "操作" });
+      }
     },
     methods: {
       loadData (checkList = []) {
-        if (this.$parent.addRepairRecord) {
-          this.columns.unshift({ prop: "cz", label: "操作" });
-        }
         getDiyiqList({
           bdcdyid: this.propsParam.bdcdyid,
           qllx: this.propsParam.qllx,
@@ -53,10 +53,9 @@
               item.dybdclx = getDictLeabel(item.dybdclx, "A27");
             });
             if (this.tableData.length < datas.columns().emptycolNum) {
-              this.emptycolNum =
-                datas.columns().emptycolNum - this.tableData.length;
+              this.$refs.djbDetail.emptycolNum = datas.columns().emptycolNum - this.tableData.length;
             } else {
-              this.emptycolNum = 0;
+              this.$refs.djbDetail.emptycolNum = 0
             }
           }
         })

@@ -67,12 +67,11 @@
           if (res.code === 200) {
             this.info = res.result;
           }
-        });
-      },
-    },
-  };
+        })
+      }
+    }
+  }
 </script>
-
 <style lang="scss" scoped>
   .djbfm {
     width: 100%;

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-21 11:05:33
+ * @LastEditTime: 2023-10-09 10:35:56
 -->
 <template>
   <div class="djxxTable">
@@ -149,7 +149,10 @@
       };
     },
     created () {
-      this.loadData();
+      this.loadData()
+      if (this.$parent.addRepairRecord) {
+        this.columns.unshift({ prop: "cz", label: "操作" });
+      }
     },
     methods: {
       /**
@@ -186,9 +189,6 @@
        * @author: miaofang
        */
       loadData () {
-        if (this.$parent.addRepairRecord) {
-          this.columns.unshift({ prop: "cz", label: "操作" });
-        }
         getFdcq1List({
           bdcdyid: this.propsParam.bdcdyid,
           qllx: this.propsParam.qllx,

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-22 09:49:44
+ * @LastEditTime: 2023-10-09 10:46:18
 -->
 <template>
   <div class="djxxTable">
-    <djbDetail :title="title" :shows="shows" :propsParam="propsParam"
+    <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
       :columns="columns" :tableData="tableData" />
   </div>
 </template>
@@ -32,7 +32,10 @@
       };
     },
     created () {
-      this.loadData();
+      this.loadData()
+      if (this.$parent.addRepairRecord) {
+        this.columns.unshift({ prop: "cz", label: "操作" });
+      }
     },
     methods: {
       /**
@@ -40,9 +43,6 @@
        * @author: miaofang
        */
       loadData (checkList = []) {
-        if (this.$parent.addRepairRecord) {
-          this.columns.unshift({ prop: "cz", label: "操作" });
-        }
         getFdcq2List({
           bdcdyid: this.propsParam.bdcdyid,
           qllx: this.propsParam.qllx,
@@ -55,10 +55,9 @@
               item.sjlx = getSjlx(item.sjlx);
             });
             if (this.tableData.length < datas.columns().emptycolNum) {
-              this.emptycolNum =
-                datas.columns().emptycolNum - this.tableData.length;
+              this.$refs.djbDetail.emptycolNum = datas.columns().emptycolNum - this.tableData.length;
             } else {
-              this.emptycolNum = 0;
+              this.$refs.djbDetail.emptycolNum = 0
             }
           }
         })

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-22 09:49:31
+ * @LastEditTime: 2023-10-09 10:46:58
 -->
 <template>
   <div class="djxxTable">
-    <djbDetail :title="title" :shows="shows" :propsParam="propsParam"
+    <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
       :columns="columns" :tableData="tableData" />
   </div>
 </template>
@@ -53,10 +53,9 @@
               item.sjlx = getSjlx(item.sjlx);
             });
             if (this.tableData.length < datas.columns().emptycolNum) {
-              this.emptycolNum =
-                datas.columns().emptycolNum - this.tableData.length;
+              this.$refs.djbDetail.emptycolNum = datas.columns().emptycolNum - this.tableData.length;
             } else {
-              this.emptycolNum = 0;
+              this.$refs.djbDetail.emptycolNum = 0
             }
           }
         })

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-22 09:53:54
+ * @LastEditTime: 2023-10-09 10:48:11
 -->
 <template>
   <div class="djxxTable">
-    <djbDetail :title="title" :shows="shows" :propsParam="propsParam"
+    <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
       :columns="columns" :tableData="tableData" />
   </div>
 </template>
@@ -62,13 +62,12 @@
               item.qy = getDictLeabel(item.qy, "A52");
             });
             if (this.tableData.length < datas.columns().emptycolNum) {
-              this.emptycolNum =
-                datas.columns().emptycolNum - this.tableData.length;
+              this.$refs.djbDetail.emptycolNum = datas.columns().emptycolNum - this.tableData.length
             } else {
-              this.emptycolNum = 0;
+              this.$refs.djbDetail.emptycolNum = 0
             }
           }
-        });
+        })
       }
     }
   }

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-22 09:53:31
+ * @LastEditTime: 2023-10-09 10:52:16
 -->
 <template>
   <div class="djxxTable">
-    <djbDetail :title="title" :shows="shows" :propsParam="propsParam"
+    <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
       :columns="columns" :tableData="tableData" />
   </div>
 </template>
@@ -65,10 +65,9 @@
               item.sjlx = getSjlx(item.sjlx);
             });
             if (this.tableData.length < datas.columns().emptycolNum) {
-              this.emptycolNum =
-                datas.columns().emptycolNum - this.tableData.length;
+              this.$refs.djbDetail.emptycolNum = datas.columns().emptycolNum - this.tableData.length
             } else {
-              this.emptycolNum = 0
+              this.$refs.djbDetail.emptycolNum = 0
             }
           }
         })

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-22 09:53:19
+ * @LastEditTime: 2023-10-09 10:48:55
 -->
 <template>
   <div class="djxxTable">
-    <djbDetail :title="title" :shows="shows" :propsParam="propsParam"
+    <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
       :columns="columns" :tableData="tableData" />
   </div>
 </template>
@@ -55,16 +55,15 @@
               item.sjlx = getSjlx(item.sjlx);
             });
             if (this.tableData.length < datas.columns().emptycolNum) {
-              this.emptycolNum =
-                datas.columns().emptycolNum - this.tableData.length;
+              this.$refs.djbDetail.emptycolNum = datas.columns().emptycolNum - this.tableData.length
             } else {
-              this.emptycolNum = 0;
+              this.$refs.djbDetail.emptycolNum = 0
             }
           }
-        });
+        })
       }
-    },
-  };
+    }
+  }
 </script>
 
 <style lang="scss" scoped>

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-18 13:06:42
+ * @LastEditTime: 2023-10-09 10:54:12
 -->
 <template>
   <div class="djxxTable">
-    <djbDetail :title="title" :shows="shows" :propsParam="propsParam"
+    <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
       :columns="columns" :tableData="tableData" />
   </div>
 </template>
@@ -63,10 +63,9 @@
               item.sjlx = getSjlx(item.sjlx);
             });
             if (this.tableData.length < datas.columns().emptycolNum) {
-              this.emptycolNum =
-                datas.columns().emptycolNum - this.tableData.length;
+              this.$refs.djbDetail.emptycolNum = datas.columns().emptycolNum - this.tableData.length
             } else {
-              this.emptycolNum = 0;
+              this.$refs.djbDetail.emptycolNum = 0
             }
           }
         })

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-22 09:52:50
+ * @LastEditTime: 2023-10-09 10:49:37
 -->
 <template>
   <div class="djxxTable">
-    <djbDetail :title="title" :shows="shows" :propsParam="propsParam"
+    <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
       :columns="columns" :tableData="tableData" />
   </div>
 </template>
@@ -57,10 +57,9 @@
               item.dybdclx = getDictLeabel(item.dybdclx, "A27");
             });
             if (this.tableData.length < datas.columns().emptycolNum) {
-              this.emptycolNum =
-                datas.columns().emptycolNum - this.tableData.length;
+              this.$refs.djbDetail.emptycolNum = datas.columns().emptycolNum - this.tableData.length
             } else {
-              this.emptycolNum = 0
+              this.$refs.djbDetail.emptycolNum = 0
             }
           }
         })

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-22 09:52:37
+ * @LastEditTime: 2023-10-09 10:53:14
 -->
 <template>
   <div class="djxxTable">
-    <djbDetail :title="title" :shows="shows" :propsParam="propsParam"
+    <djbDetail :title="title" ref="djbDetail" :shows="shows" :propsParam="propsParam"
       :columns="columns" :tableData="tableData" />
   </div>
 </template>
@@ -56,10 +56,9 @@
               item.dybdclx = getDictLeabel(item.dybdclx, "A27");
             });
             if (this.tableData.length < datas.columns().emptycolNum) {
-              this.emptycolNum =
-                datas.columns().emptycolNum - this.tableData.length;
+              this.$refs.djbDetail.emptycolNum = datas.columns().emptycolNum - this.tableData.length
             } else {
-              this.emptycolNum = 0;
+              this.$refs.djbDetail.emptycolNum = 0
             }
           }
         })

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-26 15:16:04
+ * @LastEditTime: 2023-10-09 09:50:37
 -->
 <template>
   <!-- 受理信息 -->
@@ -75,6 +75,7 @@
                 v-model="ruleForm.zdjbxx.qlxz"
                 noOptionsText="暂无数据"
                 :default-expand-level="1"
+                :disabled="!viewEdit"
                 placeholder=""
                 :normalizer="normalizer"
                 :show-count="true"