From b0434eff1efda6bfa875f0b1beadddda846df471 Mon Sep 17 00:00:00 2001 From: xiaoning <1097449274@qq.com> Date: Thu, 13 Mar 2025 12:24:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E5=9E=AE=E9=81=93(1,2,3,4=E8=B7=A8)?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=8C=E6=88=90=E5=92=8C=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=95=B0=E9=87=8F=20=E6=9F=A5=E7=9C=8B=E5=B7=B2?= =?UTF-8?q?=E5=AE=8C=E5=B7=A5=E5=92=8C=E6=9C=AA=E5=AE=8C=E5=B7=A5=E7=9A=84?= =?UTF-8?q?=E6=89=B9=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/jhzx/ydjhzxCX.vue | 171 +++++++++++++++++++++++++++--------- 1 file changed, 129 insertions(+), 42 deletions(-) diff --git a/src/views/jhzx/ydjhzxCX.vue b/src/views/jhzx/ydjhzxCX.vue index 63199fe..670192b 100644 --- a/src/views/jhzx/ydjhzxCX.vue +++ b/src/views/jhzx/ydjhzxCX.vue @@ -2,7 +2,7 @@ - + @@ -44,6 +44,17 @@ + + + + + 全部 + 已完工 + 未完工 + + + + @@ -67,7 +78,6 @@ highlight-hover-row show-overflow :cell-style="cellStyle" - :tooltip-config="{showAll:true, enterable: true,contentMethod:showWarning}" :scroll-y="{enabled: true}" @cell-dblclick="getListhzBymx1" > @@ -120,6 +130,9 @@ export default { components: {ScrollPane}, data() { return { + wgqk:"0", + allList:[], + dateTime:'', statusOptions:[], dialogVisible:false, title1:'修改明细信息', @@ -193,15 +206,55 @@ export default { { field: 'pwCount', title: '抛丸板数',width: 80, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, - { field: 'llCount', title: '理料板数',width: 80, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }}, + // { field: 'llCount', title: '理料板数',width: 80, + // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + // filterRender: { name: 'FilterCombination', }}, { field: 'hxCount', title: '划线板数',width: 80, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, { field: 'qgCount', title: '切割板数',width: 80, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }}, + { title: '1跨', + children: [ + { field: 'qgCount1k', title: '完成',width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', } }, + { field: 'qgCount1kw', title: '未完成',width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', } } + ] + }, + { title: '2跨', + children: [ + { field: 'qgCount2k', title: '完成',width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', } }, + { field: 'qgCount2kw', title: '未完成',width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', } } + ] + }, + { title: '3跨', + children: [ + { field: 'qgCount3k', title: '完成',width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', } }, + { field: 'qgCount3kw', title: '未完成',width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', } } + ] + }, + { title: '4跨', + children: [ + { field: 'qgCount4k', title: '完成',width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', } }, + { field: 'qgCount4kw', title: '未完成',width: 80, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', } } + ] + }, ], tableColumn:[ { type: 'checkbox', width: 50 ,}, @@ -730,8 +783,33 @@ export default { this.initBase() this.initgxList() this.initWorkers() + this.getNowTime() }, methods: { + getNowTime(){ + this.dateTime=XEUtils.toDateString(XEUtils.getWhatDay(new Date(), 0, 'first'),'yyyy/MM/dd') + }, + changeData(){ + this.dataChange(this.allList) + }, + dataChange(arr){ + this.list1=[] + //判断是否展示全部数据 已完成 未完成 + if(this.wgqk=='0'){ this.list1=arr} + if(this.wgqk=='1'){ + arr.forEach(item=>{ + if (item.qgCount==item.slxhthCount){ + this.list1.push(item) + } + }) + } + if(this.wgqk=='2'){ + arr.forEach(item=>{ + if (item.qgCount '0' && row.slCount '0' && row.pwCount '0' && row.slCount '0' && row.llCount '0' && row.pwCountrow.pwjhrq) { + return { + backgroundColor: '#FF0000FF', + color: '#fff', + cursor: 'pointer' + } } } - } - if (column.field === 'hxCount') { - if (row.hxCount > '0' && row.hxCount '0' && row.llCountrow.hxjhrq) { + // return { + // backgroundColor: '#FF0000FF', + // color: '#fff', + // cursor: 'pointer' + // } + // } + // } + if (column.field === 'hxCount') { + if (row.hxCount > '0' && row.hxCountrow.hxjhrq) { + return { + backgroundColor: '#FF0000FF', + color: '#fff', + cursor: 'pointer' + } } } - } - if (column.field === 'qgCount') { - if (row.qgCount > '0' && row.qgCount '0' && row.qgCountrow.qgjhrq) { + return { + backgroundColor: '#FF0000FF', + color: '#fff', + cursor: 'pointer' + } } } + return null } - return null }, save(){ const data=this.$refs.xGrid.getCheckboxRecords() @@ -921,7 +1006,9 @@ export default { return } getListhz(this.queryParam).then((res) => { - this.list1 = res.data + this.allList=res.data + //判断是否展示全部数据 已完成 未完成：未完工条件按照切割完成数量<上料匹配数量 + this.dataChange(this.allList) if (this.$refs.xGrid) { this.$refs.xGrid.loadData(this.list) }