From 74decb66f7caa5ff38ca9ba2bfae4bc1376e7bc3 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 2 Jul 2024 22:44:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20pc=E5=8F=AF=E4=BF=AE=E6=94=B9=E5=88=86?=
=?UTF-8?q?=E5=88=87=E8=AE=A1=E5=88=92=E4=BF=A1=E6=81=AF-=E5=89=8D?=
=?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wms/pdm/order/slittingplan/index.vue | 210 ++++++++++++------
.../slittingplan/slittingproductionplan.js | 10 +-
2 files changed, 154 insertions(+), 66 deletions(-)
diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
index 9747e545f..9ddecdf35 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
@@ -111,9 +111,7 @@
-
-
-
+
@@ -217,7 +215,7 @@
-
+
@@ -279,6 +277,50 @@
>
强制完成
+
+ 设置上轴
+
+
+ 设置下轴
+
+
+ 设置左卷
+
+
+ 设置右卷
+
@@ -286,144 +328,144 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -434,42 +476,58 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.up_or_down === '' ? '-' : scope.row.up_or_down === '1' ? '上轴' : '下轴' }}
+
+
+
+
+ {{ scope.row.left_or_right === '' ? '-' :scope.row.left_or_right === '1' ? '左卷' : '右卷' }}
+
+
+
+
+
-
+
@@ -674,6 +732,28 @@ export default {
},
formatChildCallName(row) {
return this.dict.label.IS_OR_NOT[row.is_call]
+ },
+ setUpOrDown(flag) {
+ const _selectData = this.$refs.table.selection
+ const param = {
+ 'data': _selectData,
+ 'up_or_down': flag
+ }
+ crudSlittingproductionplan.setDirection(param).then(() => {
+ this.crud.toQuery()
+ this.crud.notify('设置成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+ })
+ },
+ setLeftOrRight(flag) {
+ const _selectData = this.$refs.table.selection
+ const param = {
+ 'data': _selectData,
+ 'left_or_right': flag
+ }
+ crudSlittingproductionplan.setDirection(param).then(() => {
+ this.crud.toQuery()
+ this.crud.notify('设置成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+ })
}
}
}
diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/slittingproductionplan.js b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/slittingproductionplan.js
index 0e4a6f863..bbd09d1b4 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/slittingproductionplan.js
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/slittingproductionplan.js
@@ -64,4 +64,12 @@ export function compelFinish(data) {
})
}
-export default { add, edit, del, upMaterFinish, caseFinish, sendFinish, inFinish, compelFinish }
+export function setDirection(data) {
+ return request({
+ url: 'api/slittingproductionplan/setDirection',
+ method: 'post',
+ data
+ })
+}
+
+export default { add, edit, del, upMaterFinish, caseFinish, sendFinish, inFinish, compelFinish, setDirection }