Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/erp/warehousing/selectContractNo.vue

@@ -71,6 +71,11 @@
 					_list=[]
 				}
 				if(_list.length<=20){
+					_list = _list.filter(function(val) {
+						if (val.contractNo.indexOf(item) > -1) {
+							return val
+						}
+					})
 					_list.unshift(item)
 				}else{
 					_list.unshift(item).pop(item)

pages/erp/warehousing/warehousing.vue

@@ -36,24 +36,24 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">净重（吨）</view>
-				<input @input='calculate' v-model='detailData.netWeight' class="right-bottom"
+				<input @input='' v-model='detailData.netWeight' class="right-bottom"
 					placeholder="不可编辑,自动计算" :disabled="true"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">扣款（元/吨）</view>
-				<input @input='calculate' v-model='detailData.deductionAmount' class="right-bottom" placeholder="0"></input>
+				<input @input='' v-model='detailData.deductionAmount' class="right-bottom" placeholder="输入扣款"></input>
 			</view>
 			<view class="row row-bottom" v-if="detailData.type=='潮粮'">
 				<view class="left">扣重比</view>
-				<input @input='calculate' v-model='detailData.buckleWeightRatio' class="right-bottom" placeholder="输入扣重比"></input>
+				<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 @input='calculate' v-model='detailData.solidGrainWater' class="right-bottom" placeholder="输入干粮水分占比"></input>
+				<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 @input='calculate' v-model='detailData.tidalGrainWater' class="right-bottom" placeholder="输入潮粮水分占比"></input>
+				<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>
@@ -116,12 +116,12 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">质检员</view>
-				<input @input='calculate' v-model='detailData.qualityInspector' class="right-bottom"
+				<input @input='' v-model='detailData.qualityInspector' class="right-bottom"
 					placeholder="输入质检员姓名"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">水分（%）</view>
-				<input @input='calculate' v-model='detailData.waterContent' class="right-bottom"
+				<input @input='' v-model='detailData.waterContent' class="right-bottom"
 					placeholder="输入水分占比"></input>
 			</view>
 			<view class="row row-bottom" style="border: 0;">
@@ -130,22 +130,22 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">热损伤（%）</view>
-				<input @input='calculate' v-model='detailData.jiaorenli' class="right-bottom"
+				<input @input='' v-model='detailData.jiaorenli' class="right-bottom"
 					placeholder="输入热损伤占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">杂质（%）</view>
-				<input @input='calculate' v-model='detailData.impurity' class="right-bottom"
+				<input @input='' v-model='detailData.impurity' class="right-bottom"
 					placeholder="输入杂质占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">霉变粒（%）</view>
-				<input @input='calculate' v-model='detailData.mildewGrain' class="right-bottom"
+				<input @input='' v-model='detailData.mildewGrain' class="right-bottom"
 					placeholder="输入霉变粒占比"></input>
 			</view>
 			<view class="row row-bottom">
 				<view class="left">不完善粒（%）</view>
-				<input @input='calculate' v-model='detailData.imperfectGrain' class="right-bottom"
+				<input @input='' v-model='detailData.imperfectGrain' class="right-bottom"
 					placeholder="输入不完善粒占比"></input>
 			</view>
 		</view>
@@ -236,6 +236,9 @@
 					agent:'请选择经办人',
 					inOutType:'请选择入库类型',
 					deductionWeight:0,
+					grossWeight:0,
+					tare:0,
+					deductionAmount:0,
 					qualityInspectionManagement: {}
 				}
 			}
@@ -249,12 +252,14 @@
 		onShow() {
 			this.detailData.goodsName = uni.getStorageSync('erpContractNo').goodsName;
 			this.detailData.contractNo = uni.getStorageSync('erpContractNo').contractNo;
+			this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
 			if(!this.detailData.contractNo){
 				this.detailData.contractNo = '请选择合同编号'
 			}
 			if(!this.detailData.goodsName){
 				this.detailData.goodsName = '货名'
 			}
+			console.log('当前合同',uni.getStorageSync('erpContractNo'))
 			// 获取入库类型
 			this.getrkType()
 			//获取经办人
@@ -310,7 +315,7 @@
 				}
 			},
 			calculate() {
-				this.detailData.netWeight = this.detailData.grossWeight - this.detailData.tare
+				this.detailData.netWeight = this.detailData.grossWeight - this.detailData.tare -this.detailData.deductionWeight 
 			},
 			getImgUrl(res) {
 				this.detailData.addressUrl = res