From 41bd0b7ebac6c6dc09a2c0c4743635f78c8676af Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期三, 31 七月 2024 11:20:55 +0800 Subject: [PATCH] 下单提交之后选择复核人,要排除当前登录人(自己) --- src/components/do/b1-inspect-order-plan/Inspection.vue | 179 +++++++++++++++++++++++++++++++++++++---------------------- 1 files changed, 113 insertions(+), 66 deletions(-) diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue index d10c9a0..f356f86 100644 --- a/src/components/do/b1-inspect-order-plan/Inspection.vue +++ b/src/components/do/b1-inspect-order-plan/Inspection.vue @@ -230,20 +230,20 @@ <template> <div v-loading="loading" class="inspection"> <el-row class="title"> - <el-col :span="12" style="padding-left: 20px;text-align: left;">妫�楠屽崟璇︽儏 + <el-col :span="12" style="padding-left: 20px;text-align: left;" v-once>妫�楠屽崟璇︽儏 </el-col> - <el-col :span="12" style="text-align: right;"> + <el-col :span="12" style="text-align: right;" v-once> <!-- <el-button size="small" type="primary" @click="fiberOpticVisible=true" v-if="fiberOptic.length>0">鍏夌氦鍒囨崲</el-button> <el-button size="small" type="primary" @click="fiberOpticTapeVisible=true" v-if="fiberOpticTape.length>0">鍏夌氦甯﹀垏鎹�</el-button> <el-button size="small" type="primary" @click="bushingVisible=true" v-if="bushing.length>0">濂楃鍒囨崲</el-button> --> <el-button size="small" type="primary" @click="sampleVisible=true">鏍峰搧鍒囨崲</el-button> <el-button size="small" type="primary" @click="taskVisible=true">浠诲姟鍒囨崲</el-button> - <el-button size="small" type="primary" @click="addVerifyDia = true" v-show="state==1" + <el-button size="small" type="primary" @click="addVerifyDia = true" v-if="state==1" :loading="submitLoading">鎻愪氦</el-button> <!-- 澶嶆牳 --> <el-button size="medium" type="primary" @click="upInsReview(1)" :loading="reviewLoading" - v-show="state>1">閫氳繃</el-button> - <el-button size="medium" @click="upInsReview(0)" v-show="state>1">涓嶉�氳繃</el-button> + v-if="state>1">閫氳繃</el-button> + <el-button size="medium" @click="upInsReview(0)" v-if="state>1">涓嶉�氳繃</el-button> <el-button size="small" @click="$emit('goback')">杩斿洖</el-button> </el-col> </el-row> @@ -285,8 +285,8 @@ </el-radio-group> </div> <div style="display: flex;align-items: center;"> - <span v-if="fibers.length>0"> 鍏夌氦甯︼細</span> - <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,1)" v-if="fibers.length>0" size="small"> + <span v-if="fibers.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'"> 鍏夌氦甯︼細</span> + <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,1)" v-if="fibers.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'" size="small"> <el-option v-for="item in fibers" :key="item.value" @@ -296,8 +296,8 @@ <el-tag :type="item.state==1?'success':'danger'" style="float: right;margin-top: 5px;" size="small">{{ item.state==1?'宸叉':'鏈' }}</el-tag> </el-option> </el-select> - <span v-if="fiber.length>0"> 鍏夌氦锛�</span> - <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,2)" v-if="fiber.length>0" size="small"> + <span v-if="fiber.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'"> 鍏夌氦锛�</span> + <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,2)" v-if="fiber.length>0&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'" size="small"> <el-option v-for="item in fiber" :label="item.bushColor+'-'+item.color" @@ -321,12 +321,12 @@ <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'&&collected&&state==1" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'鍏抽棴缂栬緫':'缂栬緫鏁伴噰'}}</el-button> </div> </div> - <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'&&tableLists.find(m=>m.templateId==currentTable).templateName!='鐑惊鐜楠屽師濮嬭褰�')"> + <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐑惊鐜�')&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('娓╁崌璇曢獙'))"> <table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index"> <tbody> <tr v-for="(m,i) in item.arr" :key="i"> <td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j" - v-if="n.v.mc==undefined || Object.keys(n.v.mc).length === 4" :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1" + v-if="n.v.mc==undefined || Object.keys(n.v.mc).length === 4" :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1" :rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1" :style="`background:${n.v.bg?n.v.bg:''};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`"> <div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`" @@ -369,6 +369,9 @@ <el-option v-for="item in equipOptions" :key="item.value" :label="item.value" :value="item.value"> </el-option> </el-select> + </template> + <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='璁惧鍚嶇О' && state==1"> + <span>{{ n.v.v }}</span> </template> <template v-else-if="n.v.ps!=undefined && n.v.ps.value==='瑕佹眰鍊�' && state==1"> <span :style="`font-family:${n.v.ff} !important;`">{{getTell(n.i)}}</span> @@ -421,7 +424,7 @@ v-if="currentFiberOptic" class="el-icon-caret-right table_caret" @click="caretOptic(1)"></i> </div> </template> - <span v-else :style="`font-family:${n.v.ff} !important;`" v-html="getValue(n.v)" ></span> + <span v-else :style="`font-family:${n.v.ff} !important;`" v-html="getValue(n.v)" v-once></span> </div> </td> </tr> @@ -497,7 +500,7 @@ ref="wareTableData" border v-loading="wareTableDataLoading" - style="width: 100%;margin-bottom: 30px;" align="center" v-show="wareForm.inspectionItemSubclass!='20(甯告俯)'&&wareForm.inspectionItemSubclass!='20'||(wareForm.inspectionItemSubclass=='20(甯告俯)'&&wareForm.inspectionItem==1)||(wareForm.inspectionItemSubclass=='20'&&wareForm.inspectionItem==numOptions.length)"> + style="width: 100%;margin-bottom: 30px;" align="center" v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'&&wareForm.inspectionItemSubclass!='20'||(wareForm.inspectionItemSubclass=='20(甯告俯)'&&wareForm.inspectionItem==1)||(wareForm.inspectionItemSubclass=='20'&&wareForm.inspectionItem==numOptions.length)"> <el-table-column label="搴忓彿" type="index" @@ -589,9 +592,9 @@ </template> </el-table> </div> - <div v-loading="tableLoading" v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�'"> + <div v-loading="tableLoading" v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐑惊鐜�')||tableLists.find(m=>m.templateId==currentTable).templateName.includes('娓╁崌璇曢獙')"> <el-divider></el-divider> - <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;text-align: center;">鐑惊鐜楠屽師濮嬭褰�</h4> + <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;text-align: center;">{{tableLists.find(m=>m.templateId==currentTable).templateName}}</h4> <el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;"> <el-form-item label="浠櫒鍚嶇О:" style="margin-bottom: 0;"> <el-input clearable v-model="equipForm.value0" disabled size="small" placeholder=""></el-input> @@ -673,7 +676,7 @@ :data="{ orderId:id }" - v-show="state==1&&fileAdd" + v-if="state==1&&fileAdd" :on-success="handleSuccessUp" :show-file-list="false" accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar' :headers="headers" :on-change="beforeUpload" style="width: 80px !important;" @@ -742,11 +745,11 @@ </el-table-column> <!-- 妫�楠屽崟浼氭湁涓�涓槸鍚︽湁閰嶅鏍峰搧瀛楁鎺у埗鏄剧ず --> <el-table-column prop="joinModel" label="閰嶅鏍峰搧鍨嬪彿" min-width="130px" show-overflow-tooltip - v-if="insOrder.mating>0"></el-table-column> + v-if="insOrder.mating>0"></el-table-column> <el-table-column prop="joinName" label="閰嶅鏍峰搧鍚嶇О" min-width="130px" show-overflow-tooltip - v-if="insOrder.mating>0"></el-table-column> + v-if="insOrder.mating>0"></el-table-column> <el-table-column prop="joinNum" label="閰嶅鏍峰搧鏁伴噺" min-width="130px" show-overflow-tooltip - v-if="insOrder.mating>0"></el-table-column> + v-if="insOrder.mating>0"></el-table-column> </el-table> </el-drawer> <el-drawer title="浠诲姟鍒囨崲" :visible.sync="taskVisible" :size="500"> @@ -1058,7 +1061,7 @@ equipForm:{ deep:true, handler(val){ - if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')&&this.equipOptions&&this.equipOptions.length>0){ + if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))&&this.equipOptions&&this.equipOptions.length>0){ this.param[this.currentSample.insProduct[0].id].equipValue = [] this.param[this.currentSample.insProduct[0].id].equipName = [] if(this.equipForm.code0){ @@ -1125,11 +1128,15 @@ return } this.dataAcquisitionInfo = res.data - // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫 - this.worker0.postMessage(JSON.stringify({ - dataAcquisitionInfo: this.dataAcquisitionInfo, - list:this.tableList[0].arr - })); + try { + // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫 + this.worker0.postMessage(JSON.stringify({ + dataAcquisitionInfo: this.dataAcquisitionInfo, + list:this.tableList[0].arr + })); + } catch (error) { + console.log(1111,error); + } // 鐩戝惉 Worker 杩斿洖鐨勭粨鏋� this.worker0.onmessage = (event) => { let result = JSON.parse(event.data); @@ -1912,10 +1919,14 @@ this.tableLists = this.currentSample.insProduct.filter(m => { let num0 = mySet1.size; if (m.templateId != null&&m.template != null) { - mySet1.add(JSON.stringify({ - template: m.template, - templateId: m.templateId - })) + try { + mySet1.add(JSON.stringify({ + template: m.template, + templateId: m.templateId + })) + } catch (error) { + console.log(222,error); + } } let num1 = mySet1.size; if (num1 > num0) { @@ -1935,10 +1946,14 @@ this.tableLists = list.filter(m => { let num0 = mySet1.size; if (m.templateId != null&&m.template != null) { - mySet1.add(JSON.stringify({ - template: m.template, - templateId: m.templateId - })) + try { + mySet1.add(JSON.stringify({ + template: m.template, + templateId: m.templateId + })) + } catch (error) { + console.log(333,error); + } } let num1 = mySet1.size; if (num1 > num0) { @@ -1984,7 +1999,7 @@ } // 娓╁害寰幆妫�楠屽師濮嬭褰�---缁撴潫 // 鐑惊鐜楠屽師濮嬭褰�---寮�濮� - if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�'){ + if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){ let ask = this.currentSample.insProduct[0].ask let askList = ask.split(';') this.thermalCyclingInfo.max = Number(askList[askList.length-1]) @@ -2261,7 +2276,7 @@ } catch (e) {} try { let equipValue = JSON.parse(a.insProductResult.equipValue) - if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){ + if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){ this.param[a.id].equipValue = [] for (let i = 0; i < equipValue.length; i++) { this.param[a.id].equipValue.push({ @@ -2272,7 +2287,7 @@ } } for (let i = 0; i < equipValue.length; i++) { - if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){ + if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){ // 娓╁害寰幆璁惧璧嬪�� this.$set(this.equipForm,`code`+i,equipValue[i].v) this.param[a.id].equipValue[i].v.v = equipValue[i].v @@ -2300,7 +2315,7 @@ } catch (e) {} try { let equipName = JSON.parse(a.insProductResult.equipName) - if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){ + if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){ this.param[a.id].equipName = [] for (let i = 0; i < equipName.length; i++) { this.param[a.id].equipName.push({ @@ -2311,7 +2326,7 @@ } } for (let i = 0; i < equipName.length; i++) { - if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�')){ + if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁崌璇曢獙鍘熷璁板綍妯℃澘')){ // 娓╁害寰幆璧嬪�� this.$set(this.equipForm,`value`+i,equipName[i].v) this.param[a.id].equipName[i].v.v = equipName[i].v @@ -2343,16 +2358,20 @@ n.v.v = n.v.v.replace('/', '') } } - // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫 - this.worker.postMessage(JSON.stringify({ - code: code, - tableList:this.tableList, - excelMethodList:this.excelMethodList, - comparisonList:this.comparisonList, - currentSample:this.currentSample, - PROJECT:this.PROJECT, - param:this.param - })); + try { + // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫 + this.worker.postMessage(JSON.stringify({ + code: code, + tableList:this.tableList, + excelMethodList:this.excelMethodList, + comparisonList:this.comparisonList, + currentSample:this.currentSample, + PROJECT:this.PROJECT, + param:this.param + })); + } catch (error) { + console.log(444,error); + } // 鐩戝惉 Worker 杩斿洖鐨勭粨鏋� this.worker.onmessage = (event) => { @@ -2433,8 +2452,12 @@ } this.tableList[0].insProductResult[m].push(obj); }) + try { + this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m]) + } catch (error) { + console.log(555,error); + } } - this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m]) break; case 'insValue': if (value && value.length > 0) { @@ -2446,8 +2469,12 @@ } this.tableList[0].insProductResult[m].push(obj); }) + try { + this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m]) + } catch (error) { + console.log(666,error); + } } - this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m]) break; case 'equipValue': if (value && value.length > 0) { @@ -2458,8 +2485,12 @@ } this.tableList[0].insProductResult[m].push(obj); }) + try { + this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m]) + } catch (error) { + console.log(777,error); + } } - this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m]) break; case 'equipName': if (value && value.length > 0) { @@ -2470,8 +2501,12 @@ } this.tableList[0].insProductResult[m].push(obj); }) + try { + this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m]) + } catch (error) { + console.log(888,error); + } } - this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m]) break; case 'resValue': this.tableList[0].lastValue = value?value.v.v:'' @@ -2685,8 +2720,7 @@ orderId: this.orderId, laboratory: this.sonLaboratory, verifyUser: this.verifyUser, - entrustCode: this.insOrder.entrustCode, - sampleCode: this.currentSample.sampleCode + entrustCode: this.insOrder.entrustCode }).then(res => { if (res.code === 200) { this.$message.success("鎿嶄綔鎴愬姛") @@ -2740,16 +2774,26 @@ }, saveInsContext() { // console.log(1111,this.param) - if(this.param){ - this.$axios.post(this.$api.insOrderPlan.saveInsContext, { - param: JSON.stringify(this.param) - }).then(res => { - if (res.code == 201) { - this.$message.error('淇濆瓨澶辫触') - return - } - this.$message.success('宸蹭繚瀛�') - }) + try { + if(this.param){ + this.$axios.post(this.$api.insOrderPlan.saveInsContext, { + param: JSON.stringify(this.param) + }).then(res => { + if (res.code == 201) { + this.$message.error('淇濆瓨澶辫触') + return + } + this.$message.success('宸蹭繚瀛�') + }) + // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫 + this.worker.postMessage(JSON.stringify({ + type: 'saveData', + tableList:this.tableList, + param:this.param + })); + } + }catch (error) { + console.log(999,error); } }, changeEquip(val, n) { @@ -2774,17 +2818,20 @@ }) } } - console.log(this.param) + // console.log(this.param) this.saveInsContext() }, getAuthorizedPerson() { this.$axios.get(this.$api.user.getUserMenu).then(res => { let data = [] + let userName = JSON.parse(localStorage.getItem("user")).name; res.data.forEach(a => { - data.push({ + if(a.name !== userName) { + data.push({ label: a.name, value: a.id }) + } }) this.personList = data }) -- Gitblit v1.9.3