From df1250120c3821ec701def9b899e3586a33beaa2 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 08 七月 2024 15:07:26 +0800
Subject: [PATCH] 修改检验下单
---
src/components/do/b1-ins-order/add.vue | 2 ++
src/main.js | 8 ++++----
src/components/do/b1-inspect-order-plan/Inspection.vue | 3 ---
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 1af6f2a..cc855de 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -458,6 +458,8 @@
</div>
</template>
</el-table-column>
+ <el-table-column prop="inspectionItemClass" v-if="PROJECT === '瑁呭鐢电紗'" label="妫�楠岄」鍒嗙被" min-width="140" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="inspectionItemClassEn" v-if="PROJECT === '瑁呭鐢电紗'" label="妫�楠岄」鍒嗙被(EN)" min-width="140" show-overflow-tooltip></el-table-column>
<el-table-column prop="sonLaboratory" label="瀛愬疄楠屽" min-width="130" show-overflow-tooltip :filters="filters"
:filter-method="filterHandler"></el-table-column>
<el-table-column prop="methodS" label="璇曢獙鏂规硶" min-width="120" show-overflow-tooltip>
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 74d7830..2769482 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1437,7 +1437,6 @@
count++
})
})
- // 闂寮�濮�
this.tableList.forEach(a => {
let dels = new Set()
let ids = []
@@ -1494,7 +1493,6 @@
}
}
})
- // return
ids.forEach(id => {
for (let b = 0; b < a.template.length; b++) {
if (a.template[b].r === id.r) {
@@ -1529,7 +1527,6 @@
}
})
})
- // 闂缁撴潫
this.tableList.forEach(a => {
let arrs = []
let set = new Set()
diff --git a/src/main.js b/src/main.js
index 4ebb9c9..817cd9a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,8 +15,8 @@
Vue.prototype.$Big = Big;
// 椤圭洰鍒囨崲
-Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
-// Vue.prototype.PROJECT = '瑁呭鐢电紗'
+// Vue.prototype.PROJECT = '妫�娴嬩腑蹇�'
+Vue.prototype.PROJECT = '瑁呭鐢电紗'
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
@@ -28,11 +28,11 @@
//妫�娴嬩腑蹇冩寮忓簱
// Vue.prototype.LOCATIONVUE = "http://10.1.200.86:8080";
-const javaApi = 'http://10.1.200.86:8001';
+// const javaApi = 'http://10.1.200.86:8001';
//瑁呭鐢电紗娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
-// const javaApi = 'http://10.16.173.59:8001';
+const javaApi = 'http://10.16.173.59:8001';
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
--
Gitblit v1.9.3