From 19495248d671f7374432f3b50a0686d6779264ad Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Tue, 1 Nov 2022 14:35:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E7=AE=A1=E5=87=BA=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                |  17 ++-
 pages/ProductManage/EmptyPipeInStore.vue  |   8 +-
 pages/ProductManage/EmptyPipeOutStore.vue | 145 ++++++++++++++++++++++
 pages/home/home.vue                       |   2 +-
 utils/getData2.js                         |  10 +-
 5 files changed, 172 insertions(+), 10 deletions(-)
 create mode 100644 pages/ProductManage/EmptyPipeOutStore.vue

diff --git a/pages.json b/pages.json
index c70dc36..d241153 100644
--- a/pages.json
+++ b/pages.json
@@ -48,6 +48,12 @@
 		    	"navigationStyle": "custom"
 		    }   
 		}
+		,{
+		    "path" : "pages/ProductManage/EmptyPipeOutStore",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }   
+		}
 		,{
 		    "path" : "pages/ProductManage/ZjCasing",
 		    "style": {
@@ -141,7 +147,16 @@
         "disableScroll": true
     }
 }
-],
+    ,{
+            "path" : "pages/ProductManage/EmptyPipeOutStore",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
 		"navigationBarTextStyle": "white",
diff --git a/pages/ProductManage/EmptyPipeInStore.vue b/pages/ProductManage/EmptyPipeInStore.vue
index 309baf4..ce36e59 100644
--- a/pages/ProductManage/EmptyPipeInStore.vue
+++ b/pages/ProductManage/EmptyPipeInStore.vue
@@ -87,8 +87,8 @@
 			};
 		},
 		created () {
-			this._queryProductArea()
-			this._queryMaterialInfo()
+			// this._queryProductArea()
+			// this._queryMaterialInfo()
 		},
 		methods: {
 			/** 选择器 */
@@ -102,7 +102,7 @@
 			},
 			/** 初始化查询 */
 			async _queryMaterialInfo () {
-				let res = await queryMaterialInfo1(this.val1, this.val2, this.index)
+				let res = await queryMaterialInfo1(this.val1, this.val2, this.index, '2')
 				this.dataList = [...res.data]	
 			},
 			/** 确认 */
@@ -113,7 +113,7 @@
 					return
 				}
 				try {
-					let res = await emptyConfirm(this.pkObj, this.qty, this.val1)
+					let res = await emptyConfirm(this.pkObj, this.qty, this.val1, '2')
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
diff --git a/pages/ProductManage/EmptyPipeOutStore.vue b/pages/ProductManage/EmptyPipeOutStore.vue
new file mode 100644
index 0000000..b3e6078
--- /dev/null
+++ b/pages/ProductManage/EmptyPipeOutStore.vue
@@ -0,0 +1,145 @@
+<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_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">物料</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val2">
+					</view>
+				</view>
+				<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>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">数量</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="qty">
+					</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>数量</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.point_code === pkId}">
+								<td>{{Number(i) + 1}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.qty}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled" @tap="_emptyConfirm">出库确认</button>
+			<button class="submit-button" @tap="_queryMaterialInfo">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, queryMaterialInfo1, emptyConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				options: [],
+				index: '',
+				qty: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false
+			};
+		},
+		created () {
+			// this._queryProductArea()
+			// this._queryMaterialInfo()
+		},
+		methods: {
+			/** 选择器 */
+			selectChange(e) {
+				this.index = e
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options = [...res.data]
+			},
+			/** 初始化查询 */
+			async _queryMaterialInfo () {
+				let res = await queryMaterialInfo1(this.val1, this.val2, this.index, '1')
+				this.dataList = [...res.data]	
+			},
+			/** 确认 */
+			async _emptyConfirm () {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await emptyConfirm(this.pkObj, this.qty, this.val1, '1')
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this.disabled = false
+					this.pkId = ''
+					this.pkObj = {}
+					this._queryMaterialInfo()
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.point_code ? '' : e.point_code
+				this.pkObj = this.pkId === e.point_code ? e : {}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+	.slide_new table td:first-child, .slide_new table th:first-child
+		width 92rpx
+	.slide_new table td:nth-child(2), .slide_new table th:nth-child(2)
+		position sticky
+		left 89rpx
+		z-index 102
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
+</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index ac0d168..5137b80 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/ReturngoodsInStore', name: '退货入库'}, {url: '/pages/WarehouseManage/ScrapInStore', name: '报废入库'}, {url: '/pages/WarehouseManage/InStoreConfirm', name: '生产入库'}, {url: '/pages/WarehouseManage/ProdDeliveryConfirm', name: '生产区发货确认'}, {url: '/pages/WarehouseManage/XuniDelivery', name: '虚拟区发货'}, {url: '/pages/WarehouseManage/EmptyInStore', name: '空载具入库'}, {url: '/pages/WarehouseManage/EmptyOutStore', 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/EmptyPipeOutStore', 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: '生产入库'}, {url: '/pages/WarehouseManage/ProdDeliveryConfirm', name: '生产区发货确认'}, {url: '/pages/WarehouseManage/XuniDelivery', name: '虚拟区发货'}, {url: '/pages/WarehouseManage/EmptyInStore', name: '空载具入库'}, {url: '/pages/WarehouseManage/EmptyOutStore', name: '空载具出库'}]
 			};
 		},
 		mounted () {
diff --git a/utils/getData2.js b/utils/getData2.js
index eec2eaf..2451c62 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -9,21 +9,23 @@ export const queryProductArea = () => request({
 	data: {}
 })
 // 1.2空纸管库设备物料初始化查询
-export const queryMaterialInfo1 = (code, mcode, area) => request({
+export const queryMaterialInfo1 = (code, mcode, area, option) => request({
 	url:'api/pda/empty/queryMaterialInfo',
 	data: {
 		point_code: code,
 		material_code: mcode,
-		product_area: area
+		product_area: area,
+		option: option
 	}
 })
 // 1.3入库确认
-export const emptyConfirm = (jo, qty, code) => request({
+export const emptyConfirm = (jo, qty, code, option) => request({
 	url:'api/pda/empty/confirm',
 	data: {
 		raw_jo: jo,
 		qty: qty,
-		material_code: code
+		material_code: code,
+		option: option
 	}
 })