|
|
|
@ -2,7 +2,7 @@
|
|
|
|
|
<!-- 月度计划管理 -->
|
|
|
|
|
<el-container>
|
|
|
|
|
<el-header style="width: 100%; height: 50px;font-size: 12px">
|
|
|
|
|
<el-form :inline="true" label-width="65px" label-position="left">
|
|
|
|
|
<el-form :inline="true" label-width="82px" label-position="left">
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="10">
|
|
|
|
|
<el-form-item label="月份:">
|
|
|
|
@ -44,6 +44,17 @@
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="20">
|
|
|
|
|
<el-form-item label="完工情况:" >
|
|
|
|
|
<el-radio-group v-model="wgqk" @change="changeData" >
|
|
|
|
|
<el-radio label="0" >全部</el-radio>
|
|
|
|
|
<el-radio label="1" >已完工</el-radio>
|
|
|
|
|
<el-radio label="2" >未完工</el-radio>
|
|
|
|
|
</el-radio-group>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
</el-form>
|
|
|
|
|
</el-header>
|
|
|
|
|
<el-container style="padding-top: 0px">
|
|
|
|
@ -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<item.slxhthCount){
|
|
|
|
|
this.list1.push(item)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
} },
|
|
|
|
|
formatWorker({cellValue}){
|
|
|
|
|
return this.workers[cellValue]
|
|
|
|
|
},
|
|
|
|
@ -779,17 +857,14 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
//未完成数据颜色
|
|
|
|
|
cellStyle({row, column}){
|
|
|
|
|
if (column.field === 'slCount') {
|
|
|
|
|
if (row.slCount > '0' && row.slCount<row.slxhthCount) {
|
|
|
|
|
if (row.qgCount==row.slxhthCount) {
|
|
|
|
|
return {
|
|
|
|
|
backgroundColor: '#FF0000FF',
|
|
|
|
|
color: '#fff',
|
|
|
|
|
backgroundColor: 'rgba(165,255,40,0.71)',
|
|
|
|
|
cursor: 'pointer'
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (column.field === 'pwCount') {
|
|
|
|
|
if (row.pwCount > '0' && row.pwCount<row.slxhthCount) {
|
|
|
|
|
}else {
|
|
|
|
|
if (column.field === 'slCount') {
|
|
|
|
|
if (row.slCount > '0' && row.slCount<row.slxhthCount && row.sljhrq<this.dateTime) {
|
|
|
|
|
return {
|
|
|
|
|
backgroundColor: '#FF0000FF',
|
|
|
|
|
color: '#fff',
|
|
|
|
@ -797,8 +872,8 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (column.field === 'llCount') {
|
|
|
|
|
if (row.llCount > '0' && row.llCount<row.slxhthCount) {
|
|
|
|
|
if (column.field === 'pwCount') {
|
|
|
|
|
if (row.pwCount > '0' && row.pwCount<row.slxhthCount && this.dateTime>row.pwjhrq) {
|
|
|
|
|
return {
|
|
|
|
|
backgroundColor: '#FF0000FF',
|
|
|
|
|
color: '#fff',
|
|
|
|
@ -806,8 +881,17 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// if (column.field === 'llCount') {
|
|
|
|
|
// if (row.llCount > '0' && row.llCount<row.slxhthCount && this.dateTime>row.hxjhrq) {
|
|
|
|
|
// return {
|
|
|
|
|
// backgroundColor: '#FF0000FF',
|
|
|
|
|
// color: '#fff',
|
|
|
|
|
// cursor: 'pointer'
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
if (column.field === 'hxCount') {
|
|
|
|
|
if (row.hxCount > '0' && row.hxCount<row.slxhthCount) {
|
|
|
|
|
if (row.hxCount > '0' && row.hxCount<row.slxhthCount && this.dateTime>row.hxjhrq) {
|
|
|
|
|
return {
|
|
|
|
|
backgroundColor: '#FF0000FF',
|
|
|
|
|
color: '#fff',
|
|
|
|
@ -816,7 +900,7 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (column.field === 'qgCount') {
|
|
|
|
|
if (row.qgCount > '0' && row.qgCount<row.slxhthCount) {
|
|
|
|
|
if (row.qgCount > '0' && row.qgCount<row.slxhthCount && this.dateTime>row.qgjhrq) {
|
|
|
|
|
return {
|
|
|
|
|
backgroundColor: '#FF0000FF',
|
|
|
|
|
color: '#fff',
|
|
|
|
@ -825,6 +909,7 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
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)
|
|
|
|
|
}
|
|
|
|
|