隐患复查

src/views/danger/addDanger/addDanger.vue

@@ -27,7 +27,7 @@
         @click="showProjectName = true"
         :rules="[{ required: true, message: '所属项目不能为空' }]"
       />
-      <van-popup v-model="showProjectName" position="bottom">
+      <van-popup v-model="showProjectName" position="bottom" v-if="!isShowreturnCause">
         <van-picker
           show-toolbar
           value-key="projectName"
@@ -47,7 +47,7 @@
         @click="showRange = true"
         :rules="[{ required: true, message: '适用范围不能为空' }]"
       />
-      <van-popup v-model="showRange" position="bottom">
+      <van-popup v-model="showRange" position="bottom" v-if="!isShowreturnCause">
         <van-picker
           show-toolbar
           value-key="hdRange"
@@ -67,7 +67,7 @@
         @click="showType = true"
         :rules="[{ required: true, message: '隐患类型不能为空' }]"
       />
-      <van-popup v-model="showType" position="bottom">
+      <van-popup v-model="showType" position="bottom" v-if="!isShowreturnCause">
         <van-picker
           show-toolbar
           value-key="hdType"
@@ -87,7 +87,7 @@
         @click="showDangerName = true"
         :rules="[{ required: true, message: '隐患项目名称不能为空' }]"
       />
-      <van-popup v-model="showDangerName" position="bottom">
+      <van-popup v-model="showDangerName" position="bottom" v-if="!isShowreturnCause">
         <van-picker
           show-toolbar
           value-key="hdName"

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -23,6 +23,10 @@
         <van-col span="6">隐患类型：</van-col>
         <van-col span="18">{{ item.hdType }}</van-col>
       </van-row>
+      <van-row gutter="">
+        <van-col span="6">工单状态：</van-col>
+        <van-col span="18">{{ item.taskName }}</van-col>
+      </van-row>
       <!-- <van-row gutter="">
         <van-col span="6">发现时间：</van-col>
         <van-col span="18">{{ item.hdDiscoveryTime }}</van-col>
@@ -59,7 +63,10 @@
           :value="value"
           label="整改截止时间"
           placeholder="点击选择日期"
-          @click="showCalendar = true;currentDate = new Date()"
+          @click="
+            showCalendar = true;
+            currentDate = new Date();
+          "
           :rules="[{ required: true, message: '请选择日期' }]"
         />
         <van-popup v-model="showCalendar" position="bottom">
@@ -135,13 +142,13 @@
         />
       </div>
 
-      <div style="margin: 16px;">
+      <div style="margin: 16px">
         <van-button round block type="info" native-type="submit"
           >保存</van-button
         >
       </div>
     </van-form>
-    <div style="margin:10px 16px 0px;padding-bottom:16px">
+    <div style="margin: 10px 16px 0px; padding-bottom: 16px">
       <van-button round block type="warning" @click.native="cancel"
         >取消</van-button
       >
@@ -151,13 +158,13 @@
 
 <script>
 import LHeader from "@/components/header.vue";
-import {getFun,postFun} from "@/service/table.js";
+import { getFun, postFun } from "@/service/table.js";
 import { timestampToTime } from "@/utils/format";
 import { getConfirmFormList, dangerConSub } from "@/service/danger";
 export default {
   name: "affirm-danger",
   components: {
-    LHeader
+    LHeader,
   },
   data() {
     return {
@@ -177,19 +184,18 @@ export default {
       showPickerReview: false,
       valueIdea: "",
       returnReason: "",
-      currentDate: new Date()
+      currentDate: new Date(),
     };
   },
 
   beforeRouteEnter(to, from, next) {
-    next(vm => {
+    next((vm) => {
       if (from.name === "confirme-danger") {
         vm.messageList = [];
         let paramsData = to.params.data;
         vm.taskId = paramsData.taskId;
         vm.messageList.push(paramsData);
-        vm.radio= "1",
-        vm.value = "";
+        (vm.radio = "1"), (vm.value = "");
         vm.rectId = ""; // 隐患整改人
         vm.valueRect = "";
         vm.reviewId = ""; // 隐患复查人
@@ -198,7 +204,7 @@ export default {
         vm.returnReason = "";
         vm.getFormList();
         // 清空数据
-        vm.currentDate = new Date()
+        vm.currentDate = new Date();
       }
     });
   },
@@ -213,10 +219,10 @@ export default {
         message: "加载中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
       getConfirmFormList(`confirm/add/${this.taskId}`)
-        .then(res => {
+        .then((res) => {
           this.$toast.clear();
           this.columnsRect = res.data.rectificationUser;
           this.columnsReview = res.data.rectificationReview;
@@ -234,22 +240,31 @@ export default {
       }
       let formdata = new FormData();
       formdata.append("confirmResult", this.radio);
-      formdata.append("endTime", values.endTime?values.endTime:'');
-      formdata.append("rectificationUser", values.rectificationUser?values.rectificationUser:'');
-      formdata.append("rectificationReview", values.rectificationReview?values.rectificationReview:'');
-      formdata.append("confirmOpinion", values.confirmOpinion?values.confirmOpinion:'');
+      formdata.append("endTime", values.endTime ? values.endTime : "");
+      formdata.append(
+        "rectificationUser",
+        values.rectificationUser ? values.rectificationUser : ""
+      );
+      formdata.append(
+        "rectificationReview",
+        values.rectificationReview ? values.rectificationReview : ""
+      );
+      formdata.append(
+        "confirmOpinion",
+        values.confirmOpinion ? values.confirmOpinion : ""
+      );
       this.$toast.loading({
         message: "提交中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
       dangerConSub(`/confirm/add1/${this.taskId}`, formdata)
-        .then(res => {
+        .then((res) => {
           this.$toast.clear();
           this.$toast.success({
             message: "提交成功",
-            duration: 2000
+            duration: 2000,
           });
           history.go(-1);
         })
@@ -270,18 +285,18 @@ export default {
     },
 
     onConRect(value) {
-      if(!value){
+      if (!value) {
         this.showPickerRect = false;
-        return
+        return;
       }
       this.valueRect = value.userName;
       this.rectId = value.userId;
       this.showPickerRect = false;
     },
     onConReview(value) {
-      if(!value){
+      if (!value) {
         this.showPickerReview = false;
-        return
+        return;
       }
       this.valueReview = value.userName;
       this.reviewId = value.userId;
@@ -292,15 +307,15 @@ export default {
       this.$router.push({
         name: "normal-detail",
         params: {
-          id: taskId
-        }
+          id: taskId,
+        },
       });
     },
 
     cancel() {
       this.$router.go(-1);
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scoped>

src/views/danger/confirmeDanger/index.vue

@@ -45,9 +45,13 @@
           <van-col span="6">隐患类型：</van-col>
           <van-col span="18">{{ item.hdType }}</van-col>
         </van-row>
+        <van-row gutter="">
+          <van-col span="6">工单状态：</van-col>
+          <van-col span="18">{{ item.taskName }}</van-col>
+        </van-row>
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop ="showIndex = null">
+          <div class="wrapper" @click.stop="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >详情</van-button
             >
@@ -61,7 +65,13 @@
 
     <!-- 暂无数据 -->
     <div
-      style="width: 100%;text-align: center; font-size: .48rem;position: fixed; top: 30%;"
+      style="
+        width: 100%;
+        text-align: center;
+        font-size: 0.48rem;
+        position: fixed;
+        top: 30%;
+      "
       v-if="isHaveNews"
     >
       暂无数据
@@ -72,13 +82,13 @@
 
 <script>
 import LHeader from "@/components/header.vue";
-import {getFun,postFun} from "@/service/table.js";
+import { getFun, postFun } from "@/service/table.js";
 import tabBar from "@/components/TabBar";
 import { dangerConfirm } from "@/service/danger";
 export default {
   components: {
     LHeader,
-    tabBar
+    tabBar,
   },
   data() {
     return {
@@ -87,7 +97,7 @@ export default {
       searchValue: "",
       messageList: [],
       Loop: "", // 定时器
-      showIndex: null // 是否显示遮罩层
+      showIndex: null, // 是否显示遮罩层
     };
   },
   created() {
@@ -95,19 +105,19 @@ export default {
   },
   methods: {
     onSearch(val) {
-      this.postList(this.searchValue)
+      this.postList(this.searchValue);
     },
-    postList(select='') {
+    postList(select = "") {
       this.$toast.loading({
         message: "加载中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
-      let formdata=new FormData();
-      formdata.append('select',select);
-      dangerConfirm("/confirm/list",formdata)
-        .then(res => {
+      let formdata = new FormData();
+      formdata.append("select", select);
+      dangerConfirm("/confirm/list", formdata)
+        .then((res) => {
           this.$toast.clear();
           this.messageList = res.rows;
           // 判断有无数据返回
@@ -123,19 +133,18 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
-        return
+        return;
       }
       this.showIndex = index;
     },
 
-
     // 详情
     goDetail(data) {
       this.$router.push({
         name: "normal-detail",
         params: {
-          id: data.taskId
-        }
+          id: data.taskId,
+        },
       });
       this.showIndex = null;
     },
@@ -145,11 +154,11 @@ export default {
         name: "affirm-danger",
         params: {
           data: data,
-        }
+        },
       });
       this.showIndex = null;
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scoped>

src/views/danger/reportReturn/index.vue

@@ -45,6 +45,11 @@
           <van-col span="6">隐患类型：</van-col>
           <van-col span="18">{{ item.hdType }}</van-col>
         </van-row>
+        <van-row gutter="">
+          <van-col span="6">工单状态：</van-col>
+          <van-col span="18">{{ item.taskName }}</van-col>
+        </van-row>
+        <!-- {{ item.taskName }} -->
 
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">

src/views/danger/reviewDanger/index.vue

@@ -49,10 +49,13 @@
           <van-col span="6">超期标识：</van-col>
           <van-col span="18">{{ item | formatTime }}</van-col>
         </van-row>
-
+        <van-row gutter="">
+          <van-col span="6">工单状态：</van-col>
+          <van-col span="18">{{ item.taskName }}</van-col>
+        </van-row>
         <!-- 长按显示遮罩层 -->
         <van-overlay :show="showIndex == index">
-          <div class="wrapper" @click.stop ="showIndex = null">
+          <div class="wrapper" @click.stop="showIndex = null">
             <van-button round type="primary" @click="goDetail(item)"
               >详情</van-button
             >
@@ -65,7 +68,13 @@
     </div>
     <!-- 暂无数据 -->
     <div
-      style="width: 100%;text-align: center; font-size: .48rem;position: fixed; top: 30%;"
+      style="
+        width: 100%;
+        text-align: center;
+        font-size: 0.48rem;
+        position: fixed;
+        top: 30%;
+      "
       v-if="isHaveNews"
     >
       暂无数据
@@ -77,12 +86,12 @@
 <script>
 import tabBar from "@/components/TabBar";
 import LHeader from "@/components/header.vue";
-import {getFun,postFun} from "@/service/table.js";
+import { getFun, postFun } from "@/service/table.js";
 import { dangerReview } from "@/service/danger";
 export default {
   components: {
     LHeader,
-    tabBar
+    tabBar,
   },
   data() {
     return {
@@ -91,7 +100,7 @@ export default {
       searchValue: "",
       messageList: [],
       Loop: "", // 定时器
-      showIndex: null // 是否显示遮罩层
+      showIndex: null, // 是否显示遮罩层
     };
   },
   created() {
@@ -99,20 +108,20 @@ export default {
   },
   methods: {
     onSearch(val) {
-      this.postList(this.searchValue)
+      this.postList(this.searchValue);
     },
 
-    postList(select='') {
+    postList(select = "") {
       this.$toast.loading({
         message: "加载中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
-      let formdata=new FormData();
-      formdata.append('select',select);
-      dangerReview("/review/list",formdata)
-        .then(res => {
+      let formdata = new FormData();
+      formdata.append("select", select);
+      dangerReview("/review/list", formdata)
+        .then((res) => {
           this.$toast.clear();
           this.messageList = res.rows;
           // 判断有无数据返回
@@ -129,36 +138,35 @@ export default {
     touchstart(index, item) {
       if (this.showIndex != null) {
         this.showIndex = null;
-        return
+        return;
       }
       this.showIndex = index;
     },
 
-
     // 详情
     goDetail(data) {
       this.$router.push({
         name: "normal-detail",
         params: {
-          id: data.taskId
-        }
+          id: data.taskId,
+        },
       });
       this.showIndex = null;
     },
     // 确认
     goConfirm(data) {
-      localStorage.setItem('reviewdanger_params',JSON.stringify(data))
+      localStorage.setItem("reviewdanger_params", JSON.stringify(data));
       this.$router.push({
         name: "review-add",
         params: {
           data,
-        }
+        },
       });
       this.showIndex = null;
-    }
+    },
   },
   filters: {
-    formatTime: function(row) {
+    formatTime: function (row) {
       if (new Date(row.dueDate).getTime() <= row.rectificationTime) {
         return "超期";
       } else if (
@@ -170,8 +178,8 @@ export default {
       } else {
         return "正常";
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scoped>

src/views/saveWorkbench/index.vue

@@ -144,13 +144,7 @@ export default {
         }
       ],
       dangerList: [
-        {
-          key: "11",
-          // path: "/danger",
-          path: "/insert-danger",
-          imgUrl: require("@/assets/workbench/risk-confirm.png"),
-          text: "我的上报"
-        },
+        
         // 隐患排查治理
         {
           key: "1",
@@ -159,6 +153,13 @@ export default {
           imgUrl: require("@/assets/workbench/danger-report.png"),
           text: "隐患上报"
         },
+        {
+          key: "11",
+          // path: "/danger",
+          path: "/insert-danger",
+          imgUrl: require("@/assets/workbench/risk-confirm.png"),
+          text: "我的上报"
+        },
         {
           key: "3",
           path: "/confirme-danger",