From 01b6b200bedf57900a88bbd982cf25889e13dc49 Mon Sep 17 00:00:00 2001 From: shj <1790240199@qq.com> Date: 星期三, 10 八月 2022 14:17:09 +0800 Subject: [PATCH] 对接 --- src/components/equipmentDailog/Dailog.vue | 51 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 30 insertions(+), 21 deletions(-) diff --git a/src/components/equipmentDailog/Dailog.vue b/src/components/equipmentDailog/Dailog.vue index ff93503..9da3908 100644 --- a/src/components/equipmentDailog/Dailog.vue +++ b/src/components/equipmentDailog/Dailog.vue @@ -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"> @@ -333,6 +333,7 @@ </span> </template> </el-dialog> + <categoryDailog ref="categoryShow"></categoryDailog> <categoryDailog ref="categoryShow" @typeId="Tid"></categoryDailog> <regionDailog ref="regionShow"></regionDailog> <DailogSearchUser ref="UserShow" @SearchUser="userId"></DailogSearchUser> @@ -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,8 +461,7 @@ repaireDetailList: [], - equipmentTypeId: "", - equipmentTypeName:"", + equipmentTypeId: '', useDate: '', @@ -486,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) { @@ -521,7 +523,7 @@ qUsage: [], model: [], equipmentTypeId: [], - equipmentTypeName:[], + equipmentTypeName: [], departmentId: [], setPart: [], produceTime: [], @@ -574,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) => { @@ -692,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 { @@ -700,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 { @@ -708,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 { @@ -716,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 { @@ -733,11 +742,11 @@ 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 Tid = (data: any) => { + form.value.equipmentTypeId = data.id; + form.value.equipmentTypeName = data.typeName; + form.value.positionNum = data.sortNum; + }; //全屏 const full = ref(false); const toggleFullscreen = () => { @@ -841,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