隐患视屏

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -141,6 +141,7 @@
       <!-- 退回是的选项 -->
       <div class="disagree" v-else>
         <van-field
+          required
           v-model="returnReason"
           label="退回原因"
           name="confirmOpinion"

src/views/danger/delayApproval/ratifyInfo.vue

@@ -42,7 +42,7 @@
 
       <van-field
         v-model="opinion"
-        label="理由或者意见"
+        label='审批意见'
         name="examineReason"
         rows="3"
         type="textarea"
@@ -76,6 +76,7 @@ export default {
   },
   data() {
     return {
+      pid:'',
       text: "延期审批",
       taskId: "",
       delayTime: "", // 延迟时间
@@ -105,6 +106,8 @@ export default {
     formdata.append("examineResult", this.isAgree*1);
     formdata.append("examineReason", values.examineReason);
     formdata.append("taskId", this.taskId);
+    formdata.append("pid", this.pid);
+    formdata.append('applyDate',this.applyDate);
     delayEdit(`/delayApply/edit`, formdata)
       .then((res) => {
         this.$toast.clear();
@@ -133,6 +136,7 @@ export default {
         // 对数据进行赋值
         this.applyDate = res.data.delayApply.applyDate;
         this.applyReason = res.data.delayApply.applyReason;
+        this.pid=res.data.delayApply.pid;
       })
       .catch(() => {
         this.$toast.clear();

src/views/danger/majorDanger/index.vue

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

src/views/danger/majorDanger/majorSurvey.vue

@@ -56,15 +56,11 @@
                     readonly
                     v-if="radio == 1?(name=='项目经理二次认定'?true:false):(name=='项目经理二次认定'?false:true)"
                     clickable
-                    required
                     name="thinkHdLev"
                     :value="thinkLevel"
                     label="认定隐患级别"
                     placeholder="请选择认定隐患级别"
                     @click="showThinkLevel = true"
-                    :rules="[
-                        { required: true, message: '认定隐患级别不能为空' },
-                    ]"
                 />
                 <van-popup v-model="showThinkLevel" position="bottom">
                     <van-picker
@@ -84,8 +80,8 @@
                     rows="3"
                     type="textarea"
                     placeholder="请输入"
-                    :required="radio==1?false:true"
-                    :rules="[{ required: radio==1?false:true, message: '审批意见不能为空' }]"
+                    :required="true"
+                    :rules="[{ required: true, message: '审批意见不能为空' }]"
                 />
             </div>
 
@@ -148,11 +144,12 @@ export default {
     
     mounted() {
       this.getName()
-      console.log(1)
+      this.messageList=[JSON.parse(localStorage.getItem('majorDanderData'))]
     },
     methods: {
         selectResult(val) {
             this.radio = val;
+            this.disagreeOpinion=''
         },
         getName(){
             let id=this.$route.params.data.taskId

src/views/danger/standBook/normalDetail.vue

@@ -53,7 +53,15 @@
                         >
                         <van-col span="18">{{ hdReport.hdType }}</van-col>
                     </van-row>
-
+                    <!-- hdProjectId -->
+                    <van-row gutter="">
+                        <van-col span="6"
+                            ><span class="field-title"
+                                >隐患清单编号：</span
+                            ></van-col
+                        >
+                        <van-col span="18">{{ hdReport.hdProjectId }}</van-col>
+                    </van-row>
                     <!-- 隐藏的字段 -->
                     <div v-show="reportOpen">
                         <van-row gutter="">
@@ -251,16 +259,6 @@
                                         item.endTime
                                     }}</van-col>
                                 </van-row>
-                                <van-row gutter="">
-                                    <van-col span="4"
-                                        ><span class="field-title"
-                                            >意见：</span
-                                        ></van-col
-                                    >
-                                    <van-col span="20">{{
-                                        item.confirmOpinion
-                                    }}</van-col>
-                                </van-row>
                                 <van-row gutter="">
                                     <van-col span="9"
                                         ><span class="field-title"
@@ -273,6 +271,16 @@
                                             : "通过"
                                     }}</van-col>
                                 </van-row>
+                                 <van-row gutter="">
+                                    <van-col span="7"
+                                        ><span class="field-title"
+                                            >认定意见：</span
+                                        ></van-col
+                                    >
+                                    <van-col span="17">{{
+                                        item.confirmOpinion
+                                    }}</van-col>
+                                </van-row>
                             </div>
                         </van-step>
                     </van-steps>
@@ -300,7 +308,7 @@
                                 <van-row>
                                     <van-col span="6"
                                         ><span class="field-title"
-                                            >操作人：</span
+                                            >审批人：</span
                                         ></van-col
                                     >
                                     <van-col span="18">{{
@@ -594,7 +602,7 @@
                                 <van-row>
                                     <van-col span="6"
                                         ><span class="field-title"
-                                            >操作人：</span
+                                            >督办人：</span
                                         ></van-col
                                     >
                                     <van-col span="18">{{