diff --git a/src/views/jhzx/ydjhzxCX.vue b/src/views/jhzx/ydjhzxCX.vue index 8fe3f48..17b918b 100644 --- a/src/views/jhzx/ydjhzxCX.vue +++ b/src/views/jhzx/ydjhzxCX.vue @@ -2,11 +2,11 @@ - + - + - + @@ -20,7 +20,7 @@ - + + + + 批量录入 - + 全部 已完工 @@ -692,6 +695,14 @@ export default { // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filterRender: { name: 'FilterCombination' } // }, + { + field: 'qgllgs', + title: '切割理论工时', + width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination' }, + editRender:{ name: '$input'}, + }, { field: 'qgpgrq', title: '切割派工日期', @@ -700,15 +711,15 @@ export default { filterRender: { name: 'FilterCombination' } }, { - field: 'qgfkrq', - title: '切割报工日期', + field: 'qgpgry', + title: '切割派工人',formatter:this.formatWorker, width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination' } }, { - field: 'qgpgry', - title: '切割派工人',formatter:this.formatWorker, + field: 'qgfkrq', + title: '切割报工日期', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination' } @@ -951,12 +962,14 @@ export default { } for (const item of data) { item.zyq=this.plParam.zyq||item.zyq + item.qgllgs=this.plParam.qgllgs||item.qgllgs for (const _item of this.zyqList) { if(_item.value===this.plParam.zyq){ item.zyq1=_item.label } } } + this.$refs.xGrid.loadData(this.list) }, zyqChange({row}){ for (const item of this.zyqList) { diff --git a/src/views/zyjhzx/sliao/index.vue b/src/views/zyjhzx/sliao/index.vue index 1d4d875..e037bc1 100644 --- a/src/views/zyjhzx/sliao/index.vue +++ b/src/views/zyjhzx/sliao/index.vue @@ -225,7 +225,6 @@ export default { shangLiaos(jh).then(res=>{ this.selectedJh=[] - this.plslflag=false if (!res.success){ this.drawSljhItem(this.sljhItemList.r('0:200')) return; @@ -244,8 +243,10 @@ export default { this.$delete(this.sljhItemList, index); } }) - this.drawSljhItem(this.sljhItemList.r('0:200')) } + this.drawSljhItem(this.sljhItemList.r('0:200')) + this.plslList=[] + this.plslflag=false this.drawBaiFang(this.dw[this.currentDwIndex].list) this.initYcldw(); })