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
 }

main.js

@@ -204,7 +204,10 @@ const doRequest = (method, url, data,header)=> {
                     resolve(result)
                 },
                 fail: function(e) {
-                    console.log('error in...')
+                    console.log('error in...',e)
+					uni.showToast({
+						title:e
+					})
                     // reject调用后，即可传递到调用方使用catch或者async+await同步方式进行处理逻辑
                     reject(e)
                 },

pageD/warehousings/warehousings.vue

@@ -34,14 +34,14 @@
 					<text class="tit">毛重（吨）</text>
 					<view style="color: #ff0000; padding-left: 10rpx;">*</view>
 					<view class="con-list">
-						<input placeholder-style="font-size:14px" placeholder="请输入毛重" name="input" v-model="WarehouseInOutInfo.grossWeight" @input="grossWeightInput"></input>
+						<input placeholder-style="font-size:14px" style="font-size: 14px;" placeholder="请输入毛重" name="input" v-model="WarehouseInOutInfo.grossWeight" @input="grossWeightInput"></input>
 					</view>
 				</view>
 				<view class="c-row b-b">
 					<view class="tit">皮重（吨）</view>
 					<view style="color: #ff0000; padding-left: 10rpx;">*</view>
 					<view class="con-list">
-						<input placeholder-style="font-size:14px" placeholder="请输入皮重" name="input" v-model="WarehouseInOutInfo.tare"
+						<input placeholder-style="font-size:14px" style="font-size: 14px;" placeholder="请输入皮重" name="input" v-model="WarehouseInOutInfo.tare"
 							@input="tareInput"></input>
 					</view>
 				</view>
@@ -78,7 +78,8 @@
 					<text class="tit">入库类型 </text>
 					<picker @change="ruChange" :value="ruIndex" :range="ruType" class="con-list">
 						<view >
-							{{ruIndex>-1?ruType[ruIndex]:'请选择入库类型'}}
+							{{ruIndex > -1?ruType[ruIndex]:'请选择入库类型'}} 
+							
 						</view>
 					</picker>
 				</view>
@@ -97,7 +98,7 @@
 				<view class="c-row b-b">
 					<text class="tit">入库日期</text>
 					
-					<view class="con-list" @click="show = true">{{WarehouseInOutInfo.inOutDate!=''?WarehouseInOutInfo.inOutDate:time1}}</view>
+					<view class="con-list" @click="show = true">{{WarehouseInOutInfo.inOutDate!=null?WarehouseInOutInfo.inOutDate:time1}}</view>
 					<u-picker  :params='params' :default-time='time' @confirm="DateChange" v-model="show" mode="time"></u-picker>
 					
 				</view>
@@ -218,7 +219,7 @@ import upload from '@/components/upload.vue';
 				pinIndex: 0,
 				pinTypes: '',
 				pinType: ['一等品', '二等品', '三等品', '等外'],
-				ruIndex: '采购入库',
+				ruIndex: -2,
 				rutypes: '',
 				warehouse:[],
 				warehouseIndex:-1,
@@ -266,7 +267,9 @@ import upload from '@/components/upload.vue';
 			onShow(){
 				this.$api.doRequest('get', '/warehouseInOutInfo/selectCompId', {contractNo:this.WarehouseInOutInfo.contractNo,warehouseType:1,}).then(res => {
 					 if(res.data.code==200){
+						 console.log("selectCompId",res.data)
 						 this.$api.doRequest('get', '/warehouseBaseInfo/selectWarehouse', {compId:res.data.data,warehouseType:1,}).then(res => {
+							console.log("selectWarehouse",res.data)
 						 	 if(res.data.code==200){
 						 		 var arr=[]
 						 		 for(var i=0;i<res.data.data.length;i++){
@@ -275,22 +278,26 @@ import upload from '@/components/upload.vue';
 						 			 }
 						 			 arr.push(res.data.data[i].warehouseName)
 						 		 }
+								 this.warehouse = arr
+								 console.log(arr,this.warehouseIndex)
 						 		 this.warehouselist=res.data.data
 								 for(var i=0;i<this.warehouselist.length;i++){
 								 	if(this.warehouselist[i].warehouseName==this.WarehouseInOutInfo.warehouseName){
 								 		var id=this.warehouselist[i].id
 										this.$api.doRequest('get', '/warehouseBaseInfo/getWarehouse', {id:id,}).then(res => {
 											var arr=[]
-											for(var i=0;i<res.data.data.warehousePositionInfoList.length;i++){
+											for(var i=0;i<res.data.data.warehousePositionInfoList.length;i++)
+											{
+												if(res.data.data.warehousePositionInfoList[i].binNumber==this.WarehouseInOutInfo.binNumber){
+													this.warehouseIndex1=i
+												}
 												arr.push(res.data.data.warehousePositionInfoList[i].binNumber)
 											}
 											this.warehouse1=arr
 											this.warehouselist11=res.data.data
 										})
-										break;
 								 	}
 								 }
-								
 						 		 this.warehouse=arr
 						 	 }
 						 })
@@ -306,6 +313,9 @@ import upload from '@/components/upload.vue';
 			this.WarehouseInOutInfo.warehouseName = option.warehouseName
 			this.WarehouseInOutInfo.id = option.id
 			this.WarehouseInOutInfo.carNo = option.carNo
+			this.WarehouseInOutInfo.addressUrl = option.addressUrl
+			this.WarehouseInOutInfo.binNumber = option.binNumber
+			this.WarehouseInOutInfo.inOutDate = option.inOutDate
 			var date=new Date()
 			var year=date.getFullYear()
 			var month=date.getMonth()
@@ -314,6 +324,7 @@ import upload from '@/components/upload.vue';
 				month="0"+(month+1)
 			}
 			this.time = year+'-'+month+"-"+date1
+			this.getList(this.WarehouseInOutInfo.id)
 		},
 		methods: {
 			getList(id1){
@@ -325,7 +336,7 @@ import upload from '@/components/upload.vue';
 						that.list = that.WarehouseInOutInfo.warehouseInOutDetail
 					} 
 					this.pinIndex = this.WarehouseInOutInfo.gradeKey
-				this.ruIndex = this.WarehouseInOutInfo.inOutTypeKey 
+					this.ruIndex = this.WarehouseInOutInfo.inOutTypeKey 
 					this.WarehouseInOutInfo.deductionAmount = Math.abs(res.data.data.deductionAmount) 
 				})
 				.catch(res => {
@@ -359,11 +370,12 @@ import upload from '@/components/upload.vue';
 				this.warehouseIndex1=e.detail.value
 				this.WarehouseInOutInfo.binNumberKey = this.warehouseIndex1
 				this.WarehouseInOutInfo.binNumber = this.warehouse1[this.warehouseIndex1]
-				for (var i = 0; i < this.binNumber.length; i++) {
-					if(this.binNumber[i].binNumber==this.warehouse1[this.warehouseIndex1]){
-						this.WarehouseInOutInfo.baseId=this.binNumber[i].baseId
-					}
-				}
+				// for (var i = 0; i < this.WarehouseInOutInfo.binNumber.length; i++) {
+				// 	if(this.binNumber[i].binNumber==this.warehouse1[this.warehouseIndex1]){
+				// 		this.WarehouseInOutInfo.baseId=this.binNumber[i].baseId
+				// 	}
+				// }
+	
 			},
 			DateChange(e) {
 				this.WarehouseInOutInfo.inOutDate=e.year+'-'+e.month+'-'+e.day
@@ -655,6 +667,12 @@ import upload from '@/components/upload.vue';
 				this.WarehouseInOutInfo.warehouseInOutDetail = this.list
 				this.WarehouseInOutInfo.statusFlag = 3
 				this.WarehouseInOutInfo.pcFlag = 0
+				debugger
+				for(let i = 0 ;i < this.warehouselist.length ; i++){
+					if(this.warehouselist[i].warehouseName == this.WarehouseInOutInfo.warehouseName){
+						this.WarehouseInOutInfo.baseId = this.warehouselist[i].id
+					}
+				}
 				this.WarehouseInOutInfo.taskType = "入库任务"
 				uni.showLoading({
 					title:"正在提交"

pages/task/my_task.vue

@@ -200,7 +200,7 @@
 				})
 				}else{
 					uni.navigateTo({
-						url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}`
+						url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}`
 					})
 				}
 			}else if(item.taskType == "出库任务"){

websocket_sdk.js

@@ -15,6 +15,7 @@ export default class Websocket {
         // 心跳检测频率
         this._timeout = 3000;
         this._timeoutObj = null;
+        this._timeoutObj1 = null;
         // 当前重连次数
         this._connectNum = 0;
         // 心跳检测和断线重连开关，true为启用，false为关闭
@@ -26,6 +27,7 @@ export default class Websocket {
     // 心跳重置
     _reset() {
         clearTimeout(this._timeoutObj);
+        clearTimeout(this._timeoutObj1);
         return this;
     }
     // 心跳开始
@@ -34,9 +36,11 @@ export default class Websocket {
         this._timeoutObj = setInterval(() => {
             //发送心跳
             _this.sendHeartbeatData(options);
-			_this.getTips()
 			_this.getInfo()
         }, this._timeout);
+		this._timeoutObj1 = setInterval(() => {
+			_this.getTips()
+		}, 1000*60);
     }
     // 监听websocket连接关闭
     onSocketClosed(options) {