diff --git a/hw-ui/src/views/board/fourthFloor/assemble.vue b/hw-ui/src/views/board/fourthFloor/assemble.vue
index ae5c5adb..a8d213d0 100644
--- a/hw-ui/src/views/board/fourthFloor/assemble.vue
+++ b/hw-ui/src/views/board/fourthFloor/assemble.vue
@@ -348,6 +348,7 @@
首页
成品入库
成品出库
+ {{ showTitle }}完工
退出
@@ -612,7 +613,9 @@ export default {
//预览文件数据列表
fileListData: [],
rawOutstockData:[],
- purchaseOrderData:[]
+ purchaseOrderData:[],
+ IS_SHOW_FINISH: "1",
+ showTitle: "显示"
}
},
created() {
@@ -628,7 +631,7 @@ export default {
// duration: 0
// });
// }, 60 * 1000)
- getProductPlans({pageNum: 1, pageSize: 5}).then(async e => {
+ getProductPlans({pageNum: 1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(async e => {
this.tableData = e.rows
this.totalNum1 = Math.ceil(e.total / 5)
this.$refs.planTable.setCurrentRow(e.rows?.[0]);
@@ -896,14 +899,14 @@ export default {
},
next1() {
this.nowNum1 += 1
- getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
this.tableData = e.rows
this.totalNum1 = Math.ceil(e.total / 5)
})
},
pre1() {
this.nowNum1 -= 1
- getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
this.tableData = e.rows
this.totalNum1 = Math.ceil(e.total / 5)
})
@@ -1388,7 +1391,22 @@ export default {
// this.loading = false;
});
}
- }
+ },
+
+ showFinish() {
+ if (this.IS_SHOW_FINISH === "1"){
+ this.showTitle = "隐藏";
+ this.IS_SHOW_FINISH = "";
+ } else {
+ this.showTitle = "显示";
+ this.IS_SHOW_FINISH = "1";
+ }
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
+ this.tableData = e.rows
+ this.totalNum1 = Math.ceil(e.total / 5)
+ })
+ },
+
}
}
diff --git a/hw-ui/src/views/board/fourthFloor/laserLight.vue b/hw-ui/src/views/board/fourthFloor/laserLight.vue
index cf7f3f7c..b3fb35c2 100644
--- a/hw-ui/src/views/board/fourthFloor/laserLight.vue
+++ b/hw-ui/src/views/board/fourthFloor/laserLight.vue
@@ -305,6 +305,7 @@
首页
板材入库
+ {{ showTitle }}完工
SOP预览
退出
@@ -472,7 +473,9 @@ export default {
//预览文件数据列表
fileListData: [],
rawOutstockData:[],
- purchaseOrderData:[]
+ purchaseOrderData:[],
+ IS_SHOW_FINISH: "1",
+ showTitle: "显示"
}
},
async mounted() {
@@ -486,7 +489,7 @@ export default {
// duration: 0
// });
// }, 60 * 1000)
- const data = await getProductPlans({pageNum: 1, pageSize: 5}).then(e => {
+ const data = await getProductPlans({pageNum: 1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
this.tableData = e.rows
this.totalNum1 = Math.ceil(e.total / 5)
this.$refs.table1.setCurrentRow(e.rows[0]);
@@ -683,14 +686,14 @@ export default {
},
next1() {
this.nowNum1 += 1
- getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
this.tableData = e.rows
this.totalNum1 = Math.ceil(e.total / 5)
})
},
pre1() {
this.nowNum1 -= 1
- getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
this.tableData = e.rows
this.totalNum1 = Math.ceil(e.total / 5)
})
@@ -1092,7 +1095,7 @@ export default {
message: '已完成'
});
- getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
this.tableData = e.rows
this.totalNum1 = Math.ceil(e.total / 5)
let data = e.rows.find(v => v.planCode === this.form.planCode) || null
@@ -1410,7 +1413,21 @@ export default {
// this.loading = false;
});
}
- }
+ },
+
+ showFinish() {
+ if (this.IS_SHOW_FINISH === "1"){
+ this.showTitle = "隐藏";
+ this.IS_SHOW_FINISH = "";
+ } else {
+ this.showTitle = "显示";
+ this.IS_SHOW_FINISH = "1";
+ }
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
+ this.tableData = e.rows
+ this.totalNum1 = Math.ceil(e.total / 5)
+ })
+ },
},
diff --git a/hw-ui/src/views/board/fourthFloor/weld.vue b/hw-ui/src/views/board/fourthFloor/weld.vue
index 8a960ce4..352aab07 100644
--- a/hw-ui/src/views/board/fourthFloor/weld.vue
+++ b/hw-ui/src/views/board/fourthFloor/weld.vue
@@ -281,6 +281,7 @@
首页
+ {{ showTitle }}完工
退出
@@ -451,6 +452,8 @@ export default {
NOT_SINGLE: "0",//非单独成品条码标识
INTERNAL: '2'//对内条码
},
+ IS_SHOW_FINISH: "1",
+ showTitle: "显示"
}
},
mounted() {
@@ -624,7 +627,7 @@ export default {
// }
// ]
// })
- getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
this.tableData = e.rows
this.totalNum1 = Math.ceil(e.total / 5)
this.tableClick(e.rows[0])
@@ -646,14 +649,14 @@ export default {
},
next1() {
this.nowNum1 += 1
- getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
this.tableData = e.rows
this.totalNum1 = Math.ceil(e.total / 5)
})
},
pre1() {
this.nowNum1 -= 1
- getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
this.tableData = e.rows
this.totalNum1 = Math.ceil(e.total / 5)
})
@@ -1026,7 +1029,7 @@ export default {
type: 'success'
});
}
- getProductPlans({pageNum: this.nowNum1, pageSize: 5}).then(e => {
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
this.tableData = e.rows
this.totalNum1 = Math.ceil(e.total / 5)
this.tableClick(e.rows.find(v => v.planCode === this.form.planCode))
@@ -1169,6 +1172,20 @@ export default {
this.printModel = true
},
+ showFinish() {
+ if (this.IS_SHOW_FINISH === "1"){
+ this.showTitle = "隐藏";
+ this.IS_SHOW_FINISH = "";
+ } else {
+ this.showTitle = "显示";
+ this.IS_SHOW_FINISH = "1";
+ }
+ getProductPlans({pageNum: this.nowNum1, pageSize: 5, incompleteFlag: this.IS_SHOW_FINISH}).then(e => {
+ this.tableData = e.rows
+ this.totalNum1 = Math.ceil(e.total / 5)
+ })
+ },
+
}
}