From 5755a8ebe758f728747182f60328b83362873cec Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 10 Jan 2023 12:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=8D=B7=E5=A5=97=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ProductManage/ZjCasing.vue | 6 +++---
 utils/getData2.js                | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pages/ProductManage/ZjCasing.vue b/pages/ProductManage/ZjCasing.vue
index 7906702..e7b53f6 100644
--- a/pages/ProductManage/ZjCasing.vue
+++ b/pages/ProductManage/ZjCasing.vue
@@ -95,7 +95,7 @@
 			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val2}" :disabled="disabled2" @tap="_casingWearConfirm">穿轴确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled2" @tap="_casingWearConfirm">穿轴确认</button>
 			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled1" @tap="_casingOutConfirm">拔轴确认</button>
 			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || !val2}" :disabled="disabled" @tap="_casingConfirm">套轴确认</button>
 			<button class="submit-button" @tap="searchList">查询</button>
@@ -250,12 +250,12 @@
 			/** 穿轴确认 */
 			async _casingWearConfirm () {
 				this.disabled2 = true
-				if (!this.val2) {
+				if (!this.val1 || !this.val2) {
 					this.disabled2 = false
 					return
 				}
 				try {
-					let res = await casingWearConfirm(this.val2)
+					let res = await casingWearConfirm(this.val2, this.val1)
 					this.disabled2 = false
 					this.checkArr = []
 					this.val1 = ''
diff --git a/utils/getData2.js b/utils/getData2.js
index 18fbc6f..3e11dc1 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -160,10 +160,11 @@ export const casingOutConfirm = (qzz, code) => request({
 	}
 })
 // 1.5穿轴确认
-export const casingWearConfirm = (qzz) => request({
+export const casingWearConfirm = (qzz, code) => request({
 	url:'api/pda/casing/wearConfirm',
 	data: {
-		qzzno: qzz
+		qzzno: qzz,
+		point_code: code
 	}
 })