From e4dc5994adb768d2c3f8309efc23e5e957ec6116 Mon Sep 17 00:00:00 2001
From: Admin <978517621@qq.com>
Date: 星期二, 13 九月 2022 15:16:31 +0800
Subject: [PATCH] Default Changelist
---
src/views/facilityManagement/ProductionEquipment/index.vue | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/views/facilityManagement/ProductionEquipment/index.vue b/src/views/facilityManagement/ProductionEquipment/index.vue
index ab8551e..70edf54 100644
--- a/src/views/facilityManagement/ProductionEquipment/index.vue
+++ b/src/views/facilityManagement/ProductionEquipment/index.vue
@@ -28,7 +28,8 @@
<div class="btns">
<div>
<el-button size="default" type="primary" :icon="Plus" @click="openD('新建')">新建</el-button>
- <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen">修改</el-button>
+ <el-button size="default" :disabled="warning" type="warning" plain :icon="EditPen"
+ @click="openD('修改', deletAll[0])">修改</el-button>
<el-button size="default" :disabled="danger" type="danger" :icon="Delete" @click="onDeleteAll" plain>删除</el-button>
</div>
<div>
@@ -46,14 +47,14 @@
<el-tab-pane label="设备保养" name="first">
<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="leadingPersonName" align="center" label="保养负责人" sortable />
<el-table-column property="takecareDate" align="center" label="保养日期" sortable />
- <el-table-column property="leadingPersonDepartmentId" align="center" label="保养负责人单位" sortable />
+ <el-table-column property="leadingPersonDepartmentName" 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="leadingPersonName" align="center" label="检查人" sortable />
<el-table-column property="createTime" align="center" label="检查日期" sortable />
<el-table-column property="name" align="center" label="检查人部门" sortable />
<el-table-column property="takecareMemo" align="center" label="检查结果" sortable />
@@ -61,21 +62,31 @@
></el-tab-pane>
<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="testPersonName" align="center" label="检测人" sortable />
<el-table-column property="testDate" align="center" label="检测日期" sortable />
- <el-table-column property="testPersonDepartmentId" align="center" label="检测人单位" sortable />
+ <el-table-column property="testPersonDepartmentName" align="center" label="检测人单位" sortable />
<el-table-column property="testMemo" align="center" label="检测内容" sortable />
- <el-table-column property="testResult" align="center" label="检测结果" sortable />
+ <el-table-column align="center" label="检测结果">
+ <template #default="scope">
+ <span v-if="scope.row.testResult == 1">成功</span>
+ <span v-if="scope.row.testResult == 2">失败</span>
+ </template>
+ </el-table-column>
<el-table-column property="testStatus" align="center" label="检测状态" sortable />
</el-table>
</el-tab-pane>
<el-tab-pane label="设备维修" name="fourth">
<el-table ref="multipleTableRef" :data="scope.row.repaireDetailList" style="width: 100%">
<el-table-column property="exceptionInfo" align="center" label="设施异常项" sortable />
- <el-table-column property="repairStatus" align="center" label="维修状态" sortable />
+ <el-table-column align="center" label="维修状态">
+ <template #default="scope">
+ <span v-if="scope.row.repairStatus == 1">维修中</span>
+ <span v-if="scope.row.repairStatus == 2">已修好</span>
+ </template>
+ </el-table-column>
<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="repairPersonName" align="center" label="维修负责人" sortable />
+ <el-table-column property="repairPersonDepartmentName" align="center" label="维修负责人单位" sortable />
<el-table-column property="repairStartDate" align="center" label="维修开始日期" sortable />
<el-table-column property="repairEndDate" align="center" label="维修结束日期" sortable />
</el-table>
@@ -136,13 +147,16 @@
searchParams: {
qName: '', ////名称
positionNum: '', ////位号
- infoType: 0, ////具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
+ equipmentTypeId:"",
+ infoType: 1, ////具体类型（页面左侧的导航栏使用） 0:仪器仪表信息 1：生产设备设施 2：安全设备设施
},
});
// 重置
const resetForm = () => {
ruleForm.searchParams.qName = '';
ruleForm.searchParams.positionNum = '';
+ ruleForm.searchParams.equipmentTypeId = '';
+ listApiTree()
listApi();
};
const listApi = () => {
@@ -299,7 +313,8 @@
return data.typeName.includes(value);
};
const handleNodeClick=(data: Tree)=>{
- ruleForm.searchParams.positionNum=data.id
+ ruleForm.searchParams.equipmentTypeId=data.id
+ ruleForm.searchParams.equipmentTypeId = data.id;
listApi();
}
const data=ref([])
--
Gitblit v1.9.2