From dcf7f10ba7fec350fc1bed82615c718d03df8efa Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Thu, 16 Jan 2025 15:17:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=94=B6=E7=AE=A1=E7=90=86=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=AE=8C=E6=88=90=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/heli/service/orderys/OrderYsServiceImpl.java   | 3 ---
 .../src/views/heli/orderys/OrderYsForm.vue                | 8 +++++++-
 mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue    | 2 +-
 .../src/views/heli/taskdispatch/detail.vue                | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java
index fdb2442..1a0e6fa 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/orderys/OrderYsServiceImpl.java
@@ -50,9 +50,6 @@ public class OrderYsServiceImpl implements OrderYsService {
     public void updateOrderYs(OrderYsSaveReqVO updateReqVO) {
         // 校验存在
         validateOrderYsExists(updateReqVO.getId());
-        if (updateReqVO.getCgYishou().compareTo(updateReqVO.getCgYs())>=0){
-            updateReqVO.setCgTypee(2);
-        }
         // 更新
         OrderYsDO updateObj = BeanUtils.toBean(updateReqVO, OrderYsDO.class);
         orderYsMapper.updateById(updateObj);
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue
index f04105c..08be053 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue
@@ -36,7 +36,6 @@
           placeholder="请选择"
           clearable
           class="!w-240px"
-          disabled
         >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.HELI_YINGFU_MONEY)"
@@ -105,6 +104,13 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
+  if (formData.value.cgYishou<formData.value.cgYs&&formData.value.cgTypee==2){
+    message.error("已收金额小于应收金额,回款未完成,请确认")
+    return
+  }else if (formData.value.cgYishou>=formData.value.cgYs&&formData.value.cgTypee==1){
+    message.error("已收金额大于等于应收金额,回款已完成,请确认")
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue
index 19f9e46..01a1a50 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue
@@ -134,7 +134,7 @@
                 <el-button link type="primary" @click="openForm(scope.row.id)" v-if="scope.row.status!='3'">
                   编辑
                 </el-button>
-                <el-button link type="primary" @click="complete(scope.row.id)" v-if="scope.row.status=='2'">
+                <el-button link type="primary" @click="complete(scope.row.id)" v-if="scope.row.status=='2'||scope.row.status=='1'">
                   生产完成
                 </el-button>
                 <el-dropdown @command="(command) => handleCommand(command, scope.row.id, scope.row.code)">
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue
index 8c90bd6..62b855b 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskdispatch/detail.vue
@@ -255,8 +255,8 @@ ref="subFormRef" :model="formData.taskDispatchDetails" :rules="subFormRules"
 								v-loading="subFormLoading" label-width="0">
 								<el-table :data="formData.taskDispatchDetails" class="hl-table">
 									<el-table-column fixed label="序号" align="center" type="index" width="80" />
-									<el-table-column fixed label="序号名称" align="center" prop="procedureId" width="180">
-										<template #header> <span class="hl-table_header">*</span>序号名称</template>
+									<el-table-column fixed label="工序名称" align="center" prop="procedureId" width="180">
+										<template #header> <span class="hl-table_header">*</span>工序名称</template>
 										<template #default="{ row, $index }">
 											<el-form-item :prop="`${$index}.procedureId`" :rules="subFormRules.procedureId" class="mb-0px!">
 												<ProcedureSelect