From 0cbef2d33036643cd971f9132f88db8360817f49 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Wed, 17 Aug 2022 19:54:12 +0800
Subject: [PATCH] 审批规则
---
src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue | 67 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 14 deletions(-)
diff --git a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
index fcbddcf..c0ee1c0 100644
--- a/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
+++ b/src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue
@@ -77,22 +77,44 @@
<div class="stepCard">
<el-card class="box-card">
<template #header>
- <div class="card-header">
- <div>{{ item.pointId }}</div>
+ <div class="card-header" v-for="i in inspectPointAllList">
+ <div v-if="i.id == item.pointId">
+ <span>{{ i.code }}</span>
+ </div>
</div>
</template>
- <div class="text item">
- 所属设备区域：<span>{{ item.regionId }}</span>
+ <div class="text item" v-for="i in regionNameList">
+ <div v-if="i.id == item.regionId">
+ 所属设备区域：<span>{{ i.region }}</span>
+ </div>
</div>
- <div class="text item">
- 关联RFID：<span>{{ item.rfidId }}</span>
+ <!-- <div class="text item">-->
+ <!-- 所属设备区域：<span>{{ item.regionId }}</span>-->
+ <!-- </div>-->
+ <div class="text item" v-for="i in RFIDList">
+ <div v-if="i.id == item.rfidId">
+ 所属设备区域：<span>{{ i.rfidName }}</span>
+ </div>
</div>
- <div class="text item">
- 巡检指标：<span>{{ item.quotaId }}</span>
+ <!-- <div class="text item">-->
+ <!-- 关联RFID：<span>{{ item.rfidId }}</span>-->
+ <!-- </div>-->
+ <div class="text item" v-for="i in quotaList">
+ <div v-if="i.id == item.quotaId">
+ 所属设备区域：<span>{{ i.type }}</span>
+ </div>
</div>
- <div class="text item">
- 数据填报类型：<span>{{ item.dataReportType }}</span>
+ <!-- <div class="text item">-->
+ <!-- 巡检指标：<span>{{ item.quotaId }}</span>-->
+ <!-- </div>-->
+ <div class="text item" v-for="i in dataReportTypeList">
+ <div v-if="i.id == item.dataReportType">
+ 所属设备区域：<span>{{ i.name }}</span>
+ </div>
</div>
+ <!-- <div class="text item">-->
+ <!-- 数据填报类型：<span>{{ item.dataReportType }}</span>-->
+ <!-- </div>-->
<div class="text item">
数据参考值：<span>{{ item.firstReferenceValue ? item.firstReferenceValue : item.secondReferenceValue ? item.secondReferenceValue : item.thirdReferenceValue }}</span>
</div>
@@ -215,12 +237,16 @@
classGroup: Array<classGroup>;
quotaList: Array<quota>;
inspectPointAllList: Array<inspectPointAllState>;
+ regionNameList: Array<inspectPointAllState>;
+ RFIDList: Array<inspectPointAllState>;
}
interface inspectPointAllState {
id: number;
code: string;
regionId: number;
rfidId: number;
+ rfidName: string;
+ region: string;
}
interface classGroup {
depId: number;
@@ -317,6 +343,8 @@
classGroup: [],
quotaList: [],
inspectPointAllList: [],
+ regionNameList: [],
+ RFIDList: [],
dataReportTypeList: [
{ id: 1, name: '选择' },
{ id: 2, name: '填空' },
@@ -365,7 +393,9 @@
}
};
- const showInspectTaskDialog = (type: string, value: { id: number; uuid: string }, workTypeList: [], department: [], timeType: [], classGroupList: [], quotaList: [], inspectPointAllList: []) => {
+ const showInspectTaskDialog = (type: string, value: { id: number; uuid: string }, workTypeList: [], department: [], timeType: [], classGroupList: [], quotaList: [], inspectPointAllList: [], regionNameList: [], RFIDList: []) => {
+ data.regionNameList = regionNameList;
+ data.RFIDList = RFIDList;
data.quotaList = JSON.parse(JSON.stringify(quotaList));
data.timeList = JSON.parse(JSON.stringify(timeType));
data.inspectPointAllList = JSON.parse(JSON.stringify(inspectPointAllList));
@@ -404,6 +434,10 @@
giveClassGroup();
data.inspectTaskForm = JSON.parse(JSON.stringify(res.data.data));
} else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
}
})
.catch((error) => {});
@@ -416,6 +450,10 @@
if (res.data.code === '200') {
data.inspectTaskForm = JSON.parse(JSON.stringify(res.data.data));
} else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
}
})
.catch((error) => {});
@@ -432,7 +470,8 @@
data.inspectTaskForm.points.push(data.inspectPointForm);
data.inspectPointDialog = false;
} else if (data.title === '新增巡检任务' && data.pointTitle === '修改巡检点') {
- let result = data.inspectTaskForm.points.findIndex((item) => item.id === data.inspectPointForm.id);
+ debugger;
+ let result = data.inspectTaskForm.points.findIndex((item) => item.execSequence === data.inspectPointForm.execSequence);
data.inspectTaskForm.points[result] = data.inspectPointForm;
data.inspectPointDialog = false;
} else if (data.title === '修改巡检任务' && data.pointTitle === '新增巡检点') {
@@ -466,7 +505,7 @@
message: '巡检点修改成功',
duration: 2000
});
- let result = data.inspectTaskForm.points.findIndex((item) => item.id === data.inspectPointForm.id);
+ let result = data.inspectTaskForm.points.findIndex((item) => item.execSequence === data.inspectPointForm.execSequence);
data.inspectTaskForm.points[result] = data.inspectPointForm;
data.inspectPointDialog = false;
} else {
@@ -575,7 +614,7 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
.homeCard {
--
Gitblit v1.9.2