From d17bd61a549afd3c0aec1fbe1d09e592bc90b5a5 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: Thu, 14 Nov 2024 16:47:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E6=96=B0=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                 |  10 +-
 pages/home/home.vue                        |   2 +-
 pages/management/alloc-maintenance_new.vue | 427 +++++++++++++++++++++
 pages/management/check.vue                 |   1 -
 pages/management/move-inventory.vue        |   1 -
 pages/management/receive-confirm_new.vue   |   6 +-
 utils/getData2.js                          |  17 +
 utils/mork2.js                             |  25 ++
 8 files changed, 482 insertions(+), 7 deletions(-)
 create mode 100644 pages/management/alloc-maintenance_new.vue

diff --git a/pages.json b/pages.json
index 6108a5e..9ec5ff1 100644
--- a/pages.json
+++ b/pages.json
@@ -35,7 +35,15 @@
                 "navigationStyle": "custom"
             }
             
-        }
+        }
+		,{
+		    "path" : "pages/management/alloc-maintenance_new",
+		    "style" :                                                                                    
+		    {
+		        "navigationStyle": "custom"
+		    }
+		    
+		}
         ,{
             "path" : "pages/management/receive-confirm",
             "style" :                                                                                    
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 91d4181..f607216 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -78,7 +78,7 @@
 			toPage (e) {
 				let url = ''
 				if (e.ywlx === 'DB') {
-					url = '/pages/management/alloc-maintenance'
+					url = '/pages/management/alloc-maintenance_new'
 				} else if (e.ywlx === 'SH') {
 					url = '/pages/management/receive-confirm_new'
 				} else {
diff --git a/pages/management/alloc-maintenance_new.vue b/pages/management/alloc-maintenance_new.vue
new file mode 100644
index 0000000..e5f779a
--- /dev/null
+++ b/pages/management/alloc-maintenance_new.vue
@@ -0,0 +1,427 @@
+<template>
+	<view class="content">
+		<nav-bar title="调拨维护"></nav-bar>
+		<view class="search-confirm-wrap">
+			<view class="zd-row">
+				<view class="zd-col-24 zd-row jcflexstart">
+					<view class="zd-col-7"><search-box placeholder="请输入查询条件" v-model="val1" /></view>
+					<view class="zd-col-8 select_wraper mgl10">
+						<zxz-uni-data-select placeholder="选择调出组织信息" v-model="value2" filterable :localdata="range1"></zxz-uni-data-select>
+					</view>
+					<view class="zd-col-8 select_wraper mgl10">
+						<zxz-uni-data-select placeholder="选择调入组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
+					</view>
+				</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-4 zd-th"><text class="fontcol1">调拨单号</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>调出库存<br>组织编码</text></view>
+					<view class="zd-col-2 zd-th"><text>调出库存<br>组织名称</text></view>
+					<view class="zd-col-2 zd-th"><text>调入库存<br>组织编码</text></view>
+					<view class="zd-col-2 zd-th"><text>调入库存<br>组织名称</text></view>
+					<view class="zd-col-2 zd-th"><text>创建人</text></view>
+					<view class="zd-col-2 zd-th"><text>计划调<br>出日期</text></view>
+					<view class="zd-col-2 zd-th"><text>计划调<br>入日期</text></view>
+					<view class="zd-col-1 zd-th">更多</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-4 zd-td fontcol1"><text>{{e.djbh}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.cjsj}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.dckcbm}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.dckcmc}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.drkcbm}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.drkcmc}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.cjr}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.jhdrrq}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.jhdcrq}}</text></view>
+						<view class="zd-col-1 zd-td" @tap.stop="getDetails(3,e)">
+							<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
+						</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="_allocationBillConfirm(e)">直接调拨</button>
+							</view>
+						</view>
+						<view class="table-wrap">
+							<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>
+										<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.wlbm}}</td>
+										<td>{{el.wlmc}}</td>
+										<td>{{el.gzh}}</td>
+										<td>{{el.jldw}}</td>
+										<td>{{el.kclx}}</td>
+										<td>{{el.kczt}}</td>
+										<td>
+											<input class="td_input" type="number" confirm-type="go" v-model="el.sl" @blur="updateNum(e, el)" @confirm="updateNum(e, el)"/>
+										</td>
+										<td @tap.stop="showPop(1, e, el)">
+											<view class="zd-row td_change">
+												<uni-icons type="shop" size="16" color="#fff"></uni-icons>
+												<view class="mgl10">{{el.dcckbm}}</view>
+											</view>
+										</td>
+										<td>{{el.dcckmc}}</td>
+										<td @tap.stop="showPop(2, e, el)">
+											<view class="zd-row td_change">
+												<uni-icons type="shop" size="16" color="#fff"></uni-icons>
+												<view class="mgl10">{{el.drckbm}}</view>
+											</view>
+										</td>
+										<td>{{el.drckmc}}</td>
+										<td @tap.stop="getDetails(3,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></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>
+		<grid-detail :show="delShow" :data="detailObj" @closeDetail="delShow=false"></grid-detail>
+		<view class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
+			<view v-if="type === 1" class="allwidth pop-title">修改调出仓库</view>
+			<view v-if="type === 2" class="allwidth pop-title">修改调入仓库</view>
+			<view class="zd-row jcenter kwcode_wraper">
+				<view class="zd-col-10 select_wraper">
+					<zxz-uni-data-select placeholder="选择仓库名称" v-model="value" filterable :localdata="range"></zxz-uni-data-select>
+				</view>
+			</view>
+			<view class="mgb20 zd-row jcenter">
+				<view class="zd-col-10 zd-row">
+					<button class="confirm-button confirm-button_cancle mgl0" @tap="show = false">取消</button>
+					<button class="confirm-button mgl0" @tap="SetStorConfirm">确定</button>
+				</view>
+			</view>
+		</view>
+		<view v-if="show" class="modal" @click.stop="show = false"></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, getOrganizationInfo, allocationPage, allocationBillDetail, allocationBillConfirm, allocationBillDetailUpdate} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox,
+			ScanInput,
+			Pagination,
+			GridDetail
+		},
+		data() {
+			return {
+				val1: '', // 模糊查询
+				value1: '', // 选择调入组织信息
+				value2: '', // 选择调出组织信息
+				range1: [],
+				totalCount1: 0, // 分页
+				queryParams1:{
+					pageSize: 10,
+					pageNum: 1
+				},
+				currentPage1: 1,
+				dataList: [], // 一级表格数据
+				popData: [], // 副表格点击物料编码弹出弹窗
+				popObj: {}, // 弹窗当前主表格内容
+				popObj1: {},
+				show: false, // 弹窗显示布尔值
+				type: '', // 弹窗类型
+				delShow: false, // 详情弹窗布尔值
+				detailObj: {}, // 详情弹窗
+				value: '', // 选择仓库名称
+				range: [],
+				disabled1: false,
+			}
+		},
+		onLoad () {
+			this.toSearch()
+		},
+		methods: {
+			// 仓库下拉框
+			async _getWarehouseInfo () {
+				let res = await getWarehouseInfo()
+				if (res.code === 1) {
+					this.range = [...res.result]
+					this.range.map(e => {
+						this.$set(e, 'text', e.ckmc)
+						this.$set(e, 'value', e.ckbm)
+					})
+				}
+			},
+			// 组织信息下拉框
+			async _getOrganizationInfo () {
+				let res = await getOrganizationInfo()
+				if (res.code === 1) {
+					this.range1 = [...res.result]
+					this.range1.map(e => {
+						this.$set(e, 'text', e.kczzmc)
+						this.$set(e, 'value', e.kczzbm)
+					})
+				}
+			},
+			// 查询一级表格
+			toSearch () {
+				this.queryParams1 = {
+					pageSize: 10,
+					pageNum: 1
+				}
+				this.currentPage1 = 1
+				this._allocationPage()
+			},
+			// 一级表格接口
+			async _allocationPage () {
+				let res = await allocationPage(this.val1, this.value1, this.value2, 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()
+				this._getOrganizationInfo()
+			},
+			// 一级表格切换分页
+			handlePageChange1(page) {
+				this.queryParams1.pageNum = page
+				this.currentPage1 = page
+				this._allocationPage()
+			},
+			// 点击一级表格一行加载二级表格
+			loadSubData (e) {
+				if (e.subData.length > 0) {
+					e.subData = []
+				} else if (e.subData.length === 0) {
+					this._allocationBillDetail(e)
+				}
+				e.subAllChecked = false
+				e.subOneChecked = false
+			},
+			// 二级表格接口
+			async _allocationBillDetail (e) {
+				let res = await allocationBillDetail(e.djid)
+				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
+			},
+			// 点击直接调拨按钮
+			async _allocationBillConfirm (e) {
+				this.disabled1 = true
+				if (!e.subOneChecked) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let arr = e.subData.filter(ele => ele.checked === true)
+					let res = await allocationBillConfirm(arr)
+					if (res.code === 1) {
+						this._allocationBillDetail(e)
+					}
+					this.disabled1 = false
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			// 修改副表格单行收货数量
+			updateNum (e, el) {
+				this._allocationBillDetailUpdate(e, el)
+			},
+			// 副表格单行收货数量和收货仓库接口
+			async _allocationBillDetailUpdate (e, el) {
+				try {
+					let res = await allocationBillDetailUpdate(el)
+					if (res.code !== 1) {
+						this._allocationBillDetail(e)
+					}
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				} catch (e) {
+					console.log(e)
+				}
+			},
+			// 副表格修改仓库弹窗
+			showPop (type, e, obj) {
+				this.popObj = {}
+				this.popObj1 = {}
+				this.value = ''
+				this.type = type
+				if (type === 1 || type === 2) { // 修改副表格单行仓库弹窗
+					this.show = true
+					this.popObj = e
+					this.popObj1 = obj
+				} 
+			},
+			// 副表格修改仓库弹窗->确定
+			SetStorConfirm () {
+				if (this.value === '') {
+					uni.showToast({
+						title: '请设置仓库',
+						icon: 'none'
+					})
+					return
+				}
+				this.show = false
+				let text = ''
+				this.range.map(el => {
+					if (el.value === this.value) {
+						text = el.text
+					}
+				})
+				this.dataList.map(e => {
+					if (e.id === this.popObj.id) {
+						e.subData.map(el => {
+							if (el.id === this.popObj1.id) {
+								if (this.type === 1) {
+									el.dcckbm = this.value
+									el.dcckmc = text
+								} else if (this.type === 2) {
+									el.drckbm = this.value
+									el.drckmc = text
+								}
+								this._allocationBillDetailUpdate(this.popObj, el)
+							}
+						})
+					}
+				})
+			},
+			// 详情弹窗
+			getDetails (type,e) {
+				this.delShow = !this.delShow
+				this.detailObj = {type: type, data:e}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.mgr30
+	margin-right 30rpx
+.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;
+</style>
diff --git a/pages/management/check.vue b/pages/management/check.vue
index 57d9512..5a6da6a 100644
--- a/pages/management/check.vue
+++ b/pages/management/check.vue
@@ -159,7 +159,6 @@
 					pageNum: 1
 				}
 				this.currentPage1 = 1
-				this.pkId = ''
 				this._stIvtCheckdtlCheckPage()
 			},
 			// 一级表格接口
diff --git a/pages/management/move-inventory.vue b/pages/management/move-inventory.vue
index 443d00c..4e77c9e 100644
--- a/pages/management/move-inventory.vue
+++ b/pages/management/move-inventory.vue
@@ -158,7 +158,6 @@
 					pageNum: 1
 				}
 				this.currentPage1 = 1
-				this.pkId = ''
 				this._stIvtMoveinvMovePage()
 			},
 			// 一级表格接口
diff --git a/pages/management/receive-confirm_new.vue b/pages/management/receive-confirm_new.vue
index 2c8bb03..14ea1d6 100644
--- a/pages/management/receive-confirm_new.vue
+++ b/pages/management/receive-confirm_new.vue
@@ -100,7 +100,7 @@
 										<td>{{el.bcshsl}}</td>
 										<td>{{el.zzmc}}</td>
 										<td>{{['否', '是'][Number(el.sfzj)]}}</td>
-										<td><input class="td_input" type="number" v-model="el.shsl" @blur="updateNumkw(e)" @confirm="updateNumkw(e)"/></td>
+										<td><input class="td_input" type="number" confirm-type="go" v-model="el.shsl" @blur="updateNumkw(e)" @confirm="updateNumkw(e)"/></td>
 										<td @tap.stop="showPop(2, e, el)">
 											<view class="zd-row td_change">
 												<uni-icons type="shop" size="16" color="#fff"></uni-icons>
@@ -130,7 +130,7 @@
 			<view v-if="type === 2" class="allwidth pop-title">修改收货仓库</view>
 			<view class="zd-row jcenter kwcode_wraper">
 				<view class="zd-col-10 select_wraper">
-					<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
+					<zxz-uni-data-select placeholder="选择仓库名称" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
 				</view>
 			</view>
 			<view class="mgb20 zd-row jcenter">
@@ -180,7 +180,7 @@
 				disabled1: false,
 				value2: '', // 收货仓库信息
 				range2: []
-			};
+			}
 		},
 		onLoad () {
 			this.toSearch()
diff --git a/utils/getData2.js b/utils/getData2.js
index 44dfffe..396ea5c 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -165,6 +165,23 @@ export const allocationBillInventoryInfo = (obj) => request({
 	url:'api/allocationBill/queryInventoryInfo',
 	data: obj
 })
+/**
+ * 调拨维护新接口
+ * 2024/11/14
+ */
+// 1.调拨-副表格
+export const allocationBillDetail = (djid) => request({
+	url:'api/allocationBillDetail/page',
+	data: {
+		djid: djid
+	}
+})
+// 2.调拨-修改行数据
+export const allocationBillDetailUpdate = (obj) => request({
+	url:'api/allocationBillDetail/update',
+	data: obj
+})
+
 
 /**
  * 收货确认
diff --git a/utils/mork2.js b/utils/mork2.js
index 8ab6c78..0376f50 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -2320,10 +2320,35 @@ export const moveDtlByMoveId = () => {
 	}
 		return res
 }
+
 export const receiptBillDetailUpdate = () => {
 	let res = {
 		code: '1',
 		desc: 'ok'
 	}
 	return res
+}
+
+export const allocationBillDetail = () => {
+	let res = {
+	    "pageNum": 1,
+	    "pageSize": 10,
+	    "totalPage": 109,
+	    "totalElements": 1084,
+	    "result": [
+	        {
+	            "id": "0201",
+	            "material_code": "btAAAAW8Wd5QCrde",
+				"qty": "1"
+	        },
+	        {
+	            "id": "0202",
+	            "material_code": "btAAAAW8WdpQCrde",
+				"qty": "1"
+	        }
+	    ],
+	    "code": 1,
+	    "desc": "查询成功"
+	}
+		return res
 }
\ No newline at end of file