Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-08 15:08:19
+ * @LastEditTime: 2023-10-24 16:53:30
 -->
 <template>
   <div class="clmlmx-box">
@@ -173,6 +173,7 @@
     },
     mounted () {
       this.initSort()
+      console.log(this.formData);
     },
     beforeDestroy () {
       if (this.sortable) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-19 16:28:06
+ * @LastEditTime: 2023-10-24 16:55:26
 -->
 <template>
   <div class="clxx">
@@ -98,14 +98,14 @@
     watch: {
       workFresh: {
         handler (newValue, oldValue) {
-          if (newValue) this.clmlInitList()
+          if (newValue) this.clmlInitList(1)
         },
         deep: true,
         immediate: true
       }
     },
     created () {
-      this.clmlInitList()
+      this.clmlInitList(1)
     },
     methods: {
       /**
@@ -173,7 +173,7 @@
                 this.tableData = res.result;
                 if (type == 1) {
                   this.treeClick(this.tableData[0], 0);
-                } else {
+                } else if (type == 2) {
                   //新增材料后刷新列表焦点置于新增的对象上
                   this.treeClick(
                     this.tableData[this.tableData.length - 1],
@@ -296,11 +296,15 @@
         this.titleYs = index + 1;
       },
       //查看明细
-      viewDetail () {
+      async viewDetail () {
+        let res = await this.clmlInitList();
+        if (res == 200) {
           store.dispatch("user/reWorkFresh", false);
           ywPopupDialog("申请材料目录", "djbworkflow/components/clxx/dialog/clxxDetailDialog", {
             data: this.tableData,
+            ableOperation: this.$parent.ableOperation
           }, "60%", true, false)
+        }
       },
       //设置tableData
       setTableData (tableData) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-10 14:40:07
+ * @LastEditTime: 2023-10-24 16:08:44
 -->
 <template>
   <div class="clxx">
@@ -167,13 +167,7 @@
           this.unitData = this.$parent.unitData;
           var formdata = new FormData();
           formdata.append("bsmSlsq", this.$parent.bsmSlsq);
-          if (this.$route.query.sqywbm == "DJBBL") {
-            formdata.append("bsmSldy", this.$parent.bsmRepair);
-            formdata.append("clfl", 3);
-          } else {
           formdata.append("bsmSldy", this.$parent.currentSelectProps.bsmSldy);
-            formdata.append("clfl", 2);
-          }
 
           InitClml(formdata).then((res) => {
             if (res.code == 200) {
@@ -182,7 +176,7 @@
                 this.tableData = res.result;
                 if (type == 1) {
                   this.treeClick(this.tableData[0], 0);
-                } else {
+                } else if (type == 2) {
                   //新增材料后刷新列表焦点置于新增的对象上
                   this.treeClick(
                     this.tableData[this.tableData.length - 1],
@@ -266,7 +260,7 @@
         if (data.sfggcl == "0") {
           obj["bsmSldy"] = this.$parent.currentSelectProps.bsmSldy;
         }
-        if (this.$route.query.sqywbm == "DJBBL") {
+        if (this.$route.query?.djywbm == "DJBBL") {
           obj.bsmSldy = this.$parent.bsmRepair
         }
         saveClml(obj).then(async (res) => {
@@ -310,7 +304,9 @@
         this.titleYs = index + 1;
       },
       //查看明细
-      viewDetail () {
+      async viewDetail () {
+        let res = await this.clmlInitList();
+        if (res == 200) {
           this.$store.dispatch("user/reWorkFresh", false);
           this.$popupDialog(
             "申请材料目录",
@@ -322,9 +318,10 @@
               ableOperation: this.$parent.ableOperation,
               bsmRepair: this.$parent.bsmRepair
             },
-          "50%",
+            "60%",
             true
-        );
+          )
+        }
       },
       //设置tableData
       setTableData (tableData) {
@@ -407,7 +404,7 @@
         height: 100%;
         font-size: 14px;
         border-right: 1px dotted #d9d9d9;
-        padding: 0 15px;
+        padding: 0 10px;
 
         .item {
           line-height: 30px;
@@ -452,6 +449,7 @@
           .checked {
             border: 1px solid $light-blue;
             color: $light-blue;
+            box-sizing: border-box;
           }
         }
       }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-19 10:14:56
+ * @LastEditTime: 2023-10-24 16:08:59
 -->
 <template>
   <div class="clmlmx-box">
@@ -205,13 +205,7 @@
           this.unitData = this.$parent.unitData;
           var formdata = new FormData();
           formdata.append("bsmSlsq", Vue.prototype.$currentRoute.query.bsmSlsq);
-          if (Vue.prototype.$currentRoute.query.sqywbm == "DJBBL") {
-            formdata.append("bsmSldy", this.formData.bsmRepair);
-            formdata.append("clfl", 3);
-          } else {
           formdata.append("bsmSldy", this.formData.unitData[0]?.bsmSldy);
-            formdata.append("clfl", 2);
-          }
           InitClml(formdata).then((res) => {
             if (res.code == 200) {
               resolve(res.code)

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-12 09:58:32
+ * @LastEditTime: 2023-10-24 16:13:19
 -->
 <template>
   <div class="clxx">
@@ -98,14 +98,14 @@
     watch: {
       workFresh: {
         handler (newValue, oldValue) {
-          this.clmlInitList()
+          this.clmlInitList(1)
         },
         deep: true,
         immediate: true
       }
     },
     created () {
-      this.clmlInitList()
+      this.clmlInitList(1)
     },
     methods: {
       /**
@@ -173,7 +173,7 @@
                 this.tableData = res.result;
                 if (type == 1) {
                   this.treeClick(this.tableData[0], 0);
-                } else {
+                } else if (type == 2) {
                   //新增材料后刷新列表焦点置于新增的对象上
                   this.treeClick(
                     this.tableData[this.tableData.length - 1],
@@ -287,12 +287,15 @@
         this.titleYs = index + 1;
       },
       //查看明细
-      viewDetail () {
+      async viewDetail () {
+        let res = await this.clmlInitList();
+        if (res == 200) {
           store.dispatch("user/reWorkFresh", false);
           ywPopupDialog("申请材料目录", "xxba/components/clxx/dialog/clxxDetailDialog", {
             data: this.tableData,
             bsmCompany: this.formData.bsmCompany
-        }, "50%", true, false)
+          }, "60%", true, false)
+        }
       },
       //设置tableData
       setTableData (tableData) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-25 11:08:07
+ * @LastEditTime: 2023-10-24 16:09:46
 -->
 <template>
   <div class="from-clues">
@@ -278,7 +278,7 @@
           const { href } = this.$router.resolve(
             "/djbworkFrameview?bsmSlsq=" + item.bsmSlsq +
             "&bestepid=" + item.bestepid +
-            "&sqywbm=" + item.djywbm
+            "&djywbm=" + item.djywbm
           );
           window.open(href, `djbworkFrameview${item.bsmSlsq}`);
         } else {