projects/mesxc-zhp
en projects/mesxc-test
hace 6 meses
@@ -11,7 +11,7 @@ | |||
<el-col :span="12"> | |||
<el-form-item label="产线" prop="productionLineId" | |||
:rules="[{ required: true, message: '不能为空', trigger: 'blur' }]"> | |||
<el-select v-model="dataForm.productionLineId" placeholder="请选择产线" filterable | |||
<el-select v-model="dataForm.productionLineId" placeholder="请选择产线" filterable :disabled="disabled" | |||
@change="handleProductlineChange"> | |||
<el-option v-for="opt in productionLineList" :key="opt.value" :label="opt.label" :value="opt.value" /> | |||
</el-select> | |||
@@ -19,7 +19,8 @@ | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="工段" prop="sectionId" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]"> | |||
<el-select v-model="dataForm.sectionId" placeholder="请选择工段" filterable @change="$emit('update', dataForm)"> | |||
<el-select :disabled="disabled" v-model="dataForm.sectionId" placeholder="请选择工段" filterable | |||
@change="$emit('update', dataForm)"> | |||
<el-option v-for="opt in workshopSectionList" :key="opt.value" :label="opt.label" :value="opt.value" /> | |||
</el-select> | |||
</el-form-item> | |||
@@ -109,6 +110,7 @@ export default { | |||
productionLineId: null, | |||
inspectionDetIdList:[], | |||
}, | |||
disabled:false, | |||
formLoading: true, | |||
productionLineList: [], | |||
inspectionDetList:[], | |||
@@ -148,6 +150,7 @@ export default { | |||
// if(obj.id) | |||
if (obj) { | |||
this.dataForm.id = obj.id || null; | |||
this.disabled = true | |||
} | |||
this.$nextTick(() => { | |||
this.$refs["dataForm"].resetFields() | |||
@@ -167,7 +170,6 @@ export default { | |||
console.log(1111); | |||
this.urlOptions.infoURL(obj.id).then(response => { | |||
this.dataForm.id = response.data.id | |||
// if (this.setData) { | |||
// this.setDataForm() | |||
// } | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2024-01-24 15:15:24 | |||
* @LastEditTime: 2024-03-08 15:09:26 | |||
* @LastEditTime: 2024-03-11 08:59:40 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -140,7 +140,7 @@ export default { | |||
// console.log(val.setHours(7, 0, 0)) | |||
// console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) | |||
// let time = this.format(val.setHours(7, 0, 0)) | |||
this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000 | |||
console.log(this.listQuery.reportTime); | |||
} else { | |||
@@ -1,46 +1,33 @@ | |||
<!-- | |||
* @Author: Do not edit | |||
* @Date: 2023-12-13 14:10:04 | |||
* @LastEditTime: 2024-03-07 16:17:14 | |||
* @LastEditTime: 2024-03-11 14:21:40 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
<template> | |||
<div> | |||
<el-row style="float: right; margin-bottom: 5px"> | |||
<el-button size="small" @click="edit = true">编辑</el-button> | |||
<el-button v-if="!edit" size="small" @click="edit = true">编辑</el-button> | |||
<el-button v-if="edit" size="small" @click="edit= false">返回</el-button> | |||
<el-button v-if="edit" size="small" @click="updateData">保存</el-button> | |||
</el-row> | |||
<el-table | |||
:data="data" | |||
border | |||
show-summary | |||
style="width: 100%"> | |||
<el-table-column | |||
v-for="(item, index) in cols" | |||
:key="index" :prop="item.prop" | |||
:label="item.label" | |||
<el-table :data="data" border show-summary style="width: 100%"> | |||
<el-table-column v-for="(item, index) in cols" :key="index" :prop="item.prop" :label="item.label" | |||
:align="item.align ? item.align : 'left'"> | |||
<el-table-column | |||
v-for="(it, index1) in item.children" | |||
:key="index1" | |||
:prop="it.prop" | |||
:label="it.label" | |||
<el-table-column v-for="(it, index1) in item.children" :key="index1" :prop="it.prop" :label="it.label" | |||
:align="item.align ? item.align : 'left'"> | |||
<el-table-column | |||
v-for="(y, index2) in it.children" | |||
:key="index2" | |||
:prop="y.prop" | |||
:label="y.label"> | |||
<template slot-scope="scope"> | |||
<span v-if="!edit">{{ scope.row[y.prop] }}</span> | |||
<el-input v-else v-model.number="scope.row[y.prop]"></el-input> | |||
</template> | |||
<el-table-column v-for="(y, index2) in it.children" :key="index2" :prop="y.prop" :label="y.label"> | |||
<template slot-scope="scope"> | |||
<span v-if="!edit">{{ scope.row[y.prop] }}</span> | |||
<el-input v-else v-model="scope.row[y.prop]"></el-input> | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
</el-table-column> | |||
</el-table> | |||
<el-input type="textarea" v-model="sum.remark" placeholder="备注" :disabled="!edit" :autosize="{ minRows: 2, maxRows: 6}"></el-input> | |||
<el-input type="textarea" v-model="sum.remark" placeholder="备注" :disabled="!edit" | |||
:autosize="{ minRows: 2, maxRows: 6}"></el-input> | |||
</div> | |||
</template> | |||
@@ -189,6 +176,10 @@ const cols = [ | |||
text1 = '本月' | |||
text2 = '上月' | |||
text3 = '原片合计(片/月)' | |||
} else if (newv === 2) { | |||
text1 = '今日' | |||
text2 = '昨日' | |||
text3 = '原片合计(片/日)' | |||
} else { | |||
text1 = '本年' | |||
text2 = '上年' | |||
@@ -128,11 +128,11 @@ export default { | |||
} | |||
break | |||
} | |||
this.startTimeStamp = this.timeFun(new Date(fullyear, timeStamp, 1).getTime()); //开始时间 | |||
this.endTimeStamp = this.timeFun(new Date(fullyear, timeStamp, days, 23, 59, 59).getTime()); //结束时间 | |||
this.startTimeStamp = this.timeFun(new Date(fullyear, timeStamp, 1, 7, 0, 1).getTime()); //开始时间 | |||
this.endTimeStamp = this.timeFun(new Date(fullyear, timeStamp, days, 7, 0, 0).getTime()); //结束时间 | |||
console.log(this.startTimeStamp, this.endTimeStamp) | |||
this.listQuery.reportTime[0] = parseTime(new Date(fullyear, timeStamp, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.listQuery.reportTime[1] = parseTime(new Date(fullyear, timeStamp, days, 23, 59, 59).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000 | |||
this.listQuery.reportTime[0] = parseTime(new Date(fullyear, timeStamp, 1, 7, 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.listQuery.reportTime[1] = parseTime(new Date(fullyear, timeStamp, days, 7, 0, 0).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000 | |||
} else { | |||
this.listQuery.reportTime = [] | |||
} | |||
@@ -138,8 +138,8 @@ export default { | |||
this.startTimeStamp = this.timeFun(timeStamp - 24 * 60 * 60 * 1000); //开始时间 | |||
this.endTimeStamp = this.timeFun(timeStamp + (24 * 60 * 60 * 1000) * 5); //结束时间 | |||
console.log(this.startTimeStamp, this.endTimeStamp) | |||
this.listQuery.reportTime[0] = parseTime(new Date(this.startTimeStamp + ' 00:00:00').getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.listQuery.reportTime[1] = parseTime(new Date(this.endTimeStamp + ' 23:59:59').getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000 | |||
this.listQuery.reportTime[0] = parseTime(new Date(this.startTimeStamp + ' 07:00:01').getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.listQuery.reportTime[1] = parseTime(new Date(this.endTimeStamp + ' 07:00:01').getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000 | |||
} else { | |||
this.listQuery.reportTime = [] | |||
} | |||
@@ -65,10 +65,10 @@ export default { | |||
date.setDate(1); | |||
date.setMonth(0); | |||
this.reportTime = date; | |||
this.startTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 0, 1).getTime()); //开始时间 | |||
this.endTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 11, 31, 23, 59, 59).getTime()); //结束时间 | |||
this.listQuery.reportTime[0] = parseTime(new Date(new Date().getFullYear(), 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.listQuery.reportTime[1] = parseTime(new Date(new Date().getFullYear(), 11, 31, 23, 59, 59).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 100 | |||
this.startTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 0, 1,7,0,1).getTime()); //开始时间 | |||
this.endTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 11, 31, 7, 0, 0).getTime()); //结束时间 | |||
this.listQuery.reportTime[0] = parseTime(new Date(new Date().getFullYear(), 0, 1, 7, 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.listQuery.reportTime[1] = parseTime(new Date(new Date().getFullYear(), 11, 31, 7, 0, 0).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 100 | |||
}, | |||
async getDict() { | |||
// 产线列表 | |||
@@ -103,10 +103,10 @@ export default { | |||
changeTime(val) { | |||
if(val) { | |||
// let timeStamp = val.getTime(); //标准时间转为时间戳,毫秒级别 | |||
this.startTimeStamp = this.timeFun(new Date(val.getFullYear(), 0, 1).getTime()); //开始时间 | |||
this.endTimeStamp = this.timeFun(new Date(val.getFullYear(), 11, 31, 23, 59, 59).getTime()); //结束时间 | |||
this.listQuery.reportTime[0] = parseTime(new Date(val.getFullYear(), 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.listQuery.reportTime[1] = parseTime(new Date(val.getFullYear(), 11, 31, 23, 59, 59).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000 | |||
this.startTimeStamp = this.timeFun(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()); //开始时间 | |||
this.endTimeStamp = this.timeFun(new Date(val.getFullYear(), 11, 31, 7, 0, 0).getTime()); //结束时间 | |||
this.listQuery.reportTime[0] = parseTime(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.listQuery.reportTime[1] = parseTime(new Date(val.getFullYear(), 11, 31, 7, 0, 0).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000 | |||
} else { | |||
this.listQuery.reportTime = [] | |||
} | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-12-12 13:45:25 | |||
* @LastEditTime: 2024-03-07 16:10:22 | |||
* @LastEditTime: 2024-03-11 15:29:49 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -24,49 +24,49 @@ | |||
background: '#F2F4F9', | |||
color: '#606266' | |||
}"> | |||
<el-table-column :label="'许昌安彩日成品生产汇总' + timeTips" align="center"> | |||
<el-table-column prop="lineName" label="生产线"> | |||
<el-table-column :label="'许昌安彩日成品生产汇总' + '(' + timeTips + ')'" align="center"> | |||
<el-table-column prop="lineName" label="生产线" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.lineName" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.lineName }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column label="投入数㎡"> | |||
<el-table-column prop="inputNow" label="本周"> | |||
<el-table-column label="投入数㎡" align="center"> | |||
<el-table-column prop="inputNow" label="今日" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.inputNow" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.inputNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="inputHis" label="上周"> | |||
<el-table-column prop="inputHis" label="昨日" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.inputHis" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.inputHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="inputTrend" label="增减"> | |||
<el-table-column prop="inputTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.inputTrend }} </span> | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column label="完成良品产量"> | |||
<el-table-column prop="goodProductNow" label="本周"> | |||
<el-table-column label="完成良品产量" align="center"> | |||
<el-table-column prop="goodProductNow" label="今日" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductNow" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductHis" label="上周"> | |||
<el-table-column prop="goodProductHis" label="昨日" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductHis" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductTrend" label="增减"> | |||
<el-table-column prop="goodProductTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled"> | |||
</el-input> | |||
@@ -74,20 +74,20 @@ | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column label="原片漏检率"> | |||
<el-table-column prop="missCheckNow" label="本周"> | |||
<el-table-column label="原片漏检率" align="center"> | |||
<el-table-column prop="missCheckNow" label="今日" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.missCheckNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="missCheckHis" label="上周"> | |||
<el-table-column prop="missCheckHis" label="昨日" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.missCheckHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="missCheckTrend" label="增减"> | |||
<el-table-column prop="missCheckTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled"> | |||
</el-input> | |||
@@ -95,22 +95,22 @@ | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column label="综合良品率"> | |||
<el-table-column prop="goodProductPassNow" label="本周"> | |||
<el-table-column label="综合良品率" align="center"> | |||
<el-table-column prop="goodProductPassNow" label="今日" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductPassNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductPassHis" label="上周"> | |||
<el-table-column prop="goodProductPassHis" label="昨日" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductPassHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductPassTrend" label="增减"> | |||
<el-table-column prop="goodProductPassTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled"> | |||
</el-input> | |||
@@ -119,9 +119,8 @@ | |||
</el-table-column> | |||
</el-table-column> | |||
</el-table-column> | |||
<div style="height: 50px;" class="remark" slot="append"> | |||
<h3 style="float: left;text-align: center;margin-left: 20px;">备注:</h3> | |||
<el-input v-if="!disabled" v-model="remark" :disabled="disabled"> | |||
<div class="remark" slot="append"> | |||
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ remark }} </span> | |||
</div> | |||
@@ -169,11 +168,11 @@ const tableProps = [ | |||
children: [ | |||
{ | |||
prop: 'inputNow', | |||
label: '本周' | |||
label: '今日' | |||
}, | |||
{ | |||
prop: 'inputHis', | |||
label: '上周' | |||
label: '昨日' | |||
}, | |||
{ | |||
prop: 'inputTrend', | |||
@@ -189,11 +188,11 @@ const tableProps = [ | |||
children: [ | |||
{ | |||
prop: 'goodProductNow', | |||
label: '本周' | |||
label: '今日' | |||
}, | |||
{ | |||
prop: 'goodProductHis', | |||
label: '上周' | |||
label: '昨日' | |||
}, | |||
{ | |||
prop: 'goodProductTrend', | |||
@@ -209,11 +208,11 @@ const tableProps = [ | |||
children: [ | |||
{ | |||
prop: 'missCheckNow', | |||
label: '本周' | |||
label: '今日' | |||
}, | |||
{ | |||
prop: 'missCheckHis', | |||
label: '上周' | |||
label: '昨日' | |||
}, | |||
{ | |||
prop: 'missCheckTrend', | |||
@@ -229,11 +228,11 @@ const tableProps = [ | |||
children: [ | |||
{ | |||
prop: 'goodProductPassNow', | |||
label: '本周' | |||
label: '今日' | |||
}, | |||
{ | |||
prop: 'goodProductPassHis', | |||
label: '上周' | |||
label: '昨日' | |||
}, | |||
{ | |||
prop: 'goodProductPassTrend', | |||
@@ -450,7 +449,7 @@ export default { | |||
// console.log(val.setHours(7, 0, 0)) | |||
// console.log(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) | |||
// let time = this.format(val.setHours(7, 0, 0)) | |||
this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000 | |||
console.log(this.listQuery.reportTime); | |||
} else { | |||
@@ -553,7 +552,7 @@ export default { | |||
// this.listQuery.reportTime[0] = this.transformTime(this.monthValue[0]) | |||
// // this.queryParams.startTime = this.monthValue[0] | |||
// this.listQuery.reportTime[1] = this.transformTime(this.monthValue[1]) | |||
// this.timeTips = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' - ' + moment(this.monthValue[1]).format('YYYY-MM-DD') | |||
this.timeTips = moment(new Date()).format('YYYY-MM-DD') + ' - ' + moment(new Date().setHours(7, 0, 0) + 24 * 60 * 60 * 1000).format('YYYY-MM-DD') | |||
// console.log(this.timeTips); | |||
// } else { | |||
// // this.$modal.msgError('月范围不能为空') | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-12-12 13:45:25 | |||
* @LastEditTime: 2024-03-07 16:07:25 | |||
* @LastEditTime: 2024-03-11 15:46:20 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -26,49 +26,49 @@ | |||
background: '#F2F4F9', | |||
color: '#606266' | |||
}"> | |||
<el-table-column :label="'许昌安彩月成品生产汇总' + timeTips" align="center"> | |||
<el-table-column prop="lineId" label="生产线"> | |||
<el-table-column :label="'许昌安彩月成品生产汇总' + '(' + timeTips + ')'" align="center"> | |||
<el-table-column prop="lineId" label="生产线" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.lineName" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.lineName }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column label="投入数㎡"> | |||
<el-table-column prop="inputNow" label="本周"> | |||
<el-table-column label="投入数㎡" align="center"> | |||
<el-table-column prop="inputNow" label="本月" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.inputNow" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.inputNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="inputHis" label="上周"> | |||
<el-table-column prop="inputHis" label="上月" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.inputHis" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.inputHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="inputTrend" label="增减"> | |||
<el-table-column prop="inputTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.inputTrend }} </span> | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column label="完成良品产量"> | |||
<el-table-column prop="goodProductNow" label="本周"> | |||
<el-table-column label="完成良品产量" align="center"> | |||
<el-table-column prop="goodProductNow" label="本月" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductNow" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductHis" label="上周"> | |||
<el-table-column prop="goodProductHis" label="上月" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductHis" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductTrend" label="增减"> | |||
<el-table-column prop="goodProductTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled"> | |||
</el-input> | |||
@@ -76,20 +76,20 @@ | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column label="原片漏检率"> | |||
<el-table-column prop="missCheckNow" label="本周"> | |||
<el-table-column label="原片漏检率" align="center"> | |||
<el-table-column prop="missCheckNow" label="本月" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.missCheckNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="missCheckHis" label="上周"> | |||
<el-table-column prop="missCheckHis" label="上月" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.missCheckHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="missCheckTrend" label="增减"> | |||
<el-table-column prop="missCheckTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled"> | |||
</el-input> | |||
@@ -97,22 +97,22 @@ | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column label="综合良品率"> | |||
<el-table-column prop="goodProductPassNow" label="本周"> | |||
<el-table-column label="综合良品率" align="center"> | |||
<el-table-column prop="goodProductPassNow" label="本月" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductPassNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductPassHis" label="上周"> | |||
<el-table-column prop="goodProductPassHis" label="上月" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductPassHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductPassTrend" label="增减"> | |||
<el-table-column prop="goodProductPassTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled"> | |||
</el-input> | |||
@@ -121,9 +121,8 @@ | |||
</el-table-column> | |||
</el-table-column> | |||
</el-table-column> | |||
<div style="height: 50px;" class="remark" slot="append"> | |||
<h3 style="float: left;text-align: center;margin-left: 20px;">备注:</h3> | |||
<el-input v-if="!disabled" v-model="remark" :disabled="disabled"> | |||
<div class="remark" slot="append"> | |||
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ remark }} </span> | |||
</div> | |||
@@ -172,11 +171,11 @@ const tableProps = [ | |||
children: [ | |||
{ | |||
prop: 'inputNow', | |||
label: '本周' | |||
label: '本月' | |||
}, | |||
{ | |||
prop: 'inputHis', | |||
label: '上周' | |||
label: '上月' | |||
}, | |||
{ | |||
prop: 'inputTrend', | |||
@@ -192,11 +191,11 @@ const tableProps = [ | |||
children: [ | |||
{ | |||
prop: 'goodProductNow', | |||
label: '本周' | |||
label: '本月' | |||
}, | |||
{ | |||
prop: 'goodProductHis', | |||
label: '上周' | |||
label: '上月' | |||
}, | |||
{ | |||
prop: 'goodProductTrend', | |||
@@ -212,15 +211,15 @@ const tableProps = [ | |||
children: [ | |||
{ | |||
prop: 'missCheckNow', | |||
label: '本周' | |||
label: '本月' | |||
}, | |||
{ | |||
prop: 'missCheckHis', | |||
label: '上周' | |||
label: '上月' | |||
}, | |||
{ | |||
prop: 'missCheckTrend', | |||
label: '增减' | |||
label: '增月' | |||
} | |||
] | |||
}, | |||
@@ -232,11 +231,11 @@ const tableProps = [ | |||
children: [ | |||
{ | |||
prop: 'goodProductPassNow', | |||
label: '本周' | |||
label: '本月' | |||
}, | |||
{ | |||
prop: 'goodProductPassHis', | |||
label: '上周' | |||
label: '上月' | |||
}, | |||
{ | |||
prop: 'goodProductPassTrend', | |||
@@ -323,9 +322,9 @@ export default { | |||
// }, | |||
], | |||
pickerOptions: { | |||
// disabledDate(date) { | |||
// return date.getTime() > Date.now() | |||
// } | |||
disabledDate(date) { | |||
return date.getTime() > Date.now() | |||
} | |||
}, | |||
// tableBtn: [ | |||
// this.$auth.hasPermi('base:quality-inspection-record:update') | |||
@@ -451,7 +450,8 @@ export default { | |||
}, | |||
getCurrentMonthFirst() { | |||
const date = new Date(); | |||
date.setDate(1); | |||
date.setDate(1) | |||
// date.setHours(7, 0, 1) | |||
this.monthValue[0] = moment(date).format('YYYY-MM-DD') | |||
console.log(date) | |||
// console.log(date.valueOf()); | |||
@@ -474,8 +474,8 @@ export default { | |||
// break | |||
// case '2': | |||
console.log(this.monthValue[1],this.monthValue[0]); | |||
if (this.monthValue[1] - this.monthValue[0] > 729 * 24 * 3600000) { | |||
this.$modal.msgError('最大时间范围为24个月,请重新选择')// 同理上面 | |||
if (this.monthValue[1] - this.monthValue[0] > 2629800000) { | |||
this.$modal.msgError('最大时间范围为1个月,请重新选择')// 同理上面 | |||
this.monthValue = [] | |||
} | |||
// break | |||
@@ -547,9 +547,9 @@ export default { | |||
async getDataList() { | |||
if (this.monthValue.length > 0) { | |||
console.log(this.monthValue) | |||
this.dataForm.reportTime[0] = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' 00:00:00' | |||
this.dataForm.reportTime[0] = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' 07:00:01' | |||
// this.queryParams.startTime = this.monthValue[0] | |||
this.dataForm.reportTime[1] = moment(this.monthValue[1]).format('YYYY-MM-DD') + ' 23:59:59' | |||
this.dataForm.reportTime[1] = moment(this.monthValue[1]).format('YYYY-MM-DD') + ' 07:00:00' | |||
this.timeTips = moment(this.monthValue[0]).format('YYYY-MM-DD') + ' - ' + moment(this.monthValue[1]).format('YYYY-MM-DD') | |||
console.log(this.timeTips); | |||
} else { | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-12-12 13:45:25 | |||
* @LastEditTime: 2024-03-07 16:10:47 | |||
* @LastEditTime: 2024-03-11 15:43:16 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -26,7 +26,7 @@ | |||
background: '#F2F4F9', | |||
color: '#606266' | |||
}"> | |||
<el-table-column :label="'许昌安彩周成品生产汇总' + timeTips" align="center"> | |||
<el-table-column :label="'许昌安彩周成品发货及库存日报' + '(' + timeTips + ')'" align="center"> | |||
<el-table-column prop="glassType" label="品种" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.glassType" :disabled="disabled"></el-input> | |||
@@ -54,7 +54,7 @@ | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column label="原片"> | |||
<el-table-column label="原片" align="center"> | |||
<el-table-column prop="originalGlassSize"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.originalGlassSize" :disabled="disabled"> | |||
@@ -66,77 +66,77 @@ | |||
</el-table-column> | |||
<!-- <el-table-column label="完成良品产量"> --> | |||
<el-table-column prop="customerId" label="用户"> | |||
<el-table-column prop="customerId" align="center" label="用户"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.customerId" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.customerId }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="packageType" label="包装形式"> | |||
<el-table-column prop="packageType" align="center" label="包装形式"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.packageType" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.packageType }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="orderNum" label="订单数量"> | |||
<el-table-column prop="orderNum" align="center" label="订单数量"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.orderNum" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.orderNum }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="orderFinish" label="订单完成"> | |||
<el-table-column prop="orderFinish" align="center" label="订单完成"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.orderFinish" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.orderFinish }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="orderRemaining" label="未完成订单"> | |||
<el-table-column prop="orderRemaining" align="center" label="未完成订单"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.orderRemaining" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.orderRemaining }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="stockLastMonth" label="上月库存"> | |||
<el-table-column prop="stockLastMonth" align="center" label="上月库存"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.stockLastMonth" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.stockLastMonth }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="productNumThisMonth" label="本月生产成品"> | |||
<el-table-column prop="productNumThisMonth" align="center" label="本月生产成品"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.productNumThisMonth" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.productNumThisMonth }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="deliveNum" label="发货量"> | |||
<el-table-column prop="deliveNum" align="center" label="发货量"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.deliveNum" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.deliveNum }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="undeliveNum" label="未发货量"> | |||
<el-table-column prop="undeliveNum" align="center" label="未发货量"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.undeliveNum" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.undeliveNum }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="undeliveArea" label="未发货面积"> | |||
<el-table-column prop="undeliveArea" align="center" label="未发货面积"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.undeliveArea" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.undeliveArea }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="deliveArea" label="发货面积"> | |||
<el-table-column prop="deliveArea" align="center" label="发货面积"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.deliveArea" :disabled="disabled"> | |||
</el-input> | |||
@@ -144,7 +144,7 @@ | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="productAreaThisMonth" label="本月生产面积"> | |||
<el-table-column prop="productAreaThisMonth" align="center" label="本月生产面积"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.productAreaThisMonth" :disabled="disabled"> | |||
</el-input> | |||
@@ -154,9 +154,8 @@ | |||
</el-table-column> | |||
<!-- </el-table-column> --> | |||
<div style="height: 50px;" class="remark" slot="append"> | |||
<h3 style="float: left;text-align: center;margin-left: 20px;">备注:</h3> | |||
<el-input v-if="!disabled" v-model="remark" :disabled="disabled"> | |||
<div class="remark" slot="append"> | |||
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ remark }} </span> | |||
</div> | |||
@@ -442,21 +441,6 @@ export default { | |||
// this.getProductLineList(); | |||
}, | |||
mounted() { | |||
// if (this.$route.params.startTime && this.$route.params.endTime) { | |||
// this.searchBarFormConfig[0].defaultSelect = [ | |||
// this.$route.params.startTime, | |||
// this.$route.params.endTime, | |||
// ]; | |||
// this.queryParams.param = {}; | |||
// this.$set( | |||
// this.queryParams.param, | |||
// 'startTime', | |||
// this.$route.params.startTime | |||
// ); | |||
// this.$set(this.queryParams.param, 'endTime', this.$route.params.endTime); | |||
// } else { | |||
// this.searchBarFormConfig[0].defaultSelect = []; | |||
// } | |||
this.getDataList() | |||
this.getDict() | |||
}, | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-12-12 13:45:25 | |||
* @LastEditTime: 2024-03-07 16:10:53 | |||
* @LastEditTime: 2024-03-11 15:36:25 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -29,104 +29,103 @@ | |||
background: '#F2F4F9', | |||
color: '#606266' | |||
}"> | |||
<el-table-column :label="'许昌安彩周成品生产汇总' + timeTips" align="center"> | |||
<el-table-column prop="lineId" label="生产线"> | |||
<el-table-column :label="'许昌安彩周成品生产汇总' + '(' + timeTips + ')'" align="center"> | |||
<el-table-column prop="lineId" label="生产线" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.lineName" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.lineName }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column label="投入数㎡"> | |||
<el-table-column prop="inputNow" label="本周"> | |||
<el-table-column label="投入数㎡" align="center"> | |||
<el-table-column prop="inputNow" label="本周" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.inputNow" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.inputNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="inputHis" label="上周"> | |||
<el-table-column prop="inputHis" label="上周" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.inputHis" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.inputHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="inputTrend" label="增减"> | |||
<el-table-column prop="inputTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.inputTrend }} </span> | |||
<span v-else>{{ scope.row.inputTrend + '%' }} </span> | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column label="完成良品产量"> | |||
<el-table-column prop="goodProductNow" label="本周"> | |||
<el-table-column label="完成良品产量" align="center"> | |||
<el-table-column prop="goodProductNow" label="本周" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductNow" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductHis" label="上周"> | |||
<el-table-column prop="goodProductHis" label="上周" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductHis" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductTrend" label="增减"> | |||
<el-table-column prop="goodProductTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductTrend }} </span> | |||
<span v-else>{{ scope.row.goodProductTrend + '%' }} </span> | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column label="原片漏检率"> | |||
<el-table-column prop="missCheckNow" label="本周"> | |||
<el-table-column label="原片漏检率" align="center"> | |||
<el-table-column prop="missCheckNow" label="本周" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.missCheckNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="missCheckHis" label="上周"> | |||
<el-table-column prop="missCheckHis" label="上周" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.missCheckHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="missCheckTrend" label="增减"> | |||
<el-table-column prop="missCheckTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.missCheckTrend }} </span> | |||
<span v-else>{{ scope.row.missCheckTrend + '%' }} </span> | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column label="综合良品率"> | |||
<el-table-column prop="goodProductPassNow" label="本周"> | |||
<el-table-column label="综合良品率" align="center"> | |||
<el-table-column prop="goodProductPassNow" label="本周" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductPassNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductPassHis" label="上周"> | |||
<el-table-column prop="goodProductPassHis" label="上周" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductPassHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductPassTrend" label="增减"> | |||
<el-table-column prop="goodProductPassTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductPassTrend }} </span> | |||
<span v-else>{{ scope.row.goodProductPassTrend + '%' }} </span> | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
</el-table-column> | |||
<div style="height: 50px;" class="remark" slot="append"> | |||
<h3 style="float: left;text-align: center;margin-left: 20px;">备注:</h3> | |||
<el-input v-if="!disabled" v-model="remark" :disabled="disabled"> | |||
<div class="remark" slot="append"> | |||
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ remark }} </span> | |||
</div> | |||
@@ -468,9 +467,9 @@ export default { | |||
}, | |||
async getDataList() { | |||
if (this.weekValue1 && this.weekValue2) { | |||
this.dataForm.reportTime[0] = moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 00:00:00' | |||
this.dataForm.reportTime[0] = moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' 07:00:01' | |||
// this.queryParams.startTime = this.monthValue[0] | |||
this.dataForm.reportTime[1] = moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 23:59:59' | |||
this.dataForm.reportTime[1] = moment(this.weekValue2).day(6).format('YYYY-MM-DD') + ' 07:00:00' | |||
this.timeTips = moment(this.weekValue1).day(0).format('YYYY-MM-DD') + ' - ' + moment(this.weekValue2).day(0).format('YYYY-MM-DD') | |||
} else { | |||
} | |||
@@ -1,7 +1,7 @@ | |||
<!-- | |||
* @Author: zhp | |||
* @Date: 2023-12-12 13:45:25 | |||
* @LastEditTime: 2024-03-07 16:11:03 | |||
* @LastEditTime: 2024-03-11 15:42:42 | |||
* @LastEditors: zhp | |||
* @Description: | |||
--> | |||
@@ -29,104 +29,103 @@ | |||
color: '#606266' | |||
}"> | |||
<el-table-column :label="'许昌安彩年成品生产汇总' + timeTips" align="center"> | |||
<el-table-column prop="lineId" label="生产线"> | |||
<el-table-column :label="'许昌安彩年成品生产汇总' + '(' + timeTips + ')'" align="center"> | |||
<el-table-column prop="lineId" label="生产线" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.lineName" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.lineName }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column label="投入数㎡"> | |||
<el-table-column prop="inputNow" label="本周"> | |||
<el-table-column label="投入数㎡" align="center"> | |||
<el-table-column prop="inputNow" label="今年" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.inputNow" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.inputNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="inputHis" label="上周"> | |||
<el-table-column prop="inputHis" label="去年" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.inputHis" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.inputHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="inputTrend" label="增减"> | |||
<el-table-column prop="inputTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.inputTrend" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.inputTrend }} </span> | |||
<span v-else>{{ scope.row.inputTrend + '%' }} </span> | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column label="完成良品产量"> | |||
<el-table-column prop="goodProductNow" label="本周"> | |||
<el-table-column label="完成良品产量" align="center"> | |||
<el-table-column prop="goodProductNow" label="今年" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductNow" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductHis" label="上周"> | |||
<el-table-column prop="goodProductHis" label="去年" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductHis" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductTrend" label="增减"> | |||
<el-table-column prop="goodProductTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductTrend" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductTrend }} </span> | |||
<span v-else>{{ scope.row.goodProductTrend + '%' }} </span> | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column label="原片漏检率"> | |||
<el-table-column prop="missCheckNow" label="本周"> | |||
<el-table-column label="原片漏检率" align="center"> | |||
<el-table-column prop="missCheckNow" label="今年" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.missCheckNow" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.missCheckNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="missCheckHis" label="上周"> | |||
<el-table-column prop="missCheckHis" label="去年" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.missCheckHis" :disabled="disabled"></el-input> | |||
<span v-else>{{ scope.row.missCheckHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="missCheckTrend" label="增减"> | |||
<el-table-column prop="missCheckTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.missCheckTrend" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.missCheckTrend }} </span> | |||
<span v-else>{{ scope.row.missCheckTrend + '%' }} </span> | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
<el-table-column label="综合良品率"> | |||
<el-table-column prop="goodProductPassNow" label="本周"> | |||
<el-table-column label="综合良品率" align="center"> | |||
<el-table-column prop="goodProductPassNow" label="今年" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassNow" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductPassNow }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductPassHis" label="上周"> | |||
<el-table-column prop="goodProductPassHis" label="去年" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassHis" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductPassHis }} </span> | |||
</template> | |||
</el-table-column> | |||
<el-table-column prop="goodProductPassTrend" label="增减"> | |||
<el-table-column prop="goodProductPassTrend" label="增减" align="center"> | |||
<template slot-scope="scope"> | |||
<el-input v-if="!disabled" v-model="scope.row.goodProductPassTrend" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ scope.row.goodProductPassTrend }} </span> | |||
<span v-else>{{ scope.row.goodProductPassTrend + '%' }} </span> | |||
</template> | |||
</el-table-column> | |||
</el-table-column> | |||
</el-table-column> | |||
<div style="height: 50px;" class="remark" slot="append"> | |||
<h3 style="float: left;text-align: center;margin-left: 20px;">备注:</h3> | |||
<el-input v-if="!disabled" v-model="remark" :disabled="disabled"> | |||
<div class="remark" slot="append"> | |||
<el-input placeholder="备注" v-if="disabled" v-model="remark" :disabled="disabled"> | |||
</el-input> | |||
<span v-else>{{ remark }} </span> | |||
</div> | |||
@@ -175,11 +174,11 @@ const tableProps = [ | |||
children: [ | |||
{ | |||
prop: 'inputNow', | |||
label: '本周' | |||
label: '今年' | |||
}, | |||
{ | |||
prop: 'inputHis', | |||
label: '上周' | |||
label: '去年' | |||
}, | |||
{ | |||
prop: 'inputTrend', | |||
@@ -195,11 +194,11 @@ const tableProps = [ | |||
children: [ | |||
{ | |||
prop: 'goodProductNow', | |||
label: '本周' | |||
label: '今年' | |||
}, | |||
{ | |||
prop: 'goodProductHis', | |||
label: '上周' | |||
label: '去年' | |||
}, | |||
{ | |||
prop: 'goodProductTrend', | |||
@@ -215,11 +214,11 @@ const tableProps = [ | |||
children: [ | |||
{ | |||
prop: 'missCheckNow', | |||
label: '本周' | |||
label: '今年' | |||
}, | |||
{ | |||
prop: 'missCheckHis', | |||
label: '上周' | |||
label: '去年' | |||
}, | |||
{ | |||
prop: 'missCheckTrend', | |||
@@ -235,11 +234,11 @@ const tableProps = [ | |||
children: [ | |||
{ | |||
prop: 'goodProductPassNow', | |||
label: '本周' | |||
label: '今年' | |||
}, | |||
{ | |||
prop: 'goodProductPassHis', | |||
label: '上周' | |||
label: '去年' | |||
}, | |||
{ | |||
prop: 'goodProductPassTrend', | |||
@@ -385,8 +384,8 @@ export default { | |||
this.reportTime = date; | |||
this.startTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 0, 1).getTime()); //开始时间 | |||
this.endTimeStamp = this.timeFun(new Date(new Date().getFullYear(), 11, 31, 23, 59, 59).getTime()); //结束时间 | |||
this.dataForm.reportTime[0] = parseTime(new Date(new Date().getFullYear(), 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.dataForm.reportTime[1] = parseTime(new Date(new Date().getFullYear(), 11, 31, 23, 59, 59).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 100 | |||
this.dataForm.reportTime[0] = parseTime(new Date(new Date().getFullYear(), 0, 1, 7, 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.dataForm.reportTime[1] = parseTime(new Date(new Date().getFullYear(), 11, 31, 7, 0, 0).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 100 | |||
}, | |||
handleExport() { | |||
// 处理查询参数 | |||
@@ -468,10 +467,10 @@ export default { | |||
console.log(val); | |||
if (val) { | |||
// let timeStamp = val.getTime(); //标准时间转为时间戳,毫秒级别 | |||
this.startTimeStamp = this.timeFun(new Date(val.getFullYear(), 0, 1).getTime()); //开始时间 | |||
this.endTimeStamp = this.timeFun(new Date(val.getFullYear(), 11, 31, 23, 59, 59).getTime()); //结束时间 | |||
this.dataForm.reportTime[0] = parseTime(new Date(val.getFullYear(), 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.dataForm.reportTime[1] = parseTime(new Date(val.getFullYear(), 11, 31, 23, 59, 59).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000 | |||
this.startTimeStamp = this.timeFun(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()); //开始时间 | |||
this.endTimeStamp = this.timeFun(new Date(val.getFullYear(), 11, 31, 7, 0, 0).getTime()); //结束时间 | |||
this.dataForm.reportTime[0] = parseTime(new Date(val.getFullYear(), 0, 1, 7, 0, 1).getTime()) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000 | |||
this.dataForm.reportTime[1] = parseTime(new Date(val.getFullYear(), 11, 31, 7, 0, 1).getTime()) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000 | |||
} else { | |||
this.dataForm.reportTime = [] | |||
} | |||
@@ -486,6 +485,7 @@ export default { | |||
return year + "-" + month.substring(month.length - 2, month.length) + "-" + date.substring(date.length - 2, date.length) | |||
}, | |||
async getDataList() { | |||
this.timeTips = moment(this.dataForm.reportTime[0]).format('YYYY-MM-DD') + " - " + moment(this.dataForm.reportTime[1]).format('YYYY-MM-DD') | |||
console.log(this.yearValue1); | |||
if (this.yearValue1 && this.yearValue2) { | |||
if (this.yearValue2 < this.yearValue1) { | |||
@@ -494,7 +494,6 @@ export default { | |||
} else { | |||
// this.dataForm.reportTime[0] = this.transformYear(this.yearValue1) | |||
// this.dataForm.reportTime[1] = this.transformYear(this.yearValue2) | |||
// this.timeTips = this.transformYear(this.yearValue1) + " - " + this.transformYear(this.yearValue1) | |||
} | |||
} | |||
this.loading = true; | |||