From d975fc4756806f5b51f006c19c33571b9b8c0b3b Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期五, 20 十二月 2024 09:30:19 +0800 Subject: [PATCH] 修改下单时要求值输入限制 --- src/components/do/b1-ins-order/fiberoptic-config.vue | 470 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 457 insertions(+), 13 deletions(-) diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue index 59c3e2b..d58d897 100644 --- a/src/components/do/b1-ins-order/fiberoptic-config.vue +++ b/src/components/do/b1-ins-order/fiberoptic-config.vue @@ -40,7 +40,7 @@ <div class="search-item"> <label style="width: 100px">姣忔牴绠℃娊妫�妫�娴嬮噺</label> <el-input v-model="packageInfo.testNum" placeholder="璇疯緭鍏�" size="small" @blur="addTestNum" - :disabled="packageInfo.radio===0||active!=1" style="width:100px"></el-input> + :disabled="packageInfo.radio===0||active!=1" style="width:70px"></el-input> </div> </div> <el-table ref="table0" :data="bushing" tooltip-effect="dark" style="width: 100%" height="203px" size="small" @@ -95,7 +95,7 @@ </el-table-column> --> <el-table-column prop="ask" label="妫�娴嬭姹�" show-overflow-tooltip width="200px"> <template slot-scope="scope"> - <el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row)"></el-input> + <el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row,'ask')"></el-input> <span v-else>{{ scope.row.ask }}</span> </template> </el-table-column> @@ -110,7 +110,7 @@ </el-col> </el-row> <el-row :gutter="10"> - <el-col :span="12" v-if="packageInfo.ismiers"> + <el-col :span="12" v-if="packageInfo.ismiers && inspectionItemST != 1"> <div class="grid-content"> <h5>鍏夌氦甯� <el-button size="mini" type="primary" class="btns" @click="addFibers" @@ -192,7 +192,7 @@ </el-table> </div> </el-col> - <el-col :span="!packageInfo.ismiers?24:12"> + <el-col :span="!packageInfo.ismiers?24:12" v-if=" inspectionItemST != 1"> <div class="grid-content"> <h5>鍏夌氦 <el-button size="mini" type="primary" class="btns" @click="addFiber" @@ -365,6 +365,10 @@ type: Number, default: () => 0 }, + inspectionItemST: { + type: Number, + default: () => 0 + } }, data() { return { @@ -449,6 +453,7 @@ // } }, mounted() { + console.log('inspectionItemST',this.inspectionItemST); this.$parent.sampleIds.forEach(a => { for (var i = 0; i < this.$parent.sampleList.length; i++) { if (this.$parent.sampleList[i].id == a) { @@ -561,7 +566,133 @@ } }, - changeASk(row) { + changeASk(row,type) { + if(type == 'ask') { + // 濡傛灉妫�娴嬭姹傚惈鏈夋璐熷彿 + if(row.tell.indexOf('卤') != -1) { + let left = row.tell.substring(0,row.tell.indexOf('卤')) + let right = row.tell.substring(row.tell.indexOf('卤')+1) + // 濡傛灉鍙互杞寲涓烘暟鍊� + if(!isNaN(Number(left)) && !isNaN(Number(right))) { + if(row.ask.indexOf('-') != -1) { + let left1 = row.ask.substring(0,row.ask.indexOf('-')) + let right1 = row.ask.substring(row.ask.indexOf('-')+1) + if(Number(left1) != (Number(left) - Number(right)) || Number(right1) != (Number(left) + Number(right))) { + this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪') + row.ask = (Number(left) - Number(right)) + '-' + (Number(left) + Number(right)) + } + }else { + this.$message.error('妫�娴嬭姹備笉绗﹀悎瑙勮寖') + row.ask = left + '-' + right + return + } + } + // 濡傛灉瑕佹眰鎻忚堪宸﹁竟涓嶈兘杞寲涓烘暟鍊� + else if(isNaN(Number(left)) && !isNaN(Number(right))) { + const regex = /[~-]/ + const match = left.match(regex) + // 宸﹁竟鍚湁 - ~ 绗﹀彿 + if(match) { + let newLeft = ''; + if(left.includes('锛�')) { + newLeft = left.replace('锛�','(') + } + if(left.includes('锛�')) { + newLeft = newLeft.replace('锛�',')') + } + const regexTwo = /\((\d+(\.\d+)?)([~-])(\d+(\.\d+)?)\)/; + const matchTwo = newLeft.match(regexTwo); + let leftTwo = Number(matchTwo[1]) - Number(right) + let rightTwo = Number(matchTwo[4]) + Number(right) + console.log(matchTwo); + console.log(leftTwo,rightTwo); + + console.log(row.ask.indexOf('-')); + if(row.ask.indexOf('-') != -1) { + let left1 = row.ask.substring(0,row.ask.indexOf('-')) + let right1 = row.ask.substring(row.ask.indexOf('-')+1) + if(Number(left1) != leftTwo || Number(right1) != rightTwo) { + this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪') + row.ask = leftTwo + '-' + rightTwo + } + }else { + this.$message.error('妫�娴嬭姹備笉绗﹀悎瑙勮寖') + row.ask = leftTwo + '-' + rightTwo + return + } + } + } + } + // 濡傛灉瑕佹眰鎻忚堪鍚湁鈮� < 鈮� > 绗﹀彿 + const regex = /[鈮�<鈮�>]/ + const match = row.tell.match(regex) + if(match) { + // 绗﹀彿涓嶄竴鑷� + if( row.ask.indexOf(match[0]) != 0) { + this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪') + return + }else { + // 绗﹀彿涓�鑷� + // 濡傛灉妫�娴嬭姹傚惈鏈夋璐熷彿 骞朵笖鍚湁&鍙� 鈮�0.69&鈮�0.76 瑕佹眰鎻忚堪 + if(row.tell.indexOf('&') != -1) { + if(row.ask.indexOf('&') == -1) { + this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪') + row.ask = row.tell + return + }else{ + let left = row.tell.substring(0,row.tell.indexOf('&')) + let right = row.tell.substring(row.tell.indexOf('&')+1) + + let leftAsk = row.ask.substring(0,row.ask.indexOf('&')) + let rightAsk = row.ask.substring(row.ask.indexOf('&')+1) + if(leftAsk != left || rightAsk != right) { + this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪') + } + } + }else { + // 娌℃湁&鍙� + const regex = new RegExp(`${match[0]}(\\d+(\\.\\d+)?)`, 'g') + const matchTow = row.tell.match(regex); + let right = Number(matchTow[0].split(match[0])[1]) + let left = row.ask.substring(row.ask.indexOf(match[0])+1) + if(Number(left) != Number(right)) { + this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪') + row.ask = match[0] + right + } + } + + } + + + + } + + + + + + + + // 濡傛灉瑕佹眰鎻忚堪鍚湁鑼冨洿 + const regexTwo = /[~-]/ + const matchTwo = row.tell.match(regexTwo) + const matchAsk = row.ask.match(regexTwo) + if(matchTwo) { + let left = row.tell.substring(0,row.tell.indexOf(matchTwo[0])) + let right = row.tell.substring(row.tell.indexOf(matchTwo[0])+1) + + + if(!isNaN(Number(left)) && !isNaN(Number(right))) { + let leftAsk = row.ask.substring(0,row.ask.indexOf(matchAsk[0])) + let rightAsk = row.ask.substring(row.ask.indexOf(matchAsk[0])+1) + if(Number(leftAsk) != Number(left) || Number(rightAsk) != Number(right)) { + this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪') + row.ask = left + '-' + right + } + } + } + } + // 鍏堝嬀閫夌殑鎯呭喌涓� this.detectionSelect.forEach(item => { if(item.id == row.id) { @@ -712,14 +843,13 @@ }) console.log(this.bushing); this.selectBushing = this.bushing - this.addFiber() + this.addFiber(1) // 榛樿鍕鹃�� setTimeout(() => { // this.selectBushing.forEach(item =>{ // let rowToSelect = this.bushing.find(a => a.ident == item.ident) // this.$refs.table0.toggleRowSelection(rowToSelect, true) // }) - this.fiberList.forEach(item =>{ this.$refs.table3.toggleRowSelection(item, true) }) @@ -973,7 +1103,7 @@ } }) }, - addFiber() { + addFiber(isInspection) { // 鏈�鏂� let colors2 = [] if (this.packageInfo.num1 / this.colors.length > 1) { @@ -991,11 +1121,23 @@ if(this.multiFiberList.length != 0){ this.multiFiberList.forEach((a,index) => { a.fiber = [] - for (var i = 0; i < parseInt(a.num); i++) { + console.log('****',a,index); + + if(index > 0 && index < this.multiFiberList.length) { + if(this.multiFiberList[index].color == this.multiFiberList[index-1].color) { + + + + console.log('****',this.multiFiberList[index-1].num); + + + + for (var i = 0; i < parseInt(a.num); i++) { let fiber = { ident: this.fiberList.length + 1, bushColor: a.color, - color: colors2[(i+(parseInt(a.num)*index))>colors2.length?0:i+(parseInt(a.num)*index)*index].label, + // color: colors2[(i+(parseInt(a.num)*index))>colors2.length?0:i+(parseInt(a.num)*index)*index].label, + color: colors2[i+parseInt(this.multiFiberList[index-1].num)].label, model: null, noSplitModel: null, standard: null, @@ -1003,6 +1145,38 @@ productList: [] } this.fiberList.push(fiber) + } + }else { + for (var i = 0; i < parseInt(a.num); i++) { + let fiber = { + ident: this.fiberList.length + 1, + bushColor: a.color, + // color: colors2[(i+(parseInt(a.num)*index))>colors2.length?0:i+(parseInt(a.num)*index)*index].label, + color: colors2[i].label, + model: null, + noSplitModel: null, + standard: null, + fibersIdent: a.ident, + productList: [] + } + this.fiberList.push(fiber) + } + } + }else{ + for (var i = 0; i < parseInt(a.num); i++) { + let fiber = { + ident: this.fiberList.length + 1, + bushColor: a.color, + // color: colors2[(i+(parseInt(a.num)*index))>colors2.length?0:i+(parseInt(a.num)*index)*index].label, + color: colors2[i].label, + model: null, + noSplitModel: null, + standard: null, + fibersIdent: a.ident, + productList: [] + } + this.fiberList.push(fiber) + } } }) } else { @@ -1039,7 +1213,22 @@ // 鏍规嵁濂楃鐨勬祴璇曢噺鐢熸垚瀵瑰簲鐨勬暟閲忕殑鍏夌氦鏁版嵁 this.selectBushing.forEach((item,index) =>{ if(item.testNum != null && item.testNum != ''){ - for(let i =0; i < parseInt(item.testNum); i++){ + + // 鍏ㄦ + if(isInspection == 1) { + for(let i =0; i < parseInt(item.testNum); i++){ + let fiber = { + ident: this.fiberList.length + 1, + bushColor: item.color, + color: colors2[i].label, + model: null, + standard: null, + productList: [] + } + this.fiberList.push(fiber) + } + }else { + for(let i =0; i < parseInt(item.testNum); i++){ let fiber = { ident: this.fiberList.length + 1, bushColor: item.color, @@ -1049,6 +1238,7 @@ productList: [] } this.fiberList.push(fiber) + } } }else { flag = false @@ -1567,7 +1757,254 @@ // }) // this.$message.success('宸蹭繚瀛�') // this.$emit('saveFiberopticConfig') + if(this.inspectionItemST == 1) { + console.log('this.bushing',this.bushing); + this.$message.success('宸蹭繚瀛�') + this.sample.forEach(a=>{ + a.bushing = this.bushing + }) + this.$emit('saveFiberopticConfig') + return + } + let flag = true + let flags = true + + // 鍏夌氦妫�娴嬮」淇℃伅鏍¢獙 + this.fiberList.forEach(item=>{ + if(item.productList.length > 0){ + item.productList.forEach(row=>{ + + // 濡傛灉妫�娴嬭姹傚惈鏈夋璐熷彿 + if(row.tell.indexOf('卤') != -1) { + let left = row.tell.substring(0,row.tell.indexOf('卤')) + let right = row.tell.substring(row.tell.indexOf('卤')+1) + // 濡傛灉鍙互杞寲涓烘暟鍊� + if(!isNaN(Number(left)) && !isNaN(Number(right))) { + if(row.ask.indexOf('-') != -1) { + let left1 = row.ask.substring(0,row.ask.indexOf('-')) + let right1 = row.ask.substring(row.ask.indexOf('-')+1) + if(Number(left1) != (Number(left) - Number(right)) || Number(right1) != (Number(left) + Number(right))) { + // this.$message.error('11111') + flag = false + } + }else { + // this.$message.error('2222') + flag = false + return + } + } + // 濡傛灉瑕佹眰鎻忚堪宸﹁竟涓嶈兘杞寲涓烘暟鍊� + else if(isNaN(Number(left)) && !isNaN(Number(right))) { + const regex = /[~-]/ + const match = left.match(regex) + // 宸﹁竟鍚湁 - ~ 绗﹀彿 + if(match) { + let newLeft = ''; + if(left.includes('锛�')) { + newLeft = left.replace('锛�','(') + } + if(left.includes('锛�')) { + newLeft = newLeft.replace('锛�',')') + } + const regexTwo = /\((\d+(\.\d+)?)([~-])(\d+(\.\d+)?)\)/; + const matchTwo = newLeft.match(regexTwo); + let leftTwo = Number(matchTwo[1]) - Number(right) + let rightTwo = Number(matchTwo[4]) + Number(right) + if(row.ask.indexOf('-') != -1) { + let left1 = row.ask.substring(0,row.ask.indexOf('-')) + let right1 = row.ask.substring(row.ask.indexOf('-')+1) + if(Number(left1) != leftTwo || Number(right1) != rightTwo) { + // this.$message.error('33333') + flag = false + } + }else { + // this.$message.error('44444') + flag = false + return + } + } + } + } + // 濡傛灉妫�娴嬭姹傚惈鏈夆墹 < 鈮� > 绗﹀彿 + const regex = /[鈮�<鈮�>]/ + const match = row.tell.match(regex) + if(match) { + // 绗﹀彿涓嶄竴鑷� + if( row.ask.indexOf(match[0]) != 0) { + // this.$message.error('555555') + flag = false + return + }else { + // 绗﹀彿涓�鑷� + + // 濡傛灉妫�娴嬭姹傚惈鏈夋璐熷彿 骞朵笖鍚湁&鍙� 鈮�0.69&鈮�0.76 瑕佹眰鎻忚堪 + if(row.tell.indexOf('&') != -1) { + console.log(11111); + if(row.ask.indexOf('&') == -1) { + this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪') + row.ask = row.tell + return + }else{ + let left = row.tell.substring(0,row.tell.indexOf('&')) + let right = row.tell.substring(row.tell.indexOf('&')+1) + + let leftAsk = row.ask.substring(0,row.ask.indexOf('&')) + let rightAsk = row.ask.substring(row.ask.indexOf('&')+1) + console.log('&',left,right,leftAsk,rightAsk); + if(leftAsk != left || rightAsk != right) { + flag = false + } + } + }else{ + const regex = new RegExp(`${match[0]}(\\d+(\\.\\d+)?)`, 'g') + const matchTow = row.tell.match(regex); + console.log('matchTow',matchTow); + let right = Number(matchTow[0].split(match[0])[1]) + let left = row.ask.substring(row.ask.indexOf(match[0])+1) + if(Number(left) != Number(right)) { + // this.$message.error('666666') + flag = false + } + } + } + } + // 濡傛灉瑕佹眰鎻忚堪鍚湁鑼冨洿 + const regexTwo = /[~-]/ + const matchTwo = row.tell.match(regexTwo) + const matchAsk = row.ask.match(regexTwo) + if(matchTwo) { + let left = row.tell.substring(0,row.tell.indexOf(matchTwo[0])) + let right = row.tell.substring(row.tell.indexOf(matchTwo[0])+1) + if(!isNaN(Number(left)) && !isNaN(Number(right))) { + let leftAsk = row.ask.substring(0,row.ask.indexOf(matchAsk[0])) + let rightAsk = row.ask.substring(row.ask.indexOf(matchAsk[0])+1) + if(Number(leftAsk) != Number(left) || Number(rightAsk) != Number(right)) { + // this.$message.error('777777') + flag = false + } + } + } + }) + } + }) + + // 鍏夌氦甯︽娴嬮」淇℃伅鏍¢獙 + this.fibersList.forEach(item=>{ + if(item.productList.length > 0){ + item.productList.forEach(row=>{ + + // 濡傛灉妫�娴嬭姹傚惈鏈夋璐熷彿 + if(row.tell.indexOf('卤') != -1) { + let left = row.tell.substring(0,row.tell.indexOf('卤')) + let right = row.tell.substring(row.tell.indexOf('卤')+1) + // 濡傛灉鍙互杞寲涓烘暟鍊� + if(!isNaN(Number(left)) && !isNaN(Number(right))) { + if(row.ask.indexOf('-') != -1) { + let left1 = row.ask.substring(0,row.ask.indexOf('-')) + let right1 = row.ask.substring(row.ask.indexOf('-')+1) + if(Number(left1) != (Number(left) - Number(right)) || Number(right1) != (Number(left) + Number(right))) { + // this.$message.error('11111') + flags = false + } + }else { + // this.$message.error('2222') + flags = false + return + } + } + // 濡傛灉瑕佹眰鎻忚堪宸﹁竟涓嶈兘杞寲涓烘暟鍊� + else if(isNaN(Number(left)) && !isNaN(Number(right))) { + const regex = /[~-]/ + const match = left.match(regex) + // 宸﹁竟鍚湁 - ~ 绗﹀彿 + if(match) { + let newLeft = ''; + if(left.includes('锛�')) { + newLeft = left.replace('锛�','(') + } + if(left.includes('锛�')) { + newLeft = newLeft.replace('锛�',')') + } + const regexTwo = /\((\d+(\.\d+)?)([~-])(\d+(\.\d+)?)\)/; + const matchTwo = newLeft.match(regexTwo); + let leftTwo = Number(matchTwo[1]) - Number(right) + let rightTwo = Number(matchTwo[4]) + Number(right) + if(row.ask.indexOf('-') != -1) { + let left1 = row.ask.substring(0,row.ask.indexOf('-')) + let right1 = row.ask.substring(row.ask.indexOf('-')+1) + if(Number(left1) != leftTwo || Number(right1) != rightTwo) { + // this.$message.error('33333') + flags = false + } + }else { + // this.$message.error('44444') + flags = false + return + } + } + } + } + // 濡傛灉妫�娴嬭姹傚惈鏈夆墹 < 鈮� > 绗﹀彿 + const regex = /[鈮�<鈮�>]/ + const match = row.tell.match(regex) + if(match) { + // 绗﹀彿涓嶄竴鑷� + if( row.ask.indexOf(match[0]) != 0) { + // this.$message.error('555555') + flags = false + return + }else { + // 绗﹀彿涓�鑷� + if(row.tell.indexOf('&') != -1) { + console.log(11111); + if(row.ask.indexOf('&') == -1) { + this.$message.error('妫�娴嬭姹備笉绗﹀悎瑕佹眰鎻忚堪') + row.ask = row.tell + return + }else{ + let left = row.tell.substring(0,row.tell.indexOf('&')) + let right = row.tell.substring(row.tell.indexOf('&')+1) + + let leftAsk = row.ask.substring(0,row.ask.indexOf('&')) + let rightAsk = row.ask.substring(row.ask.indexOf('&')+1) + console.log('&',left,right,leftAsk,rightAsk); + if(leftAsk != left || rightAsk != right) { + flags = false + } + } + }else { + const regex = new RegExp(`${match[0]}(\\d+(\\.\\d+)?)`, 'g') + const matchTow = row.tell.match(regex); + let right = Number(matchTow[0].split(match[0])[1]) + let left = row.ask.substring(row.ask.indexOf(match[0])+1) + if(Number(left) != Number(right)) { + // this.$message.error('666666') + flags = false + } + } + + } + } + // 濡傛灉瑕佹眰鎻忚堪鍚湁鑼冨洿 + const regexTwo = /[~-]/ + const matchTwo = row.tell.match(regexTwo) + const matchAsk = row.ask.match(regexTwo) + if(matchTwo) { + let left = row.tell.substring(0,row.tell.indexOf(matchTwo[0])) + let right = row.tell.substring(row.tell.indexOf(matchTwo[0])+1) + if(!isNaN(Number(left)) && !isNaN(Number(right))) { + let leftAsk = row.ask.substring(0,row.ask.indexOf(matchAsk[0])) + let rightAsk = row.ask.substring(row.ask.indexOf(matchAsk[0])+1) + if(Number(leftAsk) != Number(left) || Number(rightAsk) != Number(right)) { + // this.$message.error('777777') + flags = false + } + } + } + }) + } + }) if(this.bushing.length === 0){ this.$message.error('缂哄皯濂楃鏃犳硶淇濆瓨') return @@ -1586,11 +2023,18 @@ item.fiber = this.fiberList // 鍏夌氦 } }) - this.sample.forEach(a=>{ + + if(flag && flags) { + this.$message.success('宸蹭繚瀛�') + this.sample.forEach(a=>{ a.bushing = this.bushing }) - this.$message.success('宸蹭繚瀛�') this.$emit('saveFiberopticConfig') + }else if(!flag) { + this.$message.error('鍏夌氦淇濆瓨鐨勬娴嬮」涓惈鏈変笉绗﹀悎瑕佹眰鐨勬暟鎹�') + }else if(!flags) { + this.$message.error('鍏夌氦甯︿繚瀛樼殑妫�娴嬮」涓惈鏈変笉绗﹀悎瑕佹眰鐨勬暟鎹�') + } }, beforeClose(done){ if (this.bsm1) { -- Gitblit v1.9.3