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

pages/erp/receivingfeedback/details.vue

@@ -468,6 +468,7 @@
 					}else{
 						this.freightspace=this.detailData.carInfoList
 					}
+					
 				}else if(status==1){
 					if(this.carNo==''){
 						var arr=this.detailData.tranCarInfoList
@@ -483,6 +484,23 @@
 					}
 					this.freightspace=arr.filter((item)=>{return item.status!='已送达'})
 				}
+				if(this.detailData.tranType=="汽运"){
+					for (var i = 0; i < this.freightspace.length; i++) {
+						this.imgUrl[i]=[]
+						this.freightspace[i].show2=false
+						if(this.freightspace[i].unloadPoundImg){
+							if(this.freightspace[i].unloadPoundImg){
+								var arr1=this.freightspace[i].unloadPoundImg.split(",")
+								for (var q = 0; q < arr1.length; q++) {
+									if(arr1[q]!=''){
+										this.imgUrl[i].push({url:arr1[q]})
+									}
+								}
+							}
+						}
+					}
+				}
+				
 			},
 			shadeshow(url){
 				this.imgShow=true
@@ -527,9 +545,9 @@
 					that.$api.doRequest('post', '/tranCarInfo/api/feedbackTranCar', tranProcessInfo).then(res => {
 						if (res.data.code == 200) {
 							that.$api.msg('保存成功')
-							that.detailData = {}
-							that.freightspace = {}
-							uni.navigateBack({})
+							// that.detailData = {}
+							// that.freightspace = {}
+							// uni.navigateBack({})
 						}
 					})
 							// }
@@ -590,9 +608,9 @@
 					that.$api.doRequest('post', '/tranCarInfo/api/feedbackTranCar', tranProcessInfo).then(res => {
 						if (res.data.code == 200) {
 							that.$api.msg('保存成功')
-							that.detailData = {}
-							that.freightspace = {}
-							uni.navigateBack({})
+							// that.detailData = {}
+							// that.freightspace = {}
+							// uni.navigateBack({})
 						}
 					})
 				}else if(this.detailData.tranType=='汽运'){
@@ -626,14 +644,15 @@
 					tranProcessInfo.unloadNetWeight = that.freightspace[index].unloadNetWeight
 					tranProcessInfo.receiveDateEnd = that.freightspace[index].receiveDateEnd
 					tranProcessInfo.unloadPoundImg = that.freightspace[index].unloadPoundImg
+					tranProcessInfo.contractPrice = that.freightspace[index].contractPrice
 					tranProcessInfo.tranType = status
 					tranProcessInfo.contractNo = that.detailData.contractNo
 					that.$api.doRequest('post', '/tranCarInfo/api/feedbackTranCar', tranProcessInfo).then(res => {
 						if (res.data.code == 200) {
 							that.$api.msg('保存成功')
-							that.detailData = {}
-							that.freightspace = {}
-								uni.navigateBack()
+							// that.detailData = {}
+							// that.freightspace = {}
+								// uni.navigateBack()
 						}
 					})
 				}
@@ -871,6 +890,7 @@
 				}
 			},
 			getList() {
+				this.imgUrl=[]
 				uni.showLoading({
 					title:'加载中'
 				})
@@ -901,15 +921,16 @@
 								}
 							}
 						}else if(res.data.data.tranType=='汽运'){
-							for (var i = 0; i < res.data.data.tranCarInfoList.length; i++) {
+							var arr=this.carNo?res.data.data.carInfoList:res.data.data.tranCarInfoList
+							for (var i = 0; i < arr.length; i++) {
 								this.imgUrl[i]=[]
-								res.data.data.tranCarInfoList[i].show2=false
-								if(res.data.data.tranCarInfoList[i].unloadPoundImg){
-									if(res.data.data.tranCarInfoList[i].unloadPoundImg){
-										var arr=res.data.data.tranCarInfoList[i].unloadPoundImg.split(",")
-										for (var q = 0; q < arr.length; q++) {
-											if(arr[q]!=''){
-												this.imgUrl[i].push({url:arr[q]})
+								arr[i].show2=false
+								if(arr[i].unloadPoundImg){
+									if(arr[i].unloadPoundImg){
+										var arr1=arr[i].unloadPoundImg.split(",")
+										for (var q = 0; q < arr1.length; q++) {
+											if(arr1[q]!=''){
+												this.imgUrl[i].push({url:arr1[q]})
 											}
 										}
 									}
@@ -952,7 +973,7 @@
 						}
 						
 					}
-					// console.log(this.imgUrl)
+					console.log(this.imgUrl)
 				})
 			},
 			getImgUrl(res1,res2,res3,res4) {

pages/task/audit/freight_settlement_detailscopy.vue

@@ -206,6 +206,7 @@
 				list: {
 					approveStatus: "",
 				},
+				show:false,
 				auditList:[],
 				dataobj:{},
 				customerName: "", //客户