From f29260ac5f120bd2f44fc800c7653c0b9658f246 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 23 Dec 2024 18:01:07 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/Abnormal/AbnormalFeedBack.vue     | 21 +++++++++++++++++++
 .../production/scheduleForShopOrder.vue       |  8 +++++++
 2 files changed, 29 insertions(+)

diff --git a/src/views/modules/Abnormal/AbnormalFeedBack.vue b/src/views/modules/Abnormal/AbnormalFeedBack.vue
index 59d1a0f..1bde8ec 100644
--- a/src/views/modules/Abnormal/AbnormalFeedBack.vue
+++ b/src/views/modules/Abnormal/AbnormalFeedBack.vue
@@ -577,6 +577,7 @@
         },
         scrapTypeList:[
           {label:'缺料'},
+          {label:'污染'},
           {label:'气泡'},
           {label:'断裂'},
           {label:'窝气'},
@@ -785,6 +786,26 @@
         this.modalFlag=true;
       },
       saveAbnormalDetail(){
+        if((this.abnormalFeedBackData.scrapType1==null||this.abnormalFeedBackData.scrapType1=='')&&
+          (this.abnormalFeedBackData.scrapType2==null||this.abnormalFeedBackData.scrapType2=='')&&
+          (this.abnormalFeedBackData.scrapType3==null||this.abnormalFeedBackData.scrapType3=='')&&
+          (this.abnormalFeedBackData.scrapType4==null||this.abnormalFeedBackData.scrapType4=='')&&
+          (this.abnormalFeedBackData.scrapType5==null||this.abnormalFeedBackData.scrapType5=='')){
+          this.$alert("请选择报废状态", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
+        if((this.abnormalFeedBackData.scrapReason1==null||this.abnormalFeedBackData.scrapReason1=='')&&
+          (this.abnormalFeedBackData.scrapReason2==null||this.abnormalFeedBackData.scrapReason2=='')&&
+          (this.abnormalFeedBackData.scrapReason3==null||this.abnormalFeedBackData.scrapReason3=='')&&
+          (this.abnormalFeedBackData.scrapReason4==null||this.abnormalFeedBackData.scrapReason4=='')&&
+          (this.abnormalFeedBackData.scrapReason5==null||this.abnormalFeedBackData.scrapReason5=='')){
+          this.$alert("请选择报废原因", '错误', {
+            confirmButtonText: '确定'
+          })
+          return false;
+        }
         if( this.disableFlag2==false&&(this.abnormalFeedBackData.treatmentTemporary==null||this.abnormalFeedBackData.treatmentTemporary=='')){
           this.$alert("请填写处理方式", '错误', {
             confirmButtonText: '确定'
diff --git a/src/views/modules/production/scheduleForShopOrder.vue b/src/views/modules/production/scheduleForShopOrder.vue
index 21cdd0f..6b62eab 100644
--- a/src/views/modules/production/scheduleForShopOrder.vue
+++ b/src/views/modules/production/scheduleForShopOrder.vue
@@ -300,6 +300,13 @@
         width="100"
         label="录入人">
       </el-table-column>
+      <el-table-column
+        prop="lastTime"
+        header-align="center"
+        align="right"
+        width="80"
+        label="排产时间">
+      </el-table-column>
       <el-table-column
         prop="machSetupTime"
         header-align="center"
@@ -583,6 +590,7 @@
           "合格数量": "qtyApprove",
           "录入时间": "enterDate",
           "录入人": "userName",
+          "排产时间": "lastTime",
           "调机时间": "machSetupTime",
           "单位产出量": "machRunFactor",
           "产出单位": "factorUnit",