|
|
@ -21,6 +21,7 @@
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item label="生产时间" prop="feedbackTimeArray">
|
|
|
|
<el-form-item label="生产时间" prop="feedbackTimeArray">
|
|
|
|
<el-date-picker v-model="queryParams.feedbackTimeArray" format="yyyy-MM-dd" type="datetimerange"
|
|
|
|
<el-date-picker v-model="queryParams.feedbackTimeArray" format="yyyy-MM-dd" type="datetimerange"
|
|
|
|
|
|
|
|
clearable
|
|
|
|
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
|
|
|
|
range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
|
|
|
|
</el-date-picker>
|
|
|
|
</el-date-picker>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
@ -879,23 +880,17 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
/** 查询报工报表列表 */
|
|
|
|
/** 查询报工报表列表 */
|
|
|
|
getList() {
|
|
|
|
getList() {
|
|
|
|
/**
|
|
|
|
if (this.queryParams.feedbackTimeArray != null &&this.queryParams.feedbackTimeArray.length > 0) {
|
|
|
|
if(this.queryParams.createTimeArray !=null && this.queryParams.createTimeArray.length>0){
|
|
|
|
|
|
|
|
this.queryParams.createTimeStart = moment(this.queryParams.createTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
|
|
|
|
|
|
|
|
this.queryParams.createTimeEnd = moment(this.queryParams.createTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (
|
|
|
|
|
|
|
|
this.queryParams.feedbackTimeArray != null &&
|
|
|
|
|
|
|
|
this.queryParams.feedbackTimeArray.length > 0
|
|
|
|
|
|
|
|
) {
|
|
|
|
|
|
|
|
this.queryParams.feedbackTimeStart = moment(
|
|
|
|
this.queryParams.feedbackTimeStart = moment(
|
|
|
|
this.queryParams.feedbackTimeArray[0]
|
|
|
|
this.queryParams.feedbackTimeArray[0]
|
|
|
|
).format("YYYY-MM-DD");
|
|
|
|
).format("YYYY-MM-DD");
|
|
|
|
this.queryParams.feedbackTimeEnd = moment(
|
|
|
|
this.queryParams.feedbackTimeEnd = moment(
|
|
|
|
this.queryParams.feedbackTimeArray[1]
|
|
|
|
this.queryParams.feedbackTimeArray[1]
|
|
|
|
).format("YYYY-MM-DD");
|
|
|
|
).format("YYYY-MM-DD");
|
|
|
|
}**/
|
|
|
|
}else{
|
|
|
|
|
|
|
|
this.queryParams.feedbackTimeStart = null;
|
|
|
|
|
|
|
|
this.queryParams.feedbackTimeEnd = null;
|
|
|
|
|
|
|
|
}
|
|
|
|
this.loading = true;
|
|
|
|
this.loading = true;
|
|
|
|
listReportWork(this.queryParams).then((response) => {
|
|
|
|
listReportWork(this.queryParams).then((response) => {
|
|
|
|
this.reportWorkList = response.rows;
|
|
|
|
this.reportWorkList = response.rows;
|
|
|
@ -916,6 +911,7 @@ export default {
|
|
|
|
},
|
|
|
|
},
|
|
|
|
// 取消按钮
|
|
|
|
// 取消按钮
|
|
|
|
cancel() {
|
|
|
|
cancel() {
|
|
|
|
|
|
|
|
window.location.reload();
|
|
|
|
this.open = false;
|
|
|
|
this.open = false;
|
|
|
|
this.openReport = false;
|
|
|
|
this.openReport = false;
|
|
|
|
this.openReportSAP = false;
|
|
|
|
this.openReportSAP = false;
|
|
|
@ -991,7 +987,7 @@ export default {
|
|
|
|
createTime: null,
|
|
|
|
createTime: null,
|
|
|
|
updateTime: null,
|
|
|
|
updateTime: null,
|
|
|
|
updateBy: null,
|
|
|
|
updateBy: null,
|
|
|
|
endReport: "0",
|
|
|
|
endReport: "0"
|
|
|
|
};
|
|
|
|
};
|
|
|
|
this.resetForm("form");
|
|
|
|
this.resetForm("form");
|
|
|
|
this.libTabs = [];
|
|
|
|
this.libTabs = [];
|
|
|
|