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

pageD/myRelease/buyGrain.vue

@@ -205,16 +205,18 @@
 				typesType: ["现货", "期货"],
 				typesIndex: 0,
 				deptList: {
-					salePlanTypeKey: 0,
-					grainKey: 0,
-					gradeKey: 0,
-					packingTypeKey: 0,
-					freightPayerKey: 0,
+					// salePlanTypeKey: 0,
+					// grainKey: 0,
+					// gradeKey: 0,
+					// packingTypeKey: 0,
+					// freightPayerKey: 0,
 					priceType: "定价采购",
+					priceTypeKey: 2,
 					procurementPlanType: "现货",
+					procurementPlanTypeKey: 1,
 					grain: "",
 					grade: "",
-					outputYear: "",
+					// outputYear: "",
 					packingType: "",
 					freightPayer: "",
 				},

pageD/myRelease/sellGrain.vue

@@ -202,12 +202,13 @@
 				typesIndex: 0,
 				deptList: {
 					salePlanType: '现货',
-					salePlanTypeKey: 0,
-					grainKey: 0,
-					gradeKey: 0,
-					packingTypeKey: 0,
-					freightPayerKey: -1,
+					salePlanTypeKey: 1,
+					// grainKey: 0,
+					// gradeKey: 0,
+					// packingTypeKey: 0,
+					// freightPayerKey: -1,
 					priceType: "定价销售",
+					priceTypeKey: 2,
 					 grain: "",
 					grade: "一等品",
 					packingType: "散装",

pageD/warehousings/ex_warehouse.vue

@@ -503,13 +503,12 @@
 						return
 					}
 				}
-				if (this.list.bulkDensity && this.list.bulkDensity < 1 || this.list.bulkDensity && this.list.bulkDensity >
-					40) {
+				if(this.list.bulkDensity&&this.list.bulkDensity<500||this.list.bulkDensity&&this.list.bulkDensity>1000){
 					this.$api.msg('容重输入错误')
 					return
 				}
-				if (this.list.bulkDensity && this.list.bulkDensity.indexOf('.') != -1) {
-					if (this.list.bulkDensity.split('.')[1].length > 2) {
+				if(this.list.bulkDensity&&this.list.bulkDensity.indexOf('.')!=-1){
+					if(this.list.bulkDensity.split('.')[1].length>2){
 						this.$api.msg('容重输入错误')
 						return
 					}

pageD/warehousings/warehousings.vue

@@ -78,7 +78,7 @@
 				<view class="c-row b-b">
 					<text class="tit">入库类型 </text>
 					<picker @change="ruChange" :value="ruIndex" :range="ruType" class="con-list">
-						<view >
+						<view v-model="WarehouseInOutInfo.inOutType">
 							 {{ruIndex > -1?ruType[ruIndex]:'请选择入库类型'}} 
 						</view>
 					</picker>
@@ -211,6 +211,8 @@ import upload from '@/components/upload.vue';
 					pcFlag: 0,
 					contractNo: {},
 					carNo: {},
+					inOutType:'采购入库',
+					inOutTypeKey:1,
 				},
 				WarehouseInOutInfo1: {
 					contractNo: {},
@@ -219,7 +221,7 @@ import upload from '@/components/upload.vue';
 				pinIndex: -1,
 				pinTypes: '',
 				pinType: ['一等品', '二等品', '三等品', '等外'],
-				ruIndex: -1,
+				ruIndex: 0,
 				rutypes: '',
 				warehouse:[],
 				warehouseIndex:-1,
@@ -338,8 +340,9 @@ import upload from '@/components/upload.vue';
 					if(this.WarehouseInOutInfo.inOutTypeKey != null){
 						this.ruIndex = this.WarehouseInOutInfo.inOutTypeKey 
 					}
-					
-					this.WarehouseInOutInfo.deductionAmount = Math.abs(res.data.data.deductionAmount) 
+					if(this.WarehouseInOutInfo.deductionAmount!=null){
+						this.WarehouseInOutInfo.deductionAmount = Math.abs(res.data.data.deductionAmount) 
+					}
 				})
 				.catch(res => {
 					if(res.errmsg){