From 69c767d40443ad7459f70a4b52f39943957a36a6 Mon Sep 17 00:00:00 2001 From: z Date: Thu, 10 Jul 2025 13:16:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../materialplanboom/MaterialPlanBoomDO.java | 2 + .../taskdispatch/TaskDispatchDetailDO.java | 3 + .../MaterialPlanBoomMapper.java | 8 +- .../bgmasterline/BgMasterLineServiceImpl.java | 30 +-- .../materialplan/MaterialPlanServiceImpl.java | 2 + .../service/pgmaster/PgMasterServiceImpl.java | 30 +-- .../taskdispatch/TaskDispatchServiceImpl.java | 86 +++--- .../src/views/heli/materialplan/part.vue | 8 + .../src/views/heli/partpurchase/index.vue | 12 +- .../src/views/heli/storagein/detail.vue | 6 +- .../views/heli/taskdispatch/detailDialog.vue | 245 ++++++++++-------- 11 files changed, 246 insertions(+), 186 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java index 761fffb..7bd933c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/materialplanboom/MaterialPlanBoomDO.java @@ -230,4 +230,6 @@ public class MaterialPlanBoomDO extends BaseDO { private String pnName; @TableField(exist = false) private BigDecimal foamPrice; + @TableField(exist = false) + private String flag; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java index 88d600e..7c1d452 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskdispatch/TaskDispatchDetailDO.java @@ -234,4 +234,7 @@ public class TaskDispatchDetailDO extends BaseDO { private String nickname; private Integer reportStatus; + + //是否泡沫， 是-Y 否 -N + private String isFoam; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java index 1e80b2c..da8e6c9 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/materialplanboom/MaterialPlanBoomMapper.java @@ -218,10 +218,14 @@ public interface MaterialPlanBoomMapper extends BaseMapperX .select("p.project_name as projectName","p.name as projectSubName","p.name_sim as projectSubNameSim") .select("d.spec as boomSpec","d.blueprint_no as blueprintNo","d.unit as unit","f.name as supplierName") .select("a.nickname as duEmpName","c.name as procedureName","e.name as compositionName") - .select("m.the_weight as theWeight") + .select("COALESCE(m.the_weight, t.mat_weight) as theWeight","COALESCE(m.the_weight, t.mat_weight) as theWeight") .select("COALESCE(m.purchase_amount, t.boom_amount) AS purchaseAmounts,m.supplier_id as supplierIds,m.estimated_price as estimatedPrices") - .select("m.arrive_time as arriveTimes,m.description as descriptions") + .select("COALESCE(m.arrive_time, t.boom_arrive_date) as arriveTimes,COALESCE(m.description, t.description) as descriptions") .select("m.is_foam as isFoams","m.foam_price as foamPrice") + .select("CASE \n" + + " WHEN t.is_foam = 'Y' THEN 1 \n" + + " ELSE 0 \n" + + " END AS flag") .leftJoin(PurchaseOrderMakeDetailDO.class,"m",PurchaseOrderMakeDetailDO::getId,MaterialPlanBoomDO::getProjectPurchaseOrderMakeDetailId) .select(MaterialPlanDO::getBrief, MaterialPlanDO::getCustomerId, MaterialPlanDO::getProjectId, MaterialPlanDO::getProjectNameSim) .leftJoin(MaterialPlanDO.class, "p", MaterialPlanDO::getId,MaterialPlanBoomDO::getProjectMaterialPlanId) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineServiceImpl.java index f8a15c6..92de164 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/bgmasterline/BgMasterLineServiceImpl.java @@ -87,21 +87,21 @@ public class BgMasterLineServiceImpl implements BgMasterLineService { wrapper.eq(TaskDispatchDetailDO::getId,pgMasterLineDO.getDispatchDetailId()); wrapper.set(TaskDispatchDetailDO::getTestYn,"Y"); taskDispatchDetailMapper.update(wrapper); - TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(pgMasterLineDO.getDispatchDetailId()); - if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)){ - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()); - wrapper1.gt(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort()); - wrapper1.eq(TaskDispatchDetailDO::getReportStatus, 0); - wrapper1.eq(TaskDispatchDetailDO::getDeleted, 0); - wrapper1.orderByAsc(TaskDispatchDetailDO::getSort); - wrapper1.last("limit 1"); - TaskDispatchDetailDO nextTaskDispatchDetailDO = taskDispatchDetailMapper.selectOne(wrapper1); - if (ObjectUtil.isNotEmpty(nextTaskDispatchDetailDO)){ - nextTaskDispatchDetailDO.setReportStatus(1); - taskDispatchDetailMapper.updateById(nextTaskDispatchDetailDO); - } - } +// TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(pgMasterLineDO.getDispatchDetailId()); +// if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)){ +// LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); +// wrapper1.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()); +// wrapper1.gt(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort()); +// wrapper1.eq(TaskDispatchDetailDO::getReportStatus, 0); +// wrapper1.eq(TaskDispatchDetailDO::getDeleted, 0); +// wrapper1.orderByAsc(TaskDispatchDetailDO::getSort); +// wrapper1.last("limit 1"); +// TaskDispatchDetailDO nextTaskDispatchDetailDO = taskDispatchDetailMapper.selectOne(wrapper1); +// if (ObjectUtil.isNotEmpty(nextTaskDispatchDetailDO)){ +// nextTaskDispatchDetailDO.setReportStatus(1); +// taskDispatchDetailMapper.updateById(nextTaskDispatchDetailDO); +// } +// } }else{ //不相等时只更新当前报工状态 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java index ed47635..9fa93a7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/materialplan/MaterialPlanServiceImpl.java @@ -293,6 +293,7 @@ public class MaterialPlanServiceImpl implements MaterialPlanService { boomDO.setBoomDetailId(taskDispatchDetailDO.getBomDetailId()); boomDO.setBoomAmount(new BigDecimal(taskDispatchDetailDO.getBoomAmount())); boomDO.setBoomArriveDate(taskDispatchDetailDO.getBoomArriveDate()); +// boomDO.setArriveTime(taskDispatchDetailDO.getEndTime()); boomDO.setMatName(taskDispatchDetailDO.getMaterialName()); boomDO.setDuEmpId(taskDispatchDetailDO.getDuEmpId()); boomDO.setProjectPlanSubId(taskDispatchDetailDO.getProjectSubId()); @@ -300,6 +301,7 @@ public class MaterialPlanServiceImpl implements MaterialPlanService { boomDO.setMplanStatus(0); boomDO.setMatWeight(taskDispatchDetailDO.getMatWeight()); boomDO.setDescription(taskDispatchDetailDO.getDescription()); + boomDO.setIsFoam(taskDispatchDetailDO.getIsFoam()); materialPlanBoomMapper.insert(boomDO); materialPlanBoomDOList.add(boomDO); taskDispatchDetailDO.setProjectMaterialPlanDetailId(boomDO.getId()); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java index aa6d9f4..04b12e6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/pgmaster/PgMasterServiceImpl.java @@ -178,21 +178,21 @@ public class PgMasterServiceImpl implements PgMasterService { PgMasterLineDO pgMasterLineDO = pgMasterLineMapper.selectById(id); pgMasterLineDO.setDispatchStatus(3); int a = pgMasterLineMapper.updateById(pgMasterLineDO); - TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(pgMasterLineDO.getDispatchDetailId()); - if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)){ - LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); - wrapper1.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()); - wrapper1.gt(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort()); - wrapper1.eq(TaskDispatchDetailDO::getReportStatus, 0); - wrapper1.eq(TaskDispatchDetailDO::getDeleted, 0); - wrapper1.orderByAsc(TaskDispatchDetailDO::getSort); - wrapper1.last("limit 1"); - TaskDispatchDetailDO nextTaskDispatchDetailDO = taskDispatchDetailMapper.selectOne(wrapper1); - if (ObjectUtil.isNotEmpty(nextTaskDispatchDetailDO)){ - nextTaskDispatchDetailDO.setReportStatus(1); - taskDispatchDetailMapper.updateById(nextTaskDispatchDetailDO); - } - } +// TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(pgMasterLineDO.getDispatchDetailId()); +// if (ObjectUtil.isNotEmpty(taskDispatchDetailDO)){ +// LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); +// wrapper1.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()); +// wrapper1.gt(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort()); +// wrapper1.eq(TaskDispatchDetailDO::getReportStatus, 0); +// wrapper1.eq(TaskDispatchDetailDO::getDeleted, 0); +// wrapper1.orderByAsc(TaskDispatchDetailDO::getSort); +// wrapper1.last("limit 1"); +// TaskDispatchDetailDO nextTaskDispatchDetailDO = taskDispatchDetailMapper.selectOne(wrapper1); +// if (ObjectUtil.isNotEmpty(nextTaskDispatchDetailDO)){ +// nextTaskDispatchDetailDO.setReportStatus(1); +// taskDispatchDetailMapper.updateById(nextTaskDispatchDetailDO); +// } +// } // 返回 return a; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java index 4703c73..08bd5e9 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskdispatch/TaskDispatchServiceImpl.java @@ -215,13 +215,13 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { taskDispatchDetailDO.setProcedureStatus(TaskDispatchProcedureStatusEnum.SUBMITTED.getCode()); } - if (taskDispatchDetailDO.getIsReport()==0){ - taskDispatchDetailDO.setReportStatus(1); - } - if (taskDispatchDetailDO.getIsReport()==1&& flag.get()){ - flag.set(false); - taskDispatchDetailDO.setReportStatus(1); - } +// if (taskDispatchDetailDO.getIsReport()==0){ +// taskDispatchDetailDO.setReportStatus(1); +// } +// if (taskDispatchDetailDO.getIsReport()==1&& flag.get()){ +// flag.set(false); +// taskDispatchDetailDO.setReportStatus(1); +// } }); } @@ -586,11 +586,11 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { List taskDispatchDetailDO2 = taskDispatchDetailMapper.selectNoReportBeforeDo(taskDispatchDetailDO); if (CollUtil.isNotEmpty(taskDispatchDetailDO2)){ // - for (TaskDispatchDetailDO dispatchDetailDO : taskDispatchDetailDO2) { - if (dispatchDetailDO.getTestYn() == null || !dispatchDetailDO.getTestYn().equals("Y") ){ - throw exception(new ErrorCode(102223_666,dispatchDetailDO.getProcedureName() + "工序过程检没有完成，请确认！")); - } - } +// for (TaskDispatchDetailDO dispatchDetailDO : taskDispatchDetailDO2) { +// if (dispatchDetailDO.getTestYn() == null || !dispatchDetailDO.getTestYn().equals("Y") ){ +// throw exception(new ErrorCode(102223_666,dispatchDetailDO.getProcedureName() + "工序过程检没有完成，请确认！")); +// } +// } List filteredList = taskDispatchDetailDO2.stream() .filter(task -> task.getProcedureStatus() != 2) // 筛选product不为"2"的记录 @@ -643,6 +643,19 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { }}); TaskDispatchDO taskDispatchDO = taskDispatchMapper.selectById(taskDispatchDetailDO.getDispatchId()); + + //校验，如果为完成，添加逻辑：1、生产结束 增加管控 - 如果报工数量 ！= 派工数量 提示：报工数量num1 != 派工数量num2，不允许结束！ + if(operate == TaskReportOperateEnum.FINISH ){ + List historyReportList = taskReportMapper.selectList(new LambdaQueryWrapper() {{ + eq(TaskReportDO::getDispatchDetailId, taskDispatchDetailDO.getId()) + .ne(TaskReportDO::getAmount, 0); + }}); + int historyReportAmount = historyReportList.stream().mapToInt(TaskReportDO::getAmount).sum(); + if ( taskDispatchDetailDO.getAmount() != historyReportAmount){ + throw exception(new ErrorCode(1_009_021,"派工数量："+taskDispatchDetailDO.getAmount()+"不等于总报工数量："+historyReportAmount+",不允许结束！")); + } + } + // 校验 if(lastReportDO == null){ // 如没有未提交的记录 @@ -691,17 +704,7 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { throw exception(TASK_DISPATCH_TASK_REPORT_AMOUNT_EXCESS); } } - //校验，如果为完成，添加逻辑：1、生产结束 增加管控 - 如果报工数量 ！= 派工数量 提示：报工数量num1 != 派工数量num2，不允许结束！ - if(operate == TaskReportOperateEnum.FINISH ){ - List historyReportList = taskReportMapper.selectList(new LambdaQueryWrapper() {{ - eq(TaskReportDO::getDispatchDetailId, taskDispatchDetailDO.getId()) - .ne(TaskReportDO::getAmount, 0); - }}); - int historyReportAmount = historyReportList.stream().mapToInt(TaskReportDO::getAmount).sum(); - if ( taskDispatchDetailDO.getAmount() != historyReportAmount){ - throw exception(new ErrorCode(1_009_021,"派工数量："+taskDispatchDetailDO.getAmount()+"不等于总报工数量："+historyReportAmount+",不允许结束！")); - } - } + } PlanDO planDO = planMapper.selectById(taskDispatchDO.getPlanId()); // 执行 @@ -900,22 +903,22 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { // planMapper.updateById(planDO); // } // } - if (ObjectUtil.isNotEmpty(taskDispatchDetailDO.getCheckYn())){ - if (taskDispatchDetailDO.getCheckYn()==1&&"PRODUCTION".equals(taskDispatchDO.getDispatchType())){ - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()); - wrapper.gt(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort()); - wrapper.eq(TaskDispatchDetailDO::getReportStatus, 0); - wrapper.eq(TaskDispatchDetailDO::getDeleted, 0); - wrapper.orderByAsc(TaskDispatchDetailDO::getSort); - wrapper.last("limit 1"); - TaskDispatchDetailDO nextTaskDispatchDetailDO = taskDispatchDetailMapper.selectOne(wrapper); - if (ObjectUtil.isNotEmpty(nextTaskDispatchDetailDO)){ - nextTaskDispatchDetailDO.setReportStatus(1); - } - taskDispatchDetailMapper.updateById(nextTaskDispatchDetailDO); - } - } +// if (ObjectUtil.isNotEmpty(taskDispatchDetailDO.getCheckYn())){ +// if (taskDispatchDetailDO.getCheckYn()==1&&"PRODUCTION".equals(taskDispatchDO.getDispatchType())){ +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(TaskDispatchDetailDO::getDispatchId, taskDispatchDetailDO.getDispatchId()); +// wrapper.gt(TaskDispatchDetailDO::getSort, taskDispatchDetailDO.getSort()); +// wrapper.eq(TaskDispatchDetailDO::getReportStatus, 0); +// wrapper.eq(TaskDispatchDetailDO::getDeleted, 0); +// wrapper.orderByAsc(TaskDispatchDetailDO::getSort); +// wrapper.last("limit 1"); +// TaskDispatchDetailDO nextTaskDispatchDetailDO = taskDispatchDetailMapper.selectOne(wrapper); +// if (ObjectUtil.isNotEmpty(nextTaskDispatchDetailDO)){ +// nextTaskDispatchDetailDO.setReportStatus(1); +// } +// taskDispatchDetailMapper.updateById(nextTaskDispatchDetailDO); +// } +// } taskDispatchDetailMapper.updateById(taskDispatchDetailDO); break; } @@ -1104,6 +1107,11 @@ public class TaskDispatchServiceImpl implements TaskDispatchService { }else { item.setIsOutsourcing("N"); } + if ("true".equals(item.getIsFoam())) { + item.setIsFoam("Y"); + }else { + item.setIsFoam("N"); + } }) .collect(Collectors.toList()); // 分组更新与插入 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/part.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/part.vue index f3510f6..0943b5c 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/part.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/materialplan/part.vue @@ -175,6 +175,14 @@ const getList = async () => { try { const data = await MaterialPlanApi.getPartPage(queryParams) list.value = data.list + list.value.forEach(item=> { + if (item.status==true){ + item.boomArriveDate=item.endTime + if (item.owner!=null&&item.owner!=''){ + item.duEmpId=item.owner; + } + } + }) total.value = data.total } finally { loading.value = false diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue index 63be656..9945a41 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue @@ -74,7 +74,7 @@ @@ -176,6 +176,7 @@ import * as PartPurchaseOrderApi from "@/api/heli/partpurchaseorder"; import {ElTable} from "element-plus"; import {useUserStore} from "@/store/modules/user"; import SupplierSelect from "@/views/heli/hlvuestyle/supplierSelect.vue"; +import {setFlagsFromString} from "node:v8"; const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用 const userStore = useUserStore() @@ -227,6 +228,14 @@ const getList = async () => { }else{ item.isFoams = false } + if (item.flag==1){ + item.isFoams = true + item.isFoam = 'Y' + + }else { + item.isFoams = false + item.isFoam = 'N' + } }) total.value = data.total } finally { @@ -293,7 +302,6 @@ const submitForm = async () => { message.error("采购数量为0或空"); break; } - console.log(list[i].isFoam) if (list[i].isFoam==true||list[i].isFoam=='Y'){ if (list[i].foamPrice === null || list[i].foamPrice === 0) { message.error("泡沫费用为0或空"); diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagein/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagein/detail.vue index 4564700..6ca1e86 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagein/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagein/detail.vue @@ -97,9 +97,9 @@ -+-+@@ -367,7 +367,7 @@ function limitTo20Chars(input) { } - + const deleteForm = async () => { // 删除的二次确认 await message.delConfirm() diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue index bf1c52d..32a0184 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detailDialog.vue @@ -62,115 +62,115 @@ class="!w-260px" v-model="formData.requiredCompletedDate" type="date" value-form - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +