From 49e941767203435ff432b092e4b250677f1b0af0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Fri, 1 Nov 2024 15:19:23 +0800
Subject: [PATCH] no message

---
 pages/manage/axis-bind.vue        |  4 ++--
 pages/manage/raw-foil-progess.vue | 24 ++++++++++++++++++++++--
 utils/getData2.js                 |  4 ++--
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/pages/manage/axis-bind.vue b/pages/manage/axis-bind.vue
index 66a6495..3fc6274 100644
--- a/pages/manage/axis-bind.vue
+++ b/pages/manage/axis-bind.vue
@@ -66,7 +66,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-4 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_doSendShaft">呼叫送轴</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_doSendShaft">呼叫送轴</button>
 			<button class="zd-col-6 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_toCleanCutCacheInventory">点位清除</button>
 			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !checkArr.length}" :disabled="disabled" @tap="_doBindingGx">纸管绑定</button>
 		</view>
@@ -117,7 +117,7 @@
 			},
 			async _doSendShaft () {
 				this.disabled = true
-				if (!this.val1 || !this.index) {
+				if (!this.val1) {
 					this.disabled = false
 					return
 				}
diff --git a/pages/manage/raw-foil-progess.vue b/pages/manage/raw-foil-progess.vue
index 7e13d40..072021c 100644
--- a/pages/manage/raw-foil-progess.vue
+++ b/pages/manage/raw-foil-progess.vue
@@ -39,7 +39,7 @@
 						<input v-model="val3" type="number" class="filter_input">
 					</view>
 				</view>
-				<view class="zd-row">
+				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">呼叫收卷辊</span>
 					</view>
@@ -48,6 +48,22 @@
 						<text @tap="setWStatus" style="position: absolute;display: inline-block;width: 52px; height: 32px;left: 0;"></text>
 					</view>
 				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">长度</span>
+					</view>
+					<view class="zd-col-17">
+						<input v-model="val4" type="number" class="filter_input">
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-7">
+						<span class="filter_label">重量</span>
+					</view>
+					<view class="zd-col-17">
+						<input v-model="val5" type="number" class="filter_input">
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
@@ -72,6 +88,8 @@
 				val1: '',
 				val2: '',
 				val3: '',
+				val4: '',
+				val5: '',
 				isChecked: false,
 				disabled: false
 			};
@@ -89,6 +107,8 @@
 				this.val3 = ''
 				this.isChecked = false
 				this.disabled = false
+				this.val4 = ''
+				this.val5 = ''
 			},
 			async _needEmptyVehicle () {
 				this.disabled = true
@@ -132,7 +152,7 @@
 				}
 				try {
 					let checked = this.isChecked ? '1' : '0'
-					let res = await needEmptyAxisv2(this.val1, this.val2, checked, this.val3)
+					let res = await needEmptyAxisv2(this.val1, this.val2, checked, this.val3, this.val4, this.val5)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
diff --git a/utils/getData2.js b/utils/getData2.js
index 78b9a71..92182f1 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -158,9 +158,9 @@ export const necessaryEmptyVehicle = (code) => request({
 	url:'api/pda/raw/necessaryEmptyVehicle',
 	data: {point_code: code}
 })
-export const needEmptyAxisv2 = (code, order, is, roll) => request({
+export const needEmptyAxisv2 = (code, order, is, roll, height, qty) => request({
 	url:'api/pda/raw/needEmptyAxis/v2',
-	data: {point_code: code, order_code: order, is_call_empty: is, roll_code: roll}
+	data: {point_code: code, order_code: order, is_call_empty: is, roll_code: roll, theory_heigh: height, productin_qty: qty}
 })
 export const confirmBlanking = (code, option) => request({
 	url:'api/pda/raw/confirmBlanking',