From 0065d87453f07f63ec6b4f0a818b65ca07905f45 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期三, 10 八月 2022 14:17:15 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/facilityManagement/safetyEquipment/index.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/facilityManagement/safetyEquipment/index.vue b/src/views/facilityManagement/safetyEquipment/index.vue
index 6094bf5..546b28b 100644
--- a/src/views/facilityManagement/safetyEquipment/index.vue
+++ b/src/views/facilityManagement/safetyEquipment/index.vue
@@ -47,14 +47,14 @@
<el-table ref="multipleTableRef" :data="scope.row.takecareDetailList" style="width: 100%">
<el-table-column property="takecareMemo" align="center" label="保养情况" sortable />
<el-table-column property="leadingPersonId" align="center" label="保养负责人" sortable />
- <el-table-column property="takecareDate" align="center" label="保养日期" sortable />
+ <el-table-column property="takecareDate" align="center" :formatter="timeDate" label="保养日期" sortable />
<el-table-column property="leadingPersonDepartmentId" align="center" label="保养负责人单位" sortable />
</el-table>
</el-tab-pane>
<el-tab-pane label="设备检查" name="second"
><el-table ref="multipleTableRef" :data="scope.row.checkDetailList" style="width: 100%">
<el-table-column property="leadingPersonId" align="center" label="检查人" sortable />
- <el-table-column property="createTime" align="center" label="检查日期" sortable />
+ <el-table-column property="createTime" align="center" :formatter="timeDate" label="检查日期" sortable />
<el-table-column property="name" align="center" label="检查人部门" sortable />
<el-table-column property="takecareMemo" align="center" label="检查结果" sortable />
<el-table-column property="name" align="center" label="检查状态" sortable /> </el-table
@@ -62,7 +62,7 @@
<el-tab-pane label="设备检测" name="third">
<el-table ref="multipleTableRef" :data="scope.row.testDetailList" style="width: 100%">
<el-table-column property="testPersonId" align="center" label="检测人" sortable />
- <el-table-column property="testDate" align="center" label="检测日期" sortable />
+ <el-table-column property="testDate" align="center" :formatter="timeDate" label="检测日期" sortable />
<el-table-column property="testPersonDepartmentId" align="center" label="检测人单位" sortable />
<el-table-column property="testMemo" align="center" label="检测内容" sortable />
<el-table-column property="testResult" align="center" label="检测结果" sortable />
@@ -76,8 +76,8 @@
<el-table-column property="repairMemo" align="center" label="维修情况" sortable />
<el-table-column property="repairPersonId" align="center" label="维修负责人" sortable />
<el-table-column property="repairPersonDepartmentId" align="center" label="维修负责人单位" sortable />
- <el-table-column property="repairStartDate" align="center" label="维修开始日期" sortable />
- <el-table-column property="repairEndDate" align="center" label="维修结束日期" sortable />
+ <el-table-column property="repairStartDate" align="center" :formatter="timeDate" label="维修开始日期" sortable />
+ <el-table-column property="repairEndDate" align="center" :formatter="timeDate" label="维修结束日期" sortable />
</el-table>
</el-tab-pane>
</el-tabs>
@@ -121,6 +121,7 @@
import Dailog from '/@/components/equipmentDailog/Dailog.vue';
import { ElTree, TabsPaneContext, ElMessage, ElMessageBox } from 'element-plus';
import { facilityManagementApi } from '/@/api/facilityManagement';
+import {timeDate} from '/@/assets/index.ts'
import { EditPen, View, Plus, Delete, Download, Refresh, Upload } from '@element-plus/icons-vue';
interface Tree {
label: string;
@@ -299,7 +300,7 @@
return data.typeName.includes(value);
};
const handleNodeClick=(data: Tree)=>{
- ruleForm.searchParams.positionNum=data.id
+ ruleForm.searchParams.positionNum=data.sortNum
listApi();
}
const data=ref([])
@@ -350,6 +351,7 @@
Refresh,
View,
Upload,
+ timeDate,
};
},
});
--
Gitblit v1.9.2