From f557b9496974d11f91d352cb4dfb557c038a9d6b Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Tue, 23 Apr 2024 16:35:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/biz/plan/edit.vue | 427 +++++------------- .../src/views/biz/plan/index.vue | 69 +-- .../src/views/biz/plan/planSchedule.vue | 152 +++++++ 3 files changed, 297 insertions(+), 351 deletions(-) create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/biz/plan/planSchedule.vue diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/plan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/plan/edit.vue index 50fd6c29..e0c9cab1 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/plan/edit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/plan/edit.vue @@ -12,126 +12,65 @@ - - + - - - - - - - - - - - - - - - - - - - {{ dict.label }} - - - - - - - - - - + + - - + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + + {{ + ' 共计' + + betweenDay( + new Date(formData.projectStartTime), + new Date(formData.projectEndTime) + ) + + '天' + }} - - + + @@ -140,69 +79,37 @@ - + - + - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - + + - - - - + + + @@ -213,129 +120,63 @@ - - - - - {{ - ' 共计' + - betweenDay( - new Date(formData.projectStartTime), - new Date(formData.projectEndTime) - ) + - '天' - }} - - - + - + - - - - - - - - - + + + + - - - - - - - - + - - - + - - - - - - - - - - - - - - + + + - - + + - - - - - - - - - + --> - - + @@ -391,11 +217,18 @@ --> - + + + + + + + - @@ -405,46 +238,33 @@ - - - + + - - - - + - + @@ -532,12 +352,10 @@ const formData = ref({ craftContent: undefined }) const formRules = reactive({ - projectCode: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }], - + projectCode: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }] }) const subFormRules = reactive({ - projectSubShortName: [{ required: true, message: '子项目简称不能为空', trigger: 'blur' }], - + projectSubShortName: [{ required: true, message: '子项目简称不能为空', trigger: 'blur' }] }) const projectOrderDialog = ref() const openProjectOrderDialog = () => { @@ -561,15 +379,16 @@ const handleSelectedProjectOrder = (arr: ProjectOrderVO[]) => { } } -const handleCraftInfo = (val) =>{ - if(val == 0){ +const handleCraftInfo = (val) => { + if (val == 0) { formData.value.craftOwner = undefined formData.value.craftStartDate = undefined formData.value.craftEndDate = undefined } } const handleSubCode = (row, name) => { - row.projectSubCode = name.length==0?"" : (formData.value.projectCode + '-' + customerInit.value.brief + '-' + name) + row.projectSubCode = + name.length == 0 ? '' : formData.value.projectCode + '-' + customerInit.value.brief + '-' + name } const handleMouldType = async (scope, mid) => { @@ -582,13 +401,17 @@ const submitForm = async () => { await formRef.value.validate() await subFormRef.value.validate() - let isRepeat= false - formData.value.projectPlanSubs.forEach(item => { - if(formData.value.projectPlanSubs.filter(record =>{ return record.projectSubShortName == item.projectSubShortName }).length>1) - isRepeat = true + let isRepeat = false + formData.value.projectPlanSubs.forEach((item) => { + if ( + formData.value.projectPlanSubs.filter((record) => { + return record.projectSubShortName == item.projectSubShortName + }).length > 1 + ) + isRepeat = true }) - if(isRepeat){ - await message.alert("子项目简称不能重复！") + if (isRepeat) { + await message.alert('子项目简称不能重复！') return } // 提交请求 @@ -598,7 +421,7 @@ const submitForm = async () => { data.craftContent = JSON.stringify(data.craftInfos) await PlanApi.updatePlan(data) - formData.value.projectPlanSubs.forEach(item => { + formData.value.projectPlanSubs.forEach((item) => { var subData = item as unknown as PlanSubApid.PlanSubVo // subData.projectId = item.projectOrderId // subData.projectPlanId = formData.value.id @@ -624,8 +447,9 @@ const submitForm = async () => { const handleInitPlanSub = async () => { // 项目子项列表 - formData.value.projectOrderSubs = - await ProjectOrderApi.getProjectOrderSubListByProjectOrderId(formData.value.projectId) + formData.value.projectOrderSubs = await ProjectOrderApi.getProjectOrderSubListByProjectOrderId( + formData.value.projectId + ) // 生产计划子项列表 const queryParams = reactive({ @@ -634,23 +458,22 @@ const handleInitPlanSub = async () => { projectPlanId: query.id }) - formData.value.projectPlanSubs = - (await PlanSubApi.getPlanSubPage(queryParams)).list + formData.value.projectPlanSubs = (await PlanSubApi.getPlanSubPage(queryParams)).list - formData.value.projectPlanSubs.forEach(item => { - if (formData.value.projectOrderSubs.filter(sub => item.projectSubId == sub.id).length > 0) { - var subTemp = formData.value.projectOrderSubs.find(sub => item.projectSubId == sub.id) + formData.value.projectPlanSubs.forEach((item) => { + if (formData.value.projectOrderSubs.filter((sub) => item.projectSubId == sub.id).length > 0) { + var subTemp = formData.value.projectOrderSubs.find((sub) => item.projectSubId == sub.id) item.planSubId = item.id item.projectPlanId = subTemp.projectPlanId item.projectId = subTemp.projectOrderId item.projectSubId = subTemp.id item.name = subTemp.name item.compositionName = subTemp.compositionName - item.unit= subTemp.unit + item.unit = subTemp.unit item.amount = subTemp.amount - if(item.equip!= undefined && item.equip.length>0){ - item.mouldId = equipInit.value.filter(rg => rg.id == item.equipId)[0].mould_type_id + if (item.equip != undefined && item.equip.length > 0) { + item.mouldId = equipInit.value.filter((rg) => rg.id == item.equipId)[0].mould_type_id } // item.projectSubCode = subTemp.projectSubCode // item.mouldId = subTemp.mouldId @@ -665,9 +488,8 @@ const handleInitPlanSub = async () => { // if(item.equipId != undefined && item.equipId.length>0){ // item.equipList = equipInit.value.filter(rg => rg.id == item.equipId) // } - item.equipList = equipInit.value.filter(rg => rg.id == item.equipId) + item.equipList = equipInit.value.filter((rg) => rg.id == item.equipId) } - }) } const userInit = ref() @@ -675,7 +497,6 @@ const equipInit = ref() const mouldTypeList = ref() const customerInit = ref() onMounted(async () => { - //用户列表数据 userInit.value = await UserApi.getSimpleUserList() @@ -716,8 +537,15 @@ onMounted(async () => { if (formData.value.craftContent == null) { formData.value.craftInfos = [] - getIntDictOptions(DICT_TYPE.BIZ_CRAFT).forEach(dict => { - formData.value.craftInfos.push({ id: dict.value, name: dict.label, startDate: '', endDate: '', owner: '', description: '' }) + getIntDictOptions(DICT_TYPE.BIZ_CRAFT).forEach((dict) => { + formData.value.craftInfos.push({ + id: dict.value, + name: dict.label, + startDate: '', + endDate: '', + owner: '', + description: '' + }) }) } else { formData.value.craftInfos = eval(formData.value.craftContent) @@ -742,38 +570,33 @@ const handleSelectedUser4 = (newValue: any) => { } // 计划批准人 const handleSelectedUser5 = (newValue: any) => { - formData.value.approver = newValue?.id } // 毛坯负责人 -const handleSelectedUser6 = (currentIndex,newValue: any) => { - formData.value.projectPlanSubs[currentIndex].blankOwner = newValue?.id +const handleSelectedUser6 = (currentIndex, newValue: any) => { + formData.value.projectPlanSubs[currentIndex].blankOwner = newValue?.id } // 设备型号 const handleSelectedequip = (scope, newValue: any) => { - - if(newValue !=null && newValue!= undefined && newValue.id>0){ + if (newValue != null && newValue != undefined && newValue.id > 0) { scope.row.equipId = newValue?.id - scope.row.mouldId = equipInit.value.filter(ep => ep.id == newValue?.id)[0].mould_type_id - }else{ + scope.row.mouldId = equipInit.value.filter((ep) => ep.id == newValue?.id)[0].mould_type_id + } else { scope.row.equipId = null scope.row.mouldId = null } } // 2D负责人 -const handleSelectedUser7 = (currentIndex,newValue: any) => { - - formData.value.projectPlanSubs[currentIndex].twoDimOwner = newValue?.id +const handleSelectedUser7 = (currentIndex, newValue: any) => { + formData.value.projectPlanSubs[currentIndex].twoDimOwner = newValue?.id } // 3D负责人 -const handleSelectedUser8 = (currentIndex,newValue: any) => { - - formData.value.projectPlanSubs[currentIndex].threeDimOwner = newValue?.id +const handleSelectedUser8 = (currentIndex, newValue: any) => { + formData.value.projectPlanSubs[currentIndex].threeDimOwner = newValue?.id } // 责任人 -const handleSelectedUser9 = (currentIndex,newValue: any) => { - - formData.value.craftInfos[currentIndex].owner = newValue?.id +const handleSelectedUser9 = (currentIndex, newValue: any) => { + formData.value.craftInfos[currentIndex].owner = newValue?.id } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/plan/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/plan/index.vue index 01013844..0ca0bf59 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/plan/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/plan/index.vue @@ -6,46 +6,30 @@ - + - + - - - - - - - - - - - - - - - - - 搜索 + 查询 重置 - + @@ -54,19 +38,19 @@ - + - + - + - + - - + + - - - - - - - - - + - + + + +