From 3da89cd464f1adce72cee56feefc71685fbf48d7 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: Tue, 12 Nov 2024 09:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8C=E6=9C=9F=E7=94=9F?=
 =?UTF-8?q?=E7=AE=94=E5=B7=A5=E5=BA=8F=E5=91=BC=E5=8F=AB=E5=A4=A7=E8=BD=A6?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=80=E6=9C=9F=E7=94=9F=E7=AE=94?=
 =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E5=91=BC=E5=8F=AB=E5=A4=A7=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ProductManage/SboProcess.vue          | 17 +++++++++++++++--
 pages/SecondPhase/production/SboProcess.vue | 17 ++---------------
 utils/getData1.js                           |  5 +++--
 utils/getData3.js                           |  5 ++---
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/pages/ProductManage/SboProcess.vue b/pages/ProductManage/SboProcess.vue
index d8d56d6..49c2472 100644
--- a/pages/ProductManage/SboProcess.vue
+++ b/pages/ProductManage/SboProcess.vue
@@ -25,6 +25,15 @@
 						/>
 					</view>
 				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label filter_label_1"></span>
+					</view>
+					<view class="filter_input_wraper filter_input_wraper_1">
+						<view class="iconfont icon_unchecked" :class="{'icon_checked': isV === '1'}" @tap="isVirtual">&#xe66b;</view>
+						<view class="filter_input_wraper_inn_text">是否大车</view>
+					</view>
+				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -108,7 +117,8 @@
 				},
 				totalCount: 0,
 				pageNum: 1,
-				pageSize: 10
+				pageSize: 10,
+				isV: '0'
 			};
 		},
 		created () {
@@ -121,6 +131,9 @@
 			this.title = options.title
 		},
 		methods: {
+			isVirtual () {
+				this.isV = this.isV === '0' ? '1' : '0'
+			},
 			searchList () {
 				this.pkId = ''
 				this.pkObj = {}
@@ -167,7 +180,7 @@
 					return
 				}
 				try {
-					let res = await needEmptyAxis(this.pkObj)
+					let res = await needEmptyAxis(this.pkObj, this.isV)
 					this.disabled1 = false
 					this.pkId = ''
 					this.pkObj = {}
diff --git a/pages/SecondPhase/production/SboProcess.vue b/pages/SecondPhase/production/SboProcess.vue
index de34e32..c24430d 100644
--- a/pages/SecondPhase/production/SboProcess.vue
+++ b/pages/SecondPhase/production/SboProcess.vue
@@ -32,15 +32,6 @@
 						<button class="btn-submit btn-success" @tap="searchList">查询</button>
 					</view>
 				</view>
-				<view class="filter_item">
-					<view class="filter_label_wraper">
-						<span class="filter_label filter_label_1"></span>
-					</view>
-					<view class="filter_input_wraper filter_input_wraper_1">
-						<view class="iconfont icon_unchecked" :class="{'icon_checked': isV === '1'}" @tap="isVirtual">&#xe66b;</view>
-						<view class="filter_input_wraper_inn_text">是否大车</view>
-					</view>
-				</view>
 			</view>
 			<view class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -128,8 +119,7 @@
 				},
 				totalCount: 0,
 				pageNum: 1,
-				pageSize: 10,
-				isV: '0'
+				pageSize: 10
 			};
 		},
 		onLoad (options) {
@@ -145,9 +135,6 @@
 			this.$refs.scanChild.handleFocus()
 		},
 		methods: {
-			isVirtual () {
-				this.isV = this.isV === '0' ? '1' : '0'
-			},
 			searchList () {
 				this.pkId = ''
 				this.pkObj = {}
@@ -191,7 +178,7 @@
 			async _needEmptyAxis () {
 				this.disabled1 = true
 				try {
-					let res = await needEmptyAxis(this.val1, this.val2, this.isV)
+					let res = await needEmptyAxis(this.val1, this.val2)
 					this.disabled1 = false
 					uni.showToast({
 						title: res.message,
diff --git a/utils/getData1.js b/utils/getData1.js
index b5ad518..0ed4877 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -35,10 +35,11 @@ export const queryRawFoilList = (pcode, cname, page, size) => request({
 	}
 })
 // 1.2呼叫
-export const needEmptyAxis = (rjo) => request({
+export const needEmptyAxis = (rjo, type) => request({
 	url: 'api/pda/raw/needEmptyAxis',
 	data: {
-		raw_jo: rjo
+		raw_jo: rjo,
+		big_type: type
 	}
 })
 // 1.3呼叫空轴
diff --git a/utils/getData3.js b/utils/getData3.js
index fd43b1e..0398c55 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -84,12 +84,11 @@ export const surfaceConfirm = (code) => request({
  * 生箔工序
  */
 // 1.1呼叫
-export const needEmptyAxis = (code, name, type) => request({
+export const needEmptyAxis = (code, name) => request({
 	url: 'api/pda/raw/needEmptyAxis',
 	data: {
 		point_code: code,
-		container_name: name,
-		big_type: type
+		container_name: name
 	}
 })
 // 创建工单