From 06e9e44c8a064ba15343718fe8496ca5c218c8e0 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 11 Jul 2025 15:03:32 +0800
Subject: [PATCH] no message

---
 pages/SecondPhase/production/ZjContainer.vue | 19 +++++++++++-----
 pages/SecondPhase/slitting/CallAxis.vue      | 23 ++++++++++++++++----
 2 files changed, 32 insertions(+), 10 deletions(-)

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 @@
 							<tr>
 								<th>选择</th>
 								<th class="th_2">订单号</th>
-								<th>客户名称</th>
+								<th><view style="width: 240rpx;">客户名称</view></th>
 								<th>子卷号</th>
-								<th>子卷规格</th>
+								<th><view style="width: 240rpx;">子卷规格</view></th>
 								<th>子卷重量</th>
 								<th>子管重量</th>
 								<th>木箱料号</th>
@@ -32,9 +32,9 @@
 							<tr v-for="(e, i) in dataList" :key="i">
 								<td><span class="iconfont icon_minus-filled" @click="toCheck(e, i)">&minus;</span></td>
 								<td class="td_2">{{e.sale_order_name}}</td>
-								<td>{{e.customer_description}}</td>
+								<td class="wrap">{{e.customer_description}}</td>
 								<td>{{e.container_name}}</td>
-								<td>{{e.paper_tube_description}}</td>
+								<td class="wrap">{{e.paper_tube_description}}</td>
 								<td>{{e.paper_weight}}</td>
 								<td>{{e.box_weight}}</td>
 								<td>{{e.box_type}}</td>
@@ -65,7 +65,7 @@
 							<thead>
 								<tr>
 									<th>木箱规格</th>
-									<th>物料名称</th>
+									<th><view style="width: 240rpx;">物料名称</view></th>
 									<th>木箱长度</th>
 									<th>木箱宽度</th>
 									<th>木箱高度</th>
@@ -76,7 +76,7 @@
 							<tbody>
 								<tr v-for="(e, i) in popData" :key="'pop' + i" @click="popCheck(e)" :class="{'checked': e.material_code === pkId}">
 									<td>{{e.material_code}}</td>
-									<td>{{e.material_name}}</td>
+									<td class="wrap">{{e.material_name}}</td>
 									<td>{{e.box_length}}</td>
 									<td>{{e.box_width}}</td>
 									<td>{{e.box_high}}</td>
@@ -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 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-5 btn-submit btn-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !index}" @tap="_doCallTubeShaftShow">刷新</button>
-			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !index || !pkId}" :disabled="disabled" @tap="_doCallTubeShaft">确认</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !index}" @tap="_doCallTubeShaftShow(index)">刷新</button>
+			<button class="zd-col-8 btn-submit btn-success" :class="{'btn-info': !index || !pkId}" :disabled="disabled" @tap="toSure">确认</button>
 		</view>
 	</view>
 </template>
@@ -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) {