From da771473cb389a597de19c036b259690f12c197d 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, 6 Sep 2024 15:31:28 +0800
Subject: [PATCH] no message

---
 pages/home/home.vue               |  2 +-
 pages/manage/empty-tray-back.vue  | 21 ++++++---------------
 pages/manage/mater-in-storage.vue | 13 ++++---------
 utils/getData2.js                 |  8 ++++----
 4 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index aa79bb2..e6c2005 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -32,7 +32,7 @@
 			return {
 				userName: '',
 				menuList: [
-					{title: '物料入库转运', icon: 'RF03', path: '/pages/manage/mater-in-storage'},
+					{title: '物料入库', icon: 'RF03', path: '/pages/manage/mater-in-storage'},
 					{title: '外协区送回', icon: 'RF01', path: '/pages/manage/empty-tray-back'},
 					// {title: '外协区空料架送回', icon: 'RF05', path: '/pages/manage/empty-material-racks-back'},
 					// {title: '物料转运', icon: 'RF02', path: '/pages/manage/material-transfer'},
diff --git a/pages/manage/empty-tray-back.vue b/pages/manage/empty-tray-back.vue
index a503471..65d80cc 100644
--- a/pages/manage/empty-tray-back.vue
+++ b/pages/manage/empty-tray-back.vue
@@ -32,9 +32,8 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-4 button-default button-primary_s" @tap="clearUp">清空</button>
-			<button class="zd-col-9 button-primary button-primary_s" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_handheldCageFrame('1')">空笼框送回确认</button>
-			<button class="zd-col-9 button-primary button-primary_s" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_handheldCageFrame('2')">空料架送回确认</button>
+			<button class="zd-col-8 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_handheldCageFrame">送回确认</button>
 		</view>
 	</view>
 </template>
@@ -55,7 +54,7 @@
 				title: '',
 				val1: '',
 				val2: '',
-				options: [{ value: '1', text: '货架' }, { value: '2', text: '内部' }, { value: '3', text: '外协' }],
+				options: [{ value: '1', text: '人工折弯区' }, { value: '2', text: '半自动折弯区' }, { value: '3', text: '内部加工区' }],
 				index: '',
 				disabled: false
 			};
@@ -67,22 +66,14 @@
 			getScanlist (e) {
 				this.val2 = e.join()
 			},
-			async _handheldCageFrame (type) {
+			async _handheldCageFrame () {
 				this.disabled = true
-				if (type === '1' && (!this.val1 || !this.val2 || !this.index)) {
-					this.disabled = false
-					return
-				}
-				if (type === '2' && (!this.val1 || !this.val2)) {
+				if (!this.val1 || !this.val2 || !this.index) {
 					this.disabled = false
 					return
 				}
 				try {
-					if (type === '1') {
-						let res = await handheldCageFrame(type, this.val1, this.val2, this.index)
-					} else if (type === '2') {
-						let res = await handheldCageFrame(type, this.val1, this.val2, '')
-					}
+					let res = await handheldCageFrame(this.index, this.val1, this.val2)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
diff --git a/pages/manage/mater-in-storage.vue b/pages/manage/mater-in-storage.vue
index a4bbb5d..779e8bf 100644
--- a/pages/manage/mater-in-storage.vue
+++ b/pages/manage/mater-in-storage.vue
@@ -66,9 +66,8 @@
 			</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}" :disabled="disabled" @tap="_handheldBlanking('1')">入库确认</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_handheldBlanking('2')">物料转运</button>
+			<button class="zd-col-8 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_handheldBlanking">入库确认</button>
 		</view>
 	</view>
 </template>
@@ -122,7 +121,7 @@
 				this.index1 = ''
 				this.disabled = false
 			},
-			async _handheldBlanking (type) {
+			async _handheldBlanking () {
 				this.disabled = true
 				if (!this.val1 || !this.val2) {
 					this.disabled = false
@@ -135,11 +134,7 @@
 					}
 				})
 				try {
-					if (type === '1') {
-						let res = await handheldBlanking(type, this.val1, this.index, this.val2, arr, this.index1)
-					} else if (type === '2') {
-						let res = await handheldBlanking(type, this.val1, '', this.val2, '', '')
-					}
+					let res = await handheldBlanking(this.index1, this.val1, this.index, this.val2, arr)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
diff --git a/utils/getData2.js b/utils/getData2.js
index f738a2f..12f8dfd 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -36,9 +36,9 @@ export const handheldRack = (code, vcode) => request({
 	data: {device_code: code, vehicle_code: vcode}
 })
 // 外协区空笼框送回
-export const handheldCageFrame = (type, code, list, rcode) => request({
+export const handheldCageFrame = (type, code, list) => request({
 	url:'api/handheld/cageFrame',
-	data: {type: type, device_code: code, vehicle_list: list, region_code: rcode}
+	data: {type: type, device_code: code, vehicle_list: list}
 })
 // 物料转运
 export const handheldTranshipment = (code, vcode) => request({
@@ -60,9 +60,9 @@ export const handheldStorehouse = (code, type) => request({
 // 	url:'api/handheld/getRegionCode',
 // 	data: {orderCode: code}
 // })
-export const handheldBlanking = (type, code, rcode, vcode, material, rcode1) => request({
+export const handheldBlanking = (type, code, rcode, vcode, material) => request({
 	url:'api/handheld/blanking',
-	data: {type: type, device_code: code, region_code: rcode, vehicle_code: vcode, material: material, region_code1: rcode1}
+	data: {type: type, device_code: code, region_code: rcode, vehicle_code: vcode, material: material}
 })
 // 修改订单工序
 export const fabOrders = (code) => request({