From 98810eb52a46ec72f2bc3d89be8ea42c33d55c5f Mon Sep 17 00:00:00 2001 From: gaoluyang <gaoluyang@rengu.cc> Date: 星期三, 17 七月 2024 10:14:49 +0800 Subject: [PATCH] 日工时管理的辅助工时的录入数据,完成一个数据的录入后页面不跳转,但是弹窗的内容清空继续新增录入 --- src/components/do/b1-inspect-order-plan/Inspection.vue | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue index bcec480..ef99776 100644 --- a/src/components/do/b1-inspect-order-plan/Inspection.vue +++ b/src/components/do/b1-inspect-order-plan/Inspection.vue @@ -1484,11 +1484,22 @@ count4 += 1 } } + // else if (c.v.ps != undefined && c.v.ps.value === '鍗曚綅'&&this.PROJECT=='妫�娴嬩腑蹇�'){ + // if(count4==1||count4==2){ + // str += c.v.v?c.v.v:'' + // console.log('str',str,c) + // count4 += 1 + // } + // } } }) if (str != '') { + console.log('str',str) let count2 = 0 for (let i in this.currentSample.insProduct) { + // (this.currentSample + // .insProduct[i].unit?this.currentSample + // .insProduct[i].unit:'') if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample .insProduct[i].inspectionItem +(this.currentSample.insProduct[i].inspectionItemSubclass == null ? '' : this.currentSample.insProduct[i].inspectionItemSubclass)+(this.currentSample.insProduct[i].inspectionItemClass==null||this.PROJECT!='瑁呭鐢电紗'?'':this.currentSample.insProduct[i].inspectionItemClass) === str) { @@ -1708,7 +1719,15 @@ this.$nextTick(()=>{ this.tableList = this.result.value.tableList this.param = this.result.value.param - console.log(11111,this.param) + for (var i in this.param){ + if(this.param[i].insResult&&this.param[i].insResult.v&&this.param[i].insResult.v.v){ + if(this.param[i].insResult.v.v=='鍚堟牸'){ + this.$set(this.param[i].insResult.v,'v',1) + }else if(this.param[i].insResult.v.v=='涓嶅悎鏍�'){ + this.$set(this.param[i].insResult.v,'v',0) + } + } + } this.saveInsContext() }) break; @@ -1828,7 +1847,7 @@ } }, getValue(v){ - let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>').replace(new RegExp('@', 'g'), '<br/>'):'') + let str = v.v?v.v:(v.v===0?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>').replace(new RegExp('@', 'g'), '<br/>'):'')) return str }, getInspectionValueType(id) { @@ -2077,7 +2096,8 @@ if (this.equipOptions[i].value === val) { for (let i1 in this.param[n.i].equipName) { if (this.param[n.i].equipName[i1].i === n.i && this.param[n.i].equipName[i1].r === n.r) { - this.param[n.i].equipName[i1].v.v = this.equipOptions[i].label + this.$set(this.param[n.i].equipName[i1].v,'v',this.equipOptions[i].label) + // this.param[n.i].equipName[i1].v.v = this.equipOptions[i].label } } } -- Gitblit v1.9.3