From 022bf207bf5844200dd2513122c0103bf7c84387 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Tue, 29 Aug 2023 16:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=A8=A1=E5=9D=97(=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96=EF=BC=8C=E6=8F=90=E7=A4=BA=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=E4=BF=A1=E6=81=AF)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/order/index.vue | 73 +++++++++++++++++++++++++++++++---
 src/views/plan/plan/index.vue  | 12 +++++-
 2 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index c95053c..0d0850c 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -730,9 +730,51 @@ export default {
     /** 新增-提交按钮 */
     submitForm() {
       // 表单校验
-      if (this.checkNull(this.form.prodCode) == 0 || this.checkNull(this.form.planProDate) == 0 || this.checkNull(this.form.prodDesc) == 0 || this.checkNull(this.form.planComplete) == 0 || this.checkNull(this.form.quantity) == 0 || this.checkNull(this.form.unit) == 0 || this.checkNull(this.form.prodType) == 0) {
+      if (this.checkNull(this.form.prodCode) == 0) {
         this.$message({
-          message: '数据不能为空！',
+          message: '物料号不能为空！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.checkNull(this.form.planProDate) == 0) {
+        this.$message({
+          message: '请选择计划生产日期！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.checkNull(this.form.planComplete) == 0) {
+        this.$message({
+          message: '请选择计划完成日期！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.checkNull(this.form.prodDesc) == 0) {
+        this.$message({
+          message: '物料名称不能为空！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.checkNull(this.form.quantity) == 0) {
+        this.$message({
+          message: '请填写订单数量！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.checkNull(this.form.unit) == 0) {
+        this.$message({
+          message: '请填写单位！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.checkNull(this.form.prodType) == 0) {
+        this.$message({
+          message: '请选择产品类型！',
           type: 'warning'
         })
         return
@@ -790,16 +832,37 @@ export default {
     /** 拆分提交按钮 */
     batchBtn() {
       // 判断数据不能为空
-      if (this.splitForm.splitNum == null || this.splitForm.shiftId == null || this.splitForm.prodLineCode == null || this.splitForm.routeCode == null) {
+      if (this.splitForm.splitNum == null) {
+        this.$message({
+          message: '拆分数量不能为空！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.splitForm.shiftId == null) {
+        this.$message({
+          message: '班次信息不能为空！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.splitForm.prodLineCode == null) {
         this.$message({
-          message: '数据不能为空！',
+          message: '请选择机型！',
           type: 'warning'
         })
         return
       }
       if (this.splitForm.routeCode == null) {
         this.$message({
-          message: '数据不能为空！',
+          message: '请选择工艺信息！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.splitForm.productDate == null) {
+        this.$message({
+          message: '请选择工单日期！！',
           type: 'warning'
         })
         return
diff --git a/src/views/plan/plan/index.vue b/src/views/plan/plan/index.vue
index d3f302a..47bc2e8 100644
--- a/src/views/plan/plan/index.vue
+++ b/src/views/plan/plan/index.vue
@@ -535,13 +535,21 @@ export default {
         })
         return
       }
-      if (this.form.bucketId == null || this.form.productId == null) {
+      if (this.form.bucketId == null){
         this.$message({
-          message: '数据不能为空！',
+          message: '请选择料管！',
+          type: 'warning'
+        })
+        return
+      }
+      if (this.form.productId == null){
+        this.$message({
+          message: '请选择物料！',
           type: 'warning'
         })
         return
       }
+      return
       // 数据校验班次冲突问题
       if (this.checkSelect === false) {
         this.$message({