From 8e99beb2235d284e0669d5baeec3098c02bd1162 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 23 Apr 2024 13:27:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/setup.vue      | 32 ++++++++++++++++----------------
 pages/manage/cbj-carry.vue | 18 ++++--------------
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index ef54916..7edb91e 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -7,11 +7,11 @@
 					<view class="setup-label">服务器地址</view>
 					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
 				</view>
-				<view class="setup-item">
+				<!-- <view class="setup-item">
 					<view class="setup-label">ACS地址</view>
 					<input type="text" class="setup-input" placeholder="请输入ACS地址" v-model="acsip">
 				</view>
-				<!-- <view class="setup-item">
+				<view class="setup-item">
 					<view class="setup-label">刷新时间(s)</view>
 					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
 				</view> -->
@@ -50,20 +50,20 @@
 					})
 					return
 				}
-				if (this.acsip === '') {
-					uni.showToast({
-						title: '请填写ACS地址',
-						icon: 'none'
-					})
-					return
-				}
-				if (this.setTime === '') {
-					uni.showToast({
-						title: '请填写刷新时间',
-						icon: 'none'
-					})
-					return
-				}
+				// if (this.acsip === '') {
+				// 	uni.showToast({
+				// 		title: '请填写ACS地址',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
+				// if (this.setTime === '') {
+				// 	uni.showToast({
+				// 		title: '请填写刷新时间',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
 				// 存值
 				this.$store.dispatch('setConfig',{baseUrl: this.addrip, acsUrl: this.acsip, setTime: this.setTime * 1000})
 				uni.redirectTo({
diff --git a/pages/manage/cbj-carry.vue b/pages/manage/cbj-carry.vue
index 79e5c4d..ccdb748 100644
--- a/pages/manage/cbj-carry.vue
+++ b/pages/manage/cbj-carry.vue
@@ -20,7 +20,7 @@
 						/>
 					</view>
 				</view>
-				<view v-show="tab === 1 || tab === 2" class="zd-row border-bottom">
+				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
 						<span class="filter_label">点位</span>
 					</view>
@@ -36,16 +36,6 @@
 						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
 					</view>
 				</view>
-				<view v-show="tab === 3" class="zd-row border-bottom">
-					<view class="zd-col-5">
-						<span class="filter_label">点位编码</span>
-					</view>
-					<view class="zd-col-19 filter_select">
-						<search-box
-						v-model="val2"
-						/>
-					</view>
-				</view>
 			</view>
 			<view v-show="tab === 1" class="zd_wrapper grid-wraper">
 				<view class="slide_new">
@@ -122,8 +112,8 @@
 			<button class="zd-col-15 button-primary" :class="{'button-info': !pkId2 || !val1 || !index1}" :disabled="disabled2" @tap="_cbjmlTask">满料入库</button>
 		</view>
 		<view v-show="tab === 3" class="zd-row submit-bar">
-			<button class="zd-col-6 button-default" @tap="index2 = '', val2 = ''">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val2 || !index2}" :disabled="disabled4" @tap="_cbjskTask">空料位送空蛊</button>
+			<button class="zd-col-6 button-default" @tap="index2 = '', index1 = ''">清空</button>
+			<button class="zd-col-15 button-primary" :class="{'button-info': !index1 || !index2}" :disabled="disabled4" @tap="_cbjskTask">空料位送空蛊</button>
 		</view>
 		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
 			<view class="pop-line"></view>
@@ -262,7 +252,7 @@
 			async _cbjskTask () {
 				this.disabled4 = true
 				try {
-					let res = await cbjskTask(this.index2, this.val2)
+					let res = await cbjskTask(this.index2, this.index1)
 					this.disabled4 = false
 					uni.showToast({
 						title: res.message,