From 000baa046586568ec93f86bc61f087594750bcaf Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 12 六月 2024 07:18:24 +0800
Subject: [PATCH] 小功能修复
---
src/components/do/b1-ins-order/add.vue | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index f366463..7400a9b 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -117,7 +117,7 @@
<span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
</el-button>
<el-button size="medium" type="primary" @click="openEquipConfig"
- v-if="PROJECT==='瑁呭鐢电紗' && active==1">鐢电紗閰嶇疆</el-button>
+ v-if="active==1">瀛愭牱鍝侀厤缃�</el-button>
<el-button size="medium" type="primary" @click="openConfig"
v-if="addObj.sampleType==='鍏夌紗'">鍏夌氦閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">鎻愪氦</el-button>
@@ -506,6 +506,15 @@
<el-radio-group v-model="bsm1Val" @input="upBsm1">
<el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai"
:label="a">{{JSON.parse(bsmRow.ask)[ai]}}</el-radio>
+ </el-radio-group>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label">鍗曚环锛�</div>
+ <div class="search_input" v-show="bsm1Val!==null&&bsm1Val!==''">
+ <el-radio-group v-model="bsm1Val" @input="upBsm1">
+ <el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai"
+ :label="a">{{JSON.parse(bsmRow.price)[ai]}}</el-radio>
</el-radio-group>
</div>
</el-col>
@@ -915,6 +924,7 @@
}
this.saveLoad = true
this.$axios.post(this.$api.insOrder.addInsOrder, {
+ str: JSON.stringify({
insOrder: this.addObj,
list: JSON.stringify(sampleList.map(a => {
a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : (
@@ -922,10 +932,7 @@
return a
})),
pairing: JSON.stringify(this.bsm2Val2)
- }, {
- headers: {
- 'Content-Type': 'application/json'
- }
+ })
}).then(res => {
this.saveLoad = false
if (res.code == 201) return
@@ -1112,6 +1119,7 @@
addStandardTree() {
if (this.selectTree == null) return
this.sampleList = []
+ this.productList = []
for (var i = 0; i < this.addObj.sampleNum; i++) {
this.sample.joinName = null
this.sample.joinModel = null
@@ -1194,8 +1202,13 @@
this.computationalPairing(this.sampleList.length)
this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
}
- } else if (row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && row.state === 1) {
+ } else if (row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && row.state === 1 && this.sampleList.length > 1) {
this.bsm2 = false
+ } else if(row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length < 2){
+ this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
+ row.state = row.state == 1 ? 0 : 1
+ this.$refs.productTable.toggleRowSelection(row, false)
+ return
}
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
@@ -1438,8 +1451,12 @@
this.computationalPairing(this.sampleList.length)
this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
}
- } else if (p.bsm === '1' && p.inspectionItem === '鐔旀帴鎹熻��' && p.state === 1) {
+ } else if (p.bsm === '1' && p.inspectionItem === '鐔旀帴鎹熻��' && p.state === 1 && this.sampleList.length > 1) {
this.bsm2 = false
+ } else if(p.bsm === '1' && p.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length < 2){
+ this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
+ this.$refs.productTable.clearSelection()
+ return
}
})
if (e.length > 0) {
--
Gitblit v1.9.3