From ef5b6af01dc1c26635baf7564b4bc2618d5d1353 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期二, 02 七月 2024 16:55:47 +0800
Subject: [PATCH] 下单页面—温度循环要求填写弹框开发联调
---
src/components/do/b1-ins-order/add.vue | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 81458d7..5461704 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -436,6 +436,7 @@
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>妫�楠岄」</span>
<el-input
+ v-if="active==1"
v-model="inspectionItem"
@input="searchFilterList"
size="mini"
@@ -449,6 +450,7 @@
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>妫�楠岄」瀛愰」</span>
<el-input
+ v-if="active==1"
v-model="inspectionItemSubclass"
@input="searchFilterList"
size="mini"
@@ -463,6 +465,7 @@
<div style="display: flex;align-items: center;flex-direction: column;font-size: 14px">
<span>璇曢獙鏂规硶</span>
<el-input
+ v-if="active==1"
v-model="methodS"
@input="searchFilterList"
size="mini"
@@ -1098,22 +1101,31 @@
this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
return
}
+
const opticalProjectList = JSON.parse(JSON.stringify(this.opticalProjectList))
let entrustTime = this.circulateForm.entrustTime
let entrustNum = this.circulateForm.entrustNum
let temperaturePoint1 = JSON.parse(JSON.stringify(this.temperatureData))
-
+ temperaturePoint1.forEach(t => {
+ if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
+ throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
+ }
+ })
let temperaturePoint = JSON.parse(JSON.stringify(this.temperatureData))
- temperaturePoint.unshift({temperaturePoint: 20, askSymbol: null, askNum: null})
+ temperaturePoint.unshift({temperaturePoint: 20})
let askArr = []
let opticalProjectArr = []
// 鎷兼帴瑕佹眰鍊糰sk
opticalProjectList.forEach(o => {
opticalProjectArr.push(o.value)
temperaturePoint.forEach(t => {
- t.temperaturePoint = t.temperaturePoint + '鈩�'
- const askObj = t.temperaturePoint + ',' + o.value + ',' + t.askSymbol + t.askNum
- askArr.push(askObj)
+ if (!t.askSymbol) {
+ const askObj = t.temperaturePoint + '鈩�' + ',' + o.value + ',' + null
+ askArr.push(askObj)
+ } else {
+ const askObj = t.temperaturePoint + '鈩�' + ',' + o.value + ',' + t.askSymbol + t.askNum
+ askArr.push(askObj)
+ }
})
})
askArr.push(this.circulateForm.entrustNum)
@@ -1129,9 +1141,6 @@
temperaturePointList.push(t.temperaturePoint)
})
temperaturePoint1.forEach(t => {
- if (!t.temperaturePoint || !t.askSymbol || !t.askNum) {
- throw this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
- }
t.temperaturePoint = t.temperaturePoint + '鈩�'
askNum.push(t.askSymbol + t.askNum + 'dB/Km')
temperaturePointList2.push(t.temperaturePoint)
@@ -1140,6 +1149,7 @@
askNum.forEach(a => {
additionArr.push(temperaturePointList2.join(',') + a)
})
+ temperaturePointList2.unshift(20 + '鈩�')
const tell = '娓╁害鑼冨洿:' + temperaturePointList2.join(',') + ';' + '淇濇俯鏃堕棿:' + entrustTime + ';' + '寰幆娆℃暟:'
+ entrustNum + ';' + '鍏夌氦(' + opticalProjectArr.join(',') + ')' + '闄勫姞琛板噺缁濆鍊�:' + additionArr.join(';')
this.productList.forEach(item => {
@@ -1148,6 +1158,8 @@
item.tell = tell
}
})
+ console.log('ask---', ask)
+ console.log('tell---', tell)
this.circulateShow = false
},
beforeCirculateShowClose () {
@@ -1324,7 +1336,7 @@
}
})
console.log('isHaveBushing===', isHaveBushing)
- if (productListSelected && select[2] === '鍏夌紗' && !isHaveBushing) {
+ if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
return
}
--
Gitblit v1.9.3