Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -76,7 +76,7 @@
         qllx: this.$route.query.qllx,
         // 默认选中
         activeIndex: "0",
-        clickindex:"",
+        clickindex: "",
         // 折叠
         isShowdrawer: true,
         delel: true,
@@ -113,7 +113,6 @@
       // },
     },
     methods: {
-      //读取申请单元信息
       /**
        * @description: 读取申请单元信息
        * @author: renchao
@@ -130,10 +129,7 @@
             }
           });
         }
-
-
       },
-      // 获取右侧菜单
       /**
        * @description: 获取右侧菜单
        * @param {*} row
@@ -150,25 +146,19 @@
                 this.unitClick(index)
               }
             })
-            if(row=="change"){
+            if (row == "change") {
               this.unitClick(this.clickindex)
-
             }
-          }else{
-             if (this.supplementarylist.length) {
-            this.unitClick(0)
-             this.activeIndex = "0"
           } else {
-            this.loadBdcdylist()
-            // this.$emit("getCurrentSelectProps", this.currentSelectProps);
+            if (this.supplementarylist.length) {
+              this.unitClick(0)
+              this.activeIndex = "0"
+            } else {
+              this.loadBdcdylist()
+              // this.$emit("getCurrentSelectProps", this.currentSelectProps);
+            }
           }
-
-       }
-
-
-
-
-        });
+        })
       },
       /**
        * @description: handleNodeClick
@@ -188,11 +178,10 @@
        * @author: renchao
        */
       unitClick (index) {
-         this.clickindex=index
+        this.clickindex = index
         this.currentSelectProps = this.supplementarylist[index];
         this.$emit("getCurrentSelectProps", this.currentSelectProps);
       },
-      //登记簿点击事件
       /**
        * @description: 登记簿点击事件
        * @author: renchao
@@ -200,7 +189,6 @@
       djbClick () {
         this.loadBdcdylist();
       },
-      // 删除补录记录
       /**
        * @description: 删除补录记录
        * @param {*} row
@@ -234,7 +222,6 @@
             });
           });
       },
-      //补录信息点击事件默认展示第一条补录记录
       /**
        * @description: 补录信息点击事件默认展示第一条补录记录
        * @author: renchao
@@ -243,10 +230,9 @@
         if (this.supplementarylist.length) {
           this.unitClick(0);
         }
-
-      },
-    },
-  };
+      }
+    }
+  }
 </script>
 <style scoped lang="scss">
   @import "~@/styles/mixin.scss";
@@ -323,8 +309,8 @@
       color: red;
       line-height: 22px;
     }
-    .ywh{
-    font-size: 12px;
+    .ywh {
+      font-size: 12px;
     }
     .el-icon-delete {
       margin-top: 10px;
@@ -333,7 +319,7 @@
       height: 27px;
       float: left;
     }
-    .el-icon-delete:hover{
+    .el-icon-delete:hover {
       color: #0079fe;
     }
   }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-15 09:27:14
+ * @LastEditTime: 2023-09-21 14:57:51
 -->
 <template>
   <div class="container">
@@ -73,8 +73,6 @@
   import { getForm } from "./flowform";
   import { getStepFormInfo } from "@/api/workFlow.js";
   import NoticeBar from "@/components/NoticeBar/index";
-  // import ProcessViewer from "./components/processViewer.vue";
-
   import ordinaryMenu from "./components/leftmenu/ordinaryMenu.vue";
   import qllxDailog from "./djbBook/components/qllxDailog";
   import selectBdc from "@/views/ywbl/ywsq/selectBdc.vue";
@@ -128,9 +126,6 @@
         ableOperation: false,
       };
     },
-    mounted () {
-      // this.getleftMenubl()
-    },
     methods: {
       /**
        * @description: stepForm
@@ -155,10 +150,10 @@
                     that.clxxForm = getForm(item.value, that.$route.query.sqywbm);
                     that.clxxTab = item;
                   }
-                });
+                })
               }
-            });
-          });
+            })
+          })
         }
       },
       /**
@@ -226,7 +221,6 @@
         if (p) {
           this.ableOperation = this.tabList[a.index].ableOperation;
         }
-
       },
       /**
        * @description: 右侧表单选项卡事件
@@ -285,13 +279,13 @@
             } else {
               this.$alert(res.message, "提示", {
                 confirmButtonText: "确定",
-                type: "warning",
-              });
+                type: "warning"
+              })
             }
           })
           .catch((res) => {
-            console.log("错", res);
-          });
+            console.log("错", res)
+          })
       }
     }
   }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-21 10:19:25
+ * @LastEditTime: 2023-09-21 10:53:44
 -->
 <template>
   <div class="tableBox">
@@ -71,10 +71,10 @@
               <span v-if="item.prop == 'qszt'">
                 {{ getQsztName(row[item.prop]) }}
               </span>
-              <el-link v-if="item.prop == 'ywh'"
+              <el-link v-if="['zxywh', 'ywh'].includes(item.prop)"
                 @click="handleSelectYwh(tableData, row[item.prop])"
                 type="primary">{{ row[item.prop] }}</el-link>
-              <span v-if="!['qszt','ywh' ].includes(item.prop)">{{ row[item.prop] }}</span>
+              <span v-if="!['qszt','ywh', 'zxywh' ].includes(item.prop)">{{ row[item.prop] }}</span>
             </p>
 
             <el-tooltip
@@ -229,7 +229,7 @@
         if (sjlx == '系统数据') {
           getXtParamsByYwh(ywh).then(res => {
             let data = res.result
-            const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bestepid=' + data.bestepid + '&bsmBusiness=' + data.bsmBusiness + '&type=jdcx')
+            const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness)
             window.open(href, `urlname${data.bsmSlsq}`)
           })
         } else {

 <!--
  * @Description:
  * @Autor: miaofang
- * @LastEditTime: 2023-09-18 14:48:07
+ * @LastEditTime: 2023-09-21 11:05:33
 -->
 <template>
   <div class="djxxTable">
@@ -72,7 +72,7 @@
               <span v-if="item.prop == 'qszt'">
                 {{ getQsztName(row[item.prop]) }}
               </span>
-              <el-link v-if="item.prop == 'ywh'"
+              <el-link v-if=" ['zxywh', 'ywh'].includes(item.prop)"
                 @click="handleSelectYwh(tableData, row[item.prop])"
                 type="primary">{{ row[item.prop] }}</el-link>
               <el-tooltip
@@ -88,6 +88,7 @@
 
               <span
                 v-if="
+                  item.prop !== 'zxywh' &&
                   item.prop !== 'ywh' &&
                   item.prop !== 'qszt' &&
                   item.prop !== 'djyy' &&
@@ -291,14 +292,16 @@
         if (sjlx == '系统数据') {
           getXtParamsByYwh(ywh).then(res => {
             let data = res.result
-            const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bestepid=' + data.bestepid + '&bsmBusiness=' + data.bsmBusiness + '&type=jdcx')
+            const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bsmBusiness=' + data.bsmBusiness + '&type=jdcx')
             window.open(href, `urlname${data.bsmSlsq}`)
           })
         } else {
           getBlParamsByYwh(ywh, bsmQlxx).then(res => {
             let data = res.result
-            const { href } = Router.resolve('/workFrameView?bsmSlsq=' + data.bsmSlsq + '&bestepid=' + data.bestepid + '&bsmBusiness=' + data.bsmBusiness + '&type=jdcx')
-            window.open(href, `urlname${data.bsmSlsq}`)
+            this.$popup('材料信息', 'registerBook/components/clxx/index', {
+              width: '60%',
+              formData: data
+            })
           })
         }
       }

 <!--
  * @Description: workFrame左侧菜单列表-普通
  * @Autor: renchao
- * @LastEditTime: 2023-09-21 10:46:05
+ * @LastEditTime: 2023-09-21 14:40:30
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -49,8 +49,8 @@
       return {
         //受理申请标识码
         bsmSlsq: this.$route.query.bsmSlsq,
-        //当前流程所在环节
         bestepid: this.$route.query.bestepid,
+        bsmBusiness: this.$route.query.bsmBusiness,
         // 默认选中
         activeIndex: '0',
         // 折叠
@@ -89,11 +89,10 @@
       loadBdcdylist (status = false) {
         let that = this
         var formdata = new FormData();
-        formdata.append("bsmSlsq", this.bsmSlsq);
-        if (this.$route.query.bsmBusiness) {
-          formdata.append("bsmBusiness", this.$route.query.bsmBusiness);
-        }
-        if (this.$route.query.type == 'jdcx') {
+        formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
+        formdata.append("bestepid", this.bestepid ? this.bestepid : '');
+        formdata.append("bsmBusiness", this.bsmBusiness ? this.bsmBusiness : '');
+        if (this.type) {
           jdcxLeftMenu(formdata).then((res) => {
             if (res.code === 200 && res.result) {
               that.unitData = res.result;
@@ -183,10 +182,6 @@
             deleteSlbdcdy(formdata).then((res) => {
               if (res.code == 200) {
                 this.$message.success("删除成功");
-                /**
-                 * @description: 更新列表
-                 * @author: miaofang
-                 */
                 this.loadBdcdylist()
                 // this.$parent.updateDialog();
               } else {

 <!--
  * @Description: workFrame左侧菜单列表-分割
  * @Autor: renchao
- * @LastEditTime: 2023-09-21 10:46:34
+ * @LastEditTime: 2023-09-21 14:44:34
 -->
 <template>
   <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -61,6 +61,9 @@
   export default {
     data () {
       return {
+        bsmSlsq: this.$route.query.bsmSlsq,
+        bsmBusiness: this.$route.query.bsmBusiness,
+        bestepid: this.$route.query.bestepid,
         // 变更前单元默认选中
         activeIndex: '0',
         // 变更后单元默认选中
@@ -102,9 +105,10 @@
         let that = this
         var formdata = new FormData();
         // 受理申请标识码
-        formdata.append("bsmSlsq", this.paramData.bsmSlsq);
-        formdata.append("bsmBusiness", this.paramData.bsmBusiness);
-        if (this.$route.query.type == 'jdcx') {
+        formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
+        formdata.append("bsmBusiness", this.bsmBusiness ? this.bsmBusiness : '');
+        formdata.append("bestepid", this.bestepid ? this.bestepid : '');
+        if (this.type) {
           jdcxLeftMenu(formdata).then((res) => {
             if (res.code === 200 && res.result) {
               this.aroundUnitData = res.result.filter(item => item.bglx == '1')
@@ -206,6 +210,7 @@
        * @author: renchao
        */
       batchUnitClick () {
+        window.currentSelect = {}
         this.currentSelectProps.batchOperation = true;
         // this.activeIndex = "-1";
         this.$parent.stepForm(0);

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-20 16:56:46
+ * @LastEditTime: 2023-09-21 14:20:02
  */
 import { getPrintTemplateByCode } from "@/api/print";
 import { uploadUndo } from "@/api/clxx";
@@ -52,7 +52,7 @@ export default {
     flowInitParam () {
       var formdata = new FormData();
       formdata.append("bsmSlsq", this.bsmSlsq);
-      formdata.append("bestepid", this.bestepid);
+      formdata.append("bestepid", this.bestepid ? this.bestepid : '');
       if (this.type) {
         formdata.append("type", "READ_ONLY");
       }
@@ -85,7 +85,7 @@ export default {
           })
           break;
         case "B1":
-          getWorkFlowImage(this.bsmSlsq, this.$route.query.bestepid).then(res => {
+          getWorkFlowImage(this.bsmSlsq, this.bestepid ? this.bestepid : '').then(res => {
             let { result } = res
             this.$popupDialog("流程图", "workflow/components/processViewer", {
               xml: result.xml,
@@ -163,22 +163,22 @@ export default {
                 bsm: res.result[0],
                 onlyShow: false,
                 unitData: window.unitData,
-                bsmSlsq:this.bsmSlsq,
-                showSave:true,
+                bsmSlsq: this.bsmSlsq,
+                showSave: true,
                 djlx: window.djlx
               }, '90%', true)
             } else {
               this.$message.error(res.message)
             }
           })
-          .catch((err) => {
-            this.$message.error(err)
-          });
+            .catch((err) => {
+              this.$message.error(err)
+            });
           window.djlx && this.$popupDialog('楼盘表', 'lpb/zjgcdy', {
             onlyShow: false,
             unitData: window.unitData,
-            bsmSlsq:this.bsmSlsq,
-            showSave:true,
+            bsmSlsq: this.bsmSlsq,
+            showSave: true,
             djlx: window.djlx
           }, '90%', true)
           break;
@@ -192,13 +192,13 @@ export default {
         case "back": //退回按钮
           this.$popupDialog("退回", "workflow/components/th", {
             bsmSlsq: this.bsmSlsq,
-            bestepid: this.bestepid
+            bestepid: this.bestepid ? this.bestepid : ''
           }, '800px', true)
           break;
         case "transfer": //转件按钮
           getNextLinkInfo({
             bsmSlsq: this.bsmSlsq,
-            bestepid: this.bestepid,
+            bestepid: this.bestepid ? his.bestepid : ''
           }).then((res) => {
             if (res.code === 200) {
               if (res.result) {
@@ -212,18 +212,18 @@ export default {
         case "stop": //终止按钮
           this.$popupDialog("终止", "workflow/components/stop", {
             bsmSlsq: this.bsmSlsq,
-            bestepid: this.bestepid,
+            bestepid: this.bestepid ? this.bestepid : ''
           }, '600px', true)
           break;
         case "signout":
           window.close();
           //取消认领
-          unClaimTask(this.bsmSlsq, this.bestepid)
+          unClaimTask(this.bsmSlsq, this.bestepid ? this.bestepid : '')
           break;
         case "B9":
           var formdata = new FormData();
           formdata.append("bsmSlsq", this.bsmSlsq);
-          formdata.append("bestepid", this.bestepid);
+          formdata.append("bestepid", this.bestepid ? this.bestepid : '');
           this.$confirm("请确认是否登簿", "提示", {
             iconClass: "el-icon-info", //自定义图标样式
             confirmButtonText: "确认", //确认按钮文字更换
@@ -265,7 +265,7 @@ export default {
       this.$confirm("确定要删除吗, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
-        type: "warning",
+        type: "warning"
       })
         .then(() => {
           deleteFlow(formdata).then((res) => {
@@ -279,14 +279,14 @@ export default {
             } else {
               this.$message.error(res.message);
             }
-          });
+          })
         })
         .catch(() => {
           this.$message({
             type: "info",
-            message: "已取消删除",
-          });
-        });
+            message: "已取消删除"
+          })
+        })
     },
     /**
      * @description: 发送下一个环节
@@ -337,7 +337,7 @@ export default {
       formdata.append("bsmSlsq", this.bsmSlsq);
       uploadUndo(formdata).then(res => {
         if (res.code == 200) {
-          this.$message.success("导入成功");
+          this.$message.success("导入成功")
         } else {
           this.$message.error(res.message)
         }

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-12 10:52:24
+ * @LastEditTime: 2023-09-21 14:16:39
  */
 import { getForm } from "../flowform";
 import { getHomeNoticeList } from "@/api/home.js"
@@ -55,7 +55,7 @@ export default {
           break;
         }
       }
-      this.componentTag = getForm(tabname, this.$route.query.sqywbm);
+      this.componentTag = getForm(tabname);
     }
   }
 }

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-18 11:13:57
+ * @LastEditTime: 2023-09-21 13:45:04
 -->
 <template>
   <div class="container">
@@ -178,7 +178,7 @@
         //  获取打印回执数据
         var formdata = new FormData();
         formdata.append("bsmSldy", this.currentSelectProps.bsmSldy);
-        formdata.append("bsmSlsq", this.paramData.bsmSlsq);
+        formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
         formdata.append("djlx", this.currentSelectProps.djlx);
         BatchInit(formdata).then((res) => {
           if (res.code === 200 && res.result) {
@@ -231,7 +231,7 @@
         //判断是窗口关闭还是刷新
         if (this._gap_time <= 10) {
           //取消认领
-          unClaimTask(this.paramData.bsmSlsq, this.paramData.bestepid)
+          unClaimTask(this.$route.query.bsmSlsq, this.bestepid ? this.bestepid : '')
         }
       },
       /**

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-21 10:46:55
+ * @LastEditTime: 2023-09-21 13:11:04
 -->
 <template>
   <div class="container">
@@ -71,8 +71,6 @@
       return {
         //受理申请标识码
         bsmSlsq: this.$route.query.bsmSlsq,
-        //当前流程所在环节
-        bestepid: this.$route.query.bestepid,
         // 流程图
         imgSrc: "",
         // 折叠

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-15 16:30:47
+ * @LastEditTime: 2023-09-21 14:49:29
 -->
 <template>
   <div class="from-clues">
@@ -303,32 +303,20 @@
               //有任务权限
               if (item.sjlx == "3") {
                 const { href } = this.$router.resolve(
-                  "/djbworkFrame?bsmSlsq=" +
-                  item.bsmSlsq +
-                  "&bestepid=" +
-                  item.bestepid +
-                  "&bsmBusiness=" +
-                  "&sqywbm=" +
-                  item.djywbm +
-                  "&zbhj=" +
-                  item.zbhj
+                  "/djbworkFrame?bsmSlsq=" + item.bsmSlsq +
+                  "&bestepid=" + item.bestepid +
+                  "&zbhj=" + item.zbhj
                 );
                 window.open(href, `djbworkFrame${item.bsmSlsq}`);
               } else {
                 const { href } = this.$router.resolve(
-                  "/workFrame?bsmSlsq=" +
-                  item.bsmSlsq +
-                  "&bestepid=" +
-                  item.bestepid +
-                  "&bsmBusiness=" +
-                  "&sqywbm=" +
-                  item.djywbm +
-                  "&zbhj=" +
-                  item.zbhj
-                );
-                window.open(href, `workFrame${item.bsmSlsq}`);
+                  "/workFrame?bsmSlsq=" + item.bsmSlsq +
+                  "&bestepid=" + item.bestepid +
+                  "&zbhj=" + item.zbhj
+                )
+                window.open(href, `workFrame${item.bsmSlsq}`)
               }
-              localStorage.setItem("ywbl", JSON.stringify(item));
+              localStorage.setItem("ywbl", JSON.stringify(item))
 
               //从待办箱进入的调取任务领取接口
               claimTask(item.bsmSlsq, item.bestepid);
@@ -341,10 +329,10 @@
           } else {
             this.$message.error("用户任务权限判断失败，请联系管理员");
           }
-        });
-      },
-    },
-  };
+        })
+      }
+    }
+  }
 </script>
 <style scoped lang="scss">
   @import "~@/styles/public.scss";

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-19 10:04:58
+ * @LastEditTime: 2023-09-21 14:24:21
 -->
 <template>
   <div class="from-clues">
@@ -220,7 +220,6 @@
     methods: {
       /**
        * @description: 列表渲染接口
-       * @author: renchao
        */
       queryClick () {
         this.$startLoading();
@@ -264,22 +263,17 @@
         if (item.sjlx == "3") {
           item.djywbm = "DJBBL";
           const { href } = this.$router.resolve(
-            "/djbworkFrameview?bsmSlsq=" +
-            item.bsmSlsq +
-            "&bestepid=" +
-            item.bestepid +
-            "&sqywbm=" +
-            item.djywbm
+            "/djbworkFrameview?bsmSlsq=" + item.bsmSlsq +
+            "&bsmBusiness=" + item.bsmBusiness +
+            "&sqywbm=" + item.djywbm
           );
           window.open(href, `djbworkFrameview${item.bsmSlsq}`);
         } else {
           const { href } = this.$router.resolve(
-            "/workFrameView?bsmSlsq=" +
-            item.bsmSlsq +
-            "&bestepid=" +
-            item.bestepid
+            "/workFrameView?bsmSlsq=" + item.bsmSlsq +
+            "&bsmBusiness=" + item.bsmBusiness
           );
-          window.open(href, `workFrameView${item.bsmSlsq}`);
+          window.open(href, `workFrameView${item.bsmSlsq}`)
         }
       }
     }

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-05-05 09:45:31
+ * @LastEditTime: 2023-09-21 14:59:40
  */
 import Router from '@/router'
 export default {
@@ -25,10 +25,8 @@ export default {
      */
     jump (data, type) {
       const { href } = Router.resolve(
-        "/djbworkFrame?bsmSlsq=" +
-        data.bsmSlsq +
-        "&bestepid=" +
-        data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type
+        "/djbworkFrame?bsmSlsq=" + data.bsmSlsq +
+        "&bestepid=" + data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type
       );
       window.open(href, "_blank");
       this.$popupCacel()

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-18 11:30:35
+ * @LastEditTime: 2023-09-21 14:59:02
  */
 import Router from '@/router'
 export default {
@@ -19,18 +19,14 @@ export default {
     },
     /**
      * @description: jump
-     * @param {*} data
-     * @param {*} type
      * @author: renchao
      */
     jump (data, type) {
       const { href } = Router.resolve(
-        "/workFrame?bsmSlsq=" +
-        data.bsmSlsq +
-        "&bestepid=" +
-        data.bestepid + '&bsmBusiness=' + '&sqywbm=' + type + "&zbhj=受理"
-      );
-         window.open(href, "_blank")
+        "/workFrame?bsmSlsq=" + data.bsmSlsq +
+        "&bestepid=" + data.bestepid + "&zbhj=受理"
+      )
+      window.open(href, "_blank")
       this.$popupCacel()
     },
     /**