From 69f2931e3bcc8cd4f81c21d6d20a18298385a20d Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 21 Apr 2026 13:53:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                   |  4 ++--
 pages/hdyy/scgl/point-quhuo.vue | 27 ++++++++++++++++++++++++---
 utils/getData3.js               |  5 +++++
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/manifest.json b/manifest.json
index 41c6e18..40dcfb9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "华东医药",
     "appid" : "__UNI__F094DF8",
     "description" : "华东医药LMS手持系统",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/hdyy/scgl/point-quhuo.vue b/pages/hdyy/scgl/point-quhuo.vue
index f5c5935..9cee2dc 100644
--- a/pages/hdyy/scgl/point-quhuo.vue
+++ b/pages/hdyy/scgl/point-quhuo.vue
@@ -76,8 +76,9 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<!-- <button class="zd-col-5 button-default" @tap="toEmpty">清空</button> -->
-			<button class="zd-col-11 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_takePalletMaterial">取物料</button>
-			<button class="zd-col-11 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_takeTheVehicle">取载具</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !dataList.length}" :disabled="disabled" @tap="_takePalletMaterial">取物料</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_clickMaterial">一键取料</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_takeTheVehicle">取载具</button>
 			<!-- <button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_takeFinish">取货完成</button> -->
 		</view>
 	</view>
@@ -86,7 +87,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {getPalletAssemblyOK, takePalletMaterial, takeTheVehicle, takeFinish} from '@/utils/getData3.js'
+	import {getPalletAssemblyOK, takePalletMaterial, clickMaterial, takeTheVehicle, takeFinish} from '@/utils/getData3.js'
 	export default {
 		components: {
 			NavBar,
@@ -189,6 +190,26 @@
 					this.disabled = false
 				}
 			},
+			async _clickMaterial () {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await clickMaterial(this.val1)
+					if (res) {
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+					}
+					this.toEmpty()
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
 			async _takeTheVehicle () {
 				this.disabled = true
 				if (!this.val1) {
diff --git a/utils/getData3.js b/utils/getData3.js
index f08be17..e53a524 100644
--- a/utils/getData3.js
+++ b/utils/getData3.js
@@ -330,6 +330,11 @@ export const takePalletMaterial = (search, rows) => request({
 	url:'api/pdaProduction/takePalletMaterial',
 	data: {search: search, rows: rows}
 })
+// 一键取料
+export const clickMaterial = (search) => request({
+	url:'api/pdaProduction/clickMaterial',
+	data: {search: search}
+})
 // 取载具
 export const takeTheVehicle = (search) => request({
 	url:'api/pdaProduction/takeTheVehicle',