diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 034ef30..03c229c 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -271,9 +271,23 @@
-
-
-
过程记录
+
+
+
+ 过程记录
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -356,7 +370,7 @@
-
-
@@ -503,6 +517,16 @@
+
+
+
+
@@ -988,6 +1022,15 @@ export default {
sfdcMaterialList: [],
sfdcRollOpsList: [],
sfdcDefectList: [],
+ // 机器下机卷分页
+ sfdcRollPage: 1,
+ sfdcRollLimit: 20,
+ // 材料清单下表分页
+ sfdcMaterialPage: 1,
+ sfdcMaterialLimit: 20,
+ // 上表展开/收起状态
+ showOrderToolTable: true,
+ showOrderBomTable: true,
sfdcRollList: [],
columnTimeArray: [
{
@@ -4036,9 +4079,33 @@ export default {
});
return sums;
},
+ // 机器下机卷分页
+ sizeChangeHandleRoll(val) {
+ this.sfdcRollLimit = val;
+ this.sfdcRollPage = 1;
+ },
+ currentChangeHandleRoll(val) {
+ this.sfdcRollPage = val;
+ },
+ // 材料清单分页
+ sizeChangeHandleMaterial(val) {
+ this.sfdcMaterialLimit = val;
+ this.sfdcMaterialPage = 1;
+ },
+ currentChangeHandleMaterial(val) {
+ this.sfdcMaterialPage = val;
+ },
+ // 展开/收起上表
+ toggleOrderToolTable() {
+ this.showOrderToolTable = !this.showOrderToolTable;
+ },
+ toggleOrderBomTable() {
+ this.showOrderBomTable = !this.showOrderBomTable;
+ },
// 机器下机卷
sfdcRollListSummaries(param) {
- const {columns, data} = param;
+ const {columns} = param;
+ const data = this.sfdcRollList;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
diff --git a/src/views/modules/yieldReport/com_split_order_report.vue b/src/views/modules/yieldReport/com_split_order_report.vue
index 8439ce3..882fa21 100644
--- a/src/views/modules/yieldReport/com_split_order_report.vue
+++ b/src/views/modules/yieldReport/com_split_order_report.vue
@@ -103,7 +103,21 @@
@@ -673,6 +705,15 @@ export default {
sfdcMaterialList: [],
sfdcRollOpsList: [],
sfdcDefectList: [],
+ // 机器下机卷分页
+ sfdcRollPage: 1,
+ sfdcRollLimit: 20,
+ // 材料清单下表分页
+ sfdcMaterialPage: 1,
+ sfdcMaterialLimit: 20,
+ // 上表展开/收起状态
+ showOrderToolTable: true,
+ showOrderBomTable: true,
materialRollList: [],
columnTimeArray: [
{
@@ -3366,9 +3407,33 @@ export default {
});
return sums;
},
+ // 机器下机卷分页
+ sizeChangeHandleRoll(val) {
+ this.sfdcRollLimit = val;
+ this.sfdcRollPage = 1;
+ },
+ currentChangeHandleRoll(val) {
+ this.sfdcRollPage = val;
+ },
+ // 材料清单分页
+ sizeChangeHandleMaterial(val) {
+ this.sfdcMaterialLimit = val;
+ this.sfdcMaterialPage = 1;
+ },
+ currentChangeHandleMaterial(val) {
+ this.sfdcMaterialPage = val;
+ },
+ // 展开/收起上表
+ toggleOrderToolTable() {
+ this.showOrderToolTable = !this.showOrderToolTable;
+ },
+ toggleOrderBomTable() {
+ this.showOrderBomTable = !this.showOrderBomTable;
+ },
// 机器下机卷
sfdcRollListSummaries(param) {
- const {columns, data} = param;
+ const {columns} = param;
+ const data = this.materialRollList;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {