style:流程框架修改

renchao@pashanhoo.com
Showing 10 changed files with 69 additions and 89 deletions
src/views/registerBook/components/djbDetail.vue
src/views/registerBook/fdcq1.vue
src/views/workflow/components/leftmenu/ordinaryMenu.vue
src/views/workflow/components/leftmenu/segmentMenu.vue
src/views/workflow/mixin/index.js
src/views/workflow/mixin/public.js
src/views/workflow/workFrame.vue
src/views/workflow/workFrameView.vue
src/views/ywbl/dbx/dbx.vue
src/views/ywbl/ybx/ybx.vue
--- a/src/views/registerBook/components/djbDetail.vue
View file @cb128d5
+++ b/src/views/registerBook/components/djbDetail.vue
View file @cb128d5
 <!--
 * @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 {
--- a/src/views/registerBook/fdcq1.vue
View file @cb128d5
+++ b/src/views/registerBook/fdcq1.vue
View file @cb128d5
 <!--
 * @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')
+            this.$popup('材料信息', 'registerBook/components/clxx/index', {
-            window.open(href, `urlname${data.bsmSlsq}`)
+              width: '60%',
+              formData: data
+            })
          })
        }
      }
--- a/src/views/workflow/components/leftmenu/ordinaryMenu.vue
View file @cb128d5
+++ b/src/views/workflow/components/leftmenu/ordinaryMenu.vue
View file @cb128d5
 <!--
 * @Description: workFrame左侧菜单列表-普通
 * @Autor: renchao
- * @LastEditTime: 2023-09-21 10:46:05
+ * @LastEditTime: 2023-09-21 13:20:03
 -->
 <template>
  <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -49,8 +49,6 @@
      return {
        //受理申请标识码
        bsmSlsq: this.$route.query.bsmSlsq,
-        //当前流程所在环节
-        bestepid: this.$route.query.bestepid,
        // 默认选中
        activeIndex: '0',
        // 折叠
@@ -89,11 +87,9 @@
      loadBdcdylist (status = false) {
        let that = this
        var formdata = new FormData();
-        formdata.append("bsmSlsq", this.bsmSlsq);
+        formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
-        if (this.$route.query.bsmBusiness) {
        formdata.append("bsmBusiness", this.$route.query.bsmBusiness);
-        }
+        if (this.type) {
-        if (this.$route.query.type == 'jdcx') {
          jdcxLeftMenu(formdata).then((res) => {
            if (res.code === 200 && res.result) {
              that.unitData = res.result;
@@ -183,10 +179,6 @@
            deleteSlbdcdy(formdata).then((res) => {
              if (res.code == 200) {
                this.$message.success("删除成功");
-                /**
-                 * @description: 更新列表
-                 * @author: miaofang
-                 */
                this.loadBdcdylist()
                // this.$parent.updateDialog();
              } else {
--- a/src/views/workflow/components/leftmenu/segmentMenu.vue
View file @cb128d5
+++ b/src/views/workflow/components/leftmenu/segmentMenu.vue
View file @cb128d5
 <!--
 * @Description: workFrame左侧菜单列表-分割
 * @Autor: renchao
- * @LastEditTime: 2023-09-21 10:46:34
+ * @LastEditTime: 2023-09-21 14:20:52
 -->
 <template>
  <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
@@ -102,9 +102,9 @@
        let that = this
        var formdata = new FormData();
        // 受理申请标识码
-        formdata.append("bsmSlsq", this.paramData.bsmSlsq);
+        formdata.append("bsmSlsq", this.$route.query.bsmSlsq);
-        formdata.append("bsmBusiness", this.paramData.bsmBusiness);
+        formdata.append("bsmBusiness", this.$route.query.bsmBusiness);
-        if (this.$route.query.type == 'jdcx') {
+        if (this.type) {
          jdcxLeftMenu(formdata).then((res) => {
            if (res.code === 200 && res.result) {
              this.aroundUnitData = res.result.filter(item => item.bglx == '1')
@@ -206,6 +206,7 @@
       * @author: renchao
       */
      batchUnitClick () {
+        window.currentSelect = {}
        this.currentSelectProps.batchOperation = true;
        // this.activeIndex = "-1";
        this.$parent.stepForm(0);
--- a/src/views/workflow/mixin/index.js
View file @cb128d5
+++ b/src/views/workflow/mixin/index.js
View file @cb128d5
 /*
 * @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,8 +163,8 @@ export default {
                bsm: res.result[0],
                onlyShow: false,
                unitData: window.unitData,
-                bsmSlsq:this.bsmSlsq,
+                bsmSlsq: this.bsmSlsq,
-                showSave:true,
+                showSave: true,
                djlx: window.djlx
              }, '90%', true)
            } else {
@@ -177,8 +177,8 @@ export default {
          window.djlx && this.$popupDialog('楼盘表', 'lpb/zjgcdy', {
            onlyShow: false,
            unitData: window.unitData,
-            bsmSlsq:this.bsmSlsq,
+            bsmSlsq: this.bsmSlsq,
-            showSave:true,
+            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)
        }
--- a/src/views/workflow/mixin/public.js
View file @cb128d5
+++ b/src/views/workflow/mixin/public.js
View file @cb128d5
 /*
 * @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);
    }
  }
 }
--- a/src/views/workflow/workFrame.vue
View file @cb128d5
+++ b/src/views/workflow/workFrame.vue
View file @cb128d5
 <!--
 * @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 : '')
        }
      },
      /**
--- a/src/views/workflow/workFrameView.vue
View file @cb128d5
+++ b/src/views/workflow/workFrameView.vue
View file @cb128d5
 <!--
 * @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: "",
        // 折叠
--- a/src/views/ywbl/dbx/dbx.vue
View file @cb128d5
+++ b/src/views/ywbl/dbx/dbx.vue
View file @cb128d5
 <!--
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-09-15 16:30:47
+ * @LastEditTime: 2023-09-21 14:24:15
 -->
 <template>
  <div class="from-clues">
@@ -303,32 +303,24 @@
              //有任务权限
              if (item.sjlx == "3") {
                const { href } = this.$router.resolve(
-                  "/djbworkFrame?bsmSlsq=" +
+                  "/djbworkFrame?bsmSlsq=" + item.bsmSlsq +
-                  item.bsmSlsq +
+                  "&bestepid=" + item.bestepid +
-                  "&bestepid=" +
+                  "&bsmBusiness=" + item.bsmBusiness,
-                  item.bestepid +
+                  "&sqywbm=" + item.djywbm +
-                  "&bsmBusiness=" +
+                  "&zbhj=" + item.zbhj
-                  "&sqywbm=" +
-                  item.djywbm +
-                  "&zbhj=" +
-                  item.zbhj
                );
                window.open(href, `djbworkFrame${item.bsmSlsq}`);
              } else {
                const { href } = this.$router.resolve(
-                  "/workFrame?bsmSlsq=" +
+                  "/workFrame?bsmSlsq=" + item.bsmSlsq +
-                  item.bsmSlsq +
+                  "&bestepid=" + item.bestepid +
-                  "&bestepid=" +
+                  "&bsmBusiness=" + item.bsmBusiness,
-                  item.bestepid +
+                  "&sqywbm=" + item.djywbm +
-                  "&bsmBusiness=" +
+                  "&zbhj=" + item.zbhj
-                  "&sqywbm=" +
+                )
-                  item.djywbm +
+                window.open(href, `workFrame${item.bsmSlsq}`)
-                  "&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 +333,10 @@
          } else {
            this.$message.error("用户任务权限判断失败，请联系管理员");
          }
-        });
+        })
-      },
+      }
-    },
+    }
-  };
+  }
 </script>
 <style scoped lang="scss">
  @import "~@/styles/public.scss";
--- a/src/views/ywbl/ybx/ybx.vue
View file @cb128d5
+++ b/src/views/ywbl/ybx/ybx.vue
View file @cb128d5
 <!--
 * @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=" +
+            "/djbworkFrameview?bsmSlsq=" + item.bsmSlsq +
-            item.bsmSlsq +
+            "&bsmBusiness=" + item.bsmBusiness +
-            "&bestepid=" +
+            "&sqywbm=" + item.djywbm
-            item.bestepid +
-            "&sqywbm=" +
-            item.djywbm
          );
          window.open(href, `djbworkFrameview${item.bsmSlsq}`);
        } else {
          const { href } = this.$router.resolve(
-            "/workFrameView?bsmSlsq=" +
+            "/workFrameView?bsmSlsq=" + item.bsmSlsq +
-            item.bsmSlsq +
+            "&bsmBusiness=" + item.bsmBusiness
-            "&bestepid=" +
-            item.bestepid
          );
-          window.open(href, `workFrameView${item.bsmSlsq}`);
+          window.open(href, `workFrameView${item.bsmSlsq}`)
        }
      }
    }