From e67446e0b0df43b3f009bbf3ea54cce0d35e0e25 Mon Sep 17 00:00:00 2001
From: z <ZhouYu0323@126.com>
Date: Wed, 15 Jan 2025 15:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/module/heli/service/plan/PlanServiceImpl.java  |  2 +-
 .../mes-ui-admin-vue3/src/views/heli/orderys/index.vue |  2 +-
 .../src/views/heli/outsourcestock/edit.vue             |  8 ++++----
 mes-ui/mes-ui-admin-vue3/src/views/heli/plan/index.vue |  2 +-
 .../src/views/heli/plan/planSchedule.vue               | 10 +++++++++-
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java
index c179bca..f86a7b7 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/plan/PlanServiceImpl.java
@@ -317,7 +317,7 @@ private TaskReportMapper taskReportMapper;
                 return false;
             }
             for (TaskDispatchDetailDO detailDO : detailDOS) {
-               if (!"2".equals(detailDO.getProcedureStatus())){
+               if (detailDO.getProcedureStatus()!=2){
                    return false;
                }
             }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue
index 0898e01..bda2c5e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue
@@ -121,7 +121,7 @@
           >
             编辑
           </el-button>
-          <el-button
+          <el-button v-if=" scope.row.cgYishou==null"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/edit.vue
index d8df869..9ce1365 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/outsourcestock/edit.vue
@@ -305,9 +305,9 @@ ref="subBoomPlanFormRef" :model="formData.boomItemDOList" :rules="subBoomPlanFor
                   <el-table-column prop="currentCount" min-width="180" align="center">
                     <template #header><span class="hl-table_header">*</span>本次到货数量</template>
                     <template #default="scope">
-                      <el-form-item :prop="`${scope.$index}.currentCount`" class="mb-0px!">
+                      <el-form-item :prop="`${scope.$index}.currentCount`" class="mb-0px!" :rules="subOutSourceMatFormRules.currentCount">
                         <el-input-number 
-style="width: 100%" v-model="scope.row.currentCount" placeholder="本次到货数量" :rules="subOutSourceMatFormRules.currentCount" 
+style="width: 100%" v-model="scope.row.currentCount" placeholder="本次到货数量"
                           @change="handleEstimatedPrice" :min="0" :precision="2" />
                       </el-form-item>
                     </template>
@@ -317,9 +317,9 @@ style="width: 100%" v-model="scope.row.currentCount" placeholder="本次到货
                     <template #header><span class="hl-table_header">*</span>不合格数量</template>
 
                     <template #default="scope">
-                      <el-form-item :prop="`${scope.$index}.unqualifiedCount`" class="mb-0px!">
+                      <el-form-item :prop="`${scope.$index}.unqualifiedCount`" class="mb-0px!" :rules="subOutSourceMatFormRules.unqualifiedCount">
                         <el-input-number
-style="width: 100%" v-model="scope.row.unqualifiedCount" placeholder="不合格数量" :rules="subOutSourceMatFormRules.unqualifiedCount"
+style="width: 100%" v-model="scope.row.unqualifiedCount" placeholder="不合格数量"
                           @change="handleEstimatedPrice" :min="0" :precision="2" />
                       </el-form-item>
                     </template>
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 c93e781..19f9e46 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!='3'&& scope.row.status!='4'">
+                <el-button link type="primary" @click="complete(scope.row.id)" v-if="scope.row.status=='2'">
                   生产完成
                 </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/plan/planSchedule.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/planSchedule.vue
index d97df39..4ceb383 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/planSchedule.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/planSchedule.vue
@@ -204,7 +204,15 @@ const getList = async () => {
   }
 }
 const tableRowClassName = ({ row }) => {
-  if (row.wgType!=2&&row.endTime<new Date()){
+  var endTime = new Date(row.endTime);
+
+// 获取当前时间的 Date 对象
+  var currentTime = new Date();
+
+// 将 endTime 和 currentTime 的时间部分设置为零
+  endTime.setHours(0, 0, 0, 0);
+  currentTime.setHours(0, 0, 0, 0);
+  if (row.wgType!=2&&endTime < currentTime){
     return 'warning-row';
   }else {
     return ''