From 5104054c6c7a28c3d97a66c1e614897a6db28ba0 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 08 六月 2024 17:39:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-ins-order/add.vue | 61 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 8 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 64dbde7..210ac64 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>
@@ -451,7 +451,7 @@
<el-col class="search_thing" :span="22">
<div class="search_label"><span class="required-span" v-if="addObj.type == 2">* </span>鎸囨淳浜哄憳锛�</div>
<div class="search_input">
- <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" filterable style="width: 100%;">
<el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -509,6 +509,15 @@
</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>
</el-row>
<el-row v-if="bsm2">
<el-col class="search_thing" :span="22">
@@ -521,9 +530,29 @@
</el-col>
<el-col style="margin-top: 6px;">
<el-col v-for="(a,ai) in bsm2Val2" :key="ai">
- <el-col :span="10" class="pairing">{{a[0]}}</el-col>
+ <el-col :span="10">
+ <el-select v-model="a[0]" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="(item,index) in sampleList"
+ :key="index"
+ :label="index+1"
+ :value="index+1">
+ </el-option>
+ </el-select>
+ </el-col>
+ <!-- <el-col :span="10" class="pairing">{{a[0]}}</el-col> -->
<el-col :span="4" class="pairing" style="border: 0;color: rgba(0, 0, 0, 0.2);">鈥斺��</el-col>
- <el-col :span="10" class="pairing">{{a[1]}}</el-col>
+ <el-col :span="10">
+ <el-select v-model="a[1]" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="(item,index) in sampleList"
+ :key="index"
+ :label="index+1"
+ :value="index+1">
+ </el-option>
+ </el-select>
+ </el-col>
+ <!-- <el-col :span="10" class="pairing">{{a[1]}}</el-col> -->
</el-col>
</el-col>
</el-row>
@@ -895,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') ? '' : (
@@ -902,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
@@ -1105,6 +1132,8 @@
this.sampleList.push(this.HaveJson(this.sample))
this.count++
}
+ this.computationalPairing(this.sampleList.length)
+ this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
},
selectSample(val) {
this.sampleIds = []
@@ -1576,6 +1605,22 @@
this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
return
}
+ let set = new Set()
+ for (let i=0;i<this.bsm2Val2.length;i++){
+ let num0 = set.size
+ set.add(JSON.stringify(this.bsm2Val2[i]))
+ let num1 = set.size
+ if(num1==num0){
+ this.$message.error('鍏宠仈椤圭洰涓嶈兘閲嶅')
+ return
+ }
+ set.add(JSON.stringify(this.bsm2Val2[i].reverse()))
+ let num2 = set.size
+ if(num1==num2){
+ this.$message.error('鍏宠仈椤圭洰涓嶈兘閲嶅')
+ return
+ }
+ }
}
done()
},
--
Gitblit v1.9.3