需求修改

common/style/layout.css

@@ -524,6 +524,9 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	height: 40px;
 	font-size: 12px;
 }
+.popChecked .zd-pop-td {
+	background-color: RGBA(23, 123, 172, 1);
+}
 .pop-input {
 	width: 100%;
 	height: 28px;

common/style/reset.css

@@ -150,6 +150,9 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 .mgl10 {
 	margin-left: 10px;
 }
+.mgl52 {
+	margin-left: 52px;
+}
 .mgr5 {
 	margin-right: 5px;
 }

pages/management/alloc-maintenance.vue

@@ -3,13 +3,16 @@
 		<nav-bar title="调拨维护"></nav-bar>
 		<view class="search-confirm-wrap">
 			<view class="zd-row">
-				<view class="zd-col-19 zd-row">
+				<view class="zd-col-24 zd-row jcflexstart">
-					<view class="zd-col-10"><search-box v-model="val1" /></view>
+					<view class="zd-col-7"><search-box v-model="val1" /></view>
-					<view class="zd-col-10 select_wraper">
+					<view class="zd-col-8 select_wraper mgl10">
-						<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
+						<zxz-uni-data-select placeholder="请选择组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
+					</view>
+					<view class="zd-col-8 select_wraper mgl10">
+						<zxz-uni-data-select placeholder="请选择仓管员" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
 					</view>
-					<button class="confirm-button" @tap="toSearch">查询</button>
 				</view>
+				<button class="confirm-button" @tap="toSearch">查询</button>
 			</view>
 		</view>
 		<view class="zd-row jcflexstart table-title_wraper">调拨单</view>
@@ -67,6 +70,7 @@
 										<th>调出库位</th>
 										<th>计划调入日期</th>
 										<th>计划调出日期</th>
+										<th>跟踪号</th>
 										<th>更多</th>
 									</tr>
 								</thead>
@@ -121,6 +125,9 @@
 												<view class="mgl10">{{el.jhdcrq}}</view>
 											</view>
 										</td>
+										<td @tap.stop="checkWarehouse(5, '跟踪号', el)">
+											<view class="td_change"><view>{{el.gzh}}</view></view>
+										</td>
 										<td @tap.stop="getDetails(3,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td>
 									</tr>
 								</tbody>
@@ -138,26 +145,25 @@
 										<td>{{el.drckmc}}</td>
 										<td>{{el.drkwbm}}</td>
 										<td>{{el.dcckbm}}</td>
-										<td>{{el.drckmc}}</td>
+										<td>{{el.dcckmc}}</td>
 										<td>{{el.dckwbm}}</td>
 										<td>{{el.jhdrrq}}</td>
 										<td>{{el.jhdcrq}}</td>
+										<td>{{el.gzh}}</td>
 										<td @tap.stop="getDetails(3,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td>
 									</tr>
 								</tbody>
 							</table>
 						</view>
-						<view class="zd-row jcenter mgt10 mgb20">
+						<view v-if="pkObj.djzt !== '审核后'" class="zd-row jcflexstart mgt10 mgb20">
-							<view class="zd-col-21 zd-row jcenter">
+							<view class="zd-col-1 zd-row jcenter mgl52">
-								<view v-if="pkObj.djzt !== '审核后'" class="zd-col-1 zd-row jcenter">
+								<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
-									<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
+							</view>
-								</view>
+							<button class="confirm-button" :class="{'confirm-button_disabled': checkArr.length === 0}" :disabled="disabled" @tap="_allocationBillConfirm">直接调拨</button>
-								<view v-if="pkObj.djzt !== '审核后'" class="zd-col-11 zd-row jcflexstart">
+							<view class="zd-col-10">
-									<button class="confirm-button" :class="{'confirm-button_disabled': checkArr.length === 0}" :disabled="disabled" @tap="_allocationBillConfirm">直接调拨</button>
+								<!-- <view class="zd-col-12 zd-row jcflexend">
-								</view>
-								<view class="zd-col-12 zd-row jcflexend">
 									<pagination :total="totalCount2" :page-size="queryParams2.pageSize" :current-page="currentPage2" @page-change="handlePageChange2" />
-								</view>
+								</view> -->
 							</view>
 						</view>
 					</view>
@@ -172,14 +178,40 @@
 		<grid-detail :show="delShow" :data="detailObj" @closeDetail="delShow=false"></grid-detail>
 		<view class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
 			<view class="allwidth pop-title">修改{{modalObj.title}}</view>
-			<view class="zd-row jcenter kwcode_wraper">
+			<view v-if="modalObj.type === 1 || modalObj.type === 2" class="zd-row jcenter kwcode_wraper">
-				<view v-if="modalObj.type === 1 || modalObj.type === 2" class="zd-col-12 select_wraper">
+				<view class="zd-col-12 select_wraper">
 					<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value" filterable :localdata="range"></zxz-uni-data-select>
 				</view>
-				<view v-if="modalObj.type === 3 || modalObj.type === 4" class="zd-col-12 grid-data">
+			</view>
+			<view v-if="modalObj.type === 3 || modalObj.type === 4" class="zd-row jcenter kwcode_wraper">
+				<view class="zd-col-12 grid-data">
 					<uni-datetime-picker type="date" v-model="date" @change="_allocationBillUpdate(el)" />
 				</view>
 			</view>
+			<view v-if="modalObj.type === 5" class="pop-grid-wraper">
+				<view class="zd-row sticky zd-sec-th-wraper zd-pop-th-wraper">
+					<view class="zd-col-2 zd-sec-th"><text>序号</text></view>
+					<view class="zd-col-3 zd-sec-th"><text>物料名称</text></view>
+					<view class="zd-col-3 zd-sec-th"><text>物料编码</text></view>
+					<view class="zd-col-3 zd-sec-th"><text>计量单位</text></view>
+					<view class="zd-col-3 zd-sec-th"><text>可用数量</text></view>
+					<view class="zd-col-3 zd-sec-th"><text>批次</text></view>
+					<view class="zd-col-3 zd-sec-th"><text>仓库</text></view>
+					<view class="zd-col-3 zd-sec-th"><text>库位</text></view>
+					<view class="zd-col-3 zd-sec-th"><text>跟踪号</text></view>
+				</view>
+				<view class="zd-row zd-td-wraper" v-for="(ele, t) in dataList3" :key="ele.id" @tap="toCheck3(ele)" :class="{'popChecked': ele.trackNo === iid}">
+					<view class="zd-col-2 zd-sec-td zd-pop-td"><text>{{t+1}}</text></view>
+					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.materialName}}</text></view>
+					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.materialNo}}</text></view>
+					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.unitNo}}</text></view>
+					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.curStoreQty}}</text></view>
+					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.lot}}</text></view>
+					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.warehouseName}}</text></view>
+					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.locationName}}</text></view>
+					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.trackNo}}</text></view>
+				</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>
@@ -198,7 +230,7 @@
 	import ScanInput from '@/components/ScanInput.vue'
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
-	import {getWarehouseInfo, allocationPage, allocationBillPage, allocationBillUpdate, allocationBillConfirm} from '@/utils/getData2.js'
+	import {getWarehouseInfo, getOrganizationInfo, getUserInfo, allocationPage, allocationBillPage, allocationBillUpdate, allocationBillConfirm, allocationBillInventoryInfo} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -237,11 +269,17 @@
 				modalObj: {},
 				disabled: false,
 				value1: '',
-				range1: []
+				range1: [],
+				value2: '',
+				range2: [],
+				dataList3: [],
+				iid: ''
 			};
 		},
 		created () {
 			this._getWarehouseInfo()
+			this._getOrganizationInfo()
+			this._getUserInfo()
 		},
 		methods: {
 			// 仓库下拉框
@@ -253,10 +291,32 @@
 						this.$set(e, 'text', e.ckmc)
 						this.$set(e, 'value', e.ckbm)
 					})
-					this.range1 = [...this.range]
 					this.toSearch()
 				}
 			},
+			// 组织信息下拉框
+			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)
+					})
+					this.toSearch()
+				}
+			},
+			// 仓管员下拉框
+			async _getUserInfo () {
+				let res = await getUserInfo()
+				if (res.code === 1) {
+					this.range2 = [...res.result]
+					this.range2.map(e => {
+						this.$set(e, 'text', e.cgymc)
+						this.$set(e, 'value', e.cgybm)
+					})
+				}
+			},
 			// 查询一级表格
 			toSearch () {
 				this.queryParams1 = {
@@ -270,7 +330,7 @@
 			},
 			// 一级表格接口
 			async _allocationPage () {
-				let res = await allocationPage(this.val1, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
+				let res = await allocationPage(this.val1, this.value1,  this.value2, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
 				if (res.code === 1) {
 					this.dataList1 = [...res.result]
 					this.totalCount1 = Number(res.totalElements)
@@ -359,6 +419,17 @@
 					console.log(e)
 				}
 			},
+			// 根据跟踪号查询库存列表
+			async _allocationBillInventoryInfo (id) {
+				let res = await allocationBillInventoryInfo(id)
+				if (res.code === 1) {
+					this.dataList3 = [...res.result]
+				}
+			},
+			// 跟踪号查询库存列表选中一行
+			toCheck3 (e) {
+				this.iid = e.trackNo === this.iid ? '' : e.trackNo 
+			},
 			// 修改调出仓库弹窗
 			checkWarehouse (type, title, e) {
 				this.modalObj = {type: type, title: title, id: e.flid}
@@ -366,10 +437,12 @@
 					this.value = e.dcckbm
 				} else if (type === 2) {
 					this.value = e.drckbm
+				} else if (type === 5) {
+					this._allocationBillInventoryInfo(e.gzh)
 				}
 				this.show = true
 			},
-			// 修改调出仓库确定
+			// 修改调出仓库确定和修改跟踪号
 			modalConfirm () {
 				let mc = ''
 				this.range.map(el => {
@@ -394,6 +467,13 @@
 							obj = e
 						}
 					})
+				} else if (this.modalObj.type === 5) {
+					this.dataList2.map(e => {
+						if (e.flid === this.modalObj.id) {
+							e.gzh = this.iid
+							obj = e
+						}
+					})
 				}
 				this.show = false
 				this._allocationBillUpdate(obj)

pages/management/in-storage.vue

@@ -3,21 +3,16 @@
 		<nav-bar :title="crType === 'IN' ? '入库' : '出库'"></nav-bar>
 		<view class="search-confirm-wrap">
 			<view class="zd-row">
-				<view class="zd-col-19 zd-row">
+				<view class="zd-col-24 zd-row jcflexstart">
-					<view class="zd-col-10"><search-box v-model="val1" /></view>
+					<view class="zd-col-8"><search-box v-model="val1" /></view>
-					<view class="zd-col-10 select_wraper">
+					<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 class="zd-col-7 select_wraper">
+					<view v-if="crType === 'OUT'" class="zd-col-8 select_wraper mgl10">
-						<uni-data-select
+						<zxz-uni-data-select placeholder="请选择仓管员" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
-						placeholder="请选择状态"
+					</view>
-						 v-model="value"
-						 :localdata="range"
-						></uni-data-select>
-					</view> -->
-					<button class="confirm-button" @tap="toSearch">查询</button>
 				</view>
-				<!-- <button class="confirm-button" :class="{'confirm-button_disabled': checkArr1.length === 0 || btnActive1}" :disabled="disabled1" @tap="toSure">单据审核</button> -->
+				<button class="confirm-button" @tap="toSearch">查询</button>
 				<button class="confirm-button" :class="{'confirm-button_disabled': checkArr1.length === 0}" :disabled="disabled1" @tap="toSure">单据审核</button>
 			</view>
 		</view>
@@ -37,6 +32,7 @@
 					<view class="zd-col-2 zd-th nowrap"><text>业务日期</text></view>
 					<view class="zd-col-2 zd-th nowrap"><text>操作日期</text></view>
 					<view class="zd-col-2 zd-th"><text>操作人</text></view>
+					<view v-if="crType === 'OUT'" class="zd-col-2 zd-th"><text>仓管员</text></view>
 					<view class="zd-col-2 zd-th">更多</view>
 				</view>
 				<view class="zd-td-wraper" v-for="(e, i) in dataList1" :key="e.id">
@@ -50,62 +46,75 @@
 						<view class="zd-col-2 zd-td"><text>{{e.zzmc}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.ckmc}}</text></view>
 						<view class="zd-col-2 zd-td"><text class="fontbg1">{{e.djzt}}</text></view>
-						<view class="zd-col-2 zd-td nowrap"><text>{{e.cjsj}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.cjsj}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.cjr}}</text></view>
-						<view class="zd-col-2 zd-td nowrap"><text>{{e.ywrq}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
-						<view class="zd-col-2 zd-td nowrap"><text>{{e.update_time}}</text></view>
+						<view class="zd-col-2 zd-td"><text>{{e.update_time}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.update_name}}</text></view>
+						<view v-if="crType === 'OUT'" class="zd-col-2 zd-td"><text>{{e.cgymc}}</text></view>
 						<view class="zd-col-2 zd-td" @tap.stop="getDetails(1,e)">
 							<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
 						</view>
 					</view>
 					<!-- 二级表格start -->
-					<view v-if="pkId === e.djid" class="zd-sec-wraper">
+					<view v-if="pkId === e.djid" class="zd-sec-wraper pd0">
-						<view class="zd-row zd-sec-th-wraper">
+						<view class="table-wrap">
-							<view class="zd-col-1 zd-sec-th"><text>序号</text></view>
+							<table class="grid-table">
-							<view class="zd-col-1 zd-sec-th"><text>选择</text></view>
+								<thead>
-							<view class="zd-col-2 zd-sec-th"><text>仓库名称</text></view>
+									<tr>
-							<view class="zd-col-2 zd-sec-th"><text>物料编号</text></view>
+										<th>序号</th>
-							<view class="zd-col-3 zd-sec-th"><text>物料名称</text></view>
+										<th>选择</th>
-							<view class="zd-col-1 zd-sec-th"><text>单位</text></view>
+										<th>仓库名称</th>
-							<view class="zd-col-2 zd-sec-th"><text>库位</text></view>
+										<th>物料编号</th>
-							<view class="zd-col-1 zd-sec-th"><text>数量</text></view>
+										<th>物料名称</th>
-							<view class="zd-col-2 zd-sec-th"><text>{{crType === 'IN'? '已入数量':'已出数量'}}</text></view>
+										<th>单位</th>
-							<view class="zd-col-2 zd-sec-th"><text>剩余数量</text></view>
+										<th>库位</th>
-							<view class="zd-col-2 zd-sec-th"><text>库存</text></view>
+										<th>数量</th>
-							<view class="zd-col-2 zd-sec-th"><text>操作人</text></view>
+										<th>{{crType === 'IN'? '已入数量':'已出数量'}}</th>
-							<view class="zd-col-2 zd-sec-th"><text>操作日期</text></view>
+										<th>剩余数量</th>
-							<view class="zd-col-1 zd-sec-th"><text>更多</text></view>
+										<th>库存</th>
+										<th>操作人</th>
+										<th v-if="crType === 'OUT'">仓管员</th>
+										<th>操作日期</th>
+										<th>更多</th>
+									</tr>
+								</thead>
+								<tbody>
+									<tr v-for="(el, j) in dataList2" :key="el.id">
+										<td>{{j+1}}</td>
+										<td @tap="toCheck2(el)">
+											<view class="zd-row jcenter">
+												<view class="zd-checkbox" :class="{'zd-checkbox_active': el.checked}"></view>
+											</view>
+										</td>
+										<td>{{el.ckmc}}</td>
+										<td>{{el.wlbm}}</td>
+										<td>{{el.wlmc}}</td>
+										<td>{{el.jldw}}</td>
+										<td>{{el.kwbm}}</td>
+										<td>{{el.sl}}</td>
+										<td>{{el.czsl}}</td>
+										<td>{{el.sysl}}</td>
+										<td>{{el.kcsl}}</td>
+										<td>{{el.update_name}}</td>
+										<td v-if="crType === 'OUT'">{{el.cgymc}}</td>
+										<td>{{el.update_time}}</td>
+										<td @tap.stop="getDetails(2,el)">
+											<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
+										</td>
+									</tr>
+								</tbody>
+							</table>
 						</view>
-						<view class="zd-row zd-td-wraper" v-for="(el, j) in dataList2" :key="el.id">
+						<view class="zd-row jcflexstart mgt20 mgb20">
-							<view class="zd-col-1 zd-sec-td"><text>{{j+1}}</text></view>
+							<view class="zd-col-1 zd-row jcenter mgl52">
-							<view class="zd-col-1 zd-sec-td" @tap="toCheck2(el)"><view class="zd-checkbox" :class="{'zd-checkbox_active': el.checked}"></view></view>
+								<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
-							<view class="zd-col-2 zd-sec-td"><text>{{el.ckmc}}</text></view>
-							<view class="zd-col-2 zd-sec-td"><text>{{el.wlbm}}</text></view>
-							<view class="zd-col-3 zd-sec-td"><text>{{el.wlmc}}</text></view>
-							<view class="zd-col-1 zd-sec-td nowrap"><text>{{el.jldw}}</text></view>
-							<view class="zd-col-2 zd-sec-td"><text>{{el.kwbm}}</text></view>
-							<view class="zd-col-1 zd-sec-td"><text>{{el.sl}}</text></view>
-							<view class="zd-col-2 zd-sec-td"><text>{{el.czsl}}</text></view>
-							<view class="zd-col-2 zd-sec-td"><text>{{el.sysl}}</text></view>
-							<view class="zd-col-2 zd-sec-td"><text>{{el.kcsl}}</text></view>
-							<view class="zd-col-2 zd-sec-td"><text>{{el.update_name}}</text></view>
-							<view class="zd-col-2 zd-sec-td nowrap"><text>{{el.update_time}}</text></view>
-							<view class="zd-col-1 zd-sec-td" @tap.stop="getDetails(2,el)">
-								<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
 							</view>
-						</view>
+							<button class="confirm-button" :class="{'confirm-button_disabled': checkArr2.length === 0}" @tap="kuwConfirm">{{crType === 'IN' ? '入库' : '出库'}}</button>
-						<view class="zd-row jcenter mgt20 mgb20">
+							<view class="zd-col-10">
-							<view class="zd-col-22 zd-row">
+								<!-- <view class="zd-col-12 zd-row jcflexend">
-								<view class="zd-col-1 zd-row jcenter">
-									<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
-								</view>
-								<view class="zd-col-11 zd-row jcflexstart">
-									<button class="confirm-button" :class="{'confirm-button_disabled': checkArr2.length === 0}" @tap="kuwConfirm">{{crType === 'IN' ? '入库' : '出库'}}</button>
-								</view>
-								<view class="zd-col-12 zd-row jcflexend">
 									<pagination :total="totalCount2" :page-size="queryParams2.pageSize" :current-page="currentPage2" @page-change="handlePageChange2" />
-								</view>
+								</view> -->
 							</view>
 						</view>
 					</view>
@@ -175,7 +184,8 @@
 	import ScanInput from '@/components/ScanInput.vue'
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
-	import {getWarehouseInfo, easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js'
+	// import {getWarehouseInfo, getUserInfo} from '@/utils/mork2.js'
+	import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -206,7 +216,7 @@
 				currentPage1: 1,
 				totalCount2: 0,
 				queryParams2:{
-					pageSize: 10,
+					pageSize: 500,
 					pageNum: 1
 				},
 				currentPage2: 1,
@@ -219,10 +229,10 @@
 				checkArr3: [],
 				delShow: false,
 				detailObj: {},
-				value: '',
-				range:[{value: 1, text: '提交'}, {value: 2, text: '审核'}],
 				value1: '',
-				range1: []
+				range1: [],
+				value2: '',
+				range2: []
 			};
 		},
 		onShow() {
@@ -240,6 +250,7 @@
 		},
 		created () {
 			this._getWarehouseInfo()
+			this._getUserInfo()
 		},
 		methods: {
 			// 仓库下拉框
@@ -254,6 +265,17 @@
 					this.toSearch()
 				}
 			},
+			// 仓管员下拉框
+			async _getUserInfo () {
+				let res = await getUserInfo()
+				if (res.code === 1) {
+					this.range2 = [...res.result]
+					this.range2.map(e => {
+						this.$set(e, 'text', e.cgymc)
+						this.$set(e, 'value', e.cgybm)
+					})
+				}
+			},
 			// 查询一级表格
 			toSearch () {
 				this.queryParams1 = {
@@ -267,7 +289,7 @@
 			},
 			// 一级表格接口
 			async _easOutInBillPage () {
-				let res = await easOutInBillPage(this.val1, this.id, this.value, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
+				let res = await easOutInBillPage(this.val1, this.id, this.value1, this.value2, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
 				if (res.code === 1) {
 					this.checkArr1 = []
 					res.result.map(el => {
@@ -325,7 +347,7 @@
 				this.dataList2 = []
 				if (this.pkId === e.djid) {
 					this.queryParams2 = {
-						pageSize: 10,
+						pageSize: 500,
 						pageNum: 1
 					}
 					this.currentPage2 = 1
@@ -504,7 +526,7 @@
 					this.disabled2 = false
 					this.show = false
 					this.queryParams2 = {
-						pageSize: 10,
+						pageSize: 500,
 						pageNum: 1
 					}
 					this.currentPage2 = 1

pages/management/receive-confirm.vue

@@ -3,13 +3,13 @@
 		<nav-bar title="收货确认"></nav-bar>
 		<view class="search-confirm-wrap">
 			<view class="zd-row">
-				<view class="zd-col-19 zd-row">
+				<view class="zd-col-24 zd-row jcflexstart">
-					<view class="zd-col-10"><search-box v-model="val1" /></view>
+					<view class="zd-col-7"><search-box v-model="val1" /></view>
-					<view class="zd-col-10 select_wraper">
+					<view class="zd-col-8 select_wraper mgl10">
-						<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
+						<zxz-uni-data-select placeholder="请选择组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
 					</view>
-					<button class="confirm-button" @tap="toSearch">查询</button>
 				</view>
+				<button class="confirm-button" @tap="toSearch">查询</button>
 			</view>
 		</view>
 		<view class="zd-row jcflexstart table-title_wraper">收货确认</view>
@@ -124,17 +124,15 @@
 								</tbody>
 							</table>
 						</view>
-						<view class="zd-row jcenter mgt10 mgb20">
+						<view v-if="pkObj.djzt !== '审核后'" class="zd-row jcflexstart mgt10 mgb20">
-							<view class="zd-col-21 zd-row jcenter">
+							<view class="zd-col-1 zd-row jcenter mgl52">
-								<view v-if="pkObj.djzt !== '审核后'" class="zd-col-1 zd-row jcenter">
+								<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
-									<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
+							</view>
-								</view>
+							<button class="confirm-button" :class="{'confirm-button_disabled': checkArr.length === 0}" :disabled="disabled" @tap="_receiptBillConfirm">确认收货</button>
-								<view v-if="pkObj.djzt !== '审核后'" class="zd-col-11 zd-row jcflexstart">
+							<view class="zd-col-10">
-									<button class="confirm-button" :class="{'confirm-button_disabled': checkArr.length === 0}" :disabled="disabled" @tap="_receiptBillConfirm">确认收货</button>
+								<!-- <view class="zd-col-12 zd-row jcflexend">
-								</view>
-								<view class="zd-col-12 zd-row jcflexend">
 									<pagination :total="totalCount2" :page-size="queryParams2.pageSize" :current-page="currentPage2" @page-change="handlePageChange2" />
-								</view>
+								</view> -->
 							</view>
 						</view>
 					</view>
@@ -171,7 +169,7 @@
 	import ScanInput from '@/components/ScanInput.vue'
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
-	import {getWarehouseInfo, receiptPage, receiptBillPage, receiptBillUpdate, receiptBillConfirm} from '@/utils/getData2.js'
+	import {getWarehouseInfo, getOrganizationInfo, receiptPage, receiptBillPage, receiptBillUpdate, receiptBillConfirm} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -214,6 +212,7 @@
 		},
 		created () {
 			this._getWarehouseInfo()
+			this._getOrganizationInfo()
 		},
 		methods: {
 			// 仓库下拉框
@@ -225,7 +224,18 @@
 						this.$set(e, 'text', e.ckmc)
 						this.$set(e, 'value', e.ckbm)
 					})
-					this.range1 = [...this.range]
+					this.toSearch()
+				}
+			},
+			// 组织信息下拉框
+			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)
+					})
 					this.toSearch()
 				}
 			},

utils/getData2.js

@@ -24,13 +24,13 @@ export const getBillsCount = (area) => request({
  * 出入库
  */
 // 1.分页查询出入库单据
-export const easOutInBillPage = (fuzzy, djlx, djzt, ckbm, page, size) => request({
+export const easOutInBillPage = (fuzzy, djlx, ckbm, cgybm, page, size) => request({
 	url:'api/easOutInBill/page',
 	data: {
 		fuzzy: fuzzy,
 		djlx: djlx,
-		djzt: djzt,
 		ckbm: ckbm,
+		cgybm: cgybm,
 		page: page,
 		size: size
 	}
@@ -59,6 +59,16 @@ export const easOutInBillDetailUpdate = (arr) => request({
 	url:'api/easOutInBillDetail/update',
 	data: arr
 })
+// 6.获取仓管员信息 ------ 下拉框带搜索功能
+export const getUserInfo = () => request({
+	url:'api/easOutInBill/getUserInfo',
+	data: {}
+})
+// 7.获取组织机构信息 ------ 下拉框带搜索功能
+export const getOrganizationInfo = () => request({
+	url:'api/easOutInBill/getOrganizationInfo',
+	data: {}
+})
 
 /**
  * 调拨维护
@@ -69,11 +79,12 @@ export const getWarehouseInfo = () => request({
 	data: {}
 })
 // 2.查询调拨单据
-export const allocationPage = (fuzzy, ckbm, page, size) => request({
+export const allocationPage = (fuzzy, kczzbm, cgybm, page, size) => request({
 	url:'api/allocationBill/allocationPage',
 	data: {
 		fuzzy: fuzzy,
-		ckbm: ckbm,
+		kczzbm: kczzbm,
+		cgybm: cgybm,
 		page: page,
 		size: size
 	}
@@ -97,16 +108,21 @@ export const allocationBillConfirm = (arr) => request({
 	url:'api/allocationBill/confirm',
 	data: arr
 })
+// 6.根据跟踪号查询库存列表
+export const allocationBillInventoryInfo = (arr) => request({
+	url:'api/allocationBill/queryInventoryInfo',
+	data: arr
+})
 
 /**
  * 收货确认
  */
 // 1.收货单据分页
-export const receiptPage = (fuzzy, ckbm, page, size) => request({
+export const receiptPage = (fuzzy, kczzbm, page, size) => request({
 	url:'api/receiptBill/receiptPage',
 	data: {
 		fuzzy: fuzzy,
-		ckbm: ckbm,
+		kczzbm: kczzbm,
 		page: page,
 		size: size
 	}

utils/mork2.js

@@ -539,6 +539,32 @@ export const getWarehouseInfo = () => {
 	}
 	return res
 }
+export const getUserInfo = () => {
+	let res = {
+		"result": [
+			{
+				"cgybm": "1",
+				"cgymc": "admin"
+			}
+		],
+		"code": 1,
+		"desc": "查询成功"
+	}
+	return res
+}
+export const getOrganizationInfo = () => {
+	let res = {
+		"result": [
+			{
+				"kczzbm": "a110",
+				"kczzmc": "管理部"
+			}
+		],
+		"code": 1,
+		"desc": "查询成功"
+	}
+	return res
+}
 export const allocationPage = () => {
 	let res = {
 		"pageNum": 1,
@@ -581,7 +607,7 @@ export const allocationPage = () => {
 				"drckmc": "销售成品仓-浙江大区",
 				"drkwbm": null,
 				"drkwmc": null,
-				"gzh": null,
+				"gzh": 'aljljdljf',
 				"jhdrrq": "2024-05-01",
 				"jhdcrq": "2024-05-02",
 				"flbz": null
@@ -994,7 +1020,7 @@ export const allocationBillPage = () => {
 				"drckmc": "销售配件仓",
 				"drkwbm": null,
 				"drkwmc": null,
-				"gzh": null,
+				"gzh": 'djlfjlfjlfj',
 				"jhdrrq": "2024-05-01",
 				"jhdcrq": "2024/05/08 17:09:47",
 				"flbz": null
@@ -1059,6 +1085,75 @@ export const allocationBillConfirm = () => {
 	}
 	return res
 }
+export const allocationBillInventoryInfo = () => {
+	let res = {
+		code: 1,
+		desc: 'ok',
+		result: [
+			{
+				"locationNo": "01.09.07",
+				"locationName": "四期智能工厂",
+				"materialNo": "255025010002",
+				"materialName": "多路阀(三联晨光)",
+				"lot": '20201010',
+				"unitNo": "PCS",
+				"curStoreQty": "2",
+				"warehouseNo": "3.04.001",
+				"warehouseName": "智能原材料库",
+				"trackNo": '1'
+			},
+			{
+				"locationNo": "01.09.07",
+				"locationName": "四期智能工厂",
+				"materialNo": "255025010002",
+				"materialName": "多路阀(三联晨光)",
+				"lot": '20201010',
+				"unitNo": "PCS",
+				"curStoreQty": "2",
+				"warehouseNo": "3.04.001",
+				"warehouseName": "智能原材料库",
+				"trackNo": '2'
+			},
+			{
+				"locationNo": "01.09.07",
+				"locationName": "四期智能工厂",
+				"materialNo": "255025010002",
+				"materialName": "多路阀(三联晨光)",
+				"lot": '20201010',
+				"unitNo": "PCS",
+				"curStoreQty": "2",
+				"warehouseNo": "3.04.001",
+				"warehouseName": "智能原材料库",
+				"trackNo": '3'
+			},
+			{
+				"locationNo": "01.09.07",
+				"locationName": "四期智能工厂",
+				"materialNo": "255025010002",
+				"materialName": "多路阀(三联晨光)",
+				"lot": '20201010',
+				"unitNo": "PCS",
+				"curStoreQty": "2",
+				"warehouseNo": "3.04.001",
+				"warehouseName": "智能原材料库",
+				"trackNo": '4'
+			},
+			{
+				"locationNo": "01.09.07",
+				"locationName": "四期智能工厂",
+				"materialNo": "255025010002",
+				"materialName": "多路阀(三联晨光)",
+				"lot": '20201010',
+				"unitNo": "PCS",
+				"curStoreQty": "2",
+				"warehouseNo": "3.04.001",
+				"warehouseName": "智能原材料库",
+				"trackNo": '5'
+			}
+		]
+	}
+	return res
+}
 export const receiptPage = () => {
 	let res = {
 		"pageNum": 1,