From 890cd9ab8cfbd642c7240413a2f2f51b7f6f0fa5 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 21 三月 2024 13:37:26 +0800
Subject: [PATCH] 完善下单

---
 src/components/do/b1-ins-order/add.vue |   10 +++-------
 src/main.js                            |    2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 9047fc3..e70fb5c 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -576,9 +576,7 @@
 			this.selectInsOrderTemplate()
 			this.getAuthorizedPerson();
 			this.selectEnumByCategoryForUnit()
-			if (this.active == 1) {
-				// 涓嬪崟娴佺▼
-			} else {
+			if (this.active != 1){
 				// 鏌ョ湅/瀹℃牳娴佺▼
 				// 璇锋眰鎺ュ彛锛屽洖鏄炬暟鎹�
 				this.$axios.post(this.$api.insOrder.getInsOrder, {
@@ -637,13 +635,11 @@
 					this.$message.error('鏈�夋嫨绱ф�ョ▼搴�')
 				} else if (this.sampleList.length < 1) {
 					this.$message.error('璇锋坊鍔犱竴涓牱鍝�')
-				} else if (!this.sampleList.every(m => m.sampleCode)) {
-					this.$message.error('杈撳叆鏍峰搧缂栧彿')
-				}else if (!this.sampleList.every(m => m.sample)) {
+				} else if (!this.sampleList.every(m => m.sample)) {
 					this.$message.error('杈撳叆鏍峰搧鍚嶇О')
 				}else if (!this.sampleList.every(m => m.model)) {
 					this.$message.error('杈撳叆鏍峰搧鍨嬪彿')
-				}else if (!this.sampleList.every(m => m.standardMethodListId)) {
+				}else if (!this.sampleList.every(m => m.method)) {
 					this.$message.error('閫夋嫨妫�楠屾爣鍑�')
 				}else if (!this.sampleList.every(m => m.unit)) {
 					this.$message.error('杈撳叆鍗曚綅')
diff --git a/src/main.js b/src/main.js
index cbc3174..018e938 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,7 +14,7 @@
 //鏈湴
 Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
 const javaApi = 'http://192.168.0.24:8001';//鏉�
-// const javaApi = 'http://114.132.189.42:9006';//鏉�
+// const javaApi = 'http://114.132.189.42:9006';//娴嬭瘯鏈�
 //鑳滀簯鏈嶅姟鍣�
 // Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
 // const javaApi = 'http://122.114.52.69:8001';

--
Gitblit v1.9.3