From 3a92e5f6e38e7e6df39ff211eeae3ddb5ab2228c Mon Sep 17 00:00:00 2001
From: zhoucong <123456>
Date: 星期一, 16 五月 2022 15:07:41 +0800
Subject: [PATCH] fix

---
 src/views/delayHiddenDangerRectification/index.vue |   82 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/src/views/delayHiddenDangerRectification/index.vue b/src/views/delayHiddenDangerRectification/index.vue
index 25dbe1a..e0fd2b9 100644
--- a/src/views/delayHiddenDangerRectification/index.vue
+++ b/src/views/delayHiddenDangerRectification/index.vue
@@ -159,28 +159,57 @@
         </el-row>
         <el-table ref="dataTable" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55" align="center"></el-table-column>
-            <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
+            <el-table-column prop="number" label="编号" align="center" width="120">
+                <template slot-scope="scope">
+                    <div class="blue-font-color" @click="showDetails(scope.row)">{{ scope.row.number }}</div>
+                </template>
+            </el-table-column>
             <el-table-column prop="check_branch" label="检查部门" align="center" width="120"></el-table-column>
             <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_content" label="内容" width="150" align="center">
+                    <template slot-scope="scope">
+                        <el-popover trigger="hover" placement="top">
+                            <p>{{ scope.row.ht_content }}</p>
+                            <div slot="reference" class="name-wrapper">{{
+                                    scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
+                                }}
+                            </div>
+                        </el-popover>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="ht_typesub" label="类别" align="center"></el-table-column>
                 <el-table-column prop="ht_level" label="级别" align="center"></el-table-column>
             </el-table-column>
             <el-table-column label="整改计划" align="center">
-                <el-table-column prop="measure" label="整改措施" align="center"></el-table-column>
+                <el-table-column prop="measure" label="整改措施" width="150" align="center">
+                    <template slot-scope="scope">
+                        <el-popover trigger="hover" placement="top">
+                            <p>{{ scope.row.measure }}</p>
+                            <div slot="reference" class="name-wrapper">{{
+                                    scope.row.measure != null && scope.row.measure.length > 10 ? scope.row.measure.substring(0, 8) + "...." : scope.row.measure
+                                }}
+                            </div>
+                        </el-popover>
+                    </template>
+                </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="限改时间" :formatter="formatColumnDate" width="120" 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>
+                <el-table-column prop="CALLBACKTIME" label="复查时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
             </el-table-column>
             <el-table-column label="隐患处理状态" align="center">
                 <template slot-scope="scope">
@@ -393,15 +422,16 @@
             this.multipleSelection = val;
         },
         // 发送隐患单跳转
-        handleClick() {
+        handleClick(row) {
             this.$router.push({
-                path: "/rectificationDelayHiddenDanger"
+                path: "/rectificationDelayHiddenDanger",
+                query:{"id":row.id}
             })
         },
         sendBath() {
             var selectData = this.$refs.dataTable.selection;
             if (selectData.length < 1) {
-                this.$message({type: 'warn', message: "请选择需要发送的数据!", duration: 3000})
+                this.$message({type: 'warning', message: "请选择需要发送的数据!", duration: 3000})
                 return;
             }
             var selectIds = "";
@@ -416,6 +446,7 @@
                 "alter_time": now.toLocaleDateString().replaceAll("/", "-"),
                 "dealContent": "同意延期申请" //备注
             }
+
             this.$confirm('确认要发送吗?', '提示', {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
@@ -451,7 +482,32 @@
             }).catch(err => {
                 console.log(err)
             })
-        }
+        },
+        //方法区
+        formatDate(data) {
+            // 获取单元格数据
+            if(data == null) {
+                return null
+            }
+            let dt = new Date(data)
+            return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
+        },
+        showDetails(row){
+            this.$router.push({
+                path: "/dangerDetails",
+                query:{"id":row.id}
+            })
+        },
+        //方法区
+        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() + ' '
+        },
     }
 };
 </script>
@@ -474,4 +530,8 @@
     background-color: #034ea2;
     border: 1px solid #034ea2;
 }
+.blue-font-color:hover{
+    cursor: pointer;
+    color: blue;
+}
 </style>

--
Gitblit v1.9.2