From 4ebd19f545b7e6cf73c40fdf890e76294c3e1284 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, 13 Sep 2024 15:55:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/manage/roll-manage.vue     | 37 ++++++--------------------------
 pages/manage/waste-foil-move.vue |  2 +-
 pages/manage/weight-bind.vue     |  4 ++--
 utils/getData2.js                |  8 +++----
 4 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/pages/manage/roll-manage.vue b/pages/manage/roll-manage.vue
index eaa764e..df42798 100644
--- a/pages/manage/roll-manage.vue
+++ b/pages/manage/roll-manage.vue
@@ -3,7 +3,7 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
+				<view class="zd-row">
 					<view class="zd-col-7">
 						<span class="filter_label">点位</span>
 					</view>
@@ -13,30 +13,12 @@
 						/>
 					</view>
 				</view>
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">收卷辊码</span>
-					</view>
-					<view class="zd-col-17">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
-				<view class="zd-row">
-					<view class="zd-col-7">
-						<span class="filter_label">收卷辊规格</span>
-					</view>
-					<view class="zd-col-17 filter_select">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
-					</view>
-				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_onlySendRollTruss">入辊</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_onlyCallRollTruss">出辊</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_onlySendRollTruss">入辊</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_onlyCallRollTruss">出辊</button>
 		</view>
 	</view>
 </template>
@@ -54,9 +36,6 @@
 			return {
 				title: '',
 				val1: '',
-				val2: '',
-				options: [],
-				index: '',
 				disabled: false
 			};
 		},
@@ -69,12 +48,12 @@
 			},
 			async _onlySendRollTruss () {
 				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.index) {
+				if (!this.val1) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await handhonlySendRollTrusseldLock(this.val1, this.val2, this.index)
+					let res = await onlySendRollTruss(this.val1)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
@@ -86,12 +65,12 @@
 			},
 			async _onlyCallRollTruss () {
 				this.disabled = true
-				if (!this.val1 || !this.index) {
+				if (!this.val1) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await onlyCallRollTruss(this.val1, this.index)
+					let res = await onlyCallRollTruss(this.val1)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
@@ -103,8 +82,6 @@
 			},
 			clearUp () {
 				this.val1 = ''
-				this.val2 = ''
-				this.index = ''
 				this.disabled = false
 			}
 		}
diff --git a/pages/manage/waste-foil-move.vue b/pages/manage/waste-foil-move.vue
index 8eded0f..d8e7a31 100644
--- a/pages/manage/waste-foil-move.vue
+++ b/pages/manage/waste-foil-move.vue
@@ -3,7 +3,7 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
+				<view class="zd-row">
 					<view class="zd-col-5">
 						<span class="filter_label">点位</span>
 					</view>
diff --git a/pages/manage/weight-bind.vue b/pages/manage/weight-bind.vue
index 51aeb92..7fa02ae 100644
--- a/pages/manage/weight-bind.vue
+++ b/pages/manage/weight-bind.vue
@@ -33,7 +33,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2 || !val3}" :disabled="disabled" @tap="_doSubVolumeBindingWeight">绑定重量</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || (!val2 && !val3)}" :disabled="disabled" @tap="_doSubVolumeBindingWeight">绑定重量</button>
 		</view>
 	</view>
 </template>
@@ -62,7 +62,7 @@
 		methods: {
 			async _doSubVolumeBindingWeight () {
 				this.disabled = true
-				if (!this.val1 || !this.val2 || !this.val3) {
+				if (!this.val1 || (!this.val2 && !this.val3)) {
 					this.disabled = false
 					return
 				}
diff --git a/utils/getData2.js b/utils/getData2.js
index 3288d62..42afda3 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -26,14 +26,14 @@ export const authority = () => request({
 	data: {}
 })
 // 入辊
-export const onlySendRollTruss = (code, vcode, type) => request({
+export const onlySendRollTruss = (code) => request({
 	url:'api/pda/other/onlySendRollTruss',
-	data: {point_code: code, vehicle_code: vcode, vehicle_type: type}
+	data: {point_code: code}
 })
 // 
-export const onlyCallRollTruss = (code, vcode, type) => request({
+export const onlyCallRollTruss = (code) => request({
 	url:'api/pda/other/onlyCallRollTruss',
-	data: {point_code: code, vehicle_type: type}
+	data: {point_code: code}
 })
 // 呼叫取样
 export const callAgvToSampling = (code1, code2) => request({