From c251626c67a55dfa8305fd49a47a0a2aa00fc32f Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 24 三月 2022 16:15:02 +0800
Subject: [PATCH] 隐患管理:v1

---
 src/views/hiddenDanger/reportView/reportView.vue |   52 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/views/hiddenDanger/reportView/reportView.vue b/src/views/hiddenDanger/reportView/reportView.vue
index f318c4e..66274e5 100644
--- a/src/views/hiddenDanger/reportView/reportView.vue
+++ b/src/views/hiddenDanger/reportView/reportView.vue
@@ -5,12 +5,33 @@
         <el-form ref="dataForm"  :model="dataForm" label-position="right" label-width="140px"
                 element-loading-text="保存中...">
 
-            <el-form-item label="作业编号:">
-                <el-input v-model="dataForm.taskCode"  style="width: 205px"  :readonly="true" />
-            </el-form-item>
-
             <el-form-item label="隐患级别:">
                 <el-input v-model="dataForm.level" style="width: 205px" placeholder="请选择" :readonly="true"/>
+            </el-form-item>
+
+            <el-form-item label="整改人:">
+                <el-input v-model="dataForm.rectifier" style="width: 205px" placeholder="请选择" :readonly="true"/>
+            </el-form-item>
+
+            <el-form-item label="整改期限:">
+                <el-date-picker
+                    v-model="dataForm.rectifydeadline"
+                    type="datetime"
+                    :readonly="true"
+                    format="yyyy-MM-dd HH:mm"
+                    value-format="yyyy-MM-dd HH:mm"
+                    >
+                </el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="整改措施:" >
+                <el-input
+                    style="width: 400px"
+                    type="textarea"
+                    :rows="3"
+                    :readonly="true"
+                    v-model="dataForm.rectifymeasure">
+                </el-input>
             </el-form-item>
 
             <el-form-item label="上报说明:" >
@@ -35,22 +56,19 @@
                 </el-image>
             </el-form-item>
 
-            <el-form-item label="隐患确认:" v-if="this.dataForm.status !== '未确认'">
-                <el-radio v-model="dataForm.ishiddendanger" v-if="dataForm.ishiddendanger" :label="true" border >是隐患</el-radio>
-                <el-radio v-model="dataForm.ishiddendanger" v-if="!dataForm.ishiddendanger" :label="false" border >非隐患</el-radio>
-            </el-form-item>
 
-            <el-form-item :label="this.dataForm.status === '已驳回'?'驳回说明:':'确认说明:'"  v-if="this.dataForm.status !== '未确认'">
+            <el-form-item label="整改说明:" v-if="this.dataForm.status !== '待整改'">
                 <el-input
                     style="width: 400px"
                     type="textarea"
                     :rows="3"
                     :readonly="true"
-                    v-model="dataForm.confirmnote">
+                    v-model="dataForm.rectifynote">
                 </el-input>
             </el-form-item>
 
-            <el-form-item label="整改图片:"  v-if="this.dataForm.status === '已整改' && imgUrls2.length > 0">
+
+            <el-form-item label="整改图片:"  v-if="this.dataForm.status !== '待整改'  && imgUrls2.length > 0">
                 <el-image
                     class="upload-img img-wrapper"
                     v-for='item in imgUrls2'
@@ -62,13 +80,14 @@
 
             </el-form-item>
 
-            <el-form-item label="整改说明:" v-if="this.dataForm.status === '已整改'">
+
+            <el-form-item label="驳回原因:"  v-if="this.dataForm.status === '驳回待整改'">
                 <el-input
                     style="width: 400px"
                     type="textarea"
                     :rows="3"
                     :readonly="true"
-                    v-model="dataForm.rectifynote">
+                    v-model="dataForm.rejectnote">
                 </el-input>
             </el-form-item>
 
@@ -104,16 +123,17 @@
       showDialog(title,row){
         this.title = title;
         this.dataForm.status = row.status
-        this.dataForm.taskCode = row.taskcode
         this.dataForm.level = row.level
         this.imgUrls = row.reportResources.map(item=>{return {url:process.env.IMG_API+item.url,name:item.id}})
         this.imgPreviewUrls = row.reportResources.map(item=>{ return process.env.IMG_API + item.url })
         this.imgUrls2 = row.rectifyResources.map(item=>{return {url:process.env.IMG_API+item.url,name:item.id}})
         this.imgPreviewUrls2 = row.rectifyResources.map(item=>{ return process.env.IMG_API + item.url })
-        this.dataForm.ishiddendanger = row.ishiddendanger
         this.dataForm.rectifynote = row.rectifynote
-        this.dataForm.confirmnote = row.confirmnote
         this.dataForm.createnote = row.createnote;
+        this.dataForm.rectifymeasure = row.rectifymeasure;
+        this.dataForm.rectifydeadline = row.rectifydeadline;
+        this.dataForm.rejectnote = row.rejectnote;
+        this.dataForm.rectifier= row.rectifier;
         this.dialogFormVisible = true;
       },
 

--
Gitblit v1.9.2