From 997835429a1d66643364091e8437ebbbeb8ff97a Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop

---
 src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue |   44 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
index 5473197..807a942 100644
--- a/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
+++ b/src/views/mdc/base/modules/mdcStandardProcessDuration/MdcStandardProcessDurationModal.vue
@@ -121,6 +121,38 @@
               },
             ],
           },
+          partsCode:{
+            rules:[
+              {
+                required:true,
+                message: "璇疯緭鍏ラ浂浠跺彿"
+              },
+            ],
+          },
+          batchCode:{
+            rules:[
+              {
+                required:true,
+                message: "璇疯緭鍏ユ壒娆″彿"
+              },
+            ],
+          },
+          sequenceNumber:{
+            rules:[
+              {
+                required:true,
+                message: "璇疯緭鍏ョ▼搴忓彿"
+              },
+            ],
+          },
+          duration:{
+            rules:[
+              {
+                required:true,
+                message: "璇疯緭鍏ユ椂闀�"
+              },
+            ],
+          },
         },
 
         url: {
@@ -256,11 +288,19 @@
                 }
                 obj.then((res) => {
                   if (res.success) {
-                    that.$message.success("娣诲姞鎴愬姛")
+                    // that.$message.success("娣诲姞鎴愬姛")
+                    that.$notification.success({
+                      message:'娑堟伅',
+                      description:"娣诲姞鎴愬姛"
+                    });
                     // that.$message.success(res.message)
                     that.$emit('ok', res.result)
                   } else {
-                    that.$message.warning(res.message)
+                    // that.$message.warning(res.message)
+                    that.$notification.warning({
+                      message:'娑堟伅',
+                      description:res.message
+                    });
                   }
                 }).finally(() => {
                   that.confirmLoading = false

--
Gitblit v1.9.3