督办和重大隐患提交页面

src/router/index.js

@@ -377,6 +377,16 @@ const routes = [{
     },
     component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/superviseDanger'),
   },
+    // 隐患督办批示
+    {
+      path: '/super-survey',
+      name: 'super-survey',
+      meta: {
+        title: '隐患督办',
+        index: 1
+      },
+      component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/danger/superviseDanger/superSurvey'),
+    },
   // 重大隐患列表
   {
     path: '/major-danger',

src/views/danger/majorDanger/index.vue

@@ -40,7 +40,7 @@
               >详情</van-button
             >
               <van-button round type="info" @touchstart="goConfirm(item)"
-              >确认</van-button
+              >审批</van-button
             >
           </div>
          
@@ -131,11 +131,11 @@ export default {
     // 详情
     goDetail(data) {
       console.log(data);
-      this.$router.push({
-        name: "risk-big-detail",
-        params: {
-          id: data.businessId
-        }
+        this.$router.push({
+          name: "normal-detail",
+          params:{
+            id: data.taskId
+          }
       });
       this.showIndex = null;
     },

src/views/danger/majorDanger/majorSurvey.vue

@@ -37,7 +37,7 @@
         <van-field
         readonly
         clickable
-        name="proId"
+        name="level"
         :value="thinkLevel"
         label="认为隐患级别"
         placeholder="请选择"
@@ -95,7 +95,7 @@ export default {
       disagreeOpinion: "",
       thinkLevel:'', //因为隐患级别
       showThinkLevel: false,
-      columnsThinkLevel:[]
+      columnsThinkLevel:["重大隐患","一般隐患A","一般隐患B","一般隐患C",]
 
     };
   },

src/views/danger/managerDanger/index.vue

@@ -16,7 +16,7 @@
 
         <van-row gutter="">
           <van-col span="7">隐患编号:</van-col>
-          <van-col span="17">{{ item.processInstanceId }}</van-col>
+          <van-col span="17">{{ item.hdProjectId }}</van-col>
         </van-row>
         <van-row gutter="">
           <van-col span="7">隐患项目名称:</van-col>
@@ -39,7 +39,7 @@
               >详情</van-button
             >
             <van-button round type="info" @touchstart="goConfirm(item)"
-              >确认</van-button
+              >批示</van-button
             >
           </div>
         </van-overlay>
@@ -95,10 +95,10 @@ export default {
         loadingType: "spinner",
         duration: 0
       });
-      superviseSABList("/supervise/SABlist")
+      superviseSABList("/supervise/list")
         .then(res => {
           this.$toast.clear();
-          this.messageList = res.rows
+          this.messageList = res.data
           
         })
         .catch(() => {
@@ -129,11 +129,11 @@ export default {
     // 详情
     goDetail(data) {
       console.log(data);
-      this.$router.push({
-        name: "risk-big-detail",
-        params: {
-          id: data.businessId
-        }
+        this.$router.push({
+          name: "normal-detail",
+          params:{
+            id: data.pid
+          }
       });
       this.showIndex = null;
     },

src/views/danger/managerDanger/managerSurvey.vue

@@ -7,7 +7,6 @@
       :scroll-to-error="true"
       validate-trigger="onSubmit"
     >
-      <div class="agree" v-if="radio == 1">
         <van-field
           v-model="opinion"
           label="批示内容"
@@ -16,7 +15,6 @@
           type="textarea"
           placeholder="请输入"
         />
-      </div>
       <div style="margin: 16px;">
         <van-button round block type="info" native-type="submit"
           >保存</van-button

src/views/danger/standBook/normalDetail.vue

@@ -265,7 +265,7 @@
               <div class="step-wrap">
                 <van-row>
                   <van-col span="24"
-                    ><div class="info-title">日志信息</div></van-col
+                    ><div class="info-title">督办信息</div></van-col
                   >
                 </van-row>
                 <van-row>
@@ -274,17 +274,11 @@
                   >
                   <van-col span="19">{{item.userName}}</van-col>
                 </van-row>
-                <van-row>
-                  <van-col span="5"
-                    ><span class="field-title">节点：</span></van-col
-                  >
-                  <van-col span="19">{{item.logNode}}</van-col>
-                </van-row>
-                <van-row>
+                  <van-row>
                   <van-col span="5"
-                    ><span class="field-title">结果：</span></van-col
+                    ><span class="field-title">时间：</span></van-col
                   >
-                  <van-col span="19">{{item.logResult}}</van-col>
+                  <van-col span="19">{{item.createTime}}</van-col>
                 </van-row>
                 <van-row>
                   <van-col span="5"
@@ -292,11 +286,11 @@
                   >
                   <van-col span="19">{{item.deptName}}</van-col>
                 </van-row>
-                <van-row>
+                  <van-row>
                   <van-col span="5"
-                    ><span class="field-title">时间：</span></van-col
+                    ><span class="field-title">结果：</span></van-col
                   >
-                  <van-col span="19">{{item.createTime}}</van-col>
+                  <van-col span="19">{{item.instructionsContent}}</van-col>
                 </van-row>
               </div>
             </van-step>

src/views/danger/superviseDanger/index.vue

@@ -37,6 +37,9 @@
             <van-button round type="primary" @touchstart="goDetail(item)"
               >详情</van-button
             >
+              <van-button round type="info" @touchstart="goConfirm(item)"
+              >批示</van-button
+            >
           </div>
         </van-overlay>
       </van-cell-group>
@@ -84,23 +87,7 @@ export default {
   methods: {
     getList() {
       /*接口对接3 START*/
-      // 例子：
-      this.$toast.loading({
-        message: "加载中...",
-        forbidClick: true,
-        loadingType: "spinner",
-        duration: 0
-      });
-      superviseList("/supervise/list")
-        .then(res => {
-          this.$toast.clear();
-          this.messageList = res.data
-          
-        })
-        .catch(() => {
-          this.$toast.clear();
-          this.$toast.fail("加载失败,请稍后再试");
-        });
+  
       /*接口对接3 END*/
     },
     onSearch(val) {
@@ -124,15 +111,26 @@ export default {
 
     // 详情
     goDetail(data) {
+      console.log(data);
+        this.$router.push({
+          name: "normal-detail",
+          params:{
+            id: data.pid
+          }
+      });
+      this.showIndex = null;
+    },
+    // 确认
+    goConfirm(data) {
       console.log(data);
       this.$router.push({
-        name: "risk-big-detail",
-        params: {
-          id: data.businessId
+        name:"super-survey",
+        params:{
+          "taskId":data.taskId
         }
       });
       this.showIndex = null;
-    },
+    }
   }
 };
 </script>

src/views/danger/superviseDanger/superSurvey.vue

+<template>
+  <div>
+    <LHeader :text="text"></LHeader>
+    <van-form
+      @submit="onSubmit"
+      :show-error='false'
+      :scroll-to-error="true"
+      validate-trigger="onSubmit"
+    >
+      <div class="agree" v-if="radio == 1">
+        <van-field
+          v-model="opinion"
+          label="批示内容"
+          name="reviewDetails"
+          rows="3"
+          type="textarea"
+          placeholder="请输入"
+        />
+      </div>
+      <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">
+      <van-button round block type="warning" @click.native="cancel"
+        >取消</van-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import LHeader from "@/components/header.vue";
+import { dangerReviewAdd } from "@/service/danger";
+export default {
+  components: {
+    LHeader
+  },
+  data() {
+    return {
+      taskId: "",
+      text: "隐患督办批示",
+      opinion: "",
+    
+
+    };
+  },
+   created() {
+    this.taskId = this.$route.params.taskId;
+  },
+  methods: {
+    onSubmit(values) {
+      console.log("submit", values);
+      this.$toast.loading({
+        message: "提交中...",
+        forbidClick: true,
+        loadingType: "spinner",
+        duration: 0
+      });
+    //   let formdata = new FormData()
+    //   formdata.append('reviewResult', this.radio)
+    //   formdata.append('reviewDetails', values.reviewDetails)
+    //   dangerReviewAdd(`/review/add1/${this.taskId}`,formdata)
+    //     .then(res => {
+    //       this.$toast.clear();
+    //       this.$toast.success({
+    //         message: "提交成功",
+    //         duration: 2000
+    //       });
+    //       history.go(-1);
+    //     })
+    //     .catch(() => {
+    //       this.$toast.clear();
+    //       this.$toast.fail("提交失败,请稍后再试");
+    //     });
+    },
+
+    cancel() {
+      this.$router.go(-1);
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+/* @import url(); 引入css类 */
+</style>