LY

ui/src/router/index.js

@@ -46,6 +46,7 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/login'], resolve),
     hidden: true
   },
+
   {
     path: '/404',
     component: (resolve) => require(['@/views/error/404'], resolve),
@@ -56,6 +57,11 @@ export const constantRoutes = [
     component: (resolve) => require(['@/views/error/401'], resolve),
     hidden: true
   },
+  {
+    path: '/hazard',
+    component: (resolve) => require(['@/views/invoicing/hazardwork/index'], resolve),
+    hidden: true
+  },
   {
     path: '',
     component: Layout,
@@ -121,7 +127,8 @@ export const constantRoutes = [
         meta: { title: '预警管理负责人配置' }
       }
     ]
-  }
+  },
+
 ]
 
 export default new Router({

ui/src/views/invoicing/hazardwork/index.vue

@@ -2564,7 +2564,7 @@ export default {
               console.log("没有需要选中的多选框");
             }
             //2022年1月5日取消防护用品自动选中
-            /*if (pro != null && pro.length > 0) {
+            if (pro != null && pro.length > 0) {
               this.form.isYesResidue = true;
               pro.forEach(p => {
                 this[p.conservatoryMeasureCode] = "1";
@@ -2574,11 +2574,11 @@ export default {
                   this[p.conservatoryMeasureContent] = p.conservatoryMeasureName;
                 }
               })
-            }*/
+            }
           }
         })
-        /*var idd = this.matterNames[id];
-        console.log(id);*/
+        var idd = this.matterNames[id];
+        console.log(id);
       });
     },
     //取消选中时-清除危害物质-危险性选中状态

ui/src/views/invoicing/ticketList/index.vue

@@ -1,5 +1,16 @@
 <template>
   <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          size="mini"
+          @click="addHazard"
+          v-hasPermi="['system:alarmhistory:remove']"
+        >新增危害工作票</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
     <el-table v-loading="loading" :data="ticketList" border row-key="aId"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column label="延期次数" align="center" prop="delayCount" :show-overflow-tooltip="true">
@@ -166,6 +177,12 @@ export default {
       a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
       a.click()
     },
+    addHazard(){
+      let routeData = this.$router.resolve({
+        path: "/hazard",
+      });
+      window.open(routeData.href, '_blank');
+    }
   },
 }
 </script>