diff --git a/pages/SecondPhase/production/ZjContainer.vue b/pages/SecondPhase/production/ZjContainer.vue
index 9c7ef59..69fb67d 100644
--- a/pages/SecondPhase/production/ZjContainer.vue
+++ b/pages/SecondPhase/production/ZjContainer.vue
@@ -20,9 +20,9 @@
| 选择 |
订单号 |
- 客户名称 |
+ 客户名称 |
子卷号 |
- 子卷规格 |
+ 子卷规格 |
子卷重量 |
子管重量 |
木箱料号 |
@@ -32,9 +32,9 @@
| − |
{{e.sale_order_name}} |
- {{e.customer_description}} |
+ {{e.customer_description}} |
{{e.container_name}} |
- {{e.paper_tube_description}} |
+ {{e.paper_tube_description}} |
{{e.paper_weight}} |
{{e.box_weight}} |
{{e.box_type}} |
@@ -65,7 +65,7 @@
| 木箱规格 |
- 物料名称 |
+ 物料名称 |
木箱长度 |
木箱宽度 |
木箱高度 |
@@ -76,7 +76,7 @@
| {{e.material_code}} |
- {{e.material_name}} |
+ {{e.material_name}} |
{{e.box_length}} |
{{e.box_width}} |
{{e.box_high}} |
@@ -257,9 +257,13 @@
this._queryBoxSpec(e)
} else {
this.popData = []
+ this.pkId = ''
+ this.pkObj = {}
}
},
async _queryBoxSpec (e) {
+ this.pkId = ''
+ this.pkObj = {}
let res = await queryBoxSpec(e)
if (res.code === 200) {
this.popData = [...res.content]
@@ -292,6 +296,9 @@
}
},
popSure () {
+ if (!this.pkId) {
+ return
+ }
if (this.dataList.length > Number(this.pkObj.num)) {
uni.showToast({
title: '子卷数量超过木箱的最大装卷数!',
diff --git a/pages/SecondPhase/slitting/CallAxis.vue b/pages/SecondPhase/slitting/CallAxis.vue
index 79eba59..2a86321 100644
--- a/pages/SecondPhase/slitting/CallAxis.vue
+++ b/pages/SecondPhase/slitting/CallAxis.vue
@@ -50,8 +50,8 @@
-
-
+
+
@@ -128,12 +128,27 @@
this.pkId = this.pkId === e.workorder_id ? '' : e.workorder_id
this.pkObj = this.pkId === e.workorder_id ? e : {}
},
- async _doCallTubeShaft () {
- this.disabled = true
+ toSure () {
+ this.disabled = false
if (!this.index || !this.pkId) {
this.disabled = false
return
}
+ uni.showModal({
+ title: '提示',
+ content: `将呼叫母卷:${this.pkObj.parent_container_name}的${this.pkObj.split_group}组的计划`,
+ confirmColor: '#ff6a00',
+ success: (res) => {
+ if (res.confirm) {
+ this._doCallTubeShaft()
+ } else if (res.cancel) {
+ this.disabled = false
+ }
+ }
+ })
+ },
+ async _doCallTubeShaft () {
+ this.disabled = true
try {
let res = await doCallTubeShaft(this.index, this.pkObj)
if (res) {