前端小程序 出库更新sdy

pages/erp/exWarehousing/exWarehousing.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="warp">
 		<view class="top">
-			<view class="top-left">鲅鱼圈一号库</view>
-			<view>102仓位</view>
+			<view class="top-left">{{warehouseName}}</view>
+			<view>{{binNumber}}仓位</view>
 		</view>
 		<view class="content">
 			<view class="row">
@@ -38,15 +38,15 @@
 			</view>
 			<view class="row row-bottom" v-if="detailData.type == '潮粮'">
 				<view class="left">扣重比</view>
-				<input v-model='detailData.deductWeight' class="right-bottom" placeholder="输入扣重比"></input>
+				<input v-model='detailData.buckleWeightRatio' class="right-bottom" placeholder="输入扣重比"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type == '潮粮'">
 				<view class="left">干粮水分（%）</view>
-				<input v-model='detailData.waterMin' class="right-bottom" placeholder="输入干粮水分占比"></input>
+				<input v-model='detailData.solidGrainWater' class="right-bottom" placeholder="输入干粮水分占比"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type == '潮粮'">
 				<view class="left">潮粮水分（%）</view>
-				<input v-model='detailData.waterContent' class="right-bottom" placeholder="输入潮粮水分占比"></input>
+				<input v-model='detailData.tidalGrainWater' class="right-bottom" placeholder="输入潮粮水分占比"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type == '潮粮'">
 				<view class="left">纯重（吨）</view>
@@ -80,7 +80,7 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">车牌号</view>
-				<input v-model='detailData.carNumber' class="right-bottom" placeholder="请输入车牌号"></input>
+				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
 			</view>
 		</view>
 		<view class="content2">
@@ -95,31 +95,31 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">质检员</view>
-				<input v-model='detailData.qualityInspector' class="right-bottom" placeholder="输入质检员姓名"></input>
+				<input v-model='detailData.warehouseInOutDetail.qualityInspector' class="right-bottom" placeholder="输入质检员姓名"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">水分（%）</view>
-				<input v-model='detailData.waterContent' class="right-bottom" placeholder="输入水分占比"></input>
+				<input v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom" placeholder="输入水分占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">容重（克/升）</view>
-				<input v-model='detailData.bulkDensity' class="right-bottom"  placeholder="输入容重"></input>
+				<input v-model='detailData.warehouseInOutDetail.bulkDensity' class="right-bottom"  placeholder="输入容重"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">热损伤（%）</view>
-				<input v-model='detailData.jiaorenli' class="right-bottom" placeholder="输入热损伤占比"></input>
+				<input v-model='detailData.warehouseInOutDetail.jiaorenli' class="right-bottom" placeholder="输入热损伤占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">杂质（%）</view>
-				<input v-model='detailData.impurity' class="right-bottom" placeholder="输入杂质占比"></input>
+				<input v-model='detailData.warehouseInOutDetail.impurity' class="right-bottom" placeholder="输入杂质占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">霉变粒（%）</view>
-				<input v-model='detailData.mildewGrain' class="right-bottom" placeholder="输入霉变粒占比"></input>
+				<input v-model='detailData.warehouseInOutDetail.mildewGrain' class="right-bottom" placeholder="输入霉变粒占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">不完善粒（%）</view>
-				<input v-model='detailData.imperfectGrain' class="right-bottom" placeholder="输入不完善粒占比"></input>
+				<input v-model='detailData.warehouseInOutDetail.imperfectGrain' class="right-bottom" placeholder="输入不完善粒占比"></input>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
@@ -188,6 +188,8 @@
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
+				warehouseName:'',
+				binNumber:'',
 				detailData: {
 					contractNo: "请选择合同编号或移库任务编号",
 					carNo: '辽H12345',
@@ -197,7 +199,8 @@
 					agent: "请选择经办人",
 					inOutDate: "请选择出库日期",
 					inOutType: "请选择出库类型",
-					qualityInspectionManagement: {}
+					warehouseInOutDetail:{},
+					gradeKey:"",
 				},
 				params: {
 					year: true,
@@ -215,6 +218,17 @@
 			this.cangId = options.cangId
 		},
 		onShow() {
+			console.log(helper.erpWarehouse.baseId,"仓位id")
+			this.binNumber = helper.erpWarehouse.binNumber
+			this.warehouseName = helper.erpWarehouse.warehouseName
+			this.detailData.goodsName = uni.getStorageSync('erpContractNo').goodsName;
+			this.detailData.contractNo = uni.getStorageSync('erpContractNo').contractNo;
+			if(!this.detailData.contractNo){
+				this.detailData.contractNo = '请选择合同编号'
+			}
+			if(!this.detailData.goodsName){
+				this.detailData.goodsName = '货名'
+			}
 			//出库类型
 			this.outWarehouse()
 			//经办人
@@ -243,6 +257,8 @@
 				this.detailData.type = this.typeList[e].type
 			},
 			pjPicker(e) {
+				console.log(e[0],"dd")
+				this.detailData.gradeKey = e[0]
 				this.detailData.grade = this.pjList[e].type
 			},
 			handlerPicker(e) {
@@ -314,7 +330,6 @@
 			},
 			onRemove(index) {},
 			submit(num) {
-				
 				if (!this.detailData.grossWeight) {
 					this.$api.msg('毛重不能为空')
 					return
@@ -330,14 +345,18 @@
 					this.$api.msg('毛重输入错误！')
 					return
 				}
+				this.detailData.baseId = helper.erpWarehouse.warehouseId
+				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
+				this.detailData.positionId = helper.erpWarehouse.baseId
+				this.detailData.binNumber = this.binNumber
 				this.detailData.compId = helper.erpWarehouse.compId
+				this.detailData.inOutFlag = 1
 				let title = ""
 				if(num == 1 ){
-					this.detailData.inOutFlag = 1
 					this.detailData.statusFlag = 1
+					this.detailData.inOutDate = this.inOutDate1
 					title = "暂存成功"
 				}else if(num == 2){
-					this.detailData.inOutFlag = 1
 					this.detailData.statusFlag = 3
 					title = "提交成功"
 				}

pages/erp/improvedExWaehousing/improvedExWaehousing.vue

@@ -3,13 +3,13 @@
 		<view class="dropdown content1">
 			<view class="left"  @click='show1=true'>
 				<view>{{warehouseName}}</view>
-				<u-icon name="arrow-right" color=""></u-icon>
-				<u-select v-model="show1" :default-value='[0]' :list="warehouseList" @confirm="confirmWarehouse">
-				</u-select>
+				<u-icon name="arrow-right" ></u-icon>
+				<!-- <u-select v-model="show1" :default-value='[0]' :list="warehouseList" @confirm="confirmWarehouse">
+				</u-select> -->
 			</view>
 			<view class="right"  @click='show2=true'>
 				<view>{{positionName}}</view>
-				<u-icon name="arrow-right" color=""></u-icon>
+				<u-icon name="arrow-right" ></u-icon>
 				<u-select v-model="show2" :default-value='[0]' :list="positionList" @confirm="confirmPositon">
 				</u-select>
 			</view>
@@ -67,7 +67,19 @@
 					]
 			}
 		},
+		onLoad() {
+			this.getList()
+		},
 		methods: {
+			getList(){
+				that.$api.doRequest('get', '/warehouseInOutInfo/selectWarehouseInOutInfo',
+					that.detailData).then(res => {
+					if (res.data.code == 200) {
+						that.$api.msg(title)
+						uni.navigateBack()
+					}
+				})
+			},
 			confirmWarehouse(){},
 			confirmPositon(){},
 			goDetail(val){
@@ -91,19 +103,20 @@
 		}
 	}
 	.content1{
-		background: red;
 		padding: 20rpx;
 		margin: 20rpx;
 		border-radius: 10rpx;
 	}
 	.content2{
-		padding: 20rpx;
+		// padding: 20rpx;
 		margin: 20rpx;
-		border-bottom: 1px solid #ccc;
-		background: yellow;
+		// border-bottom: 1px solid #ccc;
 		.content2-item{
+			padding: 20rpx;
 			margin-bottom: 10rpx;
-			border-bottom:1px solid #ccc ;
+			// border-bottom:1px solid #ccc ;
+			background: #FFFFFF;
+			border-radius: 10rpx;
 			// padding-bottom: 10px;
 		}
 		.item-style{

pages/erp/index.vue

@@ -204,13 +204,13 @@ import helper from '@/common/helper.js';
 					})
 				} else {
 					if (item.url) {
-						console.log(this.warehouseId,"id")
 						helper.erpWarehouse = {
 							warehouseName:this.warehouseName,
 							binNumber:this.binNumber,
 							compId:this.compId,
 							agent:this.agent,
-							warehouseId:this.warehouseId
+							warehouseId:this.warehouseId,
+							baseId:this.baseId
 						}
 						uni.navigateTo({
 							url: item.url
@@ -238,6 +238,7 @@ import helper from '@/common/helper.js';
 							this.binNumber = res.data.data[0].positionInfos[0].binNumber
 							this.warehouseCWList = res.data.data[0].positionInfos
 							this.warehouseId = res.data.data[0].id
+							this.baseId = res.data.data[0].positionInfos[0].baseId
 							console.log('this.warehouseCWList',this.warehouseCWList)
 							// this.makeBinNumber()
 						}
@@ -256,6 +257,7 @@ import helper from '@/common/helper.js';
 			},
 			warehouseCWchange(e){
 				this.binNumber = this.warehouseCWList[e[0]].binNumber
+				this.baseId = this.warehouseCWList[e[0]].baseId
 			}
 
 		}