diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionProcess.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionProcess.vue
index b8edca9..aaa371c 100644
--- a/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionProcess.vue
+++ b/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionProcess.vue
@@ -318,12 +318,14 @@ export default {
threeDaysAgo.setDate(today.getDate() - 7);
this.query.cycledate = [this.formatDate(threeDaysAgo), this.formatDate(today)];
-
+ this.query.interval = 30;
this.onLoad(this.page, this.query);
},
methods: {
onChangeData() {},
toDetail(row, type) {
+ row.interval = this.query.interval;
+ row.cycledate = this.query.cycledate;
this.$emit('toDetail', row, type, '工序');
},
formatDate(date) {
diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionWorkorder.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionWorkorder.vue
index f31c961..cdaf1d7 100644
--- a/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionWorkorder.vue
+++ b/src/views/productionSchedulingPlan/statisticalAnalysis/production/executionWorkorder.vue
@@ -258,6 +258,7 @@ export default {
toDetail(row, type) {
console.log(909090,row, type);
row.interval = this.query.interval
+ row.cycledate = this.query.cycledate
this.$emit('toDetail', row, type, '作业中心');
},
formatDate(date) {
diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/production/processDeatils.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/production/processDeatils.vue
index ea33f29..0097db0 100644
--- a/src/views/productionSchedulingPlan/statisticalAnalysis/production/processDeatils.vue
+++ b/src/views/productionSchedulingPlan/statisticalAnalysis/production/processDeatils.vue
@@ -15,7 +15,6 @@
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
- @on-load="onLoad"
>
@@ -255,7 +254,7 @@ export default {
},
{
label: '班组',
- prop: 'teamId',
+ prop: 'makeTeam',
search: true,
sortable: true,
hide: true,
@@ -424,9 +423,15 @@ export default {
const threeDaysAgo = new Date(today);
threeDaysAgo.setDate(today.getDate() - 7);
- this.query.cycledate = [this.formatDate(threeDaysAgo), this.formatDate(today)];
+ // this.query.cycledate = [this.formatDate(threeDaysAgo), this.formatDate(today)];
console.log(this.processItem, 'processItem');
+ if (this.processItem.cycledate) {
+ this.query.cycledate = this.processItem.cycledate;
+ }
+ if (this.processItem.interval) {
+ this.query.interval = this.processItem.interval;
+ }
if (this.processItem.workCenterId) {
this.query.workCenterId = this.processItem.workCenterId + '';
}
@@ -456,6 +461,7 @@ export default {
this.query.endType = '延迟';
}
}
+ this.onLoad(this.page,this.query);
},
methods: {
onChangeData() {},
@@ -556,31 +562,43 @@ export default {
onLoad(page, params = {}) {
this.loading = false;
- let query_ = {}
- if (!!params.cycledate) {
- query_.startTime = params.cycledate[0];
- query_.endTime = params.cycledate[1];
+ let query_ = {};
+ if (!!this.query.cycledate) {
+ query_.startTime = this.query.cycledate[0];
+ query_.endTime = this.query.cycledate[1];
+ }
+ if (!!this.query.interval) {
+ query_.interval = this.query.interval;
+ }
+ if (!!this.query.workCenterId) {
+ query_.workCenterId = this.query.workCenterId;
+ }
+ if (!!this.query.cardNo) {
+ query_.cardNo = this.query.cardNo;
+ }
+ if (!!this.query.batchNo) {
+ query_.batchNo = this.query.batchNo;
}
- if (!!params.interval) {
- query_.interval = params.interval;
+ if (!!this.query.woCode) {
+ query_.woCode = this.query.woCode;
}
- if (!!params.workCenterId) {
- query_.workCenterId = params.workCenterId;
+ if (!!this.query.startType) {
+ query_.startType = this.query.startType;
}
- if (!!params.cardNo) {
- query_.cardNo = params.cardNo;
+ if (!!this.query.endType) {
+ query_.endType = this.query.endType;
}
- if (!!params.batchNo) {
- query_.batchNo = params.batchNo;
+ if (!!this.query.caId) {
+ query_.caId = this.query.caId;
}
- if (!!params.woCode) {
- query_.woCode = params.woCode;
+ if (!!this.query.ppsId) {
+ query_.ppsId = this.query.ppsId;
}
- if (!!params.startType) {
- query_.startType = params.startType;
+ if (!!this.query.partCode) {
+ query_.partCode = this.query.partCode;
}
- if (!!params.endType) {
- query_.endType = params.endType;
+ if (!!this.query.makeTeam) {
+ query_.makeTeam = this.query.makeTeam;
}
getProcessExecuteDetailPage(page.currentPage, page.pageSize, query_).then(res => {
this.data = res.data.data.records;
diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/production/workorderDetails.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/production/workorderDetails.vue
index 8f49601..0eafd79 100644
--- a/src/views/productionSchedulingPlan/statisticalAnalysis/production/workorderDetails.vue
+++ b/src/views/productionSchedulingPlan/statisticalAnalysis/production/workorderDetails.vue
@@ -335,8 +335,11 @@ export default {
const threeDaysAgo = new Date(today);
threeDaysAgo.setDate(today.getDate() - 7);
- this.query.cycledate = [this.formatDate(threeDaysAgo), this.formatDate(today)];
+ // this.query.cycledate = [this.formatDate(threeDaysAgo), this.formatDate(today)];
console.log(this.workorderItem, 'workorderItem');
+ if(this.workorderItem.cycledate){
+ this.query.cycledate = this.workorderItem.cycledate;
+ }
if(this.workorderItem.interval){
this.query.interval = this.workorderItem.interval;
}
@@ -487,6 +490,9 @@ export default {
if (!!params.endType) {
query_.endType = params.endType;
}
+ if (!!params.interval) {
+ query_.interval = params.interval;
+ }
getOrderExecuteDetailPage(page.currentPage, page.pageSize, query_).then(res => {
this.data = res.data.data.records;
diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/productionAnalysis.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/productionAnalysis.vue
index 03d2b1d..a23106b 100644
--- a/src/views/productionSchedulingPlan/statisticalAnalysis/productionAnalysis.vue
+++ b/src/views/productionSchedulingPlan/statisticalAnalysis/productionAnalysis.vue
@@ -37,7 +37,10 @@ export default {
};
},
methods: {
- handleClick() {},
+ handleClick() {
+ this.workorderItem = {};
+ this.processItem = {};
+ },
toDetail(row, type, tabName) {
if (tabName == '作业中心') {
this.activeName = 'second';