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

config/index.js

@@ -1,8 +1,8 @@
 const dev = {
 	// baseUrlNew: 'http://192.168.1.122:9100/',
 	baseUrl: 'https://www.zthymaoyi.com',
-	// baseUrlNew: 'http://192.168.1.120:8090/',
-	baseUrlNew: 'http://api.eliangeyun.com/',
+	baseUrlNew: 'http://192.168.1.120:8090/',
+	  // baseUrlNew: 'http://api.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pageA/product/business_buy.vue

@@ -164,7 +164,7 @@
 					bankNameIndex:0,
 					packingIndex:0,
 					invoiceIndex:0,
-					packingType: ['散袋(默认)','大袋','小袋'],
+					packingType: ['散粮','大袋','小袋'],
 					// invoiceType: ['不开发票', '普通发票', '增值税发票'],
 					invoiceType: ['不开发票','增值税发票'],
 					acceptType: ['第三方检验（国家检验资质）', '交收地库或港出具的检验', '现场看货','其他'],

pageB/contract/collectLook.vue

@@ -167,7 +167,7 @@
 						this.goods.goodsName + '&tranCarNo=' + tranCarNo,
 
 					url: `/pageB/contract/contract_detail?contractNo=` + this.goods.contractNo + '&goodsName=' +
-						this.goods.goodsName + '&tranCarNo=' + tranCarNo + '&palnId=' + this.planId
+						this.goods.goodsName + '&tranCarNo=' + tranCarNo + '&planId=' + this.planId
 
 				})
 			},

pageB/contract/contract.vue

@@ -252,7 +252,7 @@
 			},
 			commit1(item) {
 				uni.navigateTo({
-					url: `/pageB/contract/look?id=${item.id}&contractNo=${item.contractNo}&contracter=${item.contracter}&goodsName=${item.goodsName}`
+					url: `/pageB/contract/look?id=${item.id}&planId=${item.planId}&contractNo=${item.contractNo}&contracter=${item.contracter}&goodsName=${item.goodsName}`
 				})
 			},
 			commit2(item) {

pageB/contract/contract_detail.vue

@@ -178,17 +178,15 @@
 						return new Date()
 					}
 				},	
-			onShow() {
-			},
+			// onShow() {
+			// },
 			onLoad(option) {
-				this.goods.planId=option.planId
-				this.goodsName=option.goodsName
+				this.goods.planId = option.planId
+				this.goodsName = option.goodsName
 				this.contractNo = option.contractNo
-				this.goods.goodsName=option.goodsName
+				this.goods.goodsName = option.goodsName
 				this.goods.contractNo = option.contractNo
-				this.goods.tranCarNo=option.tranCarNo
-				console.log(this.goods.tranCarNo)
-				
+				this.goods.tranCarNo = option.tranCarNo
 			},
 			methods: {
 				 DateChange(e) {

pageB/contract/look.vue

@@ -182,13 +182,10 @@
 				} else if (this.carlist.length < 1000 && this.carlist.length > 99) {
 					tranCarNo = 'C' + (this.carlist.length + 1)
 				}
+				var that = this
 				uni.navigateTo({
-
-					url: `/pageB/contract/contract_detail?contractNo=` + this.goods.contractNo + '&goodsName=' +
-						this.goods.goodsName + '&tranCarNo=' + tranCarNo,
-
-					url: `/pageB/contract/contract_detail?contractNo=`+this.goods.contractNo+'&goodsName='+this.goods.goodsName+'&tranCarNo='+tranCarNo+'&palnId='+this.planId
-
+					url: `/pageB/contract/contract_detail?contractNo=`
+					+that.goods.contractNo+'&goodsName='+that.goods.goodsName+'&tranCarNo='+tranCarNo+'&planId='+that.planId
 				})
 			},
 			confirmunload(item) {

pageD/identity/companyIdentityLook.vue

@@ -35,8 +35,6 @@
 				<image v-bind:src="idlow" class="picture"></image>
 			</view>
 			<view class="personalcss">
-				
-			
 			<view class="c-row b-b">
 				<text class="tit">姓名</text>
 				<view class="con-list">

pageD/myRelease/buyGrain.vue

@@ -212,9 +212,9 @@
 					freightPayerKey: 0,
 					priceType: "定价采购",
 					procurementPlanType: "现货",
-					grain: "塔粮",
+					grain: "",
 					grade: "",
-					outputYear: "2020",
+					outputYear: "",
 					packingType: "",
 					freightPayer: "",
 				},

pageD/myRelease/sellGrain.vue

@@ -208,7 +208,7 @@
 					packingTypeKey: 0,
 					freightPayerKey: -1,
 					priceType: "定价销售",
-					grain: "塔粮",
+					 grain: "",
 					grade: "一等品",
 					packingType: "散装",
 					freightPayer: "",

pageD/warehousings/ex_warehouse.vue

@@ -304,34 +304,27 @@
 			this.getList(this.WarehouseInOutInfo.id)
 		},
 		onShow() {	
-			this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
-				compId: 'cb271576afa8418fb7a2f328adc1ecc2',
-				warehouseType: 1,
-			}).then(res => {
-				if (res.data.code == 200) {
-					var arr = []
-					for (var i = 0; i < res.data.data.length; i++) {
-						if (res.data.data[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
-							this.warehouseIndex = i
-							this.ids = res.data.data[i].id
+			this.$api.doRequest('get', '/warehouseInOutInfo/selectCompId', {contractNo:this.WarehouseInOutInfo.contractNo,warehouseType:1,}).then(res => {
+				 if(res.data.code==200){
+					this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {
+						compId: res.data.data,
+						warehouseType: 1,
+					}).then(res => {
+						if (res.data.code == 200) {
+							var arr = []
+							for (var i = 0; i < res.data.data.length; i++) {
+								if (res.data.data[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {
+									this.warehouseIndex = i
+									this.ids = res.data.data[i].id
+								}
+								arr.push(res.data.data[i].warehouseName)
+							}
+							this.warehouselist = res.data.data
+							this.warehouse = arr
 						}
-						arr.push(res.data.data[i].warehouseName)
-					}
-					this.warehouselist = res.data.data
-					this.warehouse = arr
-				}
-			})
-			// this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {
-			// 	id: this.ids,
-			// }).then(res => {
-			// 	var arr = []
-			// 	for (var i = 0; i < res.data.data.warehousePositionInfoList.length; i++) {
-			// 		console.log(res.data.data.warehousePositionInfoList[i])
-			// 		arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
-			// 	}
-			// 	this.warehouse1 = arr
-			// 	this.warehouselist11 = res.data.data
-			// })
+					})
+				 }
+			})	
 		},
 		
 		methods: {
@@ -340,8 +333,6 @@
 				this.$api.doRequest('get', '/warehouseInOutInfo/getInfo', {
 						id: id1
 					}).then(res => {
-						
-
 						if(res.data.code == 200){
 							this.WarehouseInOutInfo = res.data.data
 							if (this.WarehouseInOutInfo.warehouseInOutDetail != null ) {
@@ -358,7 +349,6 @@
 								if(this.WarehouseInOutInfo.gradeKey != null){
 									this.pinIndex = this.WarehouseInOutInfo.gradeKey
 								}
-								
 								var positionid
 								for (var i = 0; i < this.warehouselist.length; i++) {
 									if (this.warehouselist[i].warehouseName == this.WarehouseInOutInfo.warehouseName) {

pageD/warehousings/warehousings.vue

@@ -215,7 +215,7 @@ import upload from '@/components/upload.vue';
 					contractNo: {},
 					carNo: {},
 				},
-				pinIndex: '一等品',
+				pinIndex: 0,
 				pinTypes: '',
 				pinType: ['一等品', '二等品', '三等品', '等外'],
 				ruIndex: '采购入库',
@@ -237,7 +237,7 @@ import upload from '@/components/upload.vue';
 					month: true,
 					day: true,
 				},
-				show:false
+				show:false,
 			}
 		},
 		computed: {
@@ -264,19 +264,23 @@ import upload from '@/components/upload.vue';
 				}
 			},
 			onShow(){
-				this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {compId:'cb271576afa8418fb7a2f328adc1ecc2',warehouseType:1,}).then(res => {
-				 if(res.data.code==200){
-					 var arr=[]
-					 for(var i=0;i<res.data.data.length;i++){
-						 if(res.data.data[i].warehouseName==this.WarehouseInOutInfo.warehouseName){
-							 this.warehouseIndex=i
-						 }
-						 arr.push(res.data.data[i].warehouseName)
+				this.$api.doRequest('get', '/warehouseInOutInfo/selectCompId', {contractNo:this.WarehouseInOutInfo.contractNo,warehouseType:1,}).then(res => {
+					 if(res.data.code==200){
+						 this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {compId:res.data.data,warehouseType:1,}).then(res => {
+						 	 if(res.data.code==200){
+						 		 var arr=[]
+						 		 for(var i=0;i<res.data.data.length;i++){
+						 			 if(res.data.data[i].warehouseName==this.WarehouseInOutInfo.warehouseName){
+						 				 this.warehouseIndex=i
+						 			 }
+						 			 arr.push(res.data.data[i].warehouseName)
+						 		 }
+						 		 this.warehouselist=res.data.data
+						 		 this.warehouse=arr
+						 	 }
+						 })
 					 }
-					 this.warehouselist=res.data.data
-					 this.warehouse=arr
-				 }
-			})
+				})	
 			},
 		onLoad(option) {
 			this.WarehouseInOutInfo.contractNo = option.contractNo
@@ -302,7 +306,6 @@ import upload from '@/components/upload.vue';
 				this.$api.doRequest('get','/warehouseInOutInfo/getInfo',{id:id1}).then(res => {
 					
 					that.WarehouseInOutInfo = res.data.data
-					console.log(that.WarehouseInOutInfo.warehouseInOutDetail != null)
 					if( that.WarehouseInOutInfo.warehouseInOutDetail != null){
 						that.list = that.WarehouseInOutInfo.warehouseInOutDetail
 					} 
@@ -330,7 +333,6 @@ import upload from '@/components/upload.vue';
 				this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {id:id,}).then(res => {
 					var arr=[]
 					for(var i=0;i<res.data.data.warehousePositionInfoList.length;i++){
-						console.log(res.data.data.warehousePositionInfoList[i])
 						arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
 					}
 					this.warehouse1=arr
@@ -501,7 +503,6 @@ import upload from '@/components/upload.vue';
 						})
 					}
 					uni.hideLoading()
-					
 				}).catch(res => {
 					uni.showToast({
 						title: res.data.message,