From 57e76b55709e8ea88a83ab6c3f665fd9ee7fd64c Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期三, 03 七月 2024 14:23:48 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master --- src/components/do/b1-ins-order/fiberoptic-config.vue | 407 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 369 insertions(+), 38 deletions(-) diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue index 6dc61c9..8255f67 100644 --- a/src/components/do/b1-ins-order/fiberoptic-config.vue +++ b/src/components/do/b1-ins-order/fiberoptic-config.vue @@ -2,9 +2,9 @@ <div class="ins_order_config"> <div> <el-row class="title"> - <el-col :span="6" style="padding-left: 20px;">鍏夌氦閰嶇疆</el-col> + <el-col :span="6" style="padding-left: 20px;text-align: left;">鍏夌氦閰嶇疆</el-col> <el-col :span="18" style="text-align: right;"> - <el-button size="medium" type="primary" @click="save" :loading="saveLoad">淇� 瀛�</el-button> + <el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-if="active==1">淇� 瀛�</el-button> <el-button size="medium" @click="outConfig"> <span style="color: #3A7BFA;">杩� 鍥�</span> </el-button> @@ -22,7 +22,7 @@ <label style="width: 70px;">鏍峰搧鍨嬪彿</label> <span style="font-size: 14px;">{{models}}</span> </div> - <el-radio-group v-model="packageInfo.radio" size="small" @change="upNum()"> + <el-radio-group v-model="packageInfo.radio" size="small" @change="upNum()" :disabled="active!=1"> <el-radio :label="0">鍏ㄦ</el-radio> <el-radio :label="1">鎶芥</el-radio> </el-radio-group> @@ -31,25 +31,29 @@ style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 8px;padding: 0 12px;box-sizing: border-box;"> <div class="search-item" style="margin-right: 10px;"> <label>濂楃鏁扮洰</label> - <el-input v-model="packageInfo.num1" placeholder="璇疯緭鍏�" size="small" @change="upNum"></el-input> + <el-input v-model="packageInfo.num1" placeholder="璇疯緭鍏�" size="small" @change="upNum" :disabled="active!=1"></el-input> </div> <div class="search-item" style="margin-right: 10px;"> <label style="width: 70px;">鏍囧噯閲�</label> - <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @change="upNum"></el-input> + <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @change="upNum" :disabled="active!=1"></el-input> </div> <div class="search-item"> <label style="width: 70px;">妫�娴嬮噺</label> <el-input v-model="packageInfo.testNum" placeholder="璇疯緭鍏�" size="small" @change="upNum" - :disabled="packageInfo.radio===0"></el-input> + :disabled="packageInfo.radio===0||active!=1"></el-input> </div> </div> <el-table ref="table0" :data="bushing" tooltip-effect="dark" style="width: 100%" height="203px" size="small" - @selection-change="handleSelectionChange1"> - <el-table-column type="selection" width="45"> + @selection-change="handleSelectionChange1" + :header-cell-class-name="setClassName0"> + <el-table-column + type="selection" + width="45" + :selectable="()=>(active==1)"> </el-table-column> <el-table-column label="绠¤壊鏍�" show-overflow-tooltip> <template slot-scope="scope"> - <el-select v-model="scope.row.color" size="mini"> + <el-select v-model="scope.row.color" size="mini" :disabled="active!=1" allow-create filterable > <el-option v-for="(color,i) in colors" :key="i" :label="color.lable" :value="color.value"></el-option> </el-select> @@ -74,7 +78,7 @@ @select="upProductSelect" > <el-table-column type="selection" width="55" - :selectable="()=>(currentDetectionItems||this.multiFiberList.length > 0)"> + :selectable="()=>((currentDetectionItems||this.multiFiberList.length > 0)&&active==1)"> </el-table-column> <el-table-column label="瀹為獙瀹�" show-overflow-tooltip prop="sonLaboratory" ></el-table-column> <el-table-column prop="inspectionItem" label="妫�楠岄」" show-overflow-tooltip> @@ -87,11 +91,12 @@ </el-table-column> <el-table-column prop="unit" label="鍗曚綅" width="70" show-overflow-tooltip> </el-table-column> - <el-table-column prop="manDay" label="棰勮鏃堕棿" width="90" show-overflow-tooltip> - </el-table-column> + <!-- <el-table-column prop="manDay" label="棰勮鏃堕棿" width="90" show-overflow-tooltip> + </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"></el-input> + <el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead"></el-input> + <span v-else>{{ scope.row.ask }}</span> </template> </el-table-column> </el-table> @@ -99,19 +104,19 @@ </el-col> </el-row> <el-row :gutter="10"> - <el-col :span="12"> + <el-col :span="12" v-if="packageInfo.ismiers"> <div class="grid-content"> <h5>鍏夌氦甯� <el-button size="mini" type="primary" class="btns" @click="addFibers" - :disabled="packageInfo.ismiers===false||miresModel===null||miresStandard===null">鐢熸垚鍏夌氦甯�</el-button> - <el-button size="mini" class="btns" @click="clearFibers" :disabled="selectBushing.length === 0">娓呴櫎</el-button> + :disabled="miresModel===null||miresStandard===null" v-if="active==1">鐢熸垚鍏夌氦甯�</el-button> + <el-button size="mini" class="btns" @click="clearFibers" :disabled="selectBushing.length === 0" v-if="active==1">娓呴櫎</el-button> </h5> <div style="display: flex;align-items: center;justify-content: space-between;margin:4px 0 6px 0;padding: 0 12px;box-sizing: border-box;"> <div class="search-item" style="width: 50%;margin-right: 16px;"> <label style="width: 80px;">绾ゅ甫绫诲瀷</label> <el-select v-model="miresModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" - :disabled="selectBushing.length===0"> + :disabled="selectBushing.length===0||active!=1"> <el-option v-for="(item,a) in miresModels" :key="a" :label="item.label" :value="item.value"> </el-option> </el-select> @@ -119,7 +124,7 @@ <div class="search-item" style="width: 50%;"> <label style="width: 80px;">鍙傝�冩爣鍑�</label> <el-select v-model="miresStandard" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" - :disabled="miresModel===null" @focus="selectsStandardMethodByFLSSM2()" + :disabled="miresModel===null||active!=1" @focus="selectsStandardMethodByFLSSM2()" @change="(value)=>methodChange2(value)"> <el-option v-for="item in miresStandards" :key="item.id" :label="item.code" :value="item.id"> </el-option> @@ -127,8 +132,12 @@ </div> </div> <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px" - size="small" @selection-change="handleSelectionChange" highlight-current-row @row-click="rowClickFiber"> - <el-table-column type="selection" width="55"> + size="small" @selection-change="handleSelectionChange" highlight-current-row @row-click="(row, column, event)=>rowClickFiber(row, column, event,0)" + :header-cell-class-name="setClassName0"> + <el-table-column + type="selection" + width="55" + :selectable="()=>(active==1)"> </el-table-column> <el-table-column prop="code" label="鍏夌氦甯︾紪鍙�" show-overflow-tooltip align="center"> </el-table-column> @@ -141,16 +150,16 @@ </el-table> </div> </el-col> - <el-col :span="12"> + <el-col :span="!packageInfo.ismiers?24:12"> <div class="grid-content"> <h5>鍏夌氦<el-button size="mini" type="primary" class="btns" @click="addFiber" - :disabled="mireModel===null||mireStandard===null">鍏夌氦閰嶈壊</el-button></h5> + :disabled="mireModel===null||mireStandard===null" v-if="active==1">鍏夌氦閰嶈壊</el-button></h5> <div style="display: flex;align-items: center;justify-content: space-between;margin: 4px 0 6px 0;padding: 0 12px;box-sizing: border-box;"> <div class="search-item" style="width: 50%;margin-right: 16px;"> <label style="width: 80px;">鍏夌氦绫诲瀷</label> <el-select v-model="mireModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" - :disabled="selectBushing.length===0"> + :disabled="selectBushing.length===0||active!=1"> <el-option v-for="(item,a) in mireModels" :key="a" :label="item.label" :value="item.value"> </el-option> </el-select> @@ -158,7 +167,7 @@ <div class="search-item" style="width: 50%;"> <label style="width: 80px;">鍙傝�冩爣鍑�</label> <el-select v-model="mireStandard" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" - :disabled="mireModel===null" @focus="selectsStandardMethodByFLSSM()" + :disabled="mireModel===null||active!=1" @focus="selectsStandardMethodByFLSSM()" @change="(value)=>methodChange(value)" :loading="mireStandardLoading"> <el-option v-for="item in mireStandards" :key="item.id" :label="item.code" :value="item.id"> </el-option> @@ -167,14 +176,18 @@ </div> <el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px" size="small" highlight-current-row @selection-change="handleSelectionChange4" - @row-click="rowClickFiber"> - <el-table-column type="selection" width="55"> + @row-click="(row, column, event)=>rowClickFiber(row, column, event,1)" + :header-cell-class-name="setClassName0"> + <el-table-column + type="selection" + width="55" + :selectable="()=>(active==1)"> </el-table-column> <el-table-column prop="bushColor" label="绠″鑹叉爣" width="90" align="center"> </el-table-column> <el-table-column prop="color" label="鍏夌氦鑹叉爣" width="120"> <template slot-scope="scope"> - <el-select v-model="scope.row.color" size="mini"> + <el-select v-model="scope.row.color" size="mini" :disabled="active!=1" allow-create filterable > <el-option v-for="(color,i) in colors" :key="i" :label="color.lable" :value="color.value"></el-option> </el-select> @@ -189,13 +202,107 @@ </el-col> </el-row> </div> + <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_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> + </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.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> + </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> + <span>MAX锛歿{bsm2Val3.length}}</span> + </div> + </el-col> + <el-col style="margin-top: 6px;"> + <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> + </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"> + <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> + <!-- <el-row v-if="bsm3"> + <el-col class="search_thing" :span="22" style="display: flex;align-items: center;"> + <div class="search_label"><span class="required-span">* </span>RTS锛�</div> + <div class="search_input"> + <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="bsm3Val"></el-input> + </div> + </el-col> + </el-row> --> + </div> + </el-dialog> + <el-dialog title="RTS濉啓" :visible.sync="bsm3Dia" width="500px" :show-close="false" :before-close="beforeClose0"> + <el-row> + <el-col class="search_thing" :span="22" style="display: flex;align-items: center;"> + <div class="search_label"><span class="required-span">* </span>RTS锛�</div> + <div class="search_input"> + <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="bsm3Val"></el-input> + </div> + </el-col> + </el-row> + </el-dialog> </div> </template> <script> export default { + props: { + active: { + type: Number, + default: () => 0 + }, + }, data() { return { + type:1, saveLoad: false, packageInfo: { radio: 1, @@ -231,12 +338,26 @@ detectionItems:[], currentDetectionItems:null, mireStandardLoading:false, - multiFiberList:[] + multiFiberList:[], + isAskOnlyRead:true, + bsm1Dia: false, + bsmRow: null, + bsm1: false, + bsm1Val: null, + bsm2: false, + bsm2Val: null, + bsm2Dia: false, + bsm2Val2: [], + bsm2Val3: [], + sampleIds:[], + bsm3Val: null, + bsmRow3: null, + bsm3Dia: false, } }, computed: { isAllDisabled() { - return this.multiFiberList.length > 0||this.currentDetectionItems + return this.multiFiberList.length > 0||this.currentDetectionItems||this.active!=1 }, }, watch: { @@ -269,7 +390,7 @@ } }) this.models = this.models.replace(',', '') - this.packageInfo.ismiers = this.models.split(',').every(e=>e.indexOf('d')>-1) + this.packageInfo.ismiers = this.models.split(',').every(e=>(e.indexOf('d')>-1||e.indexOf('D')>-1)) if(this.sample[0].bushing === undefined || this.sample[0].bushing === null){ this.bushing = [] }else{ @@ -380,8 +501,8 @@ this.miresModels = [] res.data.forEach(a => { this.miresModels.push({ - label: a.sample, - value: a.sample + label: a.model, + value: a.model }) }) }) @@ -467,12 +588,12 @@ this.$message.error('鏈�夋嫨鍏夌氦甯�') return } - this.selectFibers.forEach(a => { + this.selectFibers.forEach((a,index) => { a.fiber = [] for (var i = 0; i < parseInt(a.num); i++) { let fiber = { bushColor: a.color, - color: colors2[i].label, + color: colors2[(i+(parseInt(a.num)*index))>colors2.length?0:i+(parseInt(a.num)*index)*index].label, model: model, standard: standard, productList: this.HaveJson(this.productList) @@ -482,12 +603,12 @@ } }) } else { - this.selectBushing.forEach(a => { + this.selectBushing.forEach((a,index) => { a.fiber = [] for (var i = 0; i < parseInt(a.testNum); i++) { let fiber = { bushColor: a.color, - color: colors2[i].label, + color: colors2[(i+(parseInt(a.testNum))*index)>colors2.length?0:i+(parseInt(a.testNum))*index].label, model: model, standard: standard, productList: this.HaveJson(this.productList) @@ -525,7 +646,37 @@ } }) }, - rowClickFiber(row, column, event){ + rowClickFiber(row, column, event,type){ + this.type = type + if(this.active===1){ + if(type==0){ + let standard = null; + try{ + standard = this.miresStandards.find(a => a.id == this.miresStandards) + }catch(e){} + if(standard&&standard.code=='濮旀墭瑕佹眰'){ + this.isAskOnlyRead = false; + }else{ + this.isAskOnlyRead = true; + } + }else{ + let standard = null; + try{ + standard = this.mireStandards.find(a => a.id == this.mireStandard) + }catch(e){} + if(standard&&standard.code=='濮旀墭瑕佹眰'){ + this.isAskOnlyRead = false; + }else{ + this.isAskOnlyRead = true; + } + } + } + if(this.type==1){ + if (this.active !== 1) { + this.sampleIds = [] + this.sampleIds.push(row.id) + } + } this.currentDetectionItems = row this.detectionItems = row.productList if(this.detectionItems === null) return @@ -590,6 +741,59 @@ }); } } + this.bsmRow3 = [] + this.detectionItems.forEach(p => { + if(this.type==1){ + if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) { + if (p.section.indexOf('[') > -1) { + this.bsmRow = this.HaveJson(p) + } + this.bsm1 = true + this.bsm1Dia = true + } else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) { + this.bsm1 = false + } + if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && p.state === 1) { + this.bsm2 = true + this.bsm1Dia = true + 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.bsm2 = false + } + } + // if (p.ask.includes('RTS')&&p.state === 1) { + // p.rts = '' + // this.bsm3Val = '' + // this.bsm3Dia = true + // this.bsmRow3.push(p) + // } + }) + + if (e.length > 0) { + this.sampleList.map(item => { + if (this.sampleIds.indexOf(item.id) > -1) { + item.insProduct.map(m => { + m.state = 1 + return m; + }) + } + return item + }) + } else { + this.sampleList.map(item => { + if (this.sampleIds.indexOf(item.id) > -1) { + item.insProduct.map(m => { + m.state = 0 + return m; + }) + } + return item + }) + } this.$nextTick(() => { this.$refs.productTable.doLayout() }) @@ -614,9 +818,54 @@ return m; }); } + if(this.type==1){ + if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) { + if (row.section.indexOf('[') > -1) { + this.bsmRow = this.HaveJson(row) + } + this.bsm1 = true + this.bsm1Dia = true + } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) { + this.bsm1 = false + } + if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1) { + this.bsm2 = true + this.bsm1Dia = true + 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.bsm2 = false + } + }else{ + this.bsm1Dia = false + } + // if (row.ask.includes('RTS')&&row.state === 1) { + // this.bsmRow3 = null; + // row.rts = '' + // this.bsm3Val = '' + // this.bsm3Dia = true + // this.bsmRow3 = row + // }else{ + // this.bsm3Dia = false + // } + }, + computationalPairing(n){ + const nums = []; + for (let i = 1; i <= n; i++) { + nums.push(i); + } + this.bsm2Val3 = this.HaveJson(this.permute(nums)) }, setClassName({ column }) { if (column.type == 'selection' && !this.isAllDisabled) { + return 'all-disabled' + } + }, + setClassName0({ column }){ + if (column.type == 'selection' && this.active!=1) { return 'all-disabled' } }, @@ -642,7 +891,89 @@ a.bushing = this.bushing }) this.$message.success('宸蹭繚瀛�') - console.log(this.bushing); + this.$emit('saveFiberopticConfig') + }, + beforeClose(done){ + if (this.bsm1) { + if (this.bsm1Val === null || this.bsm1Val === '') { + this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊') + return + } + } + if (this.bsm2) { + if (this.bsm2Val2.length === 0) { + 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() + }, + beforeClose0(done){ + if(!this.bsm3Val){ + this.$message.error('RST蹇呴』濉啓') + return + }else{ + if(Array.isArray(this.bsmRow3)){ + this.bsmRow3.forEach(item=>{ + item.rts = this.bsm3Val + }) + }else{ + this.bsmRow3.rts = this.bsm3Val + } + } + done() + }, + upBsm1(val) { + let sections = JSON.parse(this.bsmRow.section); + let asks = JSON.parse(this.bsmRow.ask); + let tells = JSON.parse(this.bsmRow.tell); + let manHours = JSON.parse(this.bsmRow.manHour); + let prices = JSON.parse(this.bsmRow.price); + for (var a in sections) { + if (val === sections[a]) { + this.productList.forEach(p => { + if (p.id === this.bsmRow.id) { + p.section = sections[a] + p.ask = asks[a] + p.tell = tells[a] + p.manHour = manHours[a] + p.price = prices[a] + } + }) + break + } + } + }, + bsm2Up(val){ + let list = [] + 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){ + 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])) + } } } } -- Gitblit v1.9.3