修改了重大隐患审批不显示详情,上报详情改为隐患详情

src/views/danger/delayApproval/ratifyInfo.vue

@@ -77,6 +77,7 @@ export default {
   data() {
     return {
       pid:'',
+      id:'',
       text: "延期审批",
       taskId: "",
       delayTime: "", // 延迟时间
@@ -108,6 +109,7 @@ export default {
     formdata.append("taskId", this.taskId);
     formdata.append("pid", this.pid);
     formdata.append('applyDate',this.applyDate);
+    formdata.append('id',this.id);
     delayEdit(`/delayApply/edit`, formdata)
       .then((res) => {
         this.$toast.clear();
@@ -137,6 +139,7 @@ export default {
         this.applyDate = res.data.delayApply.applyDate;
         this.applyReason = res.data.delayApply.applyReason;
         this.pid=res.data.delayApply.pid;
+        this.id=res.data.delayApply.id;
       })
       .catch(() => {
         this.$toast.clear();

src/views/danger/insertDanger/list.vue

@@ -132,7 +132,7 @@ export default {
                 name: "normal-detail",
                 params: {
                     id: data.id,
-                    detailTitle: "上报详情",
+                    detailTitle: "隐患详情",
                 },
             });
             this.showIndex = null;

src/views/danger/majorDanger/index.vue

@@ -193,6 +193,7 @@ export default {
         },
         // 确认
         goConfirm(data) {
+            console.log(data)
             localStorage.setItem('majorDanderData',JSON.stringify(data))
             this.$router.push({
                 name: "major-survey",

src/views/danger/majorDanger/majorSurvey.vue

@@ -42,8 +42,14 @@
                         direction="horizontal"
                         @change="selectResult"
                     >
-                        <van-radio name="1" style="margin-bottom:0.3rem">{{name=='项目经理二次认定'?'退回到发起人':'同意'}}</van-radio>
-                        <van-radio name="0" style="margin-bottom:0.3rem">{{name=='项目经理二次认定'?'重新发起重大隐患审批':'退回'}}</van-radio>
+                        <van-radio name="1" style="margin-bottom: 0.3rem">{{
+                            name == "项目经理二次认定" ? "退回到发起人" : "同意"
+                        }}</van-radio>
+                        <van-radio name="0" style="margin-bottom: 0.3rem">{{
+                            name == "项目经理二次认定"
+                                ? "重新发起重大隐患审批"
+                                : "退回"
+                        }}</van-radio>
                         <!-- 退回到发起人  -->
                         <!-- <van-radio name="1" style="margin-bottom:0.3rem">{{name=='项目经理二次认定'?'退回到发起人':'同意'}}</van-radio>
                         <van-radio name="0" style="margin-bottom:0.3rem">{{name=='项目经理二次认定'?'重新发起重大隐患审批':'退回'}}</van-radio> -->
@@ -54,7 +60,15 @@
             <div class="disagree">
                 <van-field
                     readonly
-                    v-if="radio == 1?(name=='项目经理二次认定'?true:false):(name=='项目经理二次认定'?false:true)"
+                    v-if="
+                        radio == 1
+                            ? name == '项目经理二次认定'
+                                ? true
+                                : false
+                            : name == '项目经理二次认定'
+                            ? false
+                            : true
+                    "
                     clickable
                     name="thinkHdLev"
                     :value="thinkLevel"
@@ -110,7 +124,7 @@ export default {
     },
     data() {
         return {
-            name:'',
+            name: "",
             taskId: "",
             messageList: [],
             radio: "1",
@@ -127,43 +141,34 @@ export default {
             ],
         };
     },
-    beforeRouteEnter(to, from, next) {
-        next((vm) => {
-            if (from.name === "major-danger") {
-                vm.messageList = [];
-                let paramsData = to.params.data;
-                vm.taskId = paramsData.taskId;
-                vm.messageList.push(paramsData);
-                vm.radio = "1";
-                vm.agreeOpinion = "";
-                vm.disagreeOpinion = "";
-                vm.thinkLevel = "";
-            }
-        });
-    },
-    
     mounted() {
-      this.getName()
-      this.messageList=[JSON.parse(localStorage.getItem('majorDanderData'))]
+        this.messageList = [];
+        let paramsData =
+            this.$route.params.data ||
+            JSON.parse(localStorage.getItem("majorDanderData"));
+        this.messageList.push(paramsData);
+        this.taskId = paramsData.taskId;
+        this.radio = "1";
+        this.agreeOpinion = "";
+        this.disagreeOpinion = "";
+        this.thinkLevel = "";
+        this.getName();
     },
     methods: {
         selectResult(val) {
             this.radio = val;
-            this.disagreeOpinion=''
+            this.disagreeOpinion = "";
         },
-        getName(){
-            let id=this.$route.params.data.taskId
-            let fd = new FormData()
-            fd.append('taskId',id);
-          
-            getFun('/majorapprove/add',{
-                taskId:id
-            }).then(data=>{
-                
-              this.name=data.msg;
-            }).catch(err=>{
-               this.$toast.fail("提交失败,请稍后再试");
+        getName() {
+            getFun("/majorapprove/add", {
+                taskId: this.taskId,
+            })
+                .then((data) => {
+                    this.name = data.msg;
                 })
+                .catch((err) => {
+                    this.$toast.fail("提交失败,请稍后再试");
+                });
         },
         onSubmit(values) {
             this.$toast.loading({

src/views/danger/standBook/normalDetail.vue

@@ -215,6 +215,7 @@
                             v-for="(item, index) in hdConfirm"
                             :key="index"
                         >
+
                             <div class="step-wrap">
                                 <van-row>
                                     <van-col span="24"
@@ -222,6 +223,18 @@
                                             隐患认定
                                         </div></van-col
                                     >
+                                </van-row>
+                                 <van-row gutter="">
+                                    <van-col span="9"
+                                        ><span class="field-title"
+                                            >隐患确认信息：</span
+                                        ></van-col
+                                    >
+                                    <van-col span="15">{{
+                                        item.confirmResult == 0
+                                            ? "退回"
+                                            : "通过"
+                                    }}</van-col>
                                 </van-row>
                                 <van-row
                                     gutter=""
@@ -259,18 +272,7 @@
                                         item.endTime
                                     }}</van-col>
                                 </van-row>
-                                <van-row gutter="">
-                                    <van-col span="9"
-                                        ><span class="field-title"
-                                            >隐患确认信息：</span
-                                        ></van-col
-                                    >
-                                    <van-col span="15">{{
-                                        item.confirmResult == 0
-                                            ? "退回"
-                                            : "通过"
-                                    }}</van-col>
-                                </van-row>
+                               
                                  <van-row gutter="">
                                     <van-col span="7"
                                         ><span class="field-title"