cloud-web-corejs 1.0.54-dev.639 → 1.0.54-dev.640

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.639",
+  "version": "1.0.54-dev.640",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/layout/components/Sidebar/default.vue

@@ -45,10 +45,7 @@
           :content="$t1('流程待办')"
           :placement="direction"
         >
-          <i
-            class="iconfont icon-liuchengdaiban"
-            @click="$router.push('/basic/wf/wf_manage/list')"
-          />
+          <i class="iconfont icon-liuchengdaiban" @click="toWorkflowManage()" />
         </el-tooltip>
       </div>
       <div class="item" v-if="isDev && isBdAdmin">
@@ -142,9 +139,15 @@
           :key="'menuModule' + menuModule.id"
           @click.native="rourteTo(menuModule)"
         >
-          <i :class="getMenuClass(menuModule, 1)" v-if="menuModule.children.length <= 0"></i>
+          <i
+            :class="getMenuClass(menuModule, 1)"
+            v-if="menuModule.children.length <= 0"
+          ></i>
           <template slot="title">
-            <i :class="getMenuClass(menuModule, 1)" v-if="menuModule.children.length > 0"></i>
+            <i
+              :class="getMenuClass(menuModule, 1)"
+              v-if="menuModule.children.length > 0"
+            ></i>
             <span>{{ getMenuName(menuModule) }}</span>
           </template>
           <component
@@ -294,6 +297,7 @@ import extractedCodeCreateDialog from "../extractedCode/createDialog.vue";
 import extractedCodeQueryDialog from "../extractedCode/queryDialog.vue";
 import { getBdFlag } from "@base/api/user";
 import createCompanyDialog from "@base/layout/components/createCompany/createCompanyDialog.vue";
+import { getLogicParamValue } from "@base/api/user";
 
 export default {
   props: {
@@ -345,6 +349,7 @@ export default {
       showExtractedCodeQueryDialog: false,
       isDev: false,
       showCreateCompanyDialog: false,
+      workflowManageRoute: "",
     };
   },
   computed: {
@@ -400,8 +405,23 @@ export default {
     initPddLog(); //初始化拼多多日志
     this.initIsFormDev();
     this.getBdEnv();
+    //初始化流程待办路由
+    this.initWorkflowManageRoute();
   },
   methods: {
+    initWorkflowManageRoute() {
+      //初始化流程待办路由
+      getLogicParamValue({
+        data: { paramCode: "workflowManageRoute" },
+        success: (res) => {
+          let value = res?.objx;
+          this.workflowManageRoute = value || "/basic/wf/wf_manage/list";
+        },
+      });
+    },
+    toWorkflowManage() {
+      this.$router.push(this.workflowManageRoute);
+    },
     getMenuType(item) {
       if (item.children && item.children.length > 0) {
         return "el-submenu";
@@ -797,7 +817,7 @@ export default {
           if (sh >= 0) {
             $snav.style["margin-top"] = sh1 + "px";
           } else if (sh < 0) {
-            let bd = sh1 + sh ;
+            let bd = sh1 + sh;
 
             $snav.style["margin-top"] = bd + "px";
             $snav.querySelector(".ico-arrow").style["margin-top"] =
@@ -1057,22 +1077,34 @@ export default {
     position: relative;
     background-color: rgba(0, 0, 0, 0.2);
     word-break: break-word;
-    .el-scrollbar__view > .el-submenu > .el-submenu__title{padding:0 11px !important;
-      span{font-size:14px;}
-      ~ .el-menu{
-        padding:5px 0;
-        .el-submenu.is-opened .el-submenu__title{background-color:#FFF;opacity:1;
-          span{color:$baseColor;}
-          i.iconfont{color:$baseColor}
+    .el-scrollbar__view > .el-submenu > .el-submenu__title {
+      padding: 0 11px !important;
+      span {
+        font-size: 14px;
+      }
+      ~ .el-menu {
+        padding: 5px 0;
+        .el-submenu.is-opened .el-submenu__title {
+          background-color: #fff;
+          opacity: 1;
+          span {
+            color: $baseColor;
+          }
+          i.iconfont {
+            color: $baseColor;
+          }
         }
       }
-
     }
-    .el-submenu__title,.el-menu-item {
+    .el-submenu__title,
+    .el-menu-item {
       padding: 0 11px;
       height: 48px;
       line-height: 48px;
-      &:hover,&.is-active{background-color:rgba(0, 0, 0, 0.29)}
+      &:hover,
+      &.is-active {
+        background-color: rgba(0, 0, 0, 0.29);
+      }
       i {
         color: #fff;
         font-size: 13px;
@@ -1111,18 +1143,22 @@ export default {
       &.is-opened .el-submenu__title {
         //background-color: rgba(27, 66, 97) !important;
       }
-      .el-submenu .el-menu{display:none}
+      .el-submenu .el-menu {
+        display: none;
+      }
     }
 
     .el-submenu {
-      &.is-opened{
-        > .el-submenu__title{background-color:rgba(0, 0, 0, 0.29)}
+      &.is-opened {
+        > .el-submenu__title {
+          background-color: rgba(0, 0, 0, 0.29);
+        }
       }
       .el-menu {
         background: rgba(0, 0, 0, 0.35);
         box-shadow: 0px -5px 8px #00000014 inset;
         //padding:4px 0;
-        .el-submenu__title{
+        .el-submenu__title {
           height: auto;
           line-height: 1.4;
           font-size: 12px;
@@ -1156,13 +1192,18 @@ export default {
             zoom: 0.8;
             display: none;
           }
-          span{height:auto;text-align: left !important;}
+          span {
+            height: auto;
+            text-align: left !important;
+          }
           &:hover,
           &.on {
             opacity: 1;
             background-color: #fbfdfe !important;
             color: $baseColor !important;
-            i.iconfont{color:$baseColor}
+            i.iconfont {
+              color: $baseColor;
+            }
             .el-icon-arrow-right {
               color: $baseColor;
             }
@@ -1170,7 +1211,7 @@ export default {
         }
       }
 
-      .el-menu-item{
+      .el-menu-item {
         height: auto;
         line-height: 1.4;
         padding-left: 33px !important;
@@ -1193,7 +1234,7 @@ export default {
           line-height: 20px;
           left: 7px;
           font-size: 18px;
-          color:#D0D6DB;
+          color: #d0d6db;
         }
 
         [class^="el-icon-"] {
@@ -1206,7 +1247,6 @@ export default {
           width: 14px;
           zoom: 0.8;
           display: none;
-
         }
 
         &:hover,
@@ -1215,7 +1255,8 @@ export default {
           background-color: #fbfdfe !important;
           color: $baseColor !important;
 
-          .el-icon-arrow-right,i.iconfont {
+          .el-icon-arrow-right,
+          i.iconfont {
             color: $baseColor;
           }
         }
@@ -1538,53 +1579,81 @@ export default {
 // .el-submenu .el-menu {
 //   height: auto !important;
 // }
-.el-menu--vertical{
-   > .el-menu--popup{overflow: hidden;
-      .el-submenu__title,.el-menu-item{
-        height: auto !important;
-        line-height: 1.4 !important;
-        opacity: 0.8;
-        margin: 5px 0 5px 14px;
-        padding: 7px 2px 7px 12px !important;
-        border-radius: 8px;
-        text-align: left;
-        min-width: 81px !important;
-        white-space: normal;
-        margin-right: 10px;
-        word-break: break-word;
-        i.iconfont{color:#FFF;margin-right:8px;}
+.el-menu--vertical {
+  > .el-menu--popup {
+    overflow: hidden;
+    .el-submenu__title,
+    .el-menu-item {
+      height: auto !important;
+      line-height: 1.4 !important;
+      opacity: 0.8;
+      margin: 5px 0 5px 14px;
+      padding: 7px 2px 7px 12px !important;
+      border-radius: 8px;
+      text-align: left;
+      min-width: 81px !important;
+      white-space: normal;
+      margin-right: 10px;
+      word-break: break-word;
+      i.iconfont {
+        color: #fff;
+        margin-right: 8px;
+      }
+    }
+  }
+  .el-submenu {
+    .el-submenu__title {
+      height: 36px;
+      line-height: 36px;
+      .el-submenu__icon-arrow {
+        display: none;
       }
-   }
-  .el-submenu{
-    .el-submenu__title{
-      height:36px;line-height:36px;
-      .el-submenu__icon-arrow{display:none}
     }
-    &:hover{
-      .el-submenu__title{
-        background:#FFF;
-        span{color:#FFF}
-        i.iconfont{color:$baseColor}
+    &:hover {
+      .el-submenu__title {
+        background: #fff;
+        span {
+          color: #fff;
+        }
+        i.iconfont {
+          color: $baseColor;
+        }
       }
     }
 
-    &.is-opened{
-      .el-submenu__title{background-color:#FFF;opacity: 1;
-        span{color:$baseColor}
-        i.iconfont{color:$baseColor}
+    &.is-opened {
+      .el-submenu__title {
+        background-color: #fff;
+        opacity: 1;
+        span {
+          color: $baseColor;
+        }
+        i.iconfont {
+          color: $baseColor;
+        }
       }
     }
   }
-  .el-menu-item{
-    &:hover{
-      background:#FFF !important;opacity:1;
-      span{color:$baseColor}
-      i.iconfont{color:$baseColor}
+  .el-menu-item {
+    &:hover {
+      background: #fff !important;
+      opacity: 1;
+      span {
+        color: $baseColor;
+      }
+      i.iconfont {
+        color: $baseColor;
+      }
     }
-    &.is-opened{
-      background:#FFF;opacity:1;
-      span{color:$baseColor}
-      i.iconfont{color:$baseColor}
+    &.is-opened {
+      background: #fff;
+      opacity: 1;
+      span {
+        color: $baseColor;
+      }
+      i.iconfont {
+        color: $baseColor;
+      }
     }
   }
 }

package/src/router/modules/customer.js

@@ -4,9 +4,9 @@ export const constantRoutes = [
     component: () => import("@/layout/index"),
     children: [
       {
-        path: "/basic/wf/wf_manage/list",
+        path: "/basic/wf/wf_manage/list2",
         component: () => import("@base/views/user/wf/wf_manage/list2"),
-        name: "wf_manage:list",
+        name: "wf_manage:list2",
         meta: {
           title: "流程待办",
           icon: "dashboard",