From 9f2882f17b22eddc1c78c4033481c64ac5f395d6 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期六, 30 七月 2022 17:20:17 +0800
Subject: [PATCH] 对接
---
src/views/facilityManagement/InstrumentationInformation/index.vue | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/views/facilityManagement/InstrumentationInformation/index.vue b/src/views/facilityManagement/InstrumentationInformation/index.vue
index 3a8d289..3a43231 100644
--- a/src/views/facilityManagement/InstrumentationInformation/index.vue
+++ b/src/views/facilityManagement/InstrumentationInformation/index.vue
@@ -27,7 +27,7 @@
<el-col :span="20">
<div class="btns">
<div>
- <el-button size="default" type="primary" :icon="Plus" @click="openD">新建</el-button>
+ <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="danger" type="danger" :icon="Delete" @click="onDeleteAll" plain>删除</el-button>
</div>
@@ -45,10 +45,10 @@
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClicks" style="margin: 0 5%">
<el-tab-pane label="设备保养" name="first">
<el-table ref="multipleTableRef" :data="scope.row.takecareDetailList" style="width: 100%">
- <el-table-column property="name" align="center" label="保养情况" sortable />
- <el-table-column property="name" align="center" label="保养负责人" sortable />
+ <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="name" align="center" label="保养负责人单位" sortable />
+ <el-table-column property="leadingPersonDepartmentId" align="center" label="保养负责人单位" sortable />
</el-table>
</el-tab-pane>
<el-tab-pane label="设备检查" name="second"
@@ -61,23 +61,23 @@
></el-tab-pane>
<el-tab-pane label="设备检测" name="third">
<el-table ref="multipleTableRef" :data="scope.row.testDetailList" style="width: 100%">
- <el-table-column property="name" align="center" label="检测人" sortable />
- <el-table-column property="name" align="center" label="检测日期" sortable />
- <el-table-column property="name" align="center" label="检测人单位" sortable />
- <el-table-column property="name" align="center" label="检测内容" sortable />
- <el-table-column property="name" align="center" label="检测结果" sortable />
- <el-table-column property="name" align="center" label="检测状态" sortable />
+ <el-table-column property="testPersonId" 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="testMemo" align="center" label="检测内容" sortable />
+ <el-table-column property="testResult" align="center" label="检测结果" sortable />
+ <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="name" align="center" label="设施异常项" sortable />
- <el-table-column property="name" align="center" label="维修状态" sortable />
- <el-table-column property="name" align="center" label="维修情况" sortable />
- <el-table-column property="name" align="center" label="维修负责人" sortable />
- <el-table-column property="name" align="center" label="维修负责人单位" sortable />
- <el-table-column property="name" align="center" label="维修开始日期" sortable />
- <el-table-column property="name" align="center" label="维修结束日期" sortable />
+ <el-table-column property="exceptionInfo" align="center" label="设施异常项" sortable />
+ <el-table-column property="repairStatus" align="center" label="维修状态" sortable />
+ <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>
</el-tab-pane>
</el-tabs>
@@ -112,7 +112,7 @@
</el-col>
</el-row>
<!-- <updata ref="Show"></updata> -->
- <Dailog ref="openAdd"></Dailog>
+ <Dailog ref="openAdd" @navAddorUpdata="onAddorUpdata"></Dailog>
</div>
</template>
<script lang="ts">
@@ -183,7 +183,7 @@
// 弹窗
const openAdd = ref();
const openD = (title: String, id: number) => {
- openAdd.value.openDailog(title, id);
+ openAdd.value.openDailog(title,false,id,0);
};
// 删除
const onDelete = (id: number) => {
--
Gitblit v1.9.2