Merge branch 'dev'

@@ -117,9 +117,9 @@
           .catch(() => {
             this.$message({
               type: "info",
-              message: "已取消删除",
-            });
-          });
+              message: "已取消删除"
+            })
+          })
       }
     }
   }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-24 14:12:17
+ * @LastEditTime: 2023-07-25 09:27:43
 -->
 <template>
   <div class="from-clues">
@@ -122,10 +122,10 @@
           this.$message({
             type: 'info',
             message: '已取消删除'
-          });
-        });
-      },
-    },
+          })
+        })
+      }
+    }
   };
 </script>
 <style scoped lang="scss">

@@ -76,7 +76,6 @@
        * @author: renchao
        */
       handleSubmit () {
-        debugger
         this.$refs['ruleForm'].validate((valid) => {
           if (valid) {
             this.$parent.addSave(this.ruleForm);

 <!--
  * @Description: 页面提供插件下载
  * @Autor: renchao
- * @LastEditTime: 2023-06-13 15:49:55
+ * @LastEditTime: 2023-07-25 09:25:56
 -->
 <template>
   <div class='downLoad'>
@@ -21,6 +21,10 @@
       }
     },
     methods: {
+      /**
+       * @description: 
+       * @author: renchao
+       */
       handleDown () {
         let a = document.createElement('a')
         a.style.display = 'none'

 <!--
  * @Description: 流程图
  * @Autor: renchao
- * @LastEditTime: 2023-07-19 16:04:34
+ * @LastEditTime: 2023-07-25 09:26:01
 -->
 <template>
   <div class='flowChart'>
@@ -9,7 +9,6 @@
   </div>
 </template>
 <script>
-
   export default {
     props: {
       formData: {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-24 10:15:01
+ * @LastEditTime: 2023-07-25 09:26:10
 -->
 <template>
   <div class="from-clues">
@@ -79,6 +79,10 @@
           }
         })
       },
+      /**
+       * @description: 
+       * @author: renchao
+       */
       zslqClick () {
         this.$popupDialog("不动产权证领取", "workflow/components/dialog/zslq", {}, '80%', true)
       }

 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
- * @LastEditTime: 2023-07-24 14:14:01
+ * @LastEditTime: 2023-07-25 14:14:04
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -177,9 +177,8 @@
        * @author: renchao
        */
       batchUnitClick () {
-        debugger
         this.currentSelectProps.batchOperation = true;
-        // this.activeIndex = "-1";
+        this.activeIndex = "-1";
         this.$parent.stepForm(0);
 
       },
@@ -201,7 +200,7 @@
        * @author: renchao
        */
       unitClick (index) {
-        if(this.unitData.length==0) return
+        if (this.unitData.length == 0) return
         this.currentSelectProps = this.unitData[index];
         this.currentSelectProps.batchOperation = false;
         this.activeIndex = index.toString();

@@ -10,8 +10,7 @@
         v-show="!isLoading"
         ref="processCanvas"
         class="process-canvas"
-        style="height: 280px"
-      />
+        style="height: 280px" />
       <!-- 自定义箭头样式，用于成功状态下流程连线箭头 -->
       <defs ref="customSuccessDefs">
         <marker
@@ -21,8 +20,7 @@
           ref-y="10"
           marker-width="10"
           marker-height="10"
-          orient="auto"
-        >
+          orient="auto">
           <path
             class="success-arrow"
             d="M 1 5 L 11 10 L 1 15 Z"
@@ -30,8 +28,7 @@
               stroke-width: 1px;
               stroke-linecap: round;
               stroke-dasharray: 10000, 1;
-            "
-          />
+            " />
         </marker>
         <marker
           id="conditional-flow-marker-white-success"
@@ -40,8 +37,7 @@
           ref-y="10"
           marker-width="10"
           marker-height="10"
-          orient="auto"
-        >
+          orient="auto">
           <path
             class="success-conditional"
             d="M 0 10 L 8 6 L 16 10 L 8 14 Z"
@@ -49,8 +45,7 @@
               stroke-width: 1px;
               stroke-linecap: round;
               stroke-dasharray: 10000, 1;
-            "
-          />
+            " />
         </marker>
       </defs>
       <!-- 自定义箭头样式，用于失败状态下流程连线箭头 -->
@@ -62,8 +57,7 @@
           ref-y="10"
           marker-width="10"
           marker-height="10"
-          orient="auto"
-        >
+          orient="auto">
           <path
             class="fail-arrow"
             d="M 1 5 L 11 10 L 1 15 Z"
@@ -71,8 +65,7 @@
               stroke-width: 1px;
               stroke-linecap: round;
               stroke-dasharray: 10000, 1;
-            "
-          />
+            " />
         </marker>
         <marker
           id="conditional-flow-marker-white-fail"
@@ -81,8 +74,7 @@
           ref-y="10"
           marker-width="10"
           marker-height="10"
-          orient="auto"
-        >
+          orient="auto">
           <path
             class="fail-conditional"
             d="M 0 10 L 8 6 L 16 10 L 8 14 Z"
@@ -90,8 +82,7 @@
               stroke-width: 1px;
               stroke-linecap: round;
               stroke-dasharray: 10000, 1;
-            "
-          />
+            " />
         </marker>
       </defs>
 
@@ -104,8 +95,7 @@
               :plain="true"
               :disabled="defaultZoom <= 0.3"
               icon="el-icon-zoom-out"
-              @click="processZoomOut()"
-            />
+              @click="processZoomOut()" />
             <el-button size="medium" type="default" style="width: 90px">{{
               Math.floor(this.defaultZoom * 10 * 10) + "%"
             }}</el-button>
@@ -115,14 +105,12 @@
               :plain="true"
               :disabled="defaultZoom >= 3.9"
               icon="el-icon-zoom-in"
-              @click="processZoomIn()"
-            />
+              @click="processZoomIn()" />
             <el-button
               size="medium"
               type="default"
               icon="el-icon-c-scale-to-original"
-              @click="processReZoom()"
-            />
+              @click="processReZoom()" />
             <slot />
           </el-button-group>
         </el-row>
@@ -135,8 +123,7 @@
           v-for="item in selectOptions"
           :key="item.value"
           :label="item.label"
-          :value="item.value"
-        >
+          :value="item.value">
         </el-option>
       </el-select>
       <el-table
@@ -144,15 +131,13 @@
         :data="taskCommentList"
         size="mini"
         border
-        header-cell-class-name="table-header-gray"
-      >
+        header-cell-class-name="table-header-gray">
         <el-table-column
           label="序号"
           header-align="center"
           align="center"
           type="index"
-          width="55px"
-        />
+          width="55px" />
         <el-table-column label="流程状态" header-align="center" align="center">
           <template slot-scope="scope">
             <div v-if="scope.row.endTime">已完结</div>
@@ -163,35 +148,30 @@
           label="环节名称"
           prop="name"
           minWidth="100"
-          align="center"
-        />
+          align="center" />
         <el-table-column
           label="办理人"
           prop="agent"
           minWidth="120"
-          align="center"
-        />
+          align="center" />
         <el-table-column
           label="转入时间"
           prop="createTime"
           :formatter="formatDate"
           width="160"
-          align="center"
-        />
+          align="center" />
         <el-table-column
           label="认领时间"
           prop="claimTime"
           :formatter="formatDate"
           width="160"
-          align="center"
-        />
+          align="center" />
         <el-table-column
           label="转出时间"
           prop="endTime"
           :formatter="formatDate"
           width="160"
-          align="center"
-        />
+          align="center" />
         <el-table-column label="操作方式" prop="controls" align="center" />
         <el-table-column label="意见" prop="idea" align="center" />
       </el-table>
@@ -199,17 +179,17 @@
   </div>
 </template>
 <script>
-import "@/styles/package/theme/index.scss";
-import BpmnViewer from "bpmn-js/lib/Viewer";
-import MoveCanvasModule from "diagram-js/lib/navigation/movecanvas";
-export default {
+  import "@/styles/package/theme/index.scss";
+  import BpmnViewer from "bpmn-js/lib/Viewer";
+  import MoveCanvasModule from "diagram-js/lib/navigation/movecanvas";
+  export default {
     props: {
       formData: {
         type: Object,
         default: {},
       },
     },
-  data() {
+    data () {
       return {
         dlgTitle: undefined,
         defaultZoom: 1,
@@ -230,7 +210,7 @@ export default {
         selectOptions: [],
       };
     },
-  created() {
+    created () {
       this.$nextTick(() => {
         // 获取流程记录
         this.getCommentList();
@@ -238,7 +218,7 @@ export default {
         this.importXML(this.formData.xml);
       });
     },
-  destroyed() {
+    destroyed () {
       this.clearViewer();
     },
     methods: {
@@ -248,7 +228,7 @@ export default {
        * @param {*} column
        * @author: renchao
        */
-    formatDate(row, column) {
+      formatDate (row, column) {
         let data = row[column.property];
         if (data == null) {
           return null;
@@ -272,7 +252,7 @@ export default {
        * @description: processReZoom
        * @author: renchao
        */
-    processReZoom() {
+      processReZoom () {
         this.defaultZoom = 1;
         this.bpmnViewer.get("canvas").zoom("fit-viewport", "auto");
       },
@@ -281,7 +261,7 @@ export default {
        * @param {*} zoomStep
        * @author: renchao
        */
-    processZoomIn(zoomStep = 0.1) {
+      processZoomIn (zoomStep = 0.1) {
         const newZoom = Math.floor(this.defaultZoom * 100 + zoomStep * 100) / 100;
         if (newZoom > 4) {
           throw new Error(
@@ -296,7 +276,7 @@ export default {
        * @param {*} zoomStep
        * @author: renchao
        */
-    processZoomOut(zoomStep = 0.1) {
+      processZoomOut (zoomStep = 0.1) {
         const newZoom = Math.floor(this.defaultZoom * 100 - zoomStep * 100) / 100;
         if (newZoom < 0.2) {
           throw new Error(
@@ -311,7 +291,7 @@ export default {
        * @param {*} type
        * @author: renchao
        */
-    getOperationTagType(type) {
+      getOperationTagType (type) {
         return "success";
       },
       // 流程图预览清空
@@ -320,7 +300,7 @@ export default {
        * @param {*} e
        * @author: renchao
        */
-    clearViewer(a) {
+      clearViewer (a) {
         if (this.$refs.processCanvas) {
           this.$refs.processCanvas.innerHTML = "";
         }
@@ -334,7 +314,7 @@ export default {
        * @description: 添加自定义箭头
        * @author: renchao
        */
-    addCustomDefs() {
+      addCustomDefs () {
         const canvas = this.bpmnViewer.get("canvas");
         const svg = canvas._svg;
         const customSuccessDefs = this.$refs.customSuccessDefs;
@@ -348,7 +328,7 @@ export default {
        * @param {*} element
        * @author: renchao
        */
-    onSelectElement(element) {
+      onSelectElement (element) {
         this.selectTaskId = undefined;
         this.dlgTitle = undefined;
         let allfinishedTaskSet = [
@@ -378,7 +358,7 @@ export default {
        * @param {*} val
        * @author: renchao
        */
-    handleSelect(val) {
+      handleSelect (val) {
         this.taskCommentList = (this.taskList || []).filter((item) => {
           return item.taskDefinitionKey === val;
         });
@@ -392,7 +372,7 @@ export default {
        * @param {*} xml
        * @author: renchao
        */
-    async importXML(xml) {
+      async importXML (xml) {
         let xmlData = this.$x2js.xml2js(xml).definitions.process;
         this.selectOptions = xmlData.userTask.map((item) => {
           return { value: item._id, label: item._name };
@@ -447,7 +427,7 @@ export default {
        * @description: 获取流程记录
        * @author: renchao
        */
-    getCommentList() {
+      getCommentList () {
         this.formData.allCommentList.forEach(async (item, index) => {
           // item.comments.forEach(element => {
           //   if(element.type=="COMPLETE"){
@@ -513,7 +493,7 @@ export default {
        * @param {*} processNodeInfo
        * @author: renchao
        */
-    setProcessStatus(processNodeInfo) {
+      setProcessStatus (processNodeInfo) {
         this.processNodeInfo = processNodeInfo;
         if (
           this.isLoading ||
@@ -562,10 +542,10 @@ export default {
         }
       },
     },
-};
+  };
 </script>
 <style scoped lang="scss">
-.information-list {
+  .information-list {
     height: 220px;
     margin-top: 10px;
 
@@ -573,12 +553,12 @@ export default {
       font-size: 16px;
       line-height: 24px;
     }
-}
-/deep/.bjs-powered-by {
+  }
+  /deep/.bjs-powered-by {
     display: none;
-}
-// /deep/.information-list {
-//   height: 170px;
-//   overflow: visible;
-// }
+  }
+  // /deep/.information-list {
+  //   height: 170px;
+  //   overflow: visible;
+  // }
 </style>

@@ -158,6 +158,7 @@
             this.fresh++;
             //获取单元对应的所有表单信息
             this.tabList = res.result;
+            console.log(res.result, 'res.result');
             //默认加载第一个表单信息
             let arr = res.result.filter(item => item.defaultForm)
             if (arr.length > 0) {

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-24 15:03:20
+ * @LastEditTime: 2023-07-25 09:21:53
 -->
 <template>
   <div class="from-clues">
@@ -264,10 +264,10 @@
           } else {
             this.$message.error("用户任务权限判断失败，请联系管理员");
           }
-        });
-      },
-    },
-  };
+        })
+      }
+    }
+  }
 </script>
 <style scoped lang="scss">
   @import "~@/styles/public.scss";

 <!--
  * @Description: 受理信息
  * @Autor: renchao
- * @LastEditTime: 2023-07-21 14:27:15
+ * @LastEditTime: 2023-07-25 09:22:40
 -->
 <template>
   <div class="slxx">
@@ -332,7 +332,6 @@
       upDateYwrxxList (val) {
         this.ruleForm.ywrList = _.cloneDeep(val);
       },
-
       /**
        * @description: onSubmit
        * @author: renchao

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-20 09:32:18
+ * @LastEditTime: 2023-07-25 09:23:05
 -->
 <template>
   <!-- 受理信息 -->
@@ -296,9 +296,9 @@
             console.log(res);
             //this.ruleForm = { ...res.result, ...res.result.zdjbxxdatas, ...res.result.qlxxdatas, ...res.result.jsydsyqdatas }
           }
-        });
-      },
-    },
+        })
+      }
+    }
   };
 </script>
 <style scoped lang='scss'>

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-14 11:09:33
+ * @LastEditTime: 2023-07-25 09:23:20
 -->
 <template>
   <!-- 受理信息 -->
@@ -320,7 +320,10 @@
             })
           }
         }
-        console.log("this.ruleFormmmmmmmmm", this.ruleForm);
+        /**
+         * @description: saveData
+         * @author: renchao
+         */
         saveData(this.ruleForm).then((res) => {
           if (res.code === 200) {
             this.$message({

@@ -2,7 +2,7 @@
 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-05-25 08:59:49
+ * @LastEditTime: 2023-07-25 09:23:42
 -->
 <template>
   <!-- 受理信息 -->
@@ -334,10 +334,10 @@ export default {
         { propsParam: this.propsParam },
         "80%",
         true
-      );
-    },
-  },
-};
+      )
+    }
+  }
+}
 </script>
 <style scoped lang="scss">
 @import "~@/styles/public.scss";

@@ -352,8 +352,8 @@
         })
         this.ruleForm.nydsyq.ydyhflmc = itemLx.dname;
       }
-    },
-  };
+    }
+  }
 </script>
 <style scoped lang='scss'>
   @import "~@/styles/public.scss";

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-20 09:30:51
+ * @LastEditTime: 2023-07-25 09:24:18
 -->
 <template>
   <!-- 受理信息 -->
@@ -472,6 +472,10 @@
             });
           }
         }
+        /**
+         * @description: saveData
+         * @author: renchao
+         */
         saveData(this.ruleForm).then((res) => {
           if (res.code === 200) {
             this.$message({

@@ -244,9 +244,9 @@
             });
           }
         });
-      },
-    },
-  };
+      }
+    }
+  }
 </script>
 <style scoped lang='scss'>
   @import "~@/styles/public.scss";

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-07-24 15:03:46
+ * @LastEditTime: 2023-07-25 09:21:40
 -->
 <template>
   <div class="from-clues">
@@ -232,11 +232,9 @@
           );
           window.open(href, `workFrameView${item.bsmSlsq}`);
         }
-
-
-      },
-    },
-  };
+      }
+    }
+  }
 </script>
 <style scoped lang="scss">
   @import "~@/styles/public.scss";

@@ -391,7 +391,6 @@
 <style scoped lang='scss'>
   @import "~@/styles/mixin.scss";
   @import "./ywsq.scss";
-
   /deep/.el-collapse-item__content {
     padding-bottom: 0;
   }