From fe488157d08f14aed6b59dcea39264bc3c9b62cc Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 18 六月 2024 03:04:06 +0800
Subject: [PATCH] 修复大量bug
---
src/components/do/b1-ins-order/add.vue | 325 ++++++++++++++++++++++++++++--------------------------
1 files changed, 169 insertions(+), 156 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 228ecb9..2beb888 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -48,12 +48,27 @@
justify-content: space-between;
}
- .pairing{
+ .pairing {
text-align: center;
line-height: 36px;
margin: 3px 0;
border: 1px solid rgba(0, 0, 0, 0.1);
border-radius: 4px;
+ }
+
+ .askRts {
+ width: 100px;
+ font-size: 12px;
+ border-top: 0;
+ border-left: 0;
+ border-right: 0;
+ border-bottom: 2px solid rgba(0, 0, 0, 0.3);
+ text-align: center;
+ background-color: rgba(0, 0, 0, 0.1);
+ outline: none;
+ border-radius: 2px;
+ line-height: 24px;
+ margin-top: 5px;
}
</style>
<style>
@@ -118,10 +133,8 @@
</el-button>
<el-button size="medium" type="primary" @click="openCableConfig"
v-if="active==1&&PROJECT=='瑁呭鐢电紗'">鐢电紗閰嶇疆</el-button>
- <el-button size="medium" type="primary" @click="openEquipConfig"
- 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="openEquipConfig" 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>
<!-- 瀹℃牳 -->
<el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3"
@@ -312,12 +325,9 @@
<div class="search_thing">
<div class="search_label">鏍峰搧鍨嬪彿锛�</div>
<div class="search_input">
- <el-select v-model="model" placeholder="璇烽�夋嫨" filterable allow-create default-first-option size="small" @change="changeModel">
- <el-option
- v-for="item in models"
- :key="item.value"
- :label="item.label"
- :value="item.value">
+ <el-select v-model="model" placeholder="璇烽�夋嫨" filterable allow-create default-first-option size="small"
+ @change="changeModel">
+ <el-option v-for="item in models" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</div>
@@ -326,10 +336,8 @@
<div class="search_label">妫�楠屾爣鍑嗭細</div>
<div class="search_input">
<el-select v-model="standardMethodListId" placeholder="璇烽�夋嫨" size="small" @focus="methodFocus"
- :loading="methodLoad" @change="changeStandardMethodListId">
- <el-option
- v-for="item in methods"
- :key="item.id" :label="item.code" :value="item.id" >
+ :loading="methodLoad" @change="changeStandardMethodListId">
+ <el-option v-for="item in methods" :key="item.id" :label="item.code" :value="item.id">
</el-option>
</el-select>
</div>
@@ -341,13 +349,13 @@
<el-table-column type="index" label="搴忓彿" width="65" align="center"></el-table-column>
<el-table-column prop="sample" label="鏍峰搧鍚嶇О" align="center" min-width="100">
<template slot-scope="scope">
- <el-input size="small" v-model="scope.row.sample" clearable :disabled="active>1"></el-input>
+ <el-input size="small" v-model="scope.row.sample" clearable :readonly="active>1"></el-input>
</template>
</el-table-column>
<el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" min-width="140" align="center">
<template slot-scope="scope">
<el-input size="small" v-model="scope.row.sampleCode" clearable placeholder="涓嶅～鍐欏垯绯荤粺鑷姩鐢熸垚"
- :disabled="active>1"></el-input>
+ :readonly="active>1"></el-input>
</template>
</el-table-column>
<el-table-column prop="model" label="鏍峰搧鍨嬪彿" align="center" min-width="100">
@@ -394,7 +402,7 @@
:controls="false" style="width: 80%;"></el-input-number>
</template>
</el-table-column>
- <el-table-column prop="proNum" label="寰呮椤规暟閲�" width="105" align="center" ></el-table-column>
+ <el-table-column prop="proNum" label="寰呮椤规暟閲�" width="105" align="center"></el-table-column>
</el-table>
<el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border
@selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
@@ -418,7 +426,17 @@
<el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable type="textarea"
:autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row)"
v-if="active==1&&isAskOnlyRead"></el-input>
- <span v-else>{{ scope.row.ask }}</span>
+ <span v-else>
+ <template v-if="(scope.row.ask.indexOf('D')>-1
+ ||scope.row.ask.indexOf('W')>-1
+ ||scope.row.ask.indexOf('X')>-1
+ ||scope.row.ask.indexOf('RTS')>-1
+ ||scope.row.ask.indexOf('H')>-1
+ ||scope.row.ask.indexOf('L')>-1)&&active==1">
+ <input class="askRts" v-model="scope.row.rts" /><br />{{ scope.row.ask }}
+ </template>
+ <template v-else>{{ scope.row.ask }}</template>
+ </span>
</template>
</el-table-column>
</el-table>
@@ -486,7 +504,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" filterable 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>
@@ -519,17 +537,15 @@
</el-row>
</span>
</el-dialog>
- <fiberOpticConfig :currentId="currentId"
- @saveFiberopticConfig="getTotal()"
- v-if="configShow" :active="active" />
- <equipConfig :currentId="currentId"
- v-if="equipConfigShow" :active="active"/>
- <cableConfig v-if="cableConfigShow" :active="active" />
- <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1Dia" width="500px" :show-close="false" :before-close="beforeClose">
+ <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow" :active="active" />
+ <equipConfig :currentId="currentId" v-if="equipConfigShow" :active="active" />
+ <cableConfig v-if="cableConfigShow" :active="active" />
+ <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1Dia" width="500px" :show-close="false"
+ :before-close="beforeClose">
<div class="body" style="max-height: 60vh;">
<el-row v-if="bsm1">
<el-col class="search_thing" :span="22">
- <div class="search_label"><span class="required-span">* </span>鎶ゅ瀵嗗害锛�</div>
+ <div class="search_label"><span class="required-span">* </span>閫夐」锛�</div>
<div class="search_input">
<el-radio-group v-model="bsm1Val" @input="upBsm1">
<el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai" :label="a"></el-radio>
@@ -545,22 +561,13 @@
</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">
<div class="search_label" style="width: 220px;"><span class="required-span">* </span>鏍峰搧鐔旀帴閰嶅鏁伴噺锛�</div>
<div class="search_input">
- <el-input-number size="medium" v-model="bsm2Val" :min="1" :max="bsm2Val3.length" :precision="0" style="width: 70%;"
- :controls="false" @change="bsm2Up"></el-input-number>
+ <el-input-number size="medium" v-model="bsm2Val" :min="1" :max="bsm2Val3.length" :precision="0"
+ style="width: 70%;" :controls="false" @change="bsm2Up"></el-input-number>
<span>MAX锛歿{bsm2Val3.length}}</span>
</div>
</el-col>
@@ -568,11 +575,7 @@
<el-col v-for="(a,ai) in bsm2Val2" :key="ai">
<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 v-for="(item,index) in sampleList" :key="index" :label="index+1" :value="index+1">
</el-option>
</el-select>
</el-col>
@@ -580,11 +583,7 @@
<el-col :span="4" class="pairing" style="border: 0;color: rgba(0, 0, 0, 0.2);">鈥斺��</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 v-for="(item,index) in sampleList" :key="index" :label="index+1" :value="index+1">
</el-option>
</el-select>
</el-col>
@@ -756,20 +755,20 @@
bsm1Val: null,
bsm1Dia: false,
equipConfigShow: false,
- cableConfigShow:false,
+ cableConfigShow: false,
bsm2: false,
bsm2Val: null,
bsm2Dia: false,
bsm2Val2: [],
bsm2Val3: [],
- bsmRow3:null,
- bsm3Val:null,
- bsm3Dia:false,
+ bsmRow3: null,
+ bsm3Val: null,
+ bsm3Dia: false,
total: 0,
RTS: '',
totalArr: [],
- model:null,
- standardMethodListId:null,
+ model: null,
+ standardMethodListId: null,
}
},
watch: {
@@ -800,11 +799,11 @@
this.getTotal()
}
},
- 'addObj.sample'(val){
+ 'addObj.sample'(val) {
this.model = null
this.standardMethodListId = null
},
- 'addObj.sampleNum'(val){
+ 'addObj.sampleNum'(val) {
this.model = null
this.standardMethodListId = null
}
@@ -874,36 +873,43 @@
this.addObj.companyId = selects.id
this.selectUserDia = false
},
- handleAsk(ask,rts) {
- let code = [">", "<", "=", "锛�", "锛�", "鈮�", "鈮�", "卤"];
- if (ask.includes('RTS')) {
- if (ask.includes('&')) {
- // 澶氫釜鏉′欢
- let arr0 = ask.split('&')
- let arr1 = []
- arr0.forEach(m => {
- let index = code.findIndex(b => m.includes(b))
+ handleAsk(ask, rts) {
+ try{
+ let code = [">", "<", "=", "锛�", "锛�", "鈮�", "鈮�", "卤"];
+ if (ask.includes('RTS') || ask.includes('D') || ask.includes('W') ||
+ ask.includes('X') || ask.includes('H') || ask.includes('L')) {
+ if (ask.includes('&')) {
+ // 澶氫釜鏉′欢
+ let arr0 = ask.split('&')
+ let arr1 = []
+ arr0.forEach(m => {
+ let index = code.findIndex(b => m.includes(b))
+ if (index > -1) {
+ let arr = m.split(code[index]).filter(b => !!b)
+ let num = eval(this.replaceAll(arr[0], 'RTS', rts))
+ m = code[index] + '' + num
+ arr1.push(m)
+ }
+ })
+ return arr1.join('&')
+ } else {
+ // 鍗曚釜鏉′欢
+ let index = code.findIndex(b => ask.includes(b))
if (index > -1) {
- let arr = m.split(code[index]).filter(b => !!b)
+ let arr = ask.split(code[index]).filter(b => !!b)
let num = eval(this.replaceAll(arr[0], 'RTS', rts))
- m = code[index] + '' + num
- arr1.push(m)
+ return code[index] + '' + num
}
- })
- return arr1.join('&')
- } else {
- // 鍗曚釜鏉′欢
- let index = code.findIndex(b => ask.includes(b))
- if (index > -1) {
- let arr = ask.split(code[index]).filter(b => !!b)
- let num = eval(this.replaceAll(arr[0], 'RTS', rts))
- return code[index] + '' + num
}
}
- }
+ }catch(e){}
},
- replaceAll(str, find, replace) {
- return str.replace(new RegExp(find, 'g'), replace);
+ replaceAll(str, find, rts) {
+ if (rts === undefined) {
+ return str
+ }
+ return str.replace('RTS', rts).replace('D', rts).replace('W', rts).replace('X', rts).replace('H', rts).replace(
+ 'L', rts);
},
save() {
if (!this.addObj.companyId) {
@@ -930,29 +936,31 @@
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
} else {
let sampleList = this.HaveJson(this.sampleList)
- let isRTS = this.totalArr.find(a=>a.ask!=null&&a.ask.includes('RTS')&&a.state==1)
- if(isRTS){
- sampleList.forEach(item=>{
- if(item.insProduct&&item.insProduct.length>0){
- item.insProduct.forEach(a=>{
- if(a.state==1){
- let ask = this.handleAsk(a.ask,a.rts)
- if(ask&&a.state==1){
+ let isRTS = this.totalArr.find(a => a.ask != null && (a.ask.includes('RTS') || a.ask.includes('D') || a.ask
+ .includes('W') ||
+ a.ask.includes('X') || a.ask.includes('H') || a.ask.includes('L')) && a.state == 1)
+ if (isRTS) {
+ sampleList.forEach(item => {
+ if (item.insProduct && item.insProduct.length > 0) {
+ item.insProduct.forEach(a => {
+ if (a.state == 1) {
+ let ask = this.handleAsk(a.ask, a.rts)
+ if (ask && a.state == 1) {
a.ask = ask
}
}
})
}
// 鍏夌氦甯﹂」鐩�
- if(item.bushing&&item.bushing.length>0){
- item.bushing.forEach(a=>{
- if(a.fiber&&a.fiber.length>0){
- a.fiber.forEach(b=>{
- if(b.productList&&b.productList.length>0){
- b.productList.forEach(c=>{
- if(c.state==1){
- let ask = this.handleAsk(c.ask,c.rts)
- if(ask&&c.state==1){
+ if (item.bushing && item.bushing.length > 0) {
+ item.bushing.forEach(a => {
+ if (a.fiber && a.fiber.length > 0) {
+ a.fiber.forEach(b => {
+ if (b.productList && b.productList.length > 0) {
+ b.productList.forEach(c => {
+ if (c.state == 1) {
+ let ask = this.handleAsk(c.ask, c.rts)
+ if (ask && c.state == 1) {
c.ask = ask
}
}
@@ -960,25 +968,25 @@
}
})
}
- if(a.fibers&&a.fibers.length>0){
- a.fibers.forEach(b=>{
- if(b.productList&&b.productList.length>0){
- b.productList.forEach(c=>{
- if(c.state==1){
- let ask = this.handleAsk(c.ask,c.rts)
- if(ask&&c.state==1){
+ if (a.fibers && a.fibers.length > 0) {
+ a.fibers.forEach(b => {
+ if (b.productList && b.productList.length > 0) {
+ b.productList.forEach(c => {
+ if (c.state == 1) {
+ let ask = this.handleAsk(c.ask, c.rts)
+ if (ask && c.state == 1) {
c.ask = ask
}
}
})
}
- if(b.fiber&&b.fiber.length>0){
- b.fiber.forEach(c=>{
- if(c.productList&&c.productList.length>0){
- c.productList.forEach(d=>{
- if(d.state==1){
- let ask = this.handleAsk(d.ask,d.rts)
- if(ask){
+ if (b.fiber && b.fiber.length > 0) {
+ b.fiber.forEach(c => {
+ if (c.productList && c.productList.length > 0) {
+ c.productList.forEach(d => {
+ if (d.state == 1) {
+ let ask = this.handleAsk(d.ask, d.rts)
+ if (ask) {
d.ask = ask
}
}
@@ -995,19 +1003,22 @@
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') ? '' : (
- '-' + a.modelNum))
- return a
- })),
- pairing: JSON.stringify(this.bsm2Val2)
+ insOrder: this.addObj,
+ list: JSON.stringify(sampleList.map(a => {
+ a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ?
+ '' : (
+ '-' + a.modelNum))
+ return a
+ })),
+ pairing: JSON.stringify(this.bsm2Val2)
})
}).then(res => {
this.saveLoad = false
if (res.code == 201) return
this.$message.success('宸叉彁浜�')
this.$parent.playOrder(0)
+ }).catch(e=>{
+ this.saveLoad = false
})
}
},
@@ -1095,9 +1106,9 @@
this.addObj.productionEn = '/'
})
},
- getProNum(){
- this.sampleList.forEach((m,i)=>{
- Vue.set(this.sampleList[i],'proNum',m.insProduct.filter(a=>a.state==1).length)
+ getProNum() {
+ this.sampleList.forEach((m, i) => {
+ Vue.set(this.sampleList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
})
this.$refs.sampleTable.doLayout()
},
@@ -1124,9 +1135,9 @@
},
getNodeParent(val) {
if (val.parent != null) {
- if(val.data.children === null){
+ if (val.data.children === null) {
this.selectTree += ' - ' + val.label + ' - ' + ''
- }else{
+ } else {
this.selectTree += ' - ' + val.label
}
this.getNodeParent(val.parent)
@@ -1153,11 +1164,9 @@
this.addObj.factory = trees[0]
this.addObj.laboratory = trees[1]
this.addObj.sampleType = trees[2]
- if(trees[3]===''){
- this.addObj.sample = (trees[4] == undefined ? null : trees[4])
- }else if(trees[3]===undefined){
+ if (trees[3] === undefined || trees[3] === '') {
this.addObj.sample = trees[2]
- }else{
+ } else {
this.addObj.sample = trees[3]
}
this.addObj.model = (trees[4] == undefined ? null : trees[4])
@@ -1218,6 +1227,9 @@
this.sample.standardMethodListId = null
this.sample.insProduct = []
this.sample.id = this.count
+ this.sample.childSampleList = []
+ this.sample.insulating = null
+ this.sample.sheath = null
this.sampleList.push(this.HaveJson(this.sample))
this.count++
}
@@ -1286,20 +1298,20 @@
if (row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length > 1 && row.state === 1) {
this.bsm2 = true
this.bsm1Dia = true
- if(this.bsm2Val2.length === 0){
+ if (this.bsm2Val2.length === 0) {
this.bsm2Val = (this.sampleList.length - 1) * this.sampleList.length / 2
this.computationalPairing(this.sampleList.length)
this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
}
} 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){
+ } 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
}
- if (row.ask.includes('RTS')&&row.state === 1) {
+ /* if (row.ask.includes('D')&&row.state === 1) {
this.bsmRow3 = null;
row.rts = ''
this.bsm3Val = ''
@@ -1307,7 +1319,7 @@
this.bsmRow3 = row
}else{
this.bsm3Dia = false
- }
+ } */
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
item.insProduct.map(m => {
@@ -1322,6 +1334,7 @@
},
permute(nums) {
const result = [];
+
function backtrack(temp, nums) {
if (temp.length === 2) {
result.push([...temp]);
@@ -1339,7 +1352,7 @@
backtrack([], nums);
return result;
},
- computationalPairing(n){
+ computationalPairing(n) {
const nums = [];
for (let i = 1; i <= n; i++) {
nums.push(i);
@@ -1480,18 +1493,18 @@
}, 200)
})
},
- changeModel(){
+ changeModel() {
this.sampleList.forEach(a => {
let obj = this.sampleIds.find(b => b == a.id)
- if(obj){
+ if (obj) {
a.model = this.model
}
})
},
- changeStandardMethodListId(){
+ changeStandardMethodListId() {
this.sampleList.forEach(a => {
let obj = this.sampleIds.find(b => b == a.id)
- if(obj){
+ if (obj) {
a.standardMethodListId = this.standardMethodListId
}
})
@@ -1563,25 +1576,25 @@
if (p.bsm === '1' && p.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length > 1 && p.state === 1) {
this.bsm2 = true
this.bsm1Dia = true
- if(this.bsm2Val2.length === 0){
+ if (this.bsm2Val2.length === 0) {
this.bsm2Val = (this.sampleList.length - 1) * this.sampleList.length / 2
this.computationalPairing(this.sampleList.length)
this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
}
} 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){
+ } else if (p.bsm === '1' && p.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length < 2) {
this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
this.$refs.productTable.clearSelection()
return
}
- if (p.ask.includes('RTS')&&p.state === 1) {
+ /* if (p.ask.includes('RTS')&&p.state === 1) {
p.rts = ''
this.bsm3Val = ''
this.bsm3 = true
this.bsm3Dia = true
this.bsmRow3.push(p)
- }
+ } */
})
if (e.length > 0) {
this.sampleList.map(item => {
@@ -1677,7 +1690,7 @@
})
}
},
- openEquipConfig(){
+ openEquipConfig() {
if (this.active === 1) {
if (this.sampleIds.length === 0) {
this.$message.error("鏈�夋嫨鏍峰搧")
@@ -1706,7 +1719,7 @@
// })
}
},
- openCableConfig(){
+ openCableConfig() {
if (this.active === 1) {
if (this.sampleIds.length === 0) {
this.$message.error("鏈�夋嫨鏍峰搧")
@@ -1769,17 +1782,17 @@
return
}
let set = new Set()
- for (let i=0;i<this.bsm2Val2.length;i++){
+ 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){
+ if (num1 == num0) {
this.$message.error('鍏宠仈椤圭洰涓嶈兘閲嶅')
return
}
set.add(JSON.stringify(this.bsm2Val2[i].reverse()))
let num2 = set.size
- if(num1==num2){
+ if (num1 == num2) {
this.$message.error('鍏宠仈椤圭洰涓嶈兘閲嶅')
return
}
@@ -1802,15 +1815,15 @@
done()
},
beforeClose0(done) {
- if(!this.bsm3Val){
+ if (!this.bsm3Val) {
this.$message.error('RST蹇呴』濉啓')
return
- }else{
- if(Array.isArray(this.bsmRow3)){
- this.bsmRow3.forEach(item=>{
+ } else {
+ if (Array.isArray(this.bsmRow3)) {
+ this.bsmRow3.forEach(item => {
item.rts = this.bsm3Val
})
- }else{
+ } else {
this.bsmRow3.rts = this.bsm3Val
}
}
@@ -1878,19 +1891,19 @@
this.total += Number(item.price)
})
},
- bsm2Up(val){
+ bsm2Up(val) {
let list = []
- for(let a=1;a < this.bsm2Val3.length + 1;a++){
+ for (let a = 1; a < this.bsm2Val3.length + 1; a++) {
list.push(a)
}
let set = new Set()
let size1 = set.length
- while(set.size < val){
+ while (set.size < val) {
set.add(Math.ceil(Math.random() * this.bsm2Val3.length))
}
this.bsm2Val2 = []
- for(let a of set){
- this.bsm2Val2.push(this.HaveJson(this.bsm2Val3[a-1]))
+ for (let a of set) {
+ this.bsm2Val2.push(this.HaveJson(this.bsm2Val3[a - 1]))
}
}
}
--
Gitblit v1.9.3