From 1ddb60576b2212881bf74d42e49ea318ed51c65e Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 13 Apr 2023 16:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8A=E6=88=90=E5=93=81=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                               |   6 +
 pages/management/DeliveryConfirm.vue     |   6 +-
 pages/management/FinishedInStore.vue     |   5 +-
 pages/management/HalfFinishedInStore.vue | 188 +++++++++++++++++++++++
 pages/management/HcxErrorHandle.vue      |   6 +-
 pages/management/MaterList.vue           |   2 +-
 pages/management/hcxcheck.vue            |   2 +-
 pages/management/searchMater.vue         |  21 ++-
 utils/getData2.js                        |  10 +-
 9 files changed, 229 insertions(+), 17 deletions(-)
 create mode 100644 pages/management/HalfFinishedInStore.vue

diff --git a/pages.json b/pages.json
index 0bf7f3d..7c90e5b 100644
--- a/pages.json
+++ b/pages.json
@@ -87,6 +87,12 @@
 				"enablePullDownRefresh": true,
 				"onReachBottomDistance": 50
 			}
+		},
+		{
+			"path": "pages/management/HalfFinishedInStore",
+			"style": {
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/management/DeliveryConfirm.vue b/pages/management/DeliveryConfirm.vue
index b874bd0..1752fd9 100644
--- a/pages/management/DeliveryConfirm.vue
+++ b/pages/management/DeliveryConfirm.vue
@@ -91,8 +91,10 @@
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
 .filter-confirm-wrap
-	_wh(100%, calc(100% - 72px))
-	background-color #f5f5f5
+	_wh(calc(100% - 30px), calc(100% - 72px))
+	background-color #fff
+	border-radius 12px
+	margin 15px auto
 	_fj()
 .filter-confirm-wrap-inner
 	width 50%
diff --git a/pages/management/FinishedInStore.vue b/pages/management/FinishedInStore.vue
index 6cb4768..5727951 100644
--- a/pages/management/FinishedInStore.vue
+++ b/pages/management/FinishedInStore.vue
@@ -68,11 +68,14 @@
 				disabled: false
 			};
 		},
-		onLoad() {
+		onShow() {
 			if (this.$store.getters.publicArr) {
 				this.dataList = this.$store.getters.publicArr
 			}
 		},
+		destroyed () {
+			this.$store.dispatch('setPublicArr', '')
+		},
 		methods: {
 			/** 选择器1 */
 			selectChange1(e) {
diff --git a/pages/management/HalfFinishedInStore.vue b/pages/management/HalfFinishedInStore.vue
new file mode 100644
index 0000000..a1cf632
--- /dev/null
+++ b/pages/management/HalfFinishedInStore.vue
@@ -0,0 +1,188 @@
+<template>
+	<view class="content">
+		<nav-bar title="半成品入库"></nav-bar>
+		<view class="filter-confirm-wrap">
+			<view class="filter-confirm-wrap-inner">
+				<view class="filter-wrap">
+					<view class="search-item filter-item">
+						<label class="search-label">订单号</label>
+						<view class="filter_input_wraper">
+							<input type="text" class="search-input-l" v-model="val1">
+						</view>
+					</view>
+					<view class="search-item filter-item">
+						<label class="search-label">物料</label>
+						<view class="filter_input_wraper" @tap="toSearch">
+							<input type="text" class="search-input-l" v-model="val2">
+						</view>
+					</view>
+					<view class="search-item filter-item">
+						<label class="search-label">名称</label>
+						<view class="filter_input_wraper" @tap="toSearch">
+							<input type="text" class="search-input-l" v-model="val3">
+						</view>
+					</view>
+					<view class="search-item filter-item">
+						<label class="search-label">规格</label>
+						<view class="filter_input_wraper" @tap="toSearch">
+							<input type="text" class="search-input-l" v-model="val4">
+						</view>
+					</view>
+					<view class="search-item filter-item">
+						<label class="search-label">数量</label>
+						<view class="filter_input_wraper">
+							<input type="number" class="search-input-l" v-model="val5">
+						</view>
+					</view>
+					<view class="search-item filter-item">
+						<label class="search-label">载具号</label>
+						<view class="filter_input_wraper">
+							<search-box
+							v-model="val6"
+							/>
+						</view>
+					</view>
+				</view>
+				<view class="confirm-button-wrap confirm-button-wrap-c">
+					<button class="confirm-button" @tap="toCancle">清空</button>
+					<button class="confirm-button" :class="{'confirm-button_disabled': !val1 || !val2 || !val5 || !val6 }" :disabled="disabled" @tap="toSure">确定</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {releasepoint} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				val3: '',
+				val4: '',
+				val5: '',
+				val6: '',
+				val7: '',
+				disabled: false
+			};
+		},
+		onShow () {
+			if (this.$store.getters.publicObj !== '') {
+				this.val2 = this.$store.getters.publicObj.material_code
+				this.val3 = this.$store.getters.publicObj.material_name
+				this.val4 = this.$store.getters.publicObj.material_spec
+				this.val7 = this.$store.getters.publicObj.material_uuid
+			}
+		},
+		destroyed () {
+			this.$store.dispatch('setPublicObj', '')
+		},
+		methods: {
+			toCancle () {
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.val4 = ''
+				this.val5 = ''
+				this.val6 = ''
+				this.val7 = ''
+				this.$store.dispatch('setPublicObj', '')
+			},
+			toSearch () {
+				uni.navigateTo({
+					url: '/pages/management/searchMater?page=p2'
+				})
+			},
+			toSure () {
+				this.disabled = true
+				if (!this.val1) {
+					uni.showToast({
+						title: '订单号不能为空',
+						icon: 'none'
+					})
+					this.disabled = false
+					return
+				}
+				if (!this.val2) {
+					uni.showToast({
+						title: '物料不能为空',
+						icon: 'none'
+					})
+					this.disabled = false
+					return
+				}
+				if (!this.val5) {
+					uni.showToast({
+						title: '数量不能为空',
+						icon: 'none'
+					})
+					this.disabled = false
+					return
+				}
+				if (Number(this.val5) < 0) {
+					uni.showToast({
+						title: '数量不能小于零',
+						icon: 'none'
+					})
+					this.disabled = false
+					return
+				}
+				if (!this.val6) {
+					uni.showToast({
+						title: '载具号不能为空',
+						icon: 'none'
+					})
+					this.disabled = false
+					return
+				}
+				this._releasepoint()
+			},
+			async _releasepoint () {
+			  try {
+				let res = await inOutExceptionInstConfirm(this.index1, this.val1) 
+				this.disabled = false
+				this.toCancle()
+				this.$store.dispatch('setPublicObj', '')
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
+			  } catch (e) {
+				this.disabled = false
+			  }
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.filter-confirm-wrap
+	_wh(calc(100% - 30px), calc(100% - 72px))
+	background-color #fff
+	border-radius 12px
+	margin 15px auto
+	_fj()
+.filter-confirm-wrap-inner
+	width 50%
+	background-color #fff
+	border-radius 12px
+	padding-bottom 15px
+	margin 0 auto
+.filter-wrap
+	width 100%
+	padding 0 15px
+	_fj(center,,column,)
+.filter-item
+	width 100%
+.confirm-button-wrap-c
+	justify-content center
+	margin-top 50px
+</style>
\ No newline at end of file
diff --git a/pages/management/HcxErrorHandle.vue b/pages/management/HcxErrorHandle.vue
index 45b282a..3ec0071 100644
--- a/pages/management/HcxErrorHandle.vue
+++ b/pages/management/HcxErrorHandle.vue
@@ -92,8 +92,10 @@
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
 .filter-confirm-wrap
-	_wh(100%, calc(100% - 72px))
-	background-color #f5f5f5
+	_wh(calc(100% - 30px), calc(100% - 72px))
+	background-color #fff
+	border-radius 12px
+	margin 15px auto
 	_fj()
 .filter-confirm-wrap-inner
 	width 50%
diff --git a/pages/management/MaterList.vue b/pages/management/MaterList.vue
index b6e5183..41e08ac 100644
--- a/pages/management/MaterList.vue
+++ b/pages/management/MaterList.vue
@@ -4,7 +4,7 @@
 		<view class="search-confirm-wrap">
 			<view class="search-wrap">
 				<view class="search-item">
-					<label class="search-label">订单</label>
+					<label class="search-label">订单号</label>
 					<view class="filter_input_wraper">
 						<input type="text" class="search-input-l" v-model="val1">
 					</view>
diff --git a/pages/management/hcxcheck.vue b/pages/management/hcxcheck.vue
index 6229f43..a945ce3 100644
--- a/pages/management/hcxcheck.vue
+++ b/pages/management/hcxcheck.vue
@@ -237,7 +237,7 @@
 			},
 			searchMater () {
 				uni.navigateTo({
-					url: '/pages/management/searchMater'
+					url: '/pages/management/searchMater?page=p1'
 				})
 			},
 			closePop () {
diff --git a/pages/management/searchMater.vue b/pages/management/searchMater.vue
index db13a52..7bc85e0 100644
--- a/pages/management/searchMater.vue
+++ b/pages/management/searchMater.vue
@@ -54,14 +54,25 @@
 				val1: '',
 				dataList: [],
 				pkId: '',
-				pkObj: {}
+				pkObj: {},
+				page: ''
 			};
 		},
+		onLoad (options) {
+			this.page = options.page
+		},
 		methods: {
 			goIn () {
-				uni.navigateTo({
-					url: `/pages/management/hcxcheck`
-				})
+				if (this.page === 'p1') {
+					uni.redirectTo({
+						url: '/pages/management/hcxcheck'
+					})
+				}
+				if (this.page === 'p2') {
+					uni.redirectTo({
+						url: '/pages/management/HalfFinishedInStore'
+					})
+				}
 			},
 			async _materialQuery () {
 				let res = await materialQuery(this.val1)
@@ -76,7 +87,7 @@
 					return
 				}
 				this.$store.dispatch('setPublicObj', this.pkObj)
-				uni.navigateBack()
+				this.goIn()
 			}
 		}
 	}
diff --git a/utils/getData2.js b/utils/getData2.js
index 93023ee..66fb742 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -29,17 +29,17 @@ export const authority = () => {
 				{menu_id: '1', name: '扫码异常', path: '/pages/management/inscanerror'},
 				{menu_id: '2', name: '缓存线盘点', path: '/pages/management/hcxcheck'},
 				{menu_id: '3', name: '缓存线出箱异常', path: '/pages/management/HcxOutError'},
-				{menu_id: '4', name: '任务操作', path: '/pages/management/ZlOperate'},
-				{menu_id: '5', name: '缓存线异常处理', path: '/pages/management/HcxErrorHandle'}
+				{menu_id: '4', name: '缓存线异常处理', path: '/pages/management/HcxErrorHandle'}
 				]
 			},
 			{menu_id: '2', path: 'RF02', name: '生产管理', sonTree: [
-				{menu_id: '1', name: '任务管理', path: '/pages/management/TaskManage'}
+				{menu_id: '1', name: '任务管理', path: '/pages/management/ZlOperate'},
 				]
 			},
 			{menu_id: '3', path: 'RF03', name: '出入库管理', sonTree: [
-				{menu_id: '1', name: '成品入库', path: '/pages/management/FinishedInStore'},
-				{menu_id: '2', name: '发货确认', path: '/pages/management/DeliveryConfirm'}
+				{menu_id: '1', name: '半成品入库', path: '/pages/management/HalfFinishedInStore'},
+				{menu_id: '2', name: '成品入库', path: '/pages/management/FinishedInStore'},
+				{menu_id: '3', name: '发货确认', path: '/pages/management/DeliveryConfirm'}
 				]
 			}
 		]