From a1c5e2c016b84a28bea122594fb0bd4196c2e2d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Fri, 15 Nov 2024 17:42:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                            |   3 +-
 pages.json                           |  10 ++
 pages/check/check-task.vue           |   2 +-
 pages/entry/empty-tray-to-store.vue  |   2 +-
 pages/entry/group-to-store.vue       |   5 +-
 pages/entry/mater-group-to-store.vue |   2 +-
 pages/home/home.vue                  |   2 +-
 pages/mode/command.vue               |   2 +-
 pages/mode/pick.vue                  |   2 +-
 pages/mode/switch-in-out.vue         |   2 +-
 pages/outbound/bill-out-store.vue    | 186 +++++++++++++++++++++++++++
 pages/outbound/out-store-confirm.vue |   2 +-
 pages/outbound/tray-out-store.vue    |   2 +-
 pages/pick/pick-list.vue             |   6 +-
 pages/pick/pick-task.vue             |   2 +-
 utils/getData2.js                    |  15 +++
 16 files changed, 228 insertions(+), 17 deletions(-)
 create mode 100644 pages/outbound/bill-out-store.vue

diff --git a/README.md b/README.md
index b2fe163..98e1947 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,5 @@
 + 原生APP云打包使用自有证书
 + 证书别名：testalias
 + 接口在线地址：(https://apifox.com/apidoc/shared-e9d4798e-2db1-493d-a0cb-7a0e881c4bd6/api-160097540)
-+ app图标为lms
\ No newline at end of file
++ app图标为lms
++ 接口在线地址：http://47.98.105.245:8001/project/21/interface/api/cat_122
\ No newline at end of file
diff --git a/pages.json b/pages.json
index dfbdf4d..d361eb2 100644
--- a/pages.json
+++ b/pages.json
@@ -222,6 +222,16 @@
             }
             
         }
+        ,{
+            "path" : "pages/outbound/bill-out-store",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom",
+                "enablePullDownRefresh": true,
+                "onReachBottomDistance": 50
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
diff --git a/pages/check/check-task.vue b/pages/check/check-task.vue
index bff0c98..b8721a4 100644
--- a/pages/check/check-task.vue
+++ b/pages/check/check-task.vue
@@ -99,7 +99,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': JSON.stringify(data) === JSON.stringify({form_data: {}, children_form_Data: {}})}" :disabled="disabled" @tap="_checkSaveCheckTask">盘点确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(data) === JSON.stringify({form_data: {}, children_form_Data: {}})}" :disabled="disabled" @tap="_checkSaveCheckTask">盘点确认</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/entry/empty-tray-to-store.vue b/pages/entry/empty-tray-to-store.vue
index 7d467db..3adeb92 100644
--- a/pages/entry/empty-tray-to-store.vue
+++ b/pages/entry/empty-tray-to-store.vue
@@ -26,7 +26,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pdaPalletIostorinvIn">确认</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/entry/group-to-store.vue b/pages/entry/group-to-store.vue
index 20f5677..eebc9e6 100644
--- a/pages/entry/group-to-store.vue
+++ b/pages/entry/group-to-store.vue
@@ -52,9 +52,8 @@
 			
 		</view>
 		<view class="zd-row submit-bar">
-			<view class="zd-col-10"></view>
-			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-7 button-primary" :class="{'button-info': !checkArr.length}" :disabled="disabled">组盘确认</button>
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !checkArr.length}" :disabled="disabled">组盘确认</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/entry/mater-group-to-store.vue b/pages/entry/mater-group-to-store.vue
index e322f83..a039e8d 100644
--- a/pages/entry/mater-group-to-store.vue
+++ b/pages/entry/mater-group-to-store.vue
@@ -81,7 +81,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_groupMaterIn">组盘确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': JSON.stringify(currentData) === '{}'}" :disabled="disabled" @tap="_groupMaterIn">组盘确认</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 14295ab..9d59614 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -42,7 +42,7 @@
 				userName: '',
 				menuList: [
 					{title: '入库管理', path: 'RF01', sonTree: [{title: '物料组盘入库', path: '/pages/entry/mater-group-to-store'}, {title: '单据入库', path: '/pages/entry/group-to-store'}, {title: '空托盘入库', path: '/pages/entry/empty-tray-to-store'}]},
-					{title: '出库管理', path: 'RF02', sonTree: [{title: '托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}]},
+					{title: '出库管理', path: 'RF02', sonTree: [{title: '托盘出库', path: '/pages/outbound/tray-out-store'}, {title: '出库确认', path: '/pages/outbound/out-store-confirm'}, {title: '单据出库', path: '/pages/outbound/bill-out-store'}]},
 					{title: '在库管理', path: 'RF03', sonTree: [{title: '库存信息', active: false, path: '/pages/in/store-info'}]},
 					{title: '拣选管理', path: 'RF04', sonTree: [{title: '拣选作业', path: '/pages/pick/pick-task'}]},
 					{title: '盘点管理', path: 'RF05', sonTree: [{title: '盘点作业', path: '/pages/check/check-task'}]},
diff --git a/pages/mode/command.vue b/pages/mode/command.vue
index ca31d2e..beecec1 100644
--- a/pages/mode/command.vue
+++ b/pages/mode/command.vue
@@ -36,7 +36,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !index || !val2}" :disabled="disabled" @tap="_toCommandTP">下发输送线运动命令</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index || !val2}" :disabled="disabled" @tap="_toCommandTP">下发输送线运动命令</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/mode/pick.vue b/pages/mode/pick.vue
index c315c69..e4db572 100644
--- a/pages/mode/pick.vue
+++ b/pages/mode/pick.vue
@@ -26,7 +26,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pinkStartStop">拣选工位启停模式</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_pinkStartStop">拣选工位启停模式</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/mode/switch-in-out.vue b/pages/mode/switch-in-out.vue
index 5c3a9c6..1158a74 100644
--- a/pages/mode/switch-in-out.vue
+++ b/pages/mode/switch-in-out.vue
@@ -26,7 +26,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_switchInOut">切换出入库模式</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_switchInOut">切换出入库模式</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/outbound/bill-out-store.vue b/pages/outbound/bill-out-store.vue
new file mode 100644
index 0000000..ccacbf3
--- /dev/null
+++ b/pages/outbound/bill-out-store.vue
@@ -0,0 +1,186 @@
+<template>
+	<view class="zd_container">
+		<!-- 单据出库 -->
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row">
+					<view class="zd-col-9">
+						<span class="filter_label">出库单类型</span>
+					</view>
+					<view class="zd-col-24 filter_select">
+						<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>对应流程实例id</th>
+								<th>业务单据编号</th>
+								<th>业务单据类型</th>
+								<th>业务单据日期</th>
+								<th>单据类型</th>
+								<th>业务单据状态</th>
+								<th>备注</th>
+								<th>创建时间</th>
+								<th>创建人</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>物料类型</th>
+								<th>物料单重</th>
+								<th>数量</th>
+								<th>分配数量</th>
+								<th>批次号</th>
+								<th>载具</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @tap="toChek(e)" :class="{'checked': pkId === code}">
+								<td>{{e.code}}</td>
+								<td>{{e.proc_inst_id}}</td>
+								<td>{{e.source_form_id}}</td>
+								<td>{{e.source_form_type}}</td>
+								<td>{{e.source_form_date}}</td>
+								<td>{{e.form_type}}</td>
+								<td>{{e.status}}</td>
+								<td>{{e.remark}}</td>
+								<td>{{e.create_time}}</td>
+								<td>{{e.create_name}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.material_spec}}</td>
+								<td>{{e.single_weight}}</td>
+								<td>{{e.qty}}</td>
+								<td>{{e.assign_qty}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.vehicle_code}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
+		</view>
+		<view class="compute_wraper">
+			
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-6 button-primary" @tap="toEmpty">清空</button>
+			<button class="zd-col-6 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-10 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_outStorageConfirm">强制完成</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {outStorageOrder, outStorageOrderList, outStorageConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options: [],
+				index: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled: false,
+				reload: false,
+				status: 'more',
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
+				totalCount: 0,
+				pageNum: 1,
+				pageSize: 10
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._outStorageOrder()
+		},
+		methods: {
+			/** 下拉框*/
+			async _outStorageOrder () {
+				let res = await outStorageOrder()
+				this.options = [...res]
+			},
+			selectChange (e) {
+				if (e) {
+					this.searchList()
+				}
+			},
+			searchList () {
+				this.dataList = []
+				this.pageNum = 1
+				this._outStorageOrderList()
+			},
+			async _outStorageOrderList () {
+				let res = await outStorageOrderList(this.pageNum + '', this.pageSize + '', this.index)
+				if (res.code === '200') {
+					this.totalCount = res.totalElements
+					if (res.totalElements > 0) {
+						const dataMap = res.content
+						this.dataList = this.reload ? dataMap : this.dataList.concat(dataMap)
+						this.reload = false
+					} else {
+						this.dataList = []
+					}
+					if (this.totalCount == this.dataList.length) {
+						this.reload = false
+						this.status = 'noMore'
+					}
+				}
+			},
+			onReachBottom () {
+				if (this.totalCount > this.dataList.length) {
+					this.status = 'loading'
+					setTimeout(() => {
+						this.pageNum++
+						this._outStorageOrderList()
+					}, 1000)
+				} else { //停止加载
+					this.status = 'noMore'
+				}
+			},
+			toChek (e) {
+				this.pkId = this.pkId === e.code ? '' : e.code
+				this.pkObj = this.pkId === e.code ? e : {}
+			},
+			toEmpty () {
+				this.index = ''
+				this.dataList = []
+			},
+			async _outStorageConfirm () {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await outStorageConfirm(this.pkObj)
+					this.disabled = false
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
diff --git a/pages/outbound/out-store-confirm.vue b/pages/outbound/out-store-confirm.vue
index 964885f..c85b932 100644
--- a/pages/outbound/out-store-confirm.vue
+++ b/pages/outbound/out-store-confirm.vue
@@ -18,7 +18,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_ioStorageOut">扫码出库确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !code}" :disabled="disabled" @tap="_ioStorageOut">扫码出库确认</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/outbound/tray-out-store.vue b/pages/outbound/tray-out-store.vue
index 039575c..08b22b0 100644
--- a/pages/outbound/tray-out-store.vue
+++ b/pages/outbound/tray-out-store.vue
@@ -32,7 +32,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !qty || !index1 || !index2}" :disabled="disabled" @tap="_pdaPalletIostorinvOut">托盘库出库</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !qty || !index1 || !index2}" :disabled="disabled" @tap="_pdaPalletIostorinvOut">托盘库出库</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/pick/pick-list.vue b/pages/pick/pick-list.vue
index 945c2bc..8c72df4 100644
--- a/pages/pick/pick-list.vue
+++ b/pages/pick/pick-list.vue
@@ -48,9 +48,9 @@
 			<uni-load-more color="#007AFF" iconType="circle" :status="status" :icon-size="14" :content-text="contentText" v-if="dataList.length > 0"/>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-5 button-default" @tap="toEmpty">清空</button>
-			<button class="zd-col-8 button-primary" @tap="searchList">查询</button>
-			<button class="zd-col-8 button-primary" @tap="toSure">确认</button>
+			<button class="zd-col-6 button-default" @tap="toEmpty">清空</button>
+			<button class="zd-col-6 button-primary" @tap="searchList">查询</button>
+			<button class="zd-col-10 button-primary" @tap="toSure">确认</button>
 		</view>
 	</view>
 </template>
diff --git a/pages/pick/pick-task.vue b/pages/pick/pick-task.vue
index 19520ee..e048fd5 100644
--- a/pages/pick/pick-task.vue
+++ b/pages/pick/pick-task.vue
@@ -88,7 +88,7 @@
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-6 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1|| !val2 || !val3}" :disabled="disabled" @tap="_savePickTask">拣选确认</button>
+			<button class="zd-col-16 button-primary" :class="{'button-info': !val1|| !val2 || !val3}" :disabled="disabled" @tap="_savePickTask">拣选确认</button>
 		</view>
 	</view>
 </template>
diff --git a/utils/getData2.js b/utils/getData2.js
index 243dc09..e41e96a 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -135,4 +135,19 @@ export const schBaseTask = (page, size, sort, code) => request({
 export const saveCheckTask = (code, status) => request({
 	url:'api/pda/check/saveCheckTask',
 	data: {task_code: code, status: status}
+})
+/**
+ * 单据出库
+ */
+export const outStorageOrder = () => request({
+	method: 'GET',
+	url:'api/pda/outStorage/order'
+})
+export const outStorageOrderList = (page, size, type) => request({
+	method: 'GET',
+	url:'api/pda/outStorage/orderList?page=' + page + '&size=' + size + '&form_type=' + type
+})
+export const outStorageConfirm = (obj) => request({
+	url:'api/pda/outStorage/confirm',
+	data: obj
 })
\ No newline at end of file