From 483c4287f0cc2be1fc1e1a6771190476f7f78cce Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 3 Jul 2025 11:01:26 +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/home/home.vue   |  2 +-
 pages/manage/hnby.vue | 17 +++--------------
 pages/manage/smck.vue |  6 +++---
 utils/getData2.js     |  3 +--
 5 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/manifest.json b/manifest.json
index 334aaaf..75dbfde 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "华祥",
     "appid" : "__UNI__FE8E170",
     "description" : "华祥手持系统",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index c7679ec..4c22613 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -35,7 +35,7 @@
 					{title: '任务管理', icon: 'RF06', path: '/pages/manage/task-manage'},
 					{title: '指令管理', icon: 'RF05', path: '/pages/manage/inst-manage'},
 					{title: '混碾搬运', icon: 'RF01', path: '/pages/manage/hnby'},
-					{title: '扫码出入库', icon: 'RF11', path: '/pages/manage/smck'},
+					{title: '扫码入库', icon: 'RF11', path: '/pages/manage/smck'},
 					{title: '压制满料搬运', icon: 'RF02', path: '/pages/manage/yzmlby'},
 					{title: '半成品解绑', icon: 'RF08', path: '/pages/manage/bcpjb'},
 					{title: '混碾料罐绑定', icon: 'RF10', path: '/pages/manage/hnlgbd'},
diff --git a/pages/manage/hnby.vue b/pages/manage/hnby.vue
index 6696272..b94e99c 100644
--- a/pages/manage/hnby.vue
+++ b/pages/manage/hnby.vue
@@ -3,14 +3,6 @@
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="zd-row border-bottom">
-					<view class="zd-col-7">
-						<span class="filter_label">起点</span>
-					</view>
-					<view class="zd-col-17 filter_select">
-						<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
-					</view>
-				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-7">
 						<span class="filter_label">终点</span>
@@ -33,7 +25,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap.stop="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !index1 || !index2 || !val1}" :disabled="disabled1" @tap="_pdaHnby">混碾搬运</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !index2 || !val1}" :disabled="disabled1" @tap="_pdaHnby">混碾搬运</button>
 		</view>
 	</view>
 </template>
@@ -50,8 +42,6 @@
 		data() {
 			return {
 				title: '',
-				options1: this.generateArray('HNJ', 'DJW', '混碾机', '', 8),
-				index1: '',
 				options2: this.generateArray('YJ', 'SLW01', '压机', '号上料位', 10),
 				index2: '',
 				val1: null,
@@ -73,19 +63,18 @@
 				return array
 			},
 			clearUp () {
-				this.index1 = ''
 				this.index2 = ''
 				this.val1 = null
 				this.disabled1 = false
 			},
 			async _pdaHnby () {
 				this.disabled1 = true
-				if (!this.index1 || !this.index2 || !this.val1) {
+				if (!this.index2 || !this.val1) {
 					this.disabled1 = false
 					return
 				}
 				try {
-					let res = await pdaHnby(this.index1, this.index2, this.val1)
+					let res = await pdaHnby(this.index2, this.val1)
 					this.disabled1 = false
 					uni.showToast({
 						title: res.message,
diff --git a/pages/manage/smck.vue b/pages/manage/smck.vue
index ab28cdc..b458a1f 100644
--- a/pages/manage/smck.vue
+++ b/pages/manage/smck.vue
@@ -16,9 +16,9 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-5 button-default" @tap.stop="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled1" @tap="toSure1">入库</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled2" @tap="toSure2">出库</button>
+			<button class="zd-col-6 button-default" @tap.stop="clearUp">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !val1}" :disabled="disabled1" @tap="toSure1">入库</button>
+			<!-- <button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled2" @tap="toSure2">出库</button> -->
 		</view>
 	</view>
 </template>
diff --git a/utils/getData2.js b/utils/getData2.js
index f5e2c52..19ce401 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -24,10 +24,9 @@ export const handLogin = (user, password) => request({
 /**
  * 混碾搬运
  */
-export const pdaHnby = (sp, ep, code) => request({
+export const pdaHnby = (ep, code) => request({
 	url:'api/pda/hnby',
 	data: {
-		startPoint: sp,
 		endPoint: ep,
 		barCode: code
 	}