From 25e87da5660348fd5ea98e1b8f1c1db3bbe4f041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Wed, 11 Sep 2024 17:42:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=93=E5=AD=98=E7=A0=81=E5=8F=98=E6=9B=B4\c?=
 =?UTF-8?q?ode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                          |   8 +++
 pages/home/home.vue                 |  72 ++++++++------------------
 pages/modules/cache-code-change.vue |  77 ++++++++++++++++++++++++++++
 pages/modules/carry-task.vue        |   3 ++
 pages/modules/rawmater-instore.vue  |   3 ++
 pages/modules/rawmater-outstore.vue |   3 ++
 pages/modules/zupan-unbind.vue      |   3 ++
 static/image/menu/RF11.png          | Bin 0 -> 2070 bytes
 utils/getData2.js                   |  21 +++++++-
 9 files changed, 139 insertions(+), 51 deletions(-)
 create mode 100644 pages/modules/cache-code-change.vue
 create mode 100644 static/image/menu/RF11.png

diff --git a/pages.json b/pages.json
index 63fc9fa..b5caba5 100644
--- a/pages.json
+++ b/pages.json
@@ -102,6 +102,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/modules/cache-code-change",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index c8135c4..90bd061 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -15,7 +15,7 @@
 			<view class="zd_home_wrapper">
 				<view class="menus_wrap">
 					<view class="sec_menu_wrap">
-						<view class="sec_menu-item" v-for="(e, i) in menuList" :key="e.id" @tap="toPage(e)">
+						<view v-if="e.show" class="sec_menu-item" v-for="e in menuList" :key="e.id" @tap="toPage(e)">
 							<image class="menu-img" :src="require('../../static/image/menu/' + e.icon + '.png')" alt="">
 							<view class="menu-name">{{e.name}}</view>
 						</view>
@@ -32,58 +32,30 @@
 			return {
 				roles: this.$store.getters.saveRoles,
 				userName: '',
-				menuList: []
+				menuList: [
+					{id: '1', name: '原材料入库', icon: 'RF04', role: 'A1', path: '/pages/modules/rawmater-instore'},
+					{id: '2', name: '原材料出库', icon: 'RF06', role: 'A1', path: '/pages/modules/rawmater-outstore'},
+					{id: '3', name: '搬运任务', icon: 'RF07', role: 'A2', path: '/pages/modules/carry-task'},
+					{id: '4', name: '组盘解绑', icon: 'RF08', role: 'A2', path: '/pages/modules/zupan-unbind'},
+					{id: '5', name: '指令管理', icon: 'RF01', role: '', path: '/pages/modules/zlmanage'},
+					{id: '6', name: '任务管理', icon: 'RF09', role: '', path: '/pages/modules/taskmanage'},
+					{id: '7', name: '异常出库', icon: 'RF10', role: '', path: '/pages/modules/error-outstore'},
+					{id: '8', name: '托盘号补录', icon: 'RF05', role: 'A1', path: '/pages/modules/pallet-add-record'},
+					{id: '9', name: '缓存码变更', icon: 'RF11', role: 'A1', path: '/pages/modules/cache-code-change'}
+				]
 			};
 		},
 		created () {
-			this.menuList = [
-				// {id: '1', name: '人工排产', icon: 'RF01', path: '/pages/modules/man-paichan'},
-				// {id: '2', name: '涂线板', icon: 'RF02', path: '/pages/modules/wire-board'},
-				// {id: '3', name: '物料库存', icon: 'RF03', path: '/pages/modules/mater-inventory'}
-				{id: '1', name: '原材料入库', icon: 'RF04', path: '/pages/modules/rawmater-instore'},
-				{id: '2', name: '原材料出库', icon: 'RF06', path: '/pages/modules/rawmater-outstore'},
-				{id: '3', name: '搬运任务', icon: 'RF07', path: '/pages/modules/carry-task'},
-				{id: '4', name: '组盘解绑', icon: 'RF08', path: '/pages/modules/zupan-unbind'},
-				{id: '5', name: '指令管理', icon: 'RF01', path: '/pages/modules/zlmanage'},
-				{id: '6', name: '任务管理', icon: 'RF09', path: '/pages/modules/taskmanage'},
-				{id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'},
-				{id: '8', name: '托盘号补录', icon: 'RF05', path: '/pages/modules/pallet-add-record'}
-			]
-			if (this.roles === 'A1,A2,') {
-				this.menuList = [
-					// {id: '1', name: '人工排产', icon: 'RF01', path: '/pages/modules/man-paichan'},
-					// {id: '2', name: '涂线板', icon: 'RF02', path: '/pages/modules/wire-board'},
-					// {id: '3', name: '物料库存', icon: 'RF03', path: '/pages/modules/mater-inventory'}
-					{id: '1', name: '原材料入库', icon: 'RF03', path: '/pages/modules/rawmater-instore'},
-					{id: '2', name: '原材料出库', icon: 'RF07', path: '/pages/modules/rawmater-outstore'},
-					{id: '3', name: '搬运任务', icon: 'RF01', path: '/pages/modules/carry-task'},
-					{id: '4', name: '组盘解绑', icon: 'RF04', path: '/pages/modules/zupan-unbind'},
-					{id: '5', name: '指令管理', icon: 'RF02', path: '/pages/modules/zlmanage'},
-					{id: '6', name: '任务管理', icon: 'RF09', path: '/pages/modules/taskmanage'},
-					{id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'},
-					{id: '8', name: '托盘号补录', icon: 'RF05', path: '/pages/modules/pallet-add-record'}
-				]
-			}
-			if (this.roles === 'A1,') {
-				this.menuList = [
-					{id: '1', name: '原材料入库', icon: 'RF03', path: '/pages/modules/rawmater-instore'},
-					{id: '2', name: '原材料出库', icon: 'RF07', path: '/pages/modules/rawmater-outstore'},
-					{id: '5', name: '指令管理', icon: 'RF02', path: '/pages/modules/zlmanage'},
-					{id: '6', name: '任务管理', icon: 'RF09', path: '/pages/modules/taskmanage'},
-					{id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'},
-					{id: '8', name: '托盘号补录', icon: 'RF05', path: '/pages/modules/pallet-add-record'}
-				]
-			}
-			if (this.roles === 'A2,') {
-				this.menuList = [
-					{id: '3', name: '搬运任务', icon: 'RF01', path: '/pages/modules/carry-task'},
-					{id: '4', name: '组盘解绑', icon: 'RF04', path: '/pages/modules/zupan-unbind'},
-					{id: '5', name: '指令管理', icon: 'RF02', path: '/pages/modules/zlmanage'},
-					{id: '6', name: '任务管理', icon: 'RF09', path: '/pages/modules/taskmanage'},
-					{id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'}
-				]
-			}
-			this.$store.dispatch('setPublicObj', '')
+			this.menuList.map(el => {
+				if (this.roles === '') {
+					this.$set(el, 'show', true)
+				} else if (this.roles!== '' && el.role === '') {
+					this.$set(el, 'show', true)
+				} else if (this.roles!== '' && el.role !== '') {
+					let show = this.roles.indexOf(el.role) !== -1
+					this.$set(el, 'show', show)
+				}
+			})
 			if (this.$store.getters.userInfo) {
 				this.userName = JSON.parse(this.$store.getters.userInfo).username
 			}
diff --git a/pages/modules/cache-code-change.vue b/pages/modules/cache-code-change.vue
new file mode 100644
index 0000000..bcde769
--- /dev/null
+++ b/pages/modules/cache-code-change.vue
@@ -0,0 +1,77 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="缓存码变更"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">原子托盘号</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">新子托盘号</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar_new">
+			<button class="zd-col-7 submit-button_c" @tap="toClear">清空</button>
+			<button class="zd-col-15 submit-button_new" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="_zpchange">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {zpchange} from '@/utils/getData02.js'
+	import SearchBox from '@/components/SearchBox.vue'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				disabled: false
+			};
+		},
+		methods: {
+			toClear () {
+				this.val1 = ''
+				this.val2 = ''
+			},
+			async _zpchange () {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await zpchange(this.val1, this.val2)
+					if (res.code === '1') {
+						this.toClear()
+					}
+					this.disabled = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
diff --git a/pages/modules/carry-task.vue b/pages/modules/carry-task.vue
index b661259..8afaabc 100644
--- a/pages/modules/carry-task.vue
+++ b/pages/modules/carry-task.vue
@@ -136,6 +136,9 @@
 			async _taskCarry () {
 				try {
 					let res = await taskCarry(this.index1, this.index2)
+					if (res.code === '1') {
+						this.toClear()
+					}
 					this.disabled = false
 					uni.showToast({
 						title: res.message,
diff --git a/pages/modules/rawmater-instore.vue b/pages/modules/rawmater-instore.vue
index e7aee7f..2232ad1 100644
--- a/pages/modules/rawmater-instore.vue
+++ b/pages/modules/rawmater-instore.vue
@@ -90,6 +90,9 @@
 				}
 				try {
 					let res = await yclrk(this.index1, this.val2, this.val3, this.val4)
+					if (res.code === '1') {
+						this.toClear()
+					}
 					this.disabled = false
 					uni.showToast({
 						title: res.message,
diff --git a/pages/modules/rawmater-outstore.vue b/pages/modules/rawmater-outstore.vue
index 4692b90..717031d 100644
--- a/pages/modules/rawmater-outstore.vue
+++ b/pages/modules/rawmater-outstore.vue
@@ -104,6 +104,9 @@
 				}
 				try {
 					let res = await yclck(this.index1, this.index2, this.val2, this.val3)
+					if (res.code === '1') {
+						this.toClear()
+					}
 					this.disabled = false
 					uni.showToast({
 						title: res.message,
diff --git a/pages/modules/zupan-unbind.vue b/pages/modules/zupan-unbind.vue
index 650af82..617a342 100644
--- a/pages/modules/zupan-unbind.vue
+++ b/pages/modules/zupan-unbind.vue
@@ -77,6 +77,9 @@
 				}
 				try {
 					let res = await zpjb(this.val1, this.val2)
+					if (res.code === '1') {
+						this.toClear()
+					}
 					this.disabled = false
 					uni.showToast({
 						title: res.message,
diff --git a/static/image/menu/RF11.png b/static/image/menu/RF11.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4726938587f7199e560df3fb0704dfeb3312338
GIT binary patch
literal 2070
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
Staq{esUt$7cxO1Nh5rSH)k&lP

literal 0
HcmV?d00001

diff --git a/utils/getData2.js b/utils/getData2.js
index 24b94b7..f03ad24 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -21,6 +21,14 @@ export const handLogin = (user, password) => request({
 		password: password
 	}
 })
+// export const handLogin = (user, password) => {
+// 	let res = {
+// 		user: {user: 'admin'},
+// 		token: 'aaaa',
+// 		roles: 'A1,A2,'
+// 	}
+// 	return res
+// }
 
 /**
  * 人工排产
@@ -135,4 +143,15 @@ export const materialList = () => {
 export const getInventoryMaterialInfo = (code) => {
 	let res = [{"material_code":"FJB","material_name":"负极板","point_code":"01-09-01","point_name":"01排09列01层","vehicle_code":"T202312060006","vehicle_type":"1"}]
 	return res
-}
\ No newline at end of file
+}
+
+/**
+ * 缓存码变更
+ */
+export const zpchange = (code, ncode) => request({
+	url:'api/pda/zpchange',
+	data: {
+		sub_tray: code,
+		new_sub_tray: ncode
+	}
+})
\ No newline at end of file