From d83c806437d794eaa020f436b8ce6a3f72392049 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 06 十二月 2024 08:54:48 +0800
Subject: [PATCH] 修改样机完成时间在其他成品时不显示
---
src/components/do/b1-ins-order/add.vue | 4 +---
src/main.js | 12 ++++++------
src/components/do/b1-inspect-order-plan/Inspection.vue | 1 +
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index b2bd3d5..01ac43a 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1930,9 +1930,7 @@
this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
}else if (!this.addObj.appointed) {
this.$message.error('璇烽�夋嫨绾﹀畾鏃堕棿')
- }else if (!this.addObj.issueTime) {
- this.$message.error('璇烽�夋嫨鏍锋満瀹屾垚鏃堕棿')
- } else if (!this.sampleList.every(m => m.standardMethodListId&&m.standardMethodListId.length>0)) {
+ }else if (!this.sampleList.every(m => m.standardMethodListId&&m.standardMethodListId.length>0)) {
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
} else if(this.addObj.formType&&this.addObj.formType!='鍏朵粬鎴愬搧'&&!this.addObj.issueUser){
this.$message.error('璇烽�夋嫨閫氱煡鑷虫牱鏈哄憳')
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index b04a320..e5891dd 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -761,6 +761,7 @@
style="width: 80px !important;"
:on-error="onError" ref='upload'>
<el-button size="small" type="primary" v-if="state==1">闄勪欢涓婁紶</el-button></el-upload>
+ <!-- <span v-if="sonLaboratory === '杩滃満'||sonLaboratory === '杩戝満'" style="color: red;font-size: 12px;">杈愬皠璇曢獙灏介噺涓婁紶璁惧瀵煎嚭鐨刢sv鏂囦欢锛屼笉鐒惰Е鍙戜笉浜嗘姤鍛婄敓鎴�</span> -->
<ValueTable class="value-table" ref="fileList" :url="$api.insOrderPlan.getFileList"
:componentData="componentData0"
:delUrl="$api.insOrderPlan.delfile"
diff --git a/src/main.js b/src/main.js
index 107ecf3..0d347c7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,15 +21,15 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://172.20.10.5:8001';
+// const javaApi = 'http://172.20.10.5:8001';
-// //閫氫俊娴嬭瘯搴�
-// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
-// const javaApi = 'http://10.1.13.77:8001';
+//閫氫俊娴嬭瘯搴�
+Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
+const javaApi = 'http://10.1.13.77:8001';
// 閫氫俊姝ｅ紡搴�
-Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";
-const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
+// Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";
+// const javaApi = 'https://ztwxlims.ztt.cn:7443/lims/';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
--
Gitblit v1.9.3