From 6d456e53825c528490a8ccaf06be261834c816f1 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 2 Jul 2024 09:54:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E3=80=81=E5=88=86=E5=88=87?=
 =?UTF-8?q?=E6=9A=82=E5=AD=98=E6=B8=85=E9=99=A4=E3=80=81=E7=A9=BA=E6=9C=A8?=
 =?UTF-8?q?=E7=AE=B1=E5=85=A5=E5=BA=93=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/SecondPhase/EmptyBoxInStore.vue     |  3 +++
 pages/SecondPhase/slitting/CacheClean.vue | 29 ++++++++---------------
 pages/home/home.vue                       | 18 ++++++++++----
 vuex/modules/data.js                      |  1 +
 vuex/modules/user.js                      |  1 +
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/pages/SecondPhase/EmptyBoxInStore.vue b/pages/SecondPhase/EmptyBoxInStore.vue
index 6b6a09a..b882b1c 100644
--- a/pages/SecondPhase/EmptyBoxInStore.vue
+++ b/pages/SecondPhase/EmptyBoxInStore.vue
@@ -73,6 +73,9 @@
 						title: res.message,
 						icon: 'none'
 					})
+					this.val2 = ''
+					this.index = ''
+					this.$refs.scanChild.toDel()
 					this.disabled = false
 				} catch (e) {
 					this.disabled = false
diff --git a/pages/SecondPhase/slitting/CacheClean.vue b/pages/SecondPhase/slitting/CacheClean.vue
index d769c63..1089977 100644
--- a/pages/SecondPhase/slitting/CacheClean.vue
+++ b/pages/SecondPhase/slitting/CacheClean.vue
@@ -6,51 +6,42 @@
 				<view class="filter_item">
 					<view class="filter_label">分切暂存位</view>
 					<view class="filter_input_wraper">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+						<search-box v-model="val1" />
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
-			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index}" :disabled="disabled" @tap="_toCleanCutCacheInventory">确认</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val1}" :disabled="disabled" @tap="_toCleanCutCacheInventory">确认</button>
 		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
-	import {getCutCacheAgvPoints, toCleanCutCacheInventory} from '@/utils/getData3.js'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {toCleanCutCacheInventory} from '@/utils/getData3.js'
 	export default {
 		components: {
-			NavBar
+			NavBar,
+			SearchBox
 		},
 		data() {
 			return {
-				options: [],
-				index: '',
+				val1: '',
 				disabled: false
 			};
 		},
-		created () {
-			this._getCutCacheAgvPoints()
-		},
 		methods: {
-			selectChange (e) {
-				this.index = e
-			},
-			async _getCutCacheAgvPoints () {
-				let res = await getCutCacheAgvPoints()
-				this.options = [...res]
-			},
 			async _toCleanCutCacheInventory () {
 				this.disabled = true
-				if (!this.index) {
+				if (!this.val1) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await toCleanCutCacheInventory(this.index)
+					let res = await toCleanCutCacheInventory(this.val1)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -61,7 +52,7 @@
 				}
 			},
 			clearUp () {
-				this.index = ''
+				this.val1 = ''
 			}
 		}
 	}
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 234ea31..4656a5c 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -15,11 +15,11 @@
 				</view>
 			</view>
 			<view class="zd-row relative jcflexstart tabs_wrap">
-				<view class="zd-col-6 tab_active" :style="{'left': tab === 2 ? '25%' : '0'}">
+				<view class="zd-col-6 tab_active" :style="{'left': (menuList1.length > 0 && menuList2.length > 0 && tab === 2) ? '25%' : '0'}">
 					<view class="tab_line_active"></view>
 				</view>
-				<view class="zd-col-6 tab_item" :class="{'tab_item_active': tab === 1}" @tap="changeTab(1)">一期</view>
-				<view class="zd-col-6 tab_item" :class="{'tab_item_active': tab === 2}" @tap="changeTab(2)">二期</view>
+				<view v-if="menuList1.length > 0" class="zd-col-6 tab_item" :class="{'tab_item_active': tab === 1}" @tap="changeTab(1)">一期</view>
+				<view v-if="menuList2.length > 0" class="zd-col-6 tab_item" :class="{'tab_item_active': tab === 2}" @tap="changeTab(2)">二期</view>
 			</view>
 			<view class="zd_home_wrapper">
 				<view class="menu-wrap">
@@ -69,8 +69,16 @@
 			async _authority () {
 				let res = await authority()
 				if (res.code === '1') {
-					this.menuList1 = [...res.result.rf_menu0.sonTree]
-					this.menuList2 = [...res.result.rf_menu1.sonTree]
+					if (res.result.hasOwnProperty('rf_menu0')) {
+						this.menuList1 = [...res.result.rf_menu0.sonTree]
+					} else {
+						this.tab = 2
+					}
+					if (res.result.hasOwnProperty('rf_menu1')) {
+						this.menuList2 = [...res.result.rf_menu1.sonTree]
+					} else {
+						this.tab = 1
+					}
 					if (this.tab === 2) {
 						this.menuList = [...this.menuList2]
 					} else {
diff --git a/vuex/modules/data.js b/vuex/modules/data.js
index e0c0aea..c3a8bf1 100644
--- a/vuex/modules/data.js
+++ b/vuex/modules/data.js
@@ -17,6 +17,7 @@ const actions = {
     commit(types.PUBLIC_ARR, res)
   },
   setNavTab ({commit}, res) {
+	uni.setStorageSync('navTab', res)
     commit(types.SET_NAV_TAB, res)
   }
 }
diff --git a/vuex/modules/user.js b/vuex/modules/user.js
index acc138e..e4dcadd 100644
--- a/vuex/modules/user.js
+++ b/vuex/modules/user.js
@@ -39,6 +39,7 @@ const actions = {
 	delUserInfo({commit}, res) {
 		uni.removeStorageSync('userInfo')
 		uni.removeStorageSync('saveToken')
+		uni.removeStorageSync('navTab')
 		commit(types.DEL_USER_INFO, res)
 	},
 	saveToken({commit}, res) {