入库增加到货日期；出库增加领料人和出库日期

pagesStorage/checkStorage/index.vue

@@ -89,8 +89,8 @@
 				warehouseList:[]
 			}
 		},
-		onLoad() {
-			this.getSeceiptStatus();
+		async onLoad() {
+			await this.getSeceiptStatus();
 			this.getDataList();
 		},
 		onReachBottom() {
@@ -106,16 +106,15 @@
 				this.isLoading = false;
 				this.getDataList();
 			},
-			getSeceiptStatus(){
-				this.$api.get('/sys/dict/data/getListByType/wms_check_status').then(res=>{
-					if(res.data.code===0){
-						this.typeList = res.data.data;
-						res.data.data.forEach(d=>{
-							this.receiptStatus[d.dictValue] = d.dictLabel;
-						})
-						this.typeList.unshift({dictValue:'',dictLabel:'全部'})
-					}else this.$showToast(res.data.msg)
-				});
+			async getSeceiptStatus(){
+				let res = await this.$api.get('/sys/dict/data/getListByType/wms_check_status');
+				if(res.data.code===0){
+					this.typeList = res.data.data;
+					res.data.data.forEach(d=>{
+						this.receiptStatus[d.dictValue] = d.dictLabel;
+					})
+					this.typeList.unshift({dictValue:'',dictLabel:'全部'})
+				}else this.$showToast(res.data.msg)
 			},
 			getDataList(){
 				this.isLoading = true;

pagesStorage/inStorage/add.vue

@@ -31,6 +31,13 @@
 						<text class="tip" v-else>请选择 ></text>
 					</div>
 				</div>
+				<div class="item">
+					<div class="left">到货日期</div>
+					<div class="right" @tap="dateShow = true">
+						<text v-if="receiptDto.arrivalDate">{{receiptDto.arrivalDate}} ></text>
+						<text class="tip" v-else>请选择 ></text>
+					</div>
+				</div>
 				<div class="item">
 					<div class="left">业务单号</div>
 					<div class="right">
@@ -100,6 +107,7 @@
 		<u-picker title="供应商" :show="merchantShow" :columns="merchantList" keyName="merchantName" 
 			@cancel="merchantShow=false" @confirm="merchantConfirm">
 		</u-picker>
+		<u-calendar title="到货日期" :show="dateShow" mode="single" @confirm="dateConfirm" @close="dateShow = false"></u-calendar>
 	</view>
 </template>
 
@@ -121,7 +129,8 @@
 					warehouseId: '',
 					warehouseName: '',
 					totalQuantity: 0,
-					purchaser:'',
+					purchaser:'',
+					arrivalDate:'',
 					details: []
 				},
 				warehouseShow:false,
@@ -130,6 +139,7 @@
 				receiptTypeList:[],
 				merchantShow:false,
 				merchantList:[],
+				dateShow:false
 			}
 		},
 		mounted() {
@@ -272,6 +282,10 @@
 					}else this.$showToast(res.data.msg)
 				})
 			},
+			dateConfirm(e){
+				this.receiptDto.arrivalDate = e[0];
+				this.dateShow = false;
+			}
 		}
 	}
 </script>

pagesStorage/inStorage/index.vue

@@ -35,6 +35,10 @@
 						<div class="title">采购人</div>
 						<div class="nr">{{ item.purchaser||'' }}</div>
 					</div>
+					<div class="pre bfb">
+						<div class="title">到货日期</div>
+						<div class="nr">{{ item.arrivalDate||'' }}</div>
+					</div>
 					<div class="pre bfb">
 						<div class="title">时间</div>
 						<div class="nr">{{ item.updateDate||'' }}</div>
@@ -97,9 +101,9 @@
 				dataList:[],
 			}
 		},
-		onLoad() {
-			this.getSeceiptStatus();
-			this.getSeceiptType();
+		async onLoad() {
+			await this.getSeceiptStatus();
+			await this.getSeceiptType();
 			this.getDataList();
 		},
 		onReachBottom() {
@@ -115,16 +119,15 @@
 				this.isLoading = false;
 				this.getDataList();
 			},
-			getSeceiptStatus(){
-				this.$api.get('/sys/dict/data/getListByType/wms_receipt_status').then(res=>{
-					if(res.data.code===0){
-						this.typeList = res.data.data;
-						res.data.data.forEach(d=>{
-							this.receiptStatus[d.dictValue] = d.dictLabel;
-						})
-						this.typeList.unshift({dictValue:'',dictLabel:'全部'})
-					}else this.$showToast(res.data.msg)
-				});
+			async getSeceiptStatus(){
+				let res = await this.$api.get('/sys/dict/data/getListByType/wms_receipt_status');
+				if(res.data.code===0){
+					this.typeList = res.data.data;
+					res.data.data.forEach(d=>{
+						this.receiptStatus[d.dictValue] = d.dictLabel;
+					})
+					this.typeList.unshift({dictValue:'',dictLabel:'全部'})
+				}else this.$showToast(res.data.msg)
 			},
 			async getSeceiptType(){
 				let res = await this.$api.get('/sys/dict/data/getListByType/wms_receipt_type');

pagesStorage/moveStorage/index.vue

@@ -88,8 +88,8 @@
 				dataList:[],
 			}
 		},
-		onLoad() {
-			this.getMovementStatus();
+		async onLoad() {
+			await this.getMovementStatus();
 			this.getDataList();
 		},
 		onReachBottom() {
@@ -105,16 +105,15 @@
 				this.isLoading = false;
 				this.getDataList();
 			},
-			getMovementStatus(){
-				this.$api.get('/sys/dict/data/getListByType/wms_movement_status').then(res=>{
-					if(res.data.code===0){
-						this.typeList = res.data.data;
-						res.data.data.forEach(d=>{
-							this.movementStatus[d.dictValue] = d.dictLabel;
-						})
-						this.typeList.unshift({dictValue:'',dictLabel:'全部'})
-					}else this.$showToast(res.data.msg)
-				});
+			async getMovementStatus(){
+				let res = await this.$api.get('/sys/dict/data/getListByType/wms_movement_status');
+				if(res.data.code===0){
+					this.typeList = res.data.data;
+					res.data.data.forEach(d=>{
+						this.movementStatus[d.dictValue] = d.dictLabel;
+					})
+					this.typeList.unshift({dictValue:'',dictLabel:'全部'})
+				}else this.$showToast(res.data.msg)
 			},
 			getDataList(){
 				this.isLoading = true;

pagesStorage/outStorage/add.vue

@@ -31,12 +31,25 @@
 						<text class="tip" v-else>请选择 ></text>
 					</div>
 				</div>
+				<div class="item">
+					<div class="left">出库日期</div>
+					<div class="right" @tap="dateShow = true">
+						<text v-if="receiptDto.shipmentDate">{{receiptDto.shipmentDate}} ></text>
+						<text class="tip" v-else>请选择 ></text>
+					</div>
+				</div>
 				<div class="item">
 					<div class="left">业务单号</div>
 					<div class="right">
 						<input type="text" placeholder-class="storage-inp-ph" placeholder="请输入" v-model="shipmentDto.bizOrderNo" @blur="e=>setShipment(e,'bizOrderNo')">
 					</div>
 				</div>
+				<div class="item">
+					<div class="left">领料人</div>
+					<div class="right">
+						<input type="text" placeholder-class="storage-inp-ph" placeholder="请输入" v-model="shipmentDto.collector" @blur="e=>setShipment(e,'collector')">
+					</div>
+				</div>
 				<!-- <div class="item">
 					<div class="left">总数量</div>
 					<div class="right">
@@ -91,6 +104,7 @@
 		<u-picker title="客户" :show="merchantShow" :columns="merchantList" keyName="merchantName" 
 			@cancel="merchantShow=false" @confirm="merchantConfirm">
 		</u-picker>
+		<u-calendar title='出库日期' :show="dateShow" mode="single" @confirm="dateConfirm" @close="dateShow = false"></u-calendar>
 	</view>
 </template>
 
@@ -111,7 +125,9 @@
 					orderStatus: 1,
 					warehouseId: '',
 					warehouseName: '',
-					totalQuantity: 0,
+					totalQuantity: 0,
+					shipmentDate:'',
+					collector:'',
 					details: []
 				},
 				warehouseShow:false,
@@ -120,6 +136,7 @@
 				ShipmentTypeList:[],
 				merchantShow:false,
 				merchantList:[],
+				dateShow:false
 			}
 		},
 		mounted() {
@@ -247,6 +264,10 @@
 					}else this.$showToast(res.data.msg)
 				})
 			},
+			dateConfirm(e){
+				this.shipmentDto.shipmentDate = e[0];
+				this.dateShow = false;
+			}
 		}
 	}
 </script>

pagesStorage/outStorage/index.vue

@@ -31,6 +31,14 @@
 						<div class="title">出库人</div>
 						<div class="nr">{{ item.updaterName||'' }}</div>
 					</div>
+					<div class="pre">
+						<div class="title">领料人</div>
+						<div class="nr">{{ item.collector||'' }}</div>
+					</div>
+					<div class="pre bfb">
+						<div class="title">出库日期</div>
+						<div class="nr">{{ item.shipmentDate||'' }}</div>
+					</div>
 					<div class="pre bfb">
 						<div class="title">时间</div>
 						<div class="nr">{{ item.updateDate||'' }}</div>
@@ -93,9 +101,9 @@
 				dataList:[],
 			}
 		},
-		onLoad() {
-			this.getSeceiptStatus();
-			this.getSeceiptType();
+		async onLoad() {
+			await this.getSeceiptStatus();
+			await this.getSeceiptType();
 			this.getDataList();
 		},
 		onReachBottom() {
@@ -111,16 +119,15 @@
 				this.isLoading = false;
 				this.getDataList();
 			},
-			getSeceiptStatus(){
-				this.$api.get('/sys/dict/data/getListByType/wms_shipment_status').then(res=>{
-					if(res.data.code===0){
-						this.typeList = res.data.data;
-						res.data.data.forEach(d=>{
-							this.receiptStatus[d.dictValue] = d.dictLabel;
-						})
-						this.typeList.unshift({dictValue:'',dictLabel:'全部'})
-					}else this.$showToast(res.data.msg)
-				});
+			async getSeceiptStatus(){
+				let res = await this.$api.get('/sys/dict/data/getListByType/wms_shipment_status');
+				if(res.data.code===0){
+					this.typeList = res.data.data;
+					res.data.data.forEach(d=>{
+						this.receiptStatus[d.dictValue] = d.dictLabel;
+					})
+					this.typeList.unshift({dictValue:'',dictLabel:'全部'})
+				}else this.$showToast(res.data.msg)
 			},
 			async getSeceiptType(){
 				let res = await this.$api.get('/sys/dict/data/getListByType/wms_shipment_type');