From 2b286c9e6ea6a6bc60befd0f76c989907f1f20ea Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 28 Oct 2022 09:43:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/WarehouseManage/InStoreConfirm.vue     |   2 +-
 pages/WarehouseManage/ReturngoodsInStore.vue | 107 ++++++++++++++++++-
 pages/home/home.vue                          |   2 +-
 3 files changed, 105 insertions(+), 6 deletions(-)

diff --git a/pages/WarehouseManage/InStoreConfirm.vue b/pages/WarehouseManage/InStoreConfirm.vue
index bc4e4d6..5da8a90 100644
--- a/pages/WarehouseManage/InStoreConfirm.vue
+++ b/pages/WarehouseManage/InStoreConfirm.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="入库确认"></nav-bar>
+		<nav-bar title="生产入库"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="filter_item">
diff --git a/pages/WarehouseManage/ReturngoodsInStore.vue b/pages/WarehouseManage/ReturngoodsInStore.vue
index 239d03a..2bcd7a4 100644
--- a/pages/WarehouseManage/ReturngoodsInStore.vue
+++ b/pages/WarehouseManage/ReturngoodsInStore.vue
@@ -1,19 +1,118 @@
 <template>
-	<view>
-		
+	<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_wraper">
+						<span class="filter_label">木箱</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>木箱码</th>
+								<th>子卷号</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>重量KG</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_SN === pkId}">
+								<td>{{e.package_box_SN}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.product_name}}</td>
+								<td>{{e.product_description}}</td>
+								<td>{{e.net_weight}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !pkId || !val2}" :disabled="disabled" @tap="_stConfirm">入库确认</button>
+			<button class="submit-button" @tap="_boxQuery">查询</button>
+		</view>
 	</view>
 </template>
 
 <script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {boxQuery, stConfirm} from '@/utils/getData2.js'
 	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
 		data() {
 			return {
-				
+				val1: '',
+				val2: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
 			};
+		},
+		created () {
+			this._boxQuery()
+		},
+		methods: {
+			/** 初始化查询 */
+			async _boxQuery () {
+				let res = await boxQuery(this.val1, this.val2, '3')
+				this.dataList = [...res.data]	
+			},
+			/** 确认 */
+			async _stConfirm () {
+				this.disabled = true
+				if (!this.val2 || !this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await stConfirm(this.pkObj, this.val2)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.pkId = ''
+					this.pkObj = {}
+					this.disabled = false
+					this._boxQuery()
+					
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.package_box_SN ? '' : e.package_box_SN
+				this.pkObj = this.pkId === e.package_box_SN ? e : {}
+			}
 		}
 	}
 </script>
 
 <style lang="stylus">
-
 </style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index c2890a2..fa9f8ee 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -24,7 +24,7 @@
 	export default {
 		data() {
 			return {
-				menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '入库确认'}]
+				menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/SboProcess', name: '生箔工序'}, {url: '/pages/ProductManage/BakeProcess', name: '烘烤工序'}, {url: '/pages/ProductManage/PointManage', name: '点位管理'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/WarehouseManage/SemifinishedInStore', name: '半成品入库'}, {url: '/pages/WarehouseManage/SemifinishedOutStore', name: '半成品出库'}, {url: '/pages/WarehouseManage/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '入库确认'}]
 			};
 		},
 		mounted () {