From 955a2bb8ae43621210a243c1bf816bf0037f05e7 Mon Sep 17 00:00:00 2001
From: vce <daisy_vce@yeah.net>
Date: Wed, 6 Mar 2024 17:18:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../safeManage/v2/checkStandingBook.vue       |  2 +-
 .../safeManage/v2/inspectionRecord.vue        | 40 ++++++++++++++++---
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/views/projectFront/safeManage/v2/checkStandingBook.vue b/src/views/projectFront/safeManage/v2/checkStandingBook.vue
index 7881533f..458947d6 100644
--- a/src/views/projectFront/safeManage/v2/checkStandingBook.vue
+++ b/src/views/projectFront/safeManage/v2/checkStandingBook.vue
@@ -1436,6 +1436,7 @@ export default {
         imgList.push(item.name)
       })
       let data = {
+        inspectTime: this.formData.inspectTime,
         changeLimitTime: this.formData.changeLimitTime,
         changeUser: this.formData.changeUser,
         checkContent: this.formData.checkContent,
@@ -1456,7 +1457,6 @@ export default {
         status: this.formData.status,
         hiddenDangerInspectRegionId: this.formData.hiddenDangerInspectRegionId[0],
         hiddenDangerInspectRegionName: this.hiddenDangerInspectRegionName,
-        inspectTime: this.formData.inspectTime
       }
       console.log(data)
       addHiddenDangerInspectRecordApi(data).then((res) => {
diff --git a/src/views/projectFront/safeManage/v2/inspectionRecord.vue b/src/views/projectFront/safeManage/v2/inspectionRecord.vue
index 82c6c766..e5ee488c 100644
--- a/src/views/projectFront/safeManage/v2/inspectionRecord.vue
+++ b/src/views/projectFront/safeManage/v2/inspectionRecord.vue
@@ -103,7 +103,7 @@
           <template slot-scope="scope">
             <p>{{ scope.row.createUserName }}</p>
             <!-- <p>{{ scope.row.createEnterpriseName }}</p> -->
-            <p class="table_bottom_txt">{{ scope.row.createTime }}</p>
+            <p class="table_bottom_txt">{{ scope.row.inspectTime }}</p>
           </template>
         </el-table-column>
         <!-- 隐患信息 -->
@@ -315,7 +315,7 @@
                       $t('message.safeMangeCheck.time') +
                       '：'
                     }}</span>
-                    <span class="value">{{ detailData.createTime }}</span>
+                    <span class="value">{{ detailData.inspectTime }}</span>
                   </div>
                 </el-col>
               </el-row>
@@ -721,6 +721,25 @@
                 </el-option>
               </el-select>
             </el-form-item>
+
+            <!-- 检查时间 -->
+            <!-- <el-form-item
+              v-if="formData.status == 2"
+              :label="$t('message.safeMangeCheck.dialog.inspectTime')"
+            > -->
+            <el-form-item
+              prop="inspectTime"
+              :label="$t('message.safeMangeCheck.dialog.inspectTime')"
+            >
+              <el-date-picker
+                v-model="formData.inspectTime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :placeholder="$t('message.safeMangeCheck.dialog.chooseDate')"
+              >
+              </el-date-picker>
+            </el-form-item>
+
             <!-- 是否需要整改 -->
             <el-form-item
               :label="$t('message.safeMangeCheck.dialog.yesOrNoNeedChange')"
@@ -786,6 +805,7 @@
               ></el-cascader>
               <!-- @expand-change="showSecondTree" -->
             </el-form-item>
+
             <!-- 隐患内容 -->
             <el-form-item
               v-if="formData.status == 2"
@@ -917,8 +937,8 @@
             >
               <el-date-picker
                 v-model="formData.changeLimitTime"
-                type="date"
-                value-format="yyyy-MM-dd"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
                 :placeholder="$t('message.safeMangeCheck.dialog.chooseDate')"
               >
               </el-date-picker>
@@ -1028,7 +1048,8 @@ export default {
         checkItem2: '',
         changeUser: '',
         enterpriseSn: '',
-        changeLimitTime: ''
+        changeLimitTime: '',
+        inspectTime: ''
       },
       opts: {
         value: 'id',
@@ -1127,6 +1148,14 @@ export default {
             trigger: 'change'
           }
         ],
+        inspectTime: [
+          {
+            // 请选择检查时间
+            required: true,
+            message:"请选择检查时间",
+            trigger: 'change'
+          }
+        ],
         checkItem: [
           {
             // 请选择隐患类型
@@ -1303,6 +1332,7 @@ export default {
         imgList.push(item.name)
       })
       let data = {
+        inspectTime: this.formData.inspectTime,
         changeLimitTime: this.formData.changeLimitTime,
         changeUser: this.formData.changeUser,
         checkContent: this.formData.checkContent,