From 36d23a7a4b38d6c4ae12fe3485e42ea9c925905b Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 12 Oct 2022 15:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/ProductManage/ZjCasing.vue   |   4 +-
 pages/ProductManage/ZjDelivery.vue | 173 ++++++++++++++++++++++++++++-
 pages/ProductManage/ZjOutStore.vue | 143 +++++++++++++++++++++++-
 utils/getData2.js                  |  46 ++++++++
 4 files changed, 356 insertions(+), 10 deletions(-)

diff --git a/pages/ProductManage/ZjCasing.vue b/pages/ProductManage/ZjCasing.vue
index 9cd8cac..acea0d3 100644
--- a/pages/ProductManage/ZjCasing.vue
+++ b/pages/ProductManage/ZjCasing.vue
@@ -104,7 +104,7 @@
 			};
 		},
 		created () {
-			// this._queryProductArea()
+			this._queryProductArea()
 		},
 		methods: {
 			/** 选择器 */
@@ -130,7 +130,7 @@
 			/** 确认 */
 			async _casingConfirm () {
 				this.disabled = true
-				if (!this.checkArr.length) {
+				if (!this.checkArr.length || !this.val2) {
 					this.disabled = false
 					return
 				}
diff --git a/pages/ProductManage/ZjDelivery.vue b/pages/ProductManage/ZjDelivery.vue
index 315c6ad..39f57dd 100644
--- a/pages/ProductManage/ZjDelivery.vue
+++ b/pages/ProductManage/ZjDelivery.vue
@@ -1,23 +1,188 @@
 <template>
-	<view>
+	<view class="container">
 		<nav-bar title="子卷配送"></nav-bar>
+		<view class="content">
+			<view class="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="wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>选择</th>
+								<th>订单号</th>
+								<th>子卷号</th>
+								<th>机台编号</th>
+								<th>分切组</th>
+								<th>生产顺序</th>
+								<th>生产日期</th>
+								<th>纸筒/FRP管</th>
+								<th>纸筒物料编码</th>
+								<th>纸筒物料描述</th>
+								<th>纸筒规格</th>
+								<th>FRP管物料编码</th>
+								<th>FRP管物料描述</th>
+								<th>FRP管规格</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{Number(i) + 1}}</td>
+								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
+								<td>{{e.mfg_order_name}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.split_group}}</td>
+								<td>{{e.manufacture_sort}}</td>
+								<td>{{e.manufacture_date}}</td>
+								<td>{{e.paper_tube_or_FRP}}</td>
+								<td>{{e.paper_tube_material}}</td>
+								<td>{{e.paper_tube_description}}</td>
+								<td>{{e.paper_tube_model}}</td>
+								<td>{{e.FRP_material}}</td>
+								<td>{{e.FRP_description}}</td>
+								<td>{{e.FRP_model}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !checkArr.length || checkArr.length > 1}" :disabled="disabled1" @tap="_needVehicle">呼叫载具</button>
+			<button class="submit-button" :class="{'btn-disabled': !checkArr.length}" :disabled="disabled2" @tap="_shippingConfirm">配送确认</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2 || !index}" @tap="_queryMaterialInfo">查询</button>
+		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, queryMaterialInfo3, needVehicle, shippingConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
-			NavBar
+			NavBar,
+			SearchBox
 		},
 		data() {
 			return {
-				
+				val1: '',
+				val2: '',
+				options: [],
+				index: '',
+				qty: '',
+				dataList: [],
+				disabled1: false,
+				disabled2: false,
+				checkArr: []
 			};
+		},
+		created () {
+			this._queryProductArea()
+		},
+		methods: {
+			/** 选择器 */
+			selectChange(e) {
+				this.index = e
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options = [...res.rows]
+			},
+			/** 初始化查询 */
+			async _queryMaterialInfo () {
+				if (!this.val1 || !this.index) {
+					return
+				}
+				let res = await queryMaterialInfo3(this.val1, this.val2, this.options[this.index].value)
+				res.rows.map(el => {
+					this.$set(el, 'checked', false)
+				})
+				this.dataList = [...res.rows]	
+			},
+			/** 呼叫载具 */
+			async _needVehicle () {
+				this.disabled1 = true
+				if (!this.checkArr.length || this.checkArr.length > 1) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await needVehicle(this.checkArr[0])
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+					this.disabled1 = false
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			/** 确认 */
+			async _shippingConfirm () {
+				this.disabled2 = true
+				if (!this.checkArr.length) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await shippingConfirm(this.checkArr)
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+					this.disabled2 = false
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+			}
 		}
 	}
 </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 92rpx
+		width 92rpx
+		z-index 102
+	.slide_new table td:nth-child(3), .slide_new table th:nth-child(3)
+		position sticky
+		left 184rpx
+		z-index 103
 </style>
diff --git a/pages/ProductManage/ZjOutStore.vue b/pages/ProductManage/ZjOutStore.vue
index afd6a24..cbcd8fc 100644
--- a/pages/ProductManage/ZjOutStore.vue
+++ b/pages/ProductManage/ZjOutStore.vue
@@ -1,23 +1,158 @@
 <template>
-	<view>
+	<view class="container">
 		<nav-bar title="子卷出站"></nav-bar>
+		<view class="content">
+			<view class="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">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+			<view class="wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>序号</th>
+								<th>选择</th>
+								<th>订单号</th>
+								<th>子卷号</th>
+								<th>机台编号</th>
+								<th>分切组</th>
+								<th>生产顺序</th>
+								<th>生产日期</th>
+								<th>纸筒/FRP管</th>
+								<th>纸筒物料编码</th>
+								<th>纸筒物料描述</th>
+								<th>纸筒规格</th>
+								<th>FRP管物料编码</th>
+								<th>FRP管物料描述</th>
+								<th>FRP管规格</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i">
+								<td>{{Number(i) + 1}}</td>
+								<td><span class="iconfont icon_unchecked" :class="{'icon_checked': e.checked}" @tap="toCheck(e)">&#xe66b;</span></td>
+								<td>{{e.mfg_order_name}}</td>
+								<td>{{e.container_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.split_group}}</td>
+								<td>{{e.manufacture_sort}}</td>
+								<td>{{e.manufacture_date}}</td>
+								<td>{{e.paper_tube_or_FRP}}</td>
+								<td>{{e.paper_tube_material}}</td>
+								<td>{{e.paper_tube_description}}</td>
+								<td>{{e.paper_tube_model}}</td>
+								<td>{{e.FRP_material}}</td>
+								<td>{{e.FRP_description}}</td>
+								<td>{{e.FRP_model}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar">
+			<button class="submit-button" :class="{'btn-disabled': !checkArr.length}" :disabled="disabled" @tap="_outConfirm">子卷出站</button>
+			<button class="submit-button" :class="{'btn-disabled': !val1 || !index}" @tap="_queryMaterialInfo">查询</button>
+		</view>
 	</view>
 </template>
 
 <script>
 	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryProductArea, queryMaterialInfo4, outConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
-			NavBar
+			NavBar,
+			SearchBox
 		},
 		data() {
 			return {
-				
+				val1: '',
+				val2: '',
+				options: [],
+				index: '',
+				qty: '',
+				dataList: [],
+				disabled: false,
+				checkArr: []
 			};
+		},
+		created () {
+			this._queryProductArea()
+		},
+		methods: {
+			/** 选择器 */
+			selectChange(e) {
+				this.index = e
+			},
+			/** 生产区域下拉框查询 */
+			async _queryProductArea () {
+				let res = await queryProductArea()
+				this.options = [...res.rows]
+			},
+			/** 初始化查询 */
+			async _queryMaterialInfo () {
+				if (!this.val1 || !this.index) {
+					return
+				}
+				let res = await queryMaterialInfo4(this.val1, this.options[this.index].value)
+				res.rows.map(el => {
+					this.$set(el, 'checked', false)
+				})
+				this.dataList = [...res.rows]	
+			},
+			/** 确认 */
+			async _outConfirm () {
+				this.disabled = true
+				if (!this.checkArr.length) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await outConfirm(this.checkArr)
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+			}
 		}
 	}
 </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 92rpx
+		width 92rpx
+		z-index 102
+	.slide_new table td:nth-child(3), .slide_new table th:nth-child(3)
+		position sticky
+		left 184rpx
+		z-index 103
 </style>
diff --git a/utils/getData2.js b/utils/getData2.js
index c90f172..110e856 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -64,4 +64,50 @@ export const casingConfirm = (row, qzz) => request({
 		cut_rows: row,
 		qzzno: qzz
 	}
+})
+
+/**
+ * 子卷配送
+ */
+// 1.1分切计划初始化查询
+export const queryMaterialInfo3 = (code, qzz, area) => request({
+	url:'api/pda/shipping/queryMaterialInfo',
+	data: {
+		vehicle_code: code,
+		qzzno: qzz,
+		product_area: area
+	}
+})
+// 1.2呼叫载具
+export const needVehicle = (code) => request({
+	url:'api/pda/shipping/needVehicle',
+	data: {
+		cut_jo: code
+	}
+})
+// 1.3配送确认
+export const shippingConfirm = (rows) => request({
+	url:'api/pda/shipping/confirm',
+	data: {
+		cut_rows: rows
+	}
+})
+
+/**
+ * 子卷出站
+ */
+// 1.1分切计划初始化查询
+export const queryMaterialInfo4 = (code, area) => request({
+	url:'api/pda/out/queryMaterialInfo',
+	data: {
+		point_code: code,
+		product_area: area
+	}
+})
+// 1.2子卷出站
+export const outConfirm = (rows) => request({
+	url:'api/pda/out/confirm',
+	data: {
+		cut_rows: rows
+	}
 })
\ No newline at end of file