理由或者意见

src/utils/filters.js

@@ -20,6 +20,28 @@ const dangerText = function(danger) {
             return danger
     }
 }
+const riskText = function(danger) {
+    // 严重隐患 = A
+
+    // 较大隐患 = B
+
+    // 危险隐患 = C
+
+    // 重大隐患 = S
+    switch(danger){
+        case 'A':
+            return '严重风险'
+        case 'B':
+            return '较大风险'
+        case 'C':
+            return '危险风险'
+        case 'S':
+            return '重大风险'
+        default:
+            return danger
+    }
+}
 export default{
-    dangerText
+    dangerText,
+    riskText
 }
\ No newline at end of file

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -7,6 +7,10 @@
       :key="index"
       @click="goDetail(item.taskId)"
     >
+      <van-row gutter="">
+        <van-col span="6">隐患编号：</van-col>
+        <van-col span="18">{{ item.businessId }}</van-col>
+      </van-row>
       <van-row gutter="">
         <van-col span="6">所属项目：</van-col>
         <van-col span="18">{{ item.proId }}</van-col>
@@ -57,6 +61,7 @@
       <!-- 同意时的选项 -->
       <div class="agree" v-if="radio == 1">
         <van-field
+           required
           readonly
           clickable
           name="endTime"
@@ -80,6 +85,7 @@
 
         <van-field
           readonly
+          required
           clickable
           name="rectificationUser"
           :value="valueRect"
@@ -100,6 +106,7 @@
 
         <van-field
           readonly
+          required
           clickable
           name="rectificationReview"
           :value="valueReview"
@@ -119,6 +126,7 @@
         </van-popup>
 
         <van-field
+          required
           v-model="valueIdea"
           label="意见"
           name="confirmOpinion"

src/views/danger/delayApproval/ratifyInfo.vue

@@ -47,6 +47,7 @@
         rows="3"
         type="textarea"
         placeholder="请输入"
+        required
         :rules="[{ required: true, message: '理由或者意见不能为空' }]"
       />
 

src/views/danger/reviewDanger/reviewAdd.vue

@@ -2,46 +2,46 @@
   <div>
     <LHeader :text="text"></LHeader>
     <van-cell-group
-        inset
-        v-for="(item, index) in messageList"
-        :key="index"
-        @click="goDetail(item.taskId)"
-      >
-        <van-row gutter="">
-          <van-col span="6">所属项目：</van-col>
-          <van-col span="18">{{ item.proId }}</van-col>
-        </van-row>
-        <van-row gutter="">
-          <van-col span="6">隐患级别：</van-col>
-          <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
-        </van-row>
-        <van-row gutter="">
-          <van-col span="6">适用范围：</van-col>
-          <van-col span="18">{{ item.hdRange }}</van-col>
-        </van-row>
-        <van-row gutter="">
-          <van-col span="6">隐患类型：</van-col>
-          <van-col span="18">{{ item.hdType }}</van-col>
-        </van-row>
-        <!-- <van-row gutter="">
+      inset
+      v-for="(item, index) in messageList"
+      :key="index"
+      @click="goDetail(item.taskId)"
+    >
+      <van-row gutter="">
+        <van-col span="6">所属项目：</van-col>
+        <van-col span="18">{{ item.proId }}</van-col>
+      </van-row>
+      <van-row gutter="">
+        <van-col span="6">隐患级别：</van-col>
+        <van-col span="18">{{ item.hdLev | dangerText }}</van-col>
+      </van-row>
+      <van-row gutter="">
+        <van-col span="6">适用范围：</van-col>
+        <van-col span="18">{{ item.hdRange }}</van-col>
+      </van-row>
+      <van-row gutter="">
+        <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.hdDiscoveryTime }}</van-col>
         </van-row> -->
-        <van-row gutter="">
-          <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-row gutter="">
+        <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>
+      <!-- 详情 -->
       <div class="detail">详情</div>
-      </van-cell-group>
+    </van-cell-group>
 
     <van-form
       @submit="onSubmit"
-      :show-error='false'
+      :show-error="false"
       :scroll-to-error="true"
       validate-trigger="onSubmit"
     >
@@ -67,14 +67,17 @@
           rows="3"
           type="textarea"
           placeholder="请输入"
+          required
           :rules="[{ required: true, message: '详情描述不能为空' }]"
         />
-        <van-field
-          name="uploader"
-          label="复查照片"
-        >
+        <van-field name="uploader" label="复查照片">
           <template #input>
-            <van-uploader multiple :max-count="5" upload-text="最多上传五个" v-model="uploaderImg" />
+            <van-uploader
+              multiple
+              :max-count="5"
+              upload-text="最多上传五个"
+              v-model="uploaderImg"
+            />
           </template>
         </van-field>
       </div>
@@ -88,17 +91,18 @@
           rows="3"
           type="textarea"
           placeholder="请输入"
+          required
           :rules="[{ required: true, message: '退回原因不能为空' }]"
         />
       </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
       >
@@ -108,11 +112,11 @@
 
 <script>
 import LHeader from "@/components/header.vue";
-import {getFun,postFun} from "@/service/table.js";
+import { getFun, postFun } from "@/service/table.js";
 import { dangerReviewAdd } from "@/service/danger";
 export default {
   components: {
-    LHeader
+    LHeader,
   },
   data() {
     return {
@@ -122,28 +126,30 @@ export default {
       text: "隐患复查",
       detail: "",
       uploaderImg: [],
-      returnReason: ""
+      returnReason: "",
     };
   },
-   beforeRouteEnter(to, from, next) {
-    console.log('执行了此钩子')
-    next(vm => {
-      if (from.name === "review-danger"||from.name=="normal-detail") {
+  beforeRouteEnter(to, from, next) {
+    console.log("执行了此钩子");
+    next((vm) => {
+      if (from.name === "review-danger" || from.name == "normal-detail") {
         vm.messageList = [];
         // 修改bug回退获取不到参数有参数的用参数没参数的话用本地缓存
-        let paramsData = to.params.data||JSON.parse(localStorage.getItem('reviewdanger_params'));
+        let paramsData =
+          to.params.data ||
+          JSON.parse(localStorage.getItem("reviewdanger_params"));
         vm.taskId = paramsData.taskId;
         vm.messageList.push(paramsData);
-        vm.radio= "1";
+        vm.radio = "1";
         vm.detail = "";
         vm.uploaderImg = []; // 隐患整改人
         vm.returnReason = "";
       }
     });
   },
-   created() {
-     console.log('执行了此钩子1')
-   },
+  created() {
+    console.log("执行了此钩子1");
+  },
   methods: {
     selectResult(val) {
       this.radio = val;
@@ -154,24 +160,24 @@ export default {
         message: "提交中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0
+        duration: 0,
       });
-      let formdata = new FormData()
-      formdata.append('reviewResult', this.radio)
-      formdata.append('reviewDetails', values.reviewDetails)
+      let formdata = new FormData();
+      formdata.append("reviewResult", this.radio);
+      formdata.append("reviewDetails", values.reviewDetails);
       // 放图片路径 因为formdat存数组会自动变成字符串所以次用这种追加字段的方式
       if (values.uploader) {
-        values.uploader.forEach(item => {
+        values.uploader.forEach((item) => {
           formdata.append("reviewPicture1[]", item.file);
         });
       }
 
-      dangerReviewAdd(`/review/add1/${this.taskId}`,formdata)
-        .then(res => {
+      dangerReviewAdd(`/review/add1/${this.taskId}`, formdata)
+        .then((res) => {
           this.$toast.clear();
           this.$toast.success({
             message: "提交成功",
-            duration: 2000
+            duration: 2000,
           });
           history.go(-1);
         })
@@ -185,16 +191,16 @@ export default {
       this.$router.push({
         name: "normal-detail",
         params: {
-          id: taskId
-        }
+          id: taskId,
+        },
       });
     },
     cancel() {
       this.$router.go(-1);
-    }
+    },
   },
- filters: {
-    formatTime: function(row) {
+  filters: {
+    formatTime: function (row) {
       if (new Date(row.dueDate).getTime() <= row.rectificationTime) {
         return "超期";
       } else if (
@@ -206,33 +212,33 @@ export default {
       } else {
         return "正常";
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scoped>
 /* @import url(); 引入css类 */
 .van-cell-group--inset {
-    margin: 0;
-    margin-bottom: 10px;
-    padding: 10px;
-    font-size: 13px;
-    position: relative;
-    .van-row {
-      margin-bottom: 0.133333rem;
-      line-height: 0.64rem;
-    }
-    .van-overlay {
-      position: absolute;
-      .wrapper {
-        display: flex;
-        align-items: center;
-        justify-content: space-evenly;
-        height: 100%;
-      }
+  margin: 0;
+  margin-bottom: 10px;
+  padding: 10px;
+  font-size: 13px;
+  position: relative;
+  .van-row {
+    margin-bottom: 0.133333rem;
+    line-height: 0.64rem;
+  }
+  .van-overlay {
+    position: absolute;
+    .wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-evenly;
+      height: 100%;
     }
   }
-  .detail {
+}
+.detail {
   position: absolute;
   bottom: 0.32rem;
   right: 15px;