From 519ffa21de3d41ae45fe6df60fd192ec20f34f04 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: Wed, 13 Nov 2024 19:13:11 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E7=A7=BB=E5=BA=93=E3=80=81=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                          |  18 +-
 pages/home/home.vue                 |  23 ++
 pages/management/check.vue          | 363 ++++++++++++++++++++++++++++
 pages/management/move-inventory.vue | 318 ++++++++++++++++++++++++
 static/images/RF01.png              | Bin 3065 -> 3101 bytes
 static/images/RF02.png              | Bin 3101 -> 3239 bytes
 static/images/RF03.png              | Bin 2390 -> 0 bytes
 7 files changed, 721 insertions(+), 1 deletion(-)
 create mode 100644 pages/management/check.vue
 create mode 100644 pages/management/move-inventory.vue
 delete mode 100644 static/images/RF03.png

diff --git a/pages.json b/pages.json
index 73b9dc2..6108a5e 100644
--- a/pages.json
+++ b/pages.json
@@ -12,7 +12,7 @@
 				"navigationStyle": "custom"
 			}
 		}
-	    ,{
+		,{
             "path" : "pages/management/in-storage",
             "style" :                                                                                    
             {
@@ -52,6 +52,22 @@
 		    }
 		    
 		}
+        ,{
+            "path" : "pages/management/move-inventory",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/management/check",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 7d20fda..91d4181 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -20,6 +20,16 @@
 						<view v-show="Number(e.counts) > 0" class="bill_count">{{e.counts}}</view>
 					</view>
 				</view>
+				<view class="menu-item" @tap="toPage1('/pages/management/move-inventory')">
+					<view class="menu_name_bg bg_texture_YC">
+						<view class="menu-name">移库</view>
+					</view>
+				</view>
+				<view class="menu-item" @tap="toPage1('/pages/management/check')">
+					<view class="menu_name_bg bg_texture_PD">
+						<view class="menu-name">盘点</view>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view class="left_bg"></view>
@@ -78,6 +88,11 @@
 					url: url
 				})
 			},
+			toPage1 (e) {
+				uni.redirectTo({
+					url: e
+				})
+			},
 			Quit () {
 			  this.$store.dispatch('delUserInfo', '')
 			  uni.redirectTo({
@@ -210,4 +225,12 @@
 	left auto
 	right 0
 	background-image url('../../static/images/hud_right.png')
+.bg_texture_YC
+	_bis(,'../../static/images/RF01.png', 100%, ,center)
+	.menu-name
+		background-color rgba(223, 131, 21, 80%)
+.bg_texture_PD
+	_bis(,'../../static/images/RF02.png', 100%, ,center)
+	.menu-name
+		background-color rgba(223, 131, 21, 80%)
 </style>
diff --git a/pages/management/check.vue b/pages/management/check.vue
new file mode 100644
index 0000000..8d0168d
--- /dev/null
+++ b/pages/management/check.vue
@@ -0,0 +1,363 @@
+<template>
+	<view class="content">
+		<nav-bar title="移库"></nav-bar>
+		<view class="search-confirm-wrap">
+			<view class="zd-row jcflexstart">
+				<view class="zd-col-7"><search-box placeholder="输入查询条件" v-model="val1" /></view>
+				<view class="zd-col-7 select_wraper mgl10">
+					<zxz-uni-data-select placeholder="选择仓库" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
+				</view>
+				<button class="confirm-button" @tap="toSearch">查询</button>
+			</view>
+		</view>
+		<view class="zd-row jcflexstart table-title_wraper">移库</view>
+		<view class="grid-wrap">
+			<view class="zdrow-wrap">
+				<view class="zd-row sticky zd-th-wraper">
+					<view class="zd-col-1 zd-th"><text>序号</text></view>
+					<view class="zd-col-2 zd-th"><text class="fontcol1">盘点单号</text></view>
+					<view class="zd-col-3 zd-th"><text>库存组织</text></view>
+					<view class="zd-col-3 zd-th"><text>仓库名称</text></view>
+					<view class="zd-col-2 zd-th"><text>明细数</text></view>
+					<view class="zd-col-2 zd-th"><text>单据状态</text></view>
+					<view class="zd-col-2 zd-th"><text>盘点状态</text></view>
+					<view class="zd-col-2 zd-th"><text>制单日期</text></view>
+					<view class="zd-col-2 zd-th"><text>制单人</text></view>
+					<view class="zd-col-2 zd-th"><text>业务类型</text></view>
+					<view class="zd-col-4 zd-th"><text>备注</text></view>
+				</view>
+				<view class="zd-td-wraper" v-for="(e, i) in dataList" :key="e.id">
+					<view class="zd-row" @tap="loadSubData(e)">
+						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
+						<view class="zd-col-2 zd-td fontcol1"><text>{{e.check_code}}</text></view>
+						<view class="zd-col-3 zd-td"><text>{{e.org_name}}</text></view>
+						<view class="zd-col-3 zd-td"><text>{{e.stor_name}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.dtl_num}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.status}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.is_nok}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.input_time}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.input_name}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.check_type}}</text></view>
+						<view class="zd-col-4 zd-td"><text>{{e.remark}}</text></view>
+					</view>
+					<!-- 二级表格start -->
+					<view v-if="e.subData.length > 0" class="zd-sec-wraper">
+						<view class="search-confirm-wrap_2">
+							<view class="zd-row jcflexend">
+								<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked}" :disabled="disabled1" @tap="_stIvtCheckdtlCheckFinish(e)">盘点完成</button>
+								<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked}" :disabled="disabled1" @tap="_stIvtCheckdtlReally(e)">实物为准</button>
+								<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked}" :disabled="disabled1" @tap="_stIvtCheckdtlBasedOnFinance(e)">财务为准</button>
+							</view>
+						</view>
+						<view class="table-wrap table-wrap_1">
+							<table class="grid-table">
+								<thead>
+									<tr>
+										<th>序号</th>
+										<th>
+											<view class="zd-row jcenter">
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)"></view>
+											</view>
+										</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="(el, j) in e.subData" :key="el.id">
+										<td>{{j+1}}</td>
+										<td @tap="toSubCheckbox(e, el)">
+											<view class="zd-row jcenter">
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
+											</view>
+										</td>
+										<td>{{el.struct_code}}</td>
+										<td>{{el.struct_name}}</td>
+										<td>{{el.material_code}}</td>
+										<td>{{el.material_name}}</td>
+										<td><input class="td_input" type="number" v-model="el.qty"  @blur="updateNumkw(e, el)" /></td>
+										<td>{{el.fac_qty}}</td>
+										<td>{{el.unit}}</td>
+										<td>{{el.check_result}}</td>
+										<td>{{el.status}}</td>
+										<td>{{el.check_name}}</td>
+									</tr>
+								</tbody>
+							</table>
+						</view>
+					</view>
+					<!-- 二级表格end -->
+				</view>
+			</view>
+			<view class="zd-row jcenter pd20">
+				<pagination v-show="dataList.length > 0" :total="totalCount1" :page-size="queryParams1.pageSize" :current-page="currentPage1" @page-change="handlePageChange1" />
+			</view>
+		</view>
+		<view class="footer"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import ScanInput from '@/components/ScanInput.vue'
+	import Pagination from '@/components/Pagination.vue'
+	import GridDetail from '@/components/GridDetail.vue'
+	import {getWarehouseInfo, stIvtCheckdtlCheckPage, checkDtlByCheckCode, stIvtCheckdtlUpdateDtl, stIvtCheckdtlCheckFinish, stIvtCheckdtlReally, stIvtCheckdtlBasedOnFinance} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			ScanInput,
+			Pagination,
+			GridDetail
+		},
+		data() {
+			return {
+				val1: '', // 模糊查询
+				value1: '', // 仓库信息
+				range1: [],
+				totalCount1: 0, // 分页
+				queryParams1:{
+					pageSize: 10,
+					pageNum: 1
+				},
+				currentPage1: 1,
+				dataList: [], // 一级表格数据
+				disabled1: false
+			};
+		},
+		onLoad () {
+			this.toSearch()
+		},
+		methods: {
+			// 仓库下拉框
+			async _getWarehouseInfo () {
+				let res = await getWarehouseInfo()
+				if (res.code === 1) {
+					this.range1 = [...res.result]
+					this.range1.map(e => {
+						this.$set(e, 'text', e.ckmc)
+						this.$set(e, 'value', e.ckbm)
+					})
+				}
+			},
+			// 查询一级表格
+			toSearch () {
+				this.queryParams1 = {
+					pageSize: 10,
+					pageNum: 1
+				}
+				this.currentPage1 = 1
+				this.pkId = ''
+				this._stIvtCheckdtlCheckPage()
+			},
+			// 一级表格接口
+			async _stIvtCheckdtlCheckPage () {
+				let res = await stIvtCheckdtlCheckPage(this.val1, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
+				if (res.code === 1) {
+					res.result.map(el => {
+						this.$set(el, 'checked', false)
+						this.$set(el, 'subData', [])
+						this.$set(el, 'subAllChecked', false)
+						this.$set(el, 'subOneChecked', false)
+					})
+					this.dataList = [...res.result]
+					this.totalCount1 = Number(res.totalElements)
+					this.queryParams1.pageSize = Number(res.pageSize)
+					this.queryParams1.pageNum = Number(res.pageNum)
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+				this._getWarehouseInfo()
+			},
+			// 一级表格切换分页
+			handlePageChange1(page) {
+				this.queryParams1.pageNum = page
+				this.currentPage1 = page
+				this._stIvtCheckdtlCheckPage()
+			},
+			// 点击一级表格一行加载二级表格
+			loadSubData (e) {
+				if (e.subData.length > 0) {
+					e.subData = []
+				} else if (e.subData.length === 0) {
+					this._checkDtlByCheckCode(e)
+				}
+				e.subAllChecked = false
+				e.subOneChecked = false
+			},
+			// 二级表格接口
+			async _checkDtlByCheckCode (e) {
+				let res = await checkDtlByCheckCode(e.id)
+				if (res.code === 1) {
+					res.result.map(el => {
+						this.$set(el, 'subChecked', false)
+					})
+					this.dataList.map(el => {
+						if (el.djid === e.djid) {
+							el.subData = [...res.result]
+						}
+					})
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+			},
+			// 二级表格全选
+			toSubAllCheckbox (e) {
+				e.subAllChecked = !e.subAllChecked
+				e.subOneChecked = e.subAllChecked
+				e.subData.map(el => {
+					el.checked = e.subAllChecked
+				})
+			},
+			// 二级表格多选
+			toSubCheckbox (e,el) {
+				if (el.checked) {
+					this.$set(el, 'checked', false)
+				} else if (!el.checked)  {
+					this.$set(el, 'checked', true)
+				}
+				let arr = e.subData.filter(ele => ele.checked === true)
+				e.subAllChecked = arr.length === e.subData.length
+				e.subOneChecked = arr.length > 0
+			},
+			// 修改副表格单行移动数量
+			updateNumkw (e, el) {
+				this._stIvtCheckdtlUpdateDtl(e, el)
+			},
+			// 二级表格单行盘点数量接口
+			async _stIvtCheckdtlUpdateDtl (e, el) {
+				try {
+					let res = await stIvtCheckdtlUpdateDtl(el)
+					if (res.code === 1) {
+						this._checkDtlByCheckCode(e)
+					}
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				} catch (e) {
+					console.log(e)
+				}
+			},
+			// 盘点完成按钮
+			async _stIvtCheckdtlCheckFinish (e) {
+				this.disabled1 = true
+				if (!e.subOneChecked) {
+					this.disabled1 = false
+					return
+				}
+				let arr = e.subData.filter(ele => ele.checked === true)
+				try {
+					let res = await stIvtCheckdtlCheckFinish(arr)
+					if (res.code === 1) {
+						this._checkDtlByCheckCode(e)
+					}
+					this.disabled1 = false
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			// 实物为准按钮
+			async _stIvtCheckdtlReally (e) {
+				this.disabled1 = true
+				if (!e.subOneChecked) {
+					this.disabled1 = false
+					return
+				}
+				let arr = e.subData.filter(ele => ele.checked === true)
+				try {
+					let res = await stIvtCheckdtlReally(arr)
+					if (res.code === 1) {
+						this._checkDtlByCheckCode(e)
+					}
+					this.disabled1 = false
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			// 财务为准
+			async _stIvtCheckdtlBasedOnFinance (e) {
+				this.disabled1 = true
+				if (!e.subOneChecked) {
+					this.disabled1 = false
+					return
+				}
+				let arr = e.subData.filter(ele => ele.checked === true)
+				try {
+					let res = await stIvtCheckdtlBasedOnFinance(arr)
+					if (res.code === 1) {
+						this._checkDtlByCheckCode(e)
+					}
+					this.disabled1 = false
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.select_wraper
+	/deep/ .uni-select__input-box
+		height 30px
+	/deep/ .uni-select__selector
+		z-index 11
+	/deep/ .uni-select
+		height: 30px;
+		min-height: 30px;
+		line-height: 30px;
+		padding: 0 2px 0 12px;
+		border: 1px solid #4980bd;
+		background-color: rgba(45,88,184,0.1);
+		border-radius: 6px;
+	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
+		font-size 13px
+	/deep/ .uni-select__selector
+		background-color #071F3E
+		border-color #0c3162
+	/deep/ .uni-popper__arrow
+		border-bottom-color #0c3162
+		&:after
+			border-bottom-color #071F3E
+	/deep/ .uni-select__selector-item
+		color #fff
+.zd-th
+	font-size: 12px;
+	line-height: 13px;
+	height: 36px;
+.grid-table th:last-child, .grid-table td:last-child
+	position: inherit;
+	box-shadow: none;
+.grid-table td:last-child
+	background-color: rgba(63,106,202,0.3);
+</style>
diff --git a/pages/management/move-inventory.vue b/pages/management/move-inventory.vue
new file mode 100644
index 0000000..79d585a
--- /dev/null
+++ b/pages/management/move-inventory.vue
@@ -0,0 +1,318 @@
+<template>
+	<view class="content">
+		<nav-bar title="移库"></nav-bar>
+		<view class="search-confirm-wrap">
+			<view class="zd-row jcflexstart">
+				<view class="zd-col-7"><search-box placeholder="输入查询条件" v-model="val1" /></view>
+				<view class="zd-col-7 select_wraper mgl10">
+					<zxz-uni-data-select placeholder="选择仓库" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
+				</view>
+				<button class="confirm-button" @tap="toSearch">查询</button>
+			</view>
+		</view>
+		<view class="zd-row jcflexstart table-title_wraper">移库</view>
+		<view class="grid-wrap">
+			<view class="zdrow-wrap">
+				<view class="zd-row sticky zd-th-wraper">
+					<view class="zd-col-1 zd-th"><text>序号</text></view>
+					<view class="zd-col-3 zd-th"><text class="fontcol1">移库单号</text></view>
+					<view class="zd-col-3 zd-th"><text>库存组织</text></view>
+					<view class="zd-col-3 zd-th"><text>仓库名称</text></view>
+					<view class="zd-col-2 zd-th"><text>数量</text></view>
+					<view class="zd-col-2 zd-th"><text>状态</text></view>
+					<view class="zd-col-2 zd-th"><text>制单日期</text></view>
+					<view class="zd-col-2 zd-th"><text>制单人</text></view>
+					<view class="zd-col-2 zd-th"><text>业务日期</text></view>
+					<view class="zd-col-4 zd-th"><text>备注</text></view>
+				</view>
+				<view class="zd-td-wraper" v-for="(e, i) in dataList" :key="e.id">
+					<view class="zd-row" @tap="loadSubData(e)">
+						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
+						<view class="zd-col-3 zd-td fontcol1"><text>{{e.input_id}}</text></view>
+						<view class="zd-col-3 zd-td"><text>{{e.org_name}}</text></view>
+						<view class="zd-col-3 zd-td"><text>{{e.stor_name}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.total_qty}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.bill_status}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.input_time}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.input_name}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.biz_date}}</text></view>
+						<view class="zd-col-4 zd-td"><text>{{e.remark}}</text></view>
+					</view>
+					<!-- 二级表格start -->
+					<view v-if="e.subData.length > 0" class="zd-sec-wraper">
+						<view class="search-confirm-wrap_2">
+							<view class="zd-row jcflexend">
+								<button class="confirm-button" :class="{'confirm-button_disabled': !e.subOneChecked}" :disabled="disabled1" @tap="_stIvtMoveinvConfirmMove(e)">确认移库</button>
+							</view>
+						</view>
+						<view class="table-wrap table-wrap_1">
+							<table class="grid-table">
+								<thead>
+									<tr>
+										<th>序号</th>
+										<th>
+											<view class="zd-row jcenter">
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)"></view>
+											</view>
+										</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="(el, j) in e.subData" :key="el.id">
+										<td>{{j+1}}</td>
+										<td @tap="toSubCheckbox(e, el)">
+											<view class="zd-row jcenter">
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
+											</view>
+										</td>
+										<td>{{el.material_code}}</td>
+										<td>{{el.material_name}}</td>
+										<td>{{el.turnout_struct_code}}</td>
+										<td>{{el.turnout_struct_name}}</td>
+										<td><input class="td_input" type="number" v-model="el.qty"  @blur="updateNumkw(e, el)" /></td>
+										<td>
+											<view class="td_scan_wraper">
+												<scan-input v-model="el.turnin_struct_code" @handleChange="updateNumkw(e, el)" />
+											</view>
+										</td>
+										<td>{{el.turnin_struct_name}}</td>
+										<td>{{el.unit}}</td>
+										<td>{{el.remark}}</td>
+									</tr>
+								</tbody>
+							</table>
+						</view>
+					</view>
+					<!-- 二级表格end -->
+				</view>
+			</view>
+			<view class="zd-row jcenter pd20">
+				<pagination v-show="dataList.length > 0" :total="totalCount1" :page-size="queryParams1.pageSize" :current-page="currentPage1" @page-change="handlePageChange1" />
+			</view>
+		</view>
+		<view class="footer"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import ScanInput from '@/components/ScanInput.vue'
+	import Pagination from '@/components/Pagination.vue'
+	import GridDetail from '@/components/GridDetail.vue'
+	// import {getWarehouseInfo, stIvtMoveinvMovePage, moveDtlByMoveId} from '@/utils/mork2.js'
+	import {getWarehouseInfo, stIvtMoveinvMovePage, moveDtlByMoveId, stIvtMoveinvUpdateDtl, stIvtMoveinvConfirmMove} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			ScanInput,
+			Pagination,
+			GridDetail
+		},
+		data() {
+			return {
+				val1: '', // 模糊查询
+				value1: '', // 仓库信息
+				range1: [],
+				totalCount1: 0, // 分页
+				queryParams1:{
+					pageSize: 10,
+					pageNum: 1
+				},
+				currentPage1: 1,
+				dataList: [], // 一级表格数据
+				disabled1: false
+			};
+		},
+		onLoad () {
+			this.toSearch()
+		},
+		methods: {
+			// 仓库下拉框
+			async _getWarehouseInfo () {
+				let res = await getWarehouseInfo()
+				if (res.code === 1) {
+					this.range1 = [...res.result]
+					this.range1.map(e => {
+						this.$set(e, 'text', e.ckmc)
+						this.$set(e, 'value', e.ckbm)
+					})
+				}
+			},
+			// 查询一级表格
+			toSearch () {
+				this.queryParams1 = {
+					pageSize: 10,
+					pageNum: 1
+				}
+				this.currentPage1 = 1
+				this.pkId = ''
+				this._stIvtMoveinvMovePage()
+			},
+			// 一级表格接口
+			async _stIvtMoveinvMovePage () {
+				let res = await stIvtMoveinvMovePage(this.val1, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
+				if (res.code === 1) {
+					res.result.map(el => {
+						this.$set(el, 'checked', false)
+						this.$set(el, 'subData', [])
+						this.$set(el, 'subAllChecked', false)
+						this.$set(el, 'subOneChecked', false)
+					})
+					this.dataList = [...res.result]
+					this.totalCount1 = Number(res.totalElements)
+					this.queryParams1.pageSize = Number(res.pageSize)
+					this.queryParams1.pageNum = Number(res.pageNum)
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+				this._getWarehouseInfo()
+			},
+			// 一级表格切换分页
+			handlePageChange1(page) {
+				this.queryParams1.pageNum = page
+				this.currentPage1 = page
+				this._stIvtMoveinvMovePage()
+			},
+			// 点击一级表格一行加载二级表格
+			loadSubData (e) {
+				if (e.subData.length > 0) {
+					e.subData = []
+				} else if (e.subData.length === 0) {
+					this._moveDtlByMoveId(e)
+				}
+				e.subAllChecked = false
+				e.subOneChecked = false
+			},
+			// 二级表格接口
+			async _moveDtlByMoveId (e) {
+				let res = await moveDtlByMoveId(e.id)
+				if (res.code === 1) {
+					res.result.map(el => {
+						this.$set(el, 'subChecked', false)
+					})
+					this.dataList.map(el => {
+						if (el.djid === e.djid) {
+							el.subData = [...res.result]
+						}
+					})
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+			},
+			// 二级表格全选
+			toSubAllCheckbox (e) {
+				e.subAllChecked = !e.subAllChecked
+				e.subOneChecked = e.subAllChecked
+				e.subData.map(el => {
+					el.checked = e.subAllChecked
+				})
+			},
+			// 二级表格多选
+			toSubCheckbox (e,el) {
+				if (el.checked) {
+					this.$set(el, 'checked', false)
+				} else if (!el.checked)  {
+					this.$set(el, 'checked', true)
+				}
+				let arr = e.subData.filter(ele => ele.checked === true)
+				e.subAllChecked = arr.length === e.subData.length
+				e.subOneChecked = arr.length > 0
+			},
+			// 修改副表格单行移动数量
+			updateNumkw (e, el) {
+				this._stIvtMoveinvUpdateDtl(e, el)
+			},
+			// 二级表格单行收货数量和收货仓库接口
+			async _stIvtMoveinvUpdateDtl (e, el) {
+				try {
+					let res = await stIvtMoveinvUpdateDtl(el)
+					if (res.code === 1) {
+						this._moveDtlByMoveId(e)
+					}
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				} catch (e) {
+					console.log(e)
+				}
+			},
+			// 确认移库按钮
+			async _stIvtMoveinvConfirmMove (e) {
+				this.disabled1 = true
+				if (!e.subOneChecked) {
+					this.disabled1 = false
+					return
+				}
+				let arr = e.subData.filter(ele => ele.checked === true)
+				try {
+					let res = await stIvtMoveinvConfirmMove(arr)
+					if (res.code === 1) {
+						this._moveDtlByMoveId(e)
+					}
+					this.disabled1 = false
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.select_wraper
+	/deep/ .uni-select__input-box
+		height 30px
+	/deep/ .uni-select__selector
+		z-index 11
+	/deep/ .uni-select
+		height: 30px;
+		min-height: 30px;
+		line-height: 30px;
+		padding: 0 2px 0 12px;
+		border: 1px solid #4980bd;
+		background-color: rgba(45,88,184,0.1);
+		border-radius: 6px;
+	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
+		font-size 13px
+	/deep/ .uni-select__selector
+		background-color #071F3E
+		border-color #0c3162
+	/deep/ .uni-popper__arrow
+		border-bottom-color #0c3162
+		&:after
+			border-bottom-color #071F3E
+	/deep/ .uni-select__selector-item
+		color #fff
+.zd-th
+	font-size: 12px;
+	line-height: 13px;
+	height: 36px;
+.grid-table th:last-child, .grid-table td:last-child
+	position: inherit;
+	box-shadow: none;
+.grid-table td:last-child
+	background-color: rgba(63,106,202,0.3);
+</style>
diff --git a/static/images/RF01.png b/static/images/RF01.png
index af989ff01a77693e8d7a7e6d54e67db8252b6eb4..18a06e7db227e563c0739b88f0fc96e0ffd541bd 100644
GIT binary patch
delta 3097
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

literal 3065
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

diff --git a/static/images/RF02.png b/static/images/RF02.png
index 44fa467c97507a2c7fd0ce2c3e85e16d8b9ec273..972a4920c553af88167556f4f3050860baf61319 100644
GIT binary patch
delta 2523
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
Tj^XY$a{U}Lq$Q#f<{I}ecq_dC

delta 2384
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

diff --git a/static/images/RF03.png b/static/images/RF03.png
deleted file mode 100644
index 30c871f3c82ecc4e9bc9851577dc0b125a22aaa7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2390
zcmaJ@dpMN&9v`X5ghC3*7;Dpmxfz!kGvhF0Bu4JJG|QNqF;_D$GcHF<X1kCMN@CNx
zlq4mWa*4)KTD8KaR?J$GP;GQWQJtAK?fK(4@AJIx@AvyY-_PfJ{e7SJkiVaou8ye=
z2n5pg-bo5ntr6;1d#&p0a?X8~YB2#k!+;<m3y{*pOprT67{i2k^J#2mAd|*OitlFP
zKp;&UPH-3yM)Aecg?t!Itpk(sMJhB1gmaULXml<UfW$D_9049W(|R2W;V|&fJ&qIv
zMMPxAa&{(*nL){Z!SrM<9m9aS5g<4jRz<*P0yKz>&l5<nGCcG%FIKfzi{VhnXBB{p
zhyLYM7{wn#6pEP;N0^g69qHf#amK)qju;md+75z3Af4a{3>=BJM<B5X3>JZee0iWM
zYhnfq8%QF5v86iUp|JoU!ouNFsT3x4fC<HHI1+=wz!4}o3T3a-u$LqW0GiBRAhB9z
zATcF$F-HV&gaU|~krpFN0Ps+ir+<aO7k#A_NWP>=l`y!BCW0ej2z5xyiWJKKSLO4+
zYD<7X=HLGQPhv@Ml86ZpWJ-hyV!EnuEGxAs5tb-s(g2}2SSaKzXVE`a2nZ#yLJ@>W
zRA<c@Vnd<PIRdqC$7d9Ug7p?i0Gfc#^d{k<Djpbz!@v?rNF>_BgXrPziAEwlUEEPb
zGzRV9fI^c=M2ri18A}q<6ZlL4u#9E=jU}y!RW}4*q_Rw6iaCi)23aiRLp}$N<*e+B
z`-*&Du#A;`@mLWHS2+V$m-oNQy)07okb3*Ic~yt6?avgbdS0w*?hU!TIuK~h4R4Zr
zux#i#mCG{<F>05x_Vjr~dK%Ug9dt~;ac~{sk-kUSA)T64XDGL=LXMI4ZP`CSI)Yr#
z+PB5mKXu99Di&dVc%l?sb7<X0qd&U58Vo!&qR#b4?Ajz9e(QRwHL>aLb9y2h+m_P)
z_>S^q3On)rpQjuqOH$@SS@q!^+7`w>3Xl4}^~ObVR;h^{8r&0I8Xjw0v~i6=Kw6k2
zvZW)h&U>h=KQD$9QPx{W(qE{qJyZL#vE0rdZU;5(FUaw+wY`vek9?lq>~y8(?q%^}
zcu44t#)&D%t{m@ap6dydZ-5}57UO+`Se%>fWiI#rcExtZV#mHgVD*h9`E&$tF5_y_
zLEpmFBf9MxCAU4aZe@*LfDZL&IM?=RAcXGkc|3v0ylixSeAhsAN6*j>Mg;5Com!wF
zZm~M*pO}}0+<m*bUQhISGr@~8&vnW88d|AOXV1k~poI#r;zn5My3O3T4ho4PNO7;B
z<*1@_)TowX?vvqoUa3EqK2r#LGkx*Z=Bk?RY_H-dg}b#ettj-9sVukmtx&@`ot<I!
zT6t^DsAYcC54|nC*Y}c!bSJBPLPrS|{qW9`Q{4ydm%HKbpHgm_MQQTNvlK7PyEUy#
zP~pQCw0YQ8U)DS<tx0q5<FO;PeS`(G3t-X6#9_IA?^(KUY<b7aSmXC@jPR-0+3jF+
zy|Z=G2iH1*@$t0!KE0fif}BTCpnZzkvg*4#GdPr8c4P;67C!b%VQai{JnN^yMDk);
zPJN#|o^*NZKnkuK?FxS&#bCCL=7#*4blPq_^TGZ%`r7QGxWl(T_`Q|&-(Rz&tjsj5
zIB!~-P`dN6kJW-w^01BW))KRYR$ATx0^>hw8?=ER;Rk|S`_7PO2%G#O!lMpNT31u2
z0%y%#ES5~K87~!3ye3i}2uI(J9*z5yGK>9<0Isq8IeTuy;OeKCZwBfotKjK!n4!^~
zu=VXTL7z+paU&&^y_tl7u4W_PX$Vt?&}=Az1q{zC<o{mh8`9Y4zGl#_EAL@%U`DHa
z#J&p^F#mnzAh2MSUnyu7iK}-s4U{K0Y`ZQq$LXi~yKvgmv=hY9&`fWw*8>3+N7Lr(
zZWAAGJ!|VqwTbM$IJb?u-V{6_*;S~2`<=;;+2a;QdrG$-j~AGOsW%U1_3gK$Iy;U1
z)+94OsS|aHAiyU>o1|x+_-P#(l*bL*Ysz!ZTs7ESx+DMRDbK)hC{QU%`>@NcrSfF%
zP<+#YF$A0db4u>WTW@b9Io@!??v5!X`<+IrVX9uLJGb59T7YiuVq?oj{a)z!*v-BS
zTjI8FyZHsl#73V07+0w*C@45)TVemeV`}aEudZ=br_F7oWgmay_<SI-utl3ItGon(
zZC5%fO>Snpt)47mm6xN<_0yd<O=}9Z*kE>DW0-7WZ2Dt^y`SCzy-PC&TA^@z?juXW
z+43rDyy4NOld?2kq246&1XS+z&IH%))zOSFpI2=4mDCu_8T|4O*DJQ7rGOq_AiDTm
z=CooCB6~>n`N;mXopH3C`iyUOMQUyHgI$CxSxep^>b4zijp4QBIEB2>O+v(%ieesE
z6i1g|ia*ZboL<BYrD_t&em8sg^t9qMG4WYD>L$50D$U}#GH<rnDs^}gC;q@XSGVWM
zC#1ex(;r0t4_8q@jiB&|Wl&}!SVAsIe2;R&STy4=n003L+05TPrR8j<X?#6lHZ*QA
z>eYs8Xx_aH=ijpmSjy`3ex2xNnfX(BowSLddJF2R*nf%Pvi70M?t$GA1?;)bn`OLy
zTY3J8u`bj6Rg~N}Q`F(SH@}8|>-XK`<H|P7`OVLu()8Y9G%A~?UGmiLMUY^mAJ=nE
zE2xBgfJ2<!*;%2w{#P^e@g$Ry)?=-nRt3b{*Y;Ze$S9=U%Pd&h-M#*Kza4u2@`Uto
n2vbeS4%OJSLt8PHY!x7bNPX+QZr_in|8%@P{YV!*qBH&j8j$gU