From d49f39681a68fd819ac687d67b6352ba386d0d13 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 25 四月 2024 12:12:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master

---
 vue.config.js                                              |    4 ++--
 src/views/plan/customerorder/sample-customerorder-form.vue |    4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/plan/customerorder/sample-customerorder-form.vue b/src/views/plan/customerorder/sample-customerorder-form.vue
index e87342d..765dc1a 100644
--- a/src/views/plan/customerorder/sample-customerorder-form.vue
+++ b/src/views/plan/customerorder/sample-customerorder-form.vue
@@ -409,6 +409,10 @@
       let isError = false
       _than.buttonDisable = true
       _than.tableData.forEach(ele=>{
+        if(ele.productType==null || ele.productType=='' || ele.productType==undefined){
+          _than.$message.error("浜у搧鐨勯毝灞炲搧鐗屼笉鑳戒负绌�!")
+          isError = true
+        }
         if(ele.buyQtyDue==null || ele.buyQtyDue=='' || ele.buyQtyDue==undefined){
           _than.$message.error("闆朵欢鏁伴噺涓嶈兘涓虹┖!")
           isError = true
diff --git a/vue.config.js b/vue.config.js
index e94f4c8..3b58a3e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,8 +6,8 @@
 
 
 // const url = 'https://ztms-mes.chinaztt.cn/'
-// const url = 'http://localhost:9999'
-const url = 'http://192.168.32.45:9999'
+ const url = 'http://localhost:9999'
+//const url = 'http://192.168.32.45:9999'
 
 
 const localUrl = 'http://localhost:8089'

--
Gitblit v1.9.3