sunqijun пре 3 месеци
родитељ
комит
5b07626b1d

+ 60 - 1
src/router/routers/production-safety-router/risk-identification-and-control.ts

@@ -473,7 +473,66 @@ import { RouteComponent } from "vue-router";
             noCache: false,
           }
         },
-       
+       //劳务用品领用管理 
+        {
+          id: 93026,
+          parentId: 90014,
+          name: 'laborProductsRequisitionManage',
+          path: 'labor-products-requisition-manage', 
+          component: '/production-safety/risk-identification-and-control/labor-products-requisition-manage/list',  
+          meta: {
+            title: '劳务用品领用管理',
+            icon: 'OverviewIcon',
+            isRoot: false,
+            hidden: false,
+            noCache: false,
+          }
+        },
+        {
+          id: 93027,
+          parentId: 90014,
+          name: 'laborProductsRequisitionManageView',
+          path: 'labor-products-requisition-manage-view', 
+          component: '/production-safety/risk-identification-and-control/labor-products-requisition-manage/view',
+          meta: {
+            title: '查看劳务用品领用',
+            activeMenu: '/work-safety/risk-identification-and-control/labor-products-requisition-manage',
+            icon: 'OverviewIcon',
+            isRoot: false,
+            hidden: false,
+            noCache: false,
+          }
+        },
+        {
+          id: 93028,
+          parentId: 90014,
+          name: 'laborProductsRequisitionManageAdd',
+          path: 'labor-products-requisition-manage-add', 
+          component: '/production-safety/risk-identification-and-control/labor-products-requisition-manage/add',
+          meta: {
+            title: '新增劳务用品领用',
+            activeMenu: '/work-safety/risk-identification-and-control/labor-products-requisition-manage',
+            icon: 'OverviewIcon',
+            isRoot: false,
+            hidden: false,
+            noCache: false,
+          }
+        },
+        {
+          id: 93029,
+          parentId: 90014,
+          name: 'laborProductsRequisitionManageEdit',
+          path: 'labor-products-requisition-manage-edit', 
+          component: '/production-safety/risk-identification-and-control/labor-products-requisition-manage/edit',
+          meta: {
+            title: '编辑劳务用品领用',
+            activeMenu: '/work-safety/risk-identification-and-control/labor-products-requisition-manage',
+            icon: 'OverviewIcon',
+            isRoot: false,
+            hidden: false,
+            noCache: false,
+          }
+        },
 
       ],
     }];

+ 4 - 8
src/views/production-safety/implement-safety-duty/sign-agree-dept.vue

@@ -338,15 +338,11 @@
             //   ElMessage.warning('请上传签署材料');
             //   return;
             // }
-            if (currentDepartmentKey.value === 'C') {
-              if (currentLevel < 3) {
-                currentLabel.value = currentLevel === 1 ? '党委书记' : '所长';
-              }
+            if (currentDepartmentKey.value === 'C' && currentLevel < 3) {
+              currentLabel.value = currentLevel === 1 ? '党委书记' : '所长';
             }
-            if (currentDepartmentKey.value === 'D') {
-              if (currentLevel < 2) {
-                currentLabel.value = '部门负责人';
-              }
+            if (currentDepartmentKey.value === 'D' && currentLevel < 2) {
+              currentLabel.value = '部门负责人';
             }
             dialogVisible.value = true;
           }