From 81fbccc69012cbedcc60e01a26b99185430dba2a Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期五, 13 五月 2022 16:55:52 +0800
Subject: [PATCH] 隐患

---
 src/views/hiddenDangerRectification/index.vue |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/views/hiddenDangerRectification/index.vue b/src/views/hiddenDangerRectification/index.vue
index cbfffb0..d0c9a08 100644
--- a/src/views/hiddenDangerRectification/index.vue
+++ b/src/views/hiddenDangerRectification/index.vue
@@ -156,7 +156,12 @@
             <el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
             <el-table-column prop="checktype" label="检查类别" align="center"></el-table-column>
             <el-table-column label="隐患项目" align="center">
-                <el-table-column prop="check_date" label="检查时间" width="120" align="center"></el-table-column>
+                <el-table-column prop="check_date" label="检查时间" width="120" align="center">
+                    <template slot-scope="scope">
+                        <label>{{ formatDate(scope.row.check_date)}}</label><br/>
+                        <label>{{ scope.row.check_class}}</label>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="address" label="地点" align="center"></el-table-column>
                 <el-table-column prop="ht_content" label="内容" align="center"></el-table-column>
                 <el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
@@ -166,10 +171,10 @@
                 <el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
                 <el-table-column prop="ht_branch" label="隐患部门" align="center"></el-table-column>
                 <el-table-column prop="duty_officer" label="责任人" align="center"></el-table-column>
-                <el-table-column prop="alter_time" label="限改时间" width="120" align="center"></el-table-column>
+                <el-table-column prop="alter_time" label="限改时间" width="120" :formatter="formatColumnDate" align="center"></el-table-column>
             </el-table-column>
             <el-table-column label="整改情况" align="center">
-                <el-table-column prop="ACCOMPLISHTIME" label="完成时间" width="120" align="center"></el-table-column>
+                <el-table-column prop="ACCOMPLISHTIME" label="完成时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
                 <el-table-column prop="CALLBACKRESULT" label="复查结果" align="center"></el-table-column>
                 <el-table-column prop="CALLBACKPERSON" label="复查人" align="center"></el-table-column>
                 <el-table-column prop="CALLBACKTIME" label="复查时间" width="120" align="center"></el-table-column>
@@ -208,6 +213,7 @@
                                 :picker-options="pickerOptions"
                                 type="date"
                                 :disabled="false"
+                                value-format="yyyy-MM-dd"
                                 placeholder="选择日期"
                                 style="width: 100%">
                             </el-date-picker>
@@ -552,6 +558,26 @@
                 });
             })
         },
+        //方法区
+        formatDate(data) {
+            // 获取单元格数据
+            if(data == null) {
+                return null
+            }
+            let dt = new Date(data)
+            return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
+        },
+
+        //方法区
+        formatColumnDate(row, column) {
+            // 获取单元格数据
+            let data = row[column.property]
+            if(data == null) {
+                return null
+            }
+            let dt = new Date(data)
+            return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
+        },
         exportData(){
             var requestData = this.listQuery;
             requestData.export_type = 2;

--
Gitblit v1.9.2