From c0554dce01273b36e7fc894f9a76a3c8cca379ed Mon Sep 17 00:00:00 2001
From: zhaojiale <631455805@qq.com>
Date: 星期三, 10 八月 2022 15:36:39 +0800
Subject: [PATCH] 应急系统修改
---
src/components/equipmentDailog/Dailog.vue | 49 +++++++++++++++++++++++++++++++++----------------
1 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/src/components/equipmentDailog/Dailog.vue b/src/components/equipmentDailog/Dailog.vue
index 224bb22..7ccfbe2 100644
--- a/src/components/equipmentDailog/Dailog.vue
+++ b/src/components/equipmentDailog/Dailog.vue
@@ -6,7 +6,7 @@
<el-input v-model="form.qName" placeholder="请填写装置设施名称" />
</el-form-item>
<el-form-item label="装置设施位号" size="default" prop="positionNum">
- <el-input v-model="form.positionNum" placeholder="请填写装置设施位号" />
+ <el-input disabled v-model="form.positionNum" placeholder="请填写装置设施位号" />
</el-form-item>
<el-form-item label="装置设施用途" size="default" prop="qUsage">
<el-input v-model="form.qUsage" placeholder="请填写装置设施用途" />
@@ -14,7 +14,7 @@
<el-form-item label="装置设施型号" size="default" prop="model">
<el-input v-model="form.model" placeholder="请填写装置设施型号" />
</el-form-item>
- <el-form-item label="类型/类别外键" size="default" prop="equipmentTypeId">
+ <el-form-item label="类型/类别外键" size="default" prop="equipmentTypeName">
<el-input v-model="form.equipmentTypeName" placeholder="请选择">
<template #append>
<el-button :icon="Search" @click="opencategory"></el-button>
@@ -22,12 +22,12 @@
</el-input>
</el-form-item>
<!-- <el-form-item label="区域名称" size="default">
- <el-input v-model="form.name" placeholder="请选择">
- <template #append>
- <el-button :icon="Search" @click="openRegion"></el-button>
- </template>
- </el-input>
- </el-form-item> -->
+ <el-input v-model="form.name" placeholder="请选择">
+ <template #append>
+ <el-button :icon="Search" @click="openRegion"></el-button>
+ </template>
+ </el-input>
+ </el-form-item> -->
<el-form-item label="单位部门" size="default" prop="departmentId">
<el-tree-select v-model="form.departmentId" :data="data" check-strictly="true" class="w100" :props="propse" placeholder="请选择" />
</el-form-item>
@@ -44,7 +44,7 @@
<el-select v-model="form.lifeCycle" placeholder="请选择" style="width: 100%">
<el-option label="已投用" :value="1" />
<el-option label="库存中" :value="2" />
- <el-option label="报废" :value="3" />
+ <el-option label="报废" :value="3" />
</el-select>
</el-form-item>
<el-form-item label="投用日期" size="default" prop="useDate">
@@ -334,6 +334,7 @@
</template>
</el-dialog>
<categoryDailog ref="categoryShow"></categoryDailog>
+ <categoryDailog ref="categoryShow" @typeId="Tid"></categoryDailog>
<regionDailog ref="regionShow"></regionDailog>
<DailogSearchUser ref="UserShow" @SearchUser="userId"></DailogSearchUser>
<maintenanceDailog ref="maintenanceShow" @onMain="main"></maintenanceDailog>
@@ -356,7 +357,7 @@
import type { UploadProps, UploadUserFile } from 'element-plus';
import { facilityManagementApi } from '/@/api/facilityManagement';
import { goalManagementApi } from '/@/api/goalManagement';
-import {deepClone} from '/@/utils/other'
+import { deepClone } from '/@/utils/other';
export default defineComponent({
components: { categoryDailog, regionDailog, DailogSearchUser, maintenanceDailog, detectDailog, repairDailog, standardDailog },
setup(props, { emit }) {
@@ -460,7 +461,7 @@
repaireDetailList: [],
- equipmentTypeId: 1,
+ equipmentTypeId: '',
useDate: '',
@@ -485,10 +486,12 @@
delTestDetails: '',
});
const titles = ref();
+ const titleT = ref();
const disabled = ref(false);
const Dailogtype = ref(false);
const openDailog = (title: string, type: boolean, id: number, num: any) => {
dialogVisible.value = true;
+ titleT.value = title;
department();
Dailogtype.value = type;
if (num == 0) {
@@ -520,6 +523,7 @@
qUsage: [],
model: [],
equipmentTypeId: [],
+ equipmentTypeName: [{ required: true, message: '类型/类别外键不能为空', trigger: 'change' }],
departmentId: [],
setPart: [],
produceTime: [],
@@ -572,6 +576,13 @@
form.value.delRepaireDetails = deleteCId.value.toString();
form.value.delCheckStandardeDetails = deleteDId.value.toString();
dialogVisible.value = false;
+ delete form.value.equipmentTypeName;
+ delete form.value.departmentName;
+ delete form.value.leadingPersonDepartmentName;
+ delete form.value.leadingDepartmentName;
+ if (titleT.value == '新建') {
+ delete form.value.id;
+ }
facilityManagementApi()
.getequipmentInfoAddOrUpdate(form.value)
.then((res) => {
@@ -690,7 +701,7 @@
};
// 回传
const main = (data: any) => {
- let val=deepClone(data)
+ let val = deepClone(data);
if (index.value == -1) {
form.value.takecareDetailList.push(val);
} else {
@@ -698,7 +709,7 @@
}
};
const delect = (data: any) => {
- let val=deepClone(data)
+ let val = deepClone(data);
if (index.value == -1) {
form.value.testDetailList.push(val);
} else {
@@ -706,7 +717,7 @@
}
};
const Repair = (data: any) => {
- let val=deepClone(data)
+ let val = deepClone(data);
if (index.value == -1) {
form.value.repaireDetailList.push(val);
} else {
@@ -714,7 +725,7 @@
}
};
const Stand = (data: any) => {
- let val=deepClone(data)
+ let val = deepClone(data);
if (index.value == -1) {
form.value.checkStandardeDetailList.push(val);
} else {
@@ -730,6 +741,11 @@
form.value.stopSubmitPersonId = val.uid;
form.value.stopSubmitPersonName = val.realName;
}
+ };
+ const Tid = (data: any) => {
+ form.value.equipmentTypeId = data.id;
+ form.value.equipmentTypeName = data.typeName;
+ form.value.positionNum = data.sortNum;
};
//全屏
const full = ref(false);
@@ -759,6 +775,7 @@
};
const data = ref();
return {
+ Tid,
deepClone,
rules,
userId,
@@ -833,4 +850,4 @@
.el-form .el-form-item:last-of-type {
margin-bottom: 22px !important;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2