From 1847e3cde14b058e885d346130fa500fed935ee8 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Mon, 31 Oct 2022 14:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=87=BA=E5=BA=93=E7=88=B6?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   6 +
 pages/ProductManage/SboProcess.vue            |   2 -
 pages/WarehouseManage/ProdDeliveryConfirm.vue |  21 +--
 pages/WarehouseManage/XuniDelivery.vue        | 130 ++++++++++++++++++
 pages/WarehouseManage/XuniDeliveryConfirm.vue |  57 ++------
 pages/home/home.vue                           |   2 +-
 utils/getData1.js                             |  50 +++++--
 7 files changed, 198 insertions(+), 70 deletions(-)
 create mode 100644 pages/WarehouseManage/XuniDelivery.vue

diff --git a/pages.json b/pages.json
index f11ea5c..c70dc36 100644
--- a/pages.json
+++ b/pages.json
@@ -102,6 +102,12 @@
 		    	"navigationStyle": "custom"
 		    }   
 		}
+		,{
+		    "path" : "pages/WarehouseManage/XuniDelivery",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }   
+		}
 		,{
 		    "path" : "pages/WarehouseManage/XuniDeliveryConfirm",
 		    "style": {
diff --git a/pages/ProductManage/SboProcess.vue b/pages/ProductManage/SboProcess.vue
index 8484de4..0a411af 100644
--- a/pages/ProductManage/SboProcess.vue
+++ b/pages/ProductManage/SboProcess.vue
@@ -83,8 +83,6 @@
 			return {
 				val1: '',
 				val2: '',
-				options: [],
-				index: '',
 				dataList: [],
 				pkId: '',
 				pkObj: {},
diff --git a/pages/WarehouseManage/ProdDeliveryConfirm.vue b/pages/WarehouseManage/ProdDeliveryConfirm.vue
index b3d5a28..d49233c 100644
--- a/pages/WarehouseManage/ProdDeliveryConfirm.vue
+++ b/pages/WarehouseManage/ProdDeliveryConfirm.vue
@@ -51,7 +51,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_stoutConfirm">出库确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_stoutConfirm">出库确认</button>
 			<button class="submit-button" @tap="_queryRawFoilList">查询</button>
 		</view>
 	</view>
@@ -60,7 +60,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {ivtQuery, stoutConfirm, stoutPrint} from '@/utils/getData1.js'
+	import {stivtQuery, stoutConfirm, stoutPrint} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
@@ -70,8 +70,6 @@
 			return {
 				val1: '',
 				val2: '',
-				options: [],
-				index: '',
 				dataList: [],
 				pkId: '',
 				pkObj: {},
@@ -79,25 +77,20 @@
 			};
 		},
 		created () {
-			this._ivtQuery()
 		},
 		methods: {
 			handleChange (e) {
 				// console.log(e)
 			},
 			/** 初始化查询 */
-			async _ivtQuery () {
-				let res = await ivtQuery(this.val1, this.val2, '0')
+			async _stivtQuery () {
+				let res = await stivtQuery(this.val1, this.val2)
 				this.dataList = [...res.data]	
 			},
 			async _stoutConfirm () {
 				this.disabled1 = true
-				if (!this.pkId) {
-					this.disabled1 = false
-					return
-				}
 				try {
-					let res = await stoutConfirm(this.pkObj, '0')
+					let res = await stoutConfirm(this.dataList, this.val1)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -105,7 +98,7 @@
 					this.disabled1 = false
 					this.pkId = ''
 					this.pkObj = {}
-					this._ivtQuery()
+					this._stivtQuery()
 				} catch (e) {
 					this.disabled1 = false
 				}
@@ -125,7 +118,7 @@
 					this.disabled1 = false
 					this.pkId = ''
 					this.pkObj = {}
-					this._ivtQuery()
+					this._stivtQuery()
 				} catch (e) {
 					this.disabled1 = false
 				}
diff --git a/pages/WarehouseManage/XuniDelivery.vue b/pages/WarehouseManage/XuniDelivery.vue
new file mode 100644
index 0000000..0ea6f98
--- /dev/null
+++ b/pages/WarehouseManage/XuniDelivery.vue
@@ -0,0 +1,130 @@
+<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_wraper">
+						<span class="filter_label">单据号</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box 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>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>木箱码</th>
+								<th>子卷号</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>重量kg</th>
+								<th>更换外包</th>
+								<th>更换内包</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_SN === pkId, 'bgyellow': e.colro_flag === '1'}">
+								<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>
+								<td>{{e.change_out}}</td>
+								<td>{{e.change_in}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="toSure">确认</button>
+			<button class="submit-button" @tap="_queryRawFoilList">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {virtualbillQuery, virtualbillType} from '@/utils/getData1.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				options: [],
+				index: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled1: false
+			};
+		},
+		created () {
+			this._virtualbillQuery()
+		},
+		methods: {
+			handleChange (e) {
+				// console.log(e)
+			},
+			/** 选择器 */
+			selectChange(e) {
+				this.index = e
+			},
+			/** 下拉框查询 */
+			async _virtualbillType () {
+				let res = await virtualbillType()
+				this.options = [...res.data]
+			},
+			/** 初始化查询 */
+			async _virtualbillQuery () {
+				let res = await virtualbillQuery(this.val1, this.val2, this.index)
+				this.dataList = [...res.data]
+			},
+			toSure () {
+				if (this.pkId) {
+					uni.navigateTo({
+						url: '/pages/WarehouseManage/XuniDeliveryConfirm?billcode=' + this.pkObj.bill_code
+					})
+				}
+			},
+			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">
+	.zd_content
+		padding-bottom 77rpx
+	.slide_new table td:nth-child(1), .slide_new table th:nth-child(1)
+		box-shadow 1px 0 2px rgba(0,0,0,.12)
+	.bgyellow td
+		background-color #E9B451
+</style>
diff --git a/pages/WarehouseManage/XuniDeliveryConfirm.vue b/pages/WarehouseManage/XuniDeliveryConfirm.vue
index 8966dfa..f2ad717 100644
--- a/pages/WarehouseManage/XuniDeliveryConfirm.vue
+++ b/pages/WarehouseManage/XuniDeliveryConfirm.vue
@@ -14,7 +14,7 @@
 				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">点位</span>
+						<span class="filter_label">物料</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box v-model="val2" />
@@ -36,7 +36,7 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.package_box_SN === pkId, 'bgyellow': e.colro_flag === '1'}">
+							<tr v-for="(e, i) in dataList" :key="i" :class="{'bgyellow': e.colro_flag === '1'}">
 								<td>{{e.package_box_SN}}</td>
 								<td>{{e.container_name}}</td>
 								<td>{{e.product_name}}</td>
@@ -51,7 +51,7 @@
 			</view>
 		</view>
 		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_stoutConfirm">出库确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !dataList.length}" :disabled="disabled1" @tap="_virtualoutConfirm">出库确认</button>
 			<button class="submit-button" @tap="_queryRawFoilList">查询</button>
 		</view>
 	</view>
@@ -60,7 +60,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {ivtQuery, stoutConfirm, stoutPrint} from '@/utils/getData1.js'
+	import {virtualivtQuery, virtualoutConfirm} from '@/utils/getData1.js'
 	export default {
 		components: {
 			NavBar,
@@ -70,69 +70,38 @@
 			return {
 				val1: '',
 				val2: '',
-				options: [],
-				index: '',
+				billCode: '',
 				dataList: [],
-				pkId: '',
-				pkObj: {},
 				disabled1: false
 			};
 		},
 		created () {
-			this._ivtQuery()
+		},
+		onLoad (option) {
+			this.billCode = option.bill_code
 		},
 		methods: {
 			handleChange (e) {
 				// console.log(e)
 			},
 			/** 初始化查询 */
-			async _ivtQuery () {
-				let res = await ivtQuery(this.val1, this.val2, '0')
+			async _virtualivtQuery () {
+				let res = await virtualivtQuery(this.val1, this.val2, this.billCode)
 				this.dataList = [...res.data]	
 			},
-			async _stoutConfirm () {
+			async _virtualoutConfirm () {
 				this.disabled1 = true
-				if (!this.pkId) {
-					this.disabled1 = false
-					return
-				}
 				try {
-					let res = await stoutConfirm(this.pkObj, '0')
+					let res = await virtualoutConfirm(this.dataList, this.val1)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
 					})
 					this.disabled1 = false
-					this.pkId = ''
-					this.pkObj = {}
-					this._ivtQuery()
+					this._virtualivtQuery()
 				} catch (e) {
 					this.disabled1 = false
 				}
-			},
-			async _stoutPrint () {
-				this.disabled1 = true
-				if (!this.pkId) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await stoutPrint(this.pkObj)
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-					this.disabled1 = false
-					this.pkId = ''
-					this.pkObj = {}
-					this._ivtQuery()
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.package_box_SN ? '' : e.package_box_SN
-				this.pkObj = this.pkId === e.package_box_SN ? e : {}
 			}
 		}
 	}
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 7d69e8a..ac0d168 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/XuniDeliveryConfirm', 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/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/getData1.js b/utils/getData1.js
index c3b9245..a2eb0a7 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -94,28 +94,60 @@ export const pointStatusQuery = (pcode, cname) => request({
 })
 
 // 【仓储管理】
-// 出库确认-生产区发货确认、虚拟区发货确认
+// 生产区发货确认
 // 1.1出库初始化查询
-export const ivtQuery = (bno, pcode, option) => request({
+export const stivtQuery = (bno, pcode) => request({
 	url: 'api/pda/st/ivtQuery',
 	data: {
 		box_no: bno,
-		point_code: pcode,
-		option: option
+		point_code: pcode
 	}
 })
-// 1.1出库确认
-export const stoutConfirm = (bjo, option) => request({
+// 1.2出库确认
+export const stoutConfirm = (brows, bno) => request({
 	url: 'api/pda/st/outConfirm',
 	data: {
-		box_jo: bjo,
-		option: option
+		box_rows: brows,
+		box_no: bno
 	}
 })
-// 1.1出库确认
+// 1.3打印
 export const stoutPrint = (bjo) => request({
 	url: 'api/pda/st/outPrint',
 	data: {
 		box_jo: bjo
 	}
 })
+
+// 虚拟区发货确认
+// 1.1出库初始化查询
+export const virtualbillQuery = (bno, bcode, btype) => request({
+	url: 'api/pda/virtual/billQuery',
+	data: {
+		box_no: bno,
+		bill_code: bcode,
+		bill_type: btype
+	}
+})
+// 1.2单据类型
+export const virtualbillType = () => request({
+	url: 'api/pda/virtual/billType',
+	data: {}
+})
+// 1.3出库查询
+export const virtualivtQuery = (bno, mcode, bcode) => request({
+	url: 'api/pda/virtual/ivtQuery',
+	data: {
+		box_no: bno,
+		material_code: mcode,
+		bill_code: bcode
+	}
+})
+// 1.4出库确认
+export const virtualoutConfirm = (brows, bno) => request({
+	url: 'api/pda/virtual/outConfirm',
+	data: {
+		box_rows: brows,
+		box_no: bno
+	}
+})