From 21a4511adc7e897daaadff712a97db5773ba3629 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 04 七月 2024 18:14:44 +0800
Subject: [PATCH] 检验下单跳转
---
src/components/do/b1-ins-order/add.vue | 5 +++++
src/main.js | 10 +++++-----
src/components/do/b1-inspect-order-plan/Inspection.vue | 4 ++--
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index f350fbc..346e0b1 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1377,6 +1377,11 @@
console.log('isHaveBushing===', isHaveBushing)
if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
+
+ this.$refs.sampleTable.setCurrentRow(this.currentMethod, true)
+ this.rowClick(this.currentMethod)
+ this.sampleIds = [this.currentMethod.id]
+ this.openConfig()
return
}
let sampleList = this.HaveJson(this.sampleList)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 7e56d4e..48806e7 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -953,7 +953,7 @@
methods: {
changeItem(row){
if(row.value0&&row.value1){
- this.$set(row,'comValue',((Number(row.value0)+Number(row.value1))/2).toFixed(5))
+ this.$set(row,'comValue',((Number(row.value0)+Number(row.value1))/2).toFixed(3))
}else{
return
}
@@ -978,7 +978,7 @@
}
}]
if(this.wareForm.inspectionItemSubclass!=20){
- row.resValue = row.comValue?Math.abs(row.comValue-20).toFixed(5):''
+ row.resValue = row.comValue?Math.abs(row.comValue-20).toFixed(3):''
this.param[row.id].resValue.v.v = row.resValue
if(row.ask&&row.resValue){
if(row.ask.includes('<')){
diff --git a/src/main.js b/src/main.js
index 718081f..c684668 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,12 +15,12 @@
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';
-// const javaApi = 'http://192.168.47.249:8001';
+const javaApi = 'http://192.168.47.249:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
@@ -31,8 +31,8 @@
// const javaApi = 'http://10.1.200.86:8001';
//瑁呭鐢电紗娴嬭瘯搴�
-Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
-const javaApi = 'http://10.16.173.59:8001';
+// Vue.prototype.LOCATIONVUE = "http://10.16.173.59";
+// const javaApi = 'http://10.16.173.59:8001';
Vue.prototype.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val))
--
Gitblit v1.9.3