Browse Source

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

ccjgmwz 3 years ago
parent
commit
51d1da077f

+ 2 - 1
config/index.js

@@ -1,6 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	baseUrlNew: 'http://192.168.1.107:8090/',
 	// baseUrlNew: 'http://192.168.1.122:9100/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

+ 561 - 113
pages/erp/deliveryfeedback/details.vue

@@ -1,89 +1,97 @@
 <template>
 	<view class="wrap">
-		<view class="content">
-			<view class="row">
-				<view class="left">任务编号</view>
-				<view>{{detailData.processNo}}</view>
-			</view>
-			<view class="row">
-				<view class="left">货名</view>
-				<view>{{detailData.goodsName}}</view>
-			</view>
-			<view class="row">
-				<view class="left">重量</view>
-				<view>{{detailData.weight}}</view>
-			</view>
-			<view class="row">
-				<view class="left">发货地址</view>
-				<view>{{detailData.sendPrivate}}{{detailData.sendCity}}{{detailData.sendArea}}</view>
-			</view>
-			<view class="row">
-				<view class="left">发货人</view>
-				<view>{{detailData.sender}}</view>
-			</view>
-			<view class="row">
-				<view class="left">发货人电话</view>
-				<view>{{detailData.senderPhone}}</view>
-			</view>
-			<view class="row">
-				<view class="left">收货地址</view>
-				<view>{{detailData.receivePrivate}}{{detailData.receiveCity}}{{detailData.receiveArea}}</view>
-			</view>
-			<view class="row">
-				<view class="left">收货人</view>
-				<view>{{detailData.receiver}}</view>
-			</view>
-			<view class="row">
-				<view class="left">收货人电话</view>
-				<view>{{detailData.receiverPhone}}</view>
-			</view>
-			<view class="row">
-				<view class="left">发货日期</view>
-				<view>{{detailData.deliveryDateStart}}</view>
-			</view>
-			<view class="row">
-				<view class="left">最晚到货日期</view>
-				<view>{{detailData.deliveryDateEnd}}</view>
-			</view>
-			<view class="row">
-				<view class="left">合同编号</view>
-				<view>{{detailData.contractNo}}</view>
-			</view>
-			<view class="row">
-				<view class="left">运输方式</view>
-				<view>{{detailData.tranType}}</view>
+		<view>
+			<view style='margin-left:10px;'>任务详情</view>
+			<view class="content">
+				<view class="row">
+					<view class="left">任务编号</view>
+					<view>{{detailData.processNo}}</view>
+				</view>
+				<view class="row">
+					<view class="left">货名</view>
+					<view>{{detailData.goodsName}}</view>
+				</view>
+				<view class="row">
+					<view class="left">重量</view>
+					<view>{{detailData.weight}}</view>
+				</view>
+				<view class="row">
+					<view class="left">发货地址</view>
+					<view>{{detailData.sendPrivate}}{{detailData.sendCity}}{{detailData.sendArea}}</view>
+				</view>
+				<view class="row">
+					<view class="left">发货人</view>
+					<view>{{detailData.sender}}</view>
+				</view>
+				<view class="row">
+					<view class="left">发货人电话</view>
+					<view>{{detailData.senderPhone}}</view>
+				</view>
+				<view class="row">
+					<view class="left">收货地址</view>
+					<view>{{detailData.receivePrivate}}{{detailData.receiveCity}}{{detailData.receiveArea}}</view>
+				</view>
+				<view class="row">
+					<view class="left">收货人</view>
+					<view>{{detailData.receiver}}</view>
+				</view>
+				<view class="row">
+					<view class="left">收货人电话</view>
+					<view>{{detailData.receiverPhone}}</view>
+				</view>
+				<view class="row">
+					<view class="left">发货日期</view>
+					<view>{{detailData.deliveryDateStart}}</view>
+				</view>
+				<view class="row">
+					<view class="left">最晚到货日期</view>
+					<view>{{detailData.deliveryDateEnd}}</view>
+				</view>
+				<view class="row">
+					<view class="left">合同编号</view>
+					<view>{{detailData.contractNo}}</view>
+				</view>
+				<view class="row">
+					<view class="left">运输方式</view>
+					<view>{{detailData.tranType}}</view>
+				</view>
 			</view>
 		</view>
-		<view v-if='detailData.tranType=="火运"' class="content">
-			<view class="row">
-				<view class="left">姓名</view>
-				<view>{{detailData.driver}}</view>
-			</view>
-			<view class="row">
-				<view class="left">电话</view>
-				<view>{{detailData.driverPhone}}</view>
-			</view>
-			<view class="row">
-				<view class="left">发车日期</view>
-				<view>
-					<view @click='show1=true'>{{detailData.sendDateStart}}</view>
-					<u-picker v-model="show1" mode="time" @confirm='dateChange($event)' :params="params">
-					</u-picker>
+		
+		<view>
+			<view v-if='detailData.tranType=="火运"' style='margin-left:10px;'>联络员及车次</view>
+			<view v-if='detailData.tranType=="火运"' class="content">
+				<view class="row">
+					<view class="left">姓名</view>
+					<view>{{detailData.driver}}</view>
 				</view>
-			</view>
-			<view class="row">
-				<view class="left">预计到站日期</view>
-				<view> 
-					<view>{{detailData.receiveDateEnd}}</view>
+				<view class="row">
+					<view class="left">电话</view>
+					<view>{{detailData.driverPhone}}</view>
 				</view>
-			</view>
-			<view class="row">
-				<view class="left">车型</view>
-				<view> 
-					<view>{{detailData.carModel}}</view>
+				<view class="row">
+					<view class="left">发车日期</view>
+					<view>
+						<view @click='show1=true'>{{detailData.sendDateStart}}</view>
+						<u-picker v-model="show1" mode="time" @confirm='dateChange($event)' :params="params">
+						</u-picker>
+					</view>
+				</view>
+				<view class="row">
+					<view class="left">预计到站日期</view>
+					<view> 
+						<view>{{detailData.receiveDateEnd}}</view>
+					</view>
+				</view>
+				<view class="row">
+					<view class="left">车型</view>
+					<view> 
+						<view>{{detailData.carModel}}</view>
+					</view>
 				</view>
 			</view>
 		</view>
+		
 		<view v-if='detailData.tranType=="船运"' class="content">
 			<view class="row">
 				<view class="left">姓名</view>
@@ -149,8 +157,9 @@
 				</view>
 				<view class="row">
 					<view class="left">磅单</view>
-					<view v-if="item.loadPoundImg">
-						<image style='width:100px;height:100px;' :src="item.loadPoundImg" mode=""></image>
+					<view v-if="item.status == '已装车' || item.status == '已送达'">
+						<image v-if="item.loadPoundImg"  @click='shadeshow(item.loadPoundImg)' style='width:100px;height:100px;' :src="item.loadPoundImg" mode=""></image>
+						<view v-else>暂无图片</view>
 					</view>
 					<view v-else>
 						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1" :file-list="imgUrl"
@@ -162,13 +171,13 @@
 					<view class="left">装车日期</view>
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadingDate}}</view>
-						<view v-else @click='show2=true'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
-						<u-picker v-model="show2" mode="time" @confirm='dateChange1($event,index)' :params="params">
+						<view v-else @click='train(index)'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
+						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,item)' :params="params">
 						</u-picker>
 					</view>
 				</view>
 				<view style='text-align:right;' v-if="item.status == '已装车' || item.status == '已送达'">{{item.status}}</view>
-				<u-button v-else @click='submit(index)' type="success">提交</u-button>
+				<u-button v-else @click='submit(index,2)' type="success">保存</u-button>
 			</view>
 		</view>
 		<view v-if='detailData.tranType=="汽运"'>
@@ -202,15 +211,15 @@
 					<view class="left">装车日期</view>
 					<view>
 						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadingDate}}</view>
-						<view v-else @click='show2=true'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
-						<u-picker v-model="show2" mode="time" @confirm='dateChange1($event,index)' :params="params">
+						<view v-else @click='train(index)'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
+						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,index)' :params="params">
 						</u-picker>
 					</view>
 				</view>
 				<view class="row">
 					<view class="left">磅单</view>
 					<view v-if="item.loadPoundImg">
-						<image style='width:100px;height:100px;' :src="item.loadPoundImg" mode=""></image>
+						<image style='width:100px;height:100px;' @click='shadeshow(item.loadPoundImg)' :src="item.loadPoundImg" mode=""></image>
 					</view>
 					<view v-else>
 						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1" :file-list="imgUrl"
@@ -228,18 +237,97 @@
 				</view>
 				<view v-if="item.signStatus == '未签合同'">未签合同</view>
 				<view v-if="item.signStatus == '已签合同'">已签合同</view>
-				<u-button v-if="item.status != '已装车' && item.status != '已送达'" @click='submit(index)' type="success">保存</u-button>
+				<u-button v-if="item.status != '已装车' && item.status != '已送达'" @click='submit(index,1)' type="success">保存</u-button>
 			</view>
 		</view>
 		<view v-if='detailData.tranType=="船运"'>
-			<view style='margin-left:10px;'>装详情</view>
+			<view style='margin-left:10px;'>装详情</view>
 			<view v-for='(item,index) in freightspace' class="content">
+				<view v-if="item.shipType == '集装箱'" class="row">
+					<view class="left">集装箱-{{index+1}}</view>
+					<view v-if="item.status == '未装车'">未装船</view>
+					<view v-if="item.status == '已装车'">已装船</view>
+					<view v-if="item.status == '已送达'">{{item.status}}</view>
+				</view>
+				<view v-if="item.shipType == '散船'" class="row">
+					<view class="left">仓位号-{{index+1}}</view>
+					<view v-if="item.status == '未装车'">未装船</view>
+					<view v-if="item.status == '已装车'">已装船</view>
+					<view v-if="item.status == '已送达'">{{item.status}}</view>
+				</view>
+				<view v-if="item.shipType == '集装箱'" class="row">
+					<view class="left">箱号</view>
+					<view style='text-align:right;'>
+						<view  v-if="item.status == '已装车' || item.status == '已送达'">{{item.caseNo}}</view>
+						<input v-else placeholder="请输入箱号" v-model='item.caseNo' type="text">
+					</view>
+				</view>
+				<view v-if="item.shipType == '集装箱'" class="row">
+					<view class="left">封号</view>
+					<view style='text-align:right;'>
+						<view  v-if="item.status == '已装车' || item.status == '已送达'">{{item.titleNo}}</view>
+						<input v-else placeholder="请输入封号" v-model='item.titleNo' type="text">
+					</view>
+				</view>
+				<view v-if="item.shipType == '散船'" class="row">
+					<view class="left">仓位号</view>
+					<view>
+						<view>{{item.binNumber}}</view>
+					</view>
+				</view>
+				<view v-if="item.shipType == '散船'" class="row">
+					<view class="left">计划重量</view>
+					<view>
+						<view>{{item.positionWeight}}</view>
+					</view>
+				</view>
 				<view class="row">
-					<view class="left">司机-{{index+1}}</view>
-					<view>{{item.status}}</view>
+					<view class="left">装船净重</view>
+					<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadNetWeight}}</view>
+					<view style='text-align:right;' v-else>
+						<input  v-model='item.loadNetWeight' class="right-bottom"
+					placeholder="输入毛重"></input>
+					</view>
+				</view>
+				<view class="row">
+					<view class="left">装船日期</view>
+					<view>
+						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.loadingDate}}</view>
+						<view v-else @click='train(index)'>{{item.loadingDate?item.loadingDate:'请选择日期'}}</view>
+						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,index)' :params="params">
+						</u-picker>
+					</view>
+				</view>
+				<view style='text-align:right;' v-if="item.status == '已装车' || item.status == '已送达'">{{item.status}}</view>
+				<u-button v-else @click='submit(index,3)' type="success">保存</u-button>
+			</view>
+			<view class="row">
+				<view style='margin-left:10px;' class="left">运单</view>
+				<view v-if="pictureTotal.length>0">
+					<image  v-for='item in pictureTotal' @click='shadeshow(item)' style='width:100px;height:100px;' :src="item" mode=""></image>
+				</view>
+				<view v-else>
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1" :file-list="imgUrl"
+						:size-type="['compressed']"  @on-success="getImgUrl1" @on-error="onError" @on-remove="onRemove"
+						@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
 				</view>
 			</view>
 		</view>
+		<view>合计吨:{{ total }}/{{ detailData.weight }}
+			<text style='margin-left:10px;'
+			class="noservice"
+			v-show="detailData.receivingStatus == '执行中'">未完货</text>
+			<text
+			class="service"
+			v-show="detailData.receivingStatus == '已完货'">{{ detailData.receivingStatus }}</text>
+		</view>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button  @click='pass' type="error" class="btn1" hover-class='none'>提交</u-button>
+			<u-button  @click='finishedgoods' type="success" class="btn2">完货</u-button>
+		</view>
+		<view @click='imgShow=false' v-if="imgShow" class="shade">
+			<image style='position:absolute;top:0;left:0;right:0;bottom:0;margin:auto;' :src="url" mode=""></image>
+		</view>
 	</view>
 </template>
 
@@ -263,6 +351,7 @@
 				maxSize: 50 * 1024 * 1024,
 				status: '执行中',
 				positionName: '',
+				pictureTotal:[],
 				statusList: [
 					{name:'执行中',value:1},
 					{name:'已完货',value:2},
@@ -274,12 +363,16 @@
 					day: true,
 				},
 				imgUrl:[],
+				unloadPoundImg:'',
 				action: this.$uploadUrl,
 				freightspace:[],
 				feedbackFlag:1,
 				detailData:{},
 				allWarehouse: [],
-				showTime: ''
+				showTime: '',
+				index:0,
+				imgShow:false,
+				url:''
 			}
 		},
 		onLoad(options) {
@@ -288,9 +381,25 @@
 		onShow() {
 			this.getList()
 		},
-		
+		computed: {
+		    total: function () {
+		      var maxStorage = 0
+			  if(this.detailData.tranCarInfoList){
+				for (var i = 0; i < this.detailData.tranCarInfoList.length; i++) {
+					maxStorage += Number(
+					  this.detailData.tranCarInfoList[i].loadNetWeight
+					)
+				  } 
+			  }
+		      return maxStorage
+		    },
+		 },
 		methods: {
-			submit(index){
+			shadeshow(url){
+				this.imgShow=true
+				this.url=url
+			},
+			submit(index,status){
 				var that = this
 				if(this.detailData.tranType=='火运'){
 					if (!this.freightspace[index].loadNetWeight) {
@@ -308,10 +417,237 @@
 						this.$api.msg('装车日期不能为空!')
 						return
 					}
+					var tranProcessInfo = {}
+					tranProcessInfo.flag=0
+					tranProcessInfo.id=that.freightspace[index].id
+					tranProcessInfo.infoId = that.detailData.infoId
+					tranProcessInfo.processId = that.detailData.id
+					tranProcessInfo.driver = that.detailData.driver
+					tranProcessInfo.driverPhone = that.detailData.driverPhone
+					tranProcessInfo.tranCarNo = that.detailData.tranCarNo
+					tranProcessInfo.carNo = that.detailData.carNo
+					tranProcessInfo.loadNetWeight = that.freightspace[index].loadNetWeight
+					tranProcessInfo.loadingDate = that.freightspace[index].loadingDate
+					tranProcessInfo.loadPoundImg = that.freightspace[index].loadPoundImg
+					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({})
+						}
+					})
+							// }
+						// }
+					// })
+				}else if(this.detailData.tranType=='船运'){
+					if (this.freightspace[index].shipType == '集装箱'&&!this.freightspace[index].caseNo) {
+						this.$api.msg('箱号不能为空!')
+						return
+					}
+					if (
+						this.freightspace[index].shipType == '集装箱'&&this.freightspace[index].caseNo.length > 15 ||
+						this.freightspace[index].shipType == '集装箱'&&this.freightspace[index].caseNo.length < 1) {
+						this.$api.msg('箱号输入错误!')
+						return
+					}
+					if (this.freightspace[index].shipType == '集装箱'&&!this.freightspace[index].titleNo) {
+						this.$api.msg('封号不能为空!')
+						return
+					}
+					if (
+						this.freightspace[index].shipType == '集装箱'&&this.freightspace[index].titleNo.length > 15 ||
+						this.freightspace[index].shipType == '集装箱'&&this.freightspace[index].titleNo.length < 1
+					) {
+						this.$api.msg('封号输入错误!')
+						return
+					}
+					if (!this.freightspace[index].loadNetWeight) {
+						this.$api.msg('装船净重不能为空!')
+						return
+					}
+					if (
+						this.freightspace[index].loadNetWeight < 0 ||
+						this.freightspace[index].loadNetWeight > 10000
+					) {
+						this.$api.msg('装船净重输入错误!')
+						return
+					}
+					if (!this.freightspace[index].loadingDate) {
+						this.$api.msg('装船日期不能为空!')
+						return
+					}
+					var tranProcessInfo = {}
+					tranProcessInfo.flag=0
+					tranProcessInfo.id=that.freightspace[index].id
+					tranProcessInfo.infoId = that.detailData.infoId
+					tranProcessInfo.processId = that.detailData.id
+					tranProcessInfo.driver = that.detailData.driver
+					tranProcessInfo.driverPhone = that.detailData.driverPhone
+					tranProcessInfo.tranCarNo = that.detailData.tranCarNo
+					tranProcessInfo.caseNo = that.freightspace[index].caseNo
+					tranProcessInfo.titleNo = that.freightspace[index].titleNo                    
+					tranProcessInfo.loadNetWeight = that.freightspace[index].loadNetWeight
+					tranProcessInfo.loadingDate = that.freightspace[index].loadingDate
+					tranProcessInfo.loadPoundImg = that.freightspace[index].loadPoundImg
+					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({})
+						}
+					})
+				}else if(this.detailData.tranType=='汽运'){
+					if (!this.freightspace[index].driver) {
+						that.$api.msg('司机姓名不能为空!')
+						return
+					}
+					if (!this.freightspace[index].driverPhone) {
+						that.$api.msg('司机电话不能为空!')
+						return
+					}
+					if (!this.freightspace[index].carNo) {
+						that.$api.msg('车牌号不能为空!')	
+						return
+					}
+					if (!this.freightspace[index].loadNetWeight) {
+						that.$api.msg('装载净重不能为空!')
+						return
+					}
+					var tranProcessInfo = {}
+					tranProcessInfo.flag=0
+					tranProcessInfo.id=that.freightspace[index].id
+					tranProcessInfo.infoId = that.detailData.infoId
+					tranProcessInfo.processId = that.detailData.id
+					tranProcessInfo.driver = that.detailData.driver
+					tranProcessInfo.driverPhone = that.detailData.driverPhone
+					tranProcessInfo.tranCarNo = that.detailData.tranCarNo
+					tranProcessInfo.carNo = that.freightspace[index].carNo
+					tranProcessInfo.caseNo = that.freightspace[index].caseNo
+					tranProcessInfo.titleNo = that.freightspace[index].titleNo                    
+					tranProcessInfo.loadNetWeight = that.freightspace[index].loadNetWeight
+					tranProcessInfo.loadingDate = that.freightspace[index].loadingDate
+					tranProcessInfo.loadPoundImg = that.freightspace[index].loadPoundImg
+					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({})
+						}
+					})
+				}
+			},
+			finishedgoods(){
+				var that = this
+				if(this.detailData.tranType=='火运'){
+					uni.showModal({
+						content: "完货操作后,装车信息不可修改,是否确定完货?",
+						success(res) {
+							if (res.confirm) {
+								that.tranCarInfoList = that.freightspace
+								that.tranCarInfoList.driver = that.detailData.driver
+								that.tranCarInfoList.driverPhone = that.detailData.driverPhone
+								that.tranCarInfoList.tranCarNo = that.detailData.tranCarNo
+								that.tranCarInfoList.carNo = that.detailData.carNo
+								that.tranCarInfoList[0].sendDateStart = that.detailData.sendDateStart
+								that.tranCarInfoList.loadNetWeight = that.detailData.loadNetWeight
+								that.tranCarInfoList.tranType = that.tranType
+								that.tranCarInfoList.loadPoundImg = that.detailData.loadPoundImg
+								            // this.tranCarInfoList.boxNo = this.arr.toString()
+								for (var i = 0; i < that.tranCarInfoList.length; i++) {
+									that.tranCarInfoList[i].id = that.freightspace[i].id
+									if (that.tranCarInfoList[i].temporaryDriverFlag != 0) {
+											that.tranCarInfoList[i].temporaryDriverFlag = 1
+											that.tranCarInfoList[i].tranType = that.tranType
+									}
+								}
+								var tranProcessInfo = {}
+								tranProcessInfo.id = that.detailData.id
+								tranProcessInfo.infoId = that.detailData.infoId
+								tranProcessInfo.processNo = that.detailData.processNo
+								tranProcessInfo.tranPrice = that.detailData.tranPrice
+								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
+								that.$api.doRequest('post', '/tranProcessInfo/api/editFeedbackStatus', tranProcessInfo).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('提交成功')
+										that.detailData = {}
+										that.freightspace = {}
+										uni.navigateBack({})
+									}
+								})
+							}
+						}
+					})
+				}else if(this.detailData.tranType=='船运'){
+					uni.showModal({
+						content: "完货操作后,装船信息不可修改,是否确定完货?",
+						success(res) {
+							if (res.confirm) {
+								var tranProcessInfo = {}
+								tranProcessInfo.id = that.detailData.id
+								that.$api.doRequest('post', '/tranProcessInfo/api/editFeedbackStatus', tranProcessInfo).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('提交成功')
+										that.detailData = {}
+										that.freightspace = {}
+										uni.navigateBack({})
+									}
+								})
+							}
+						}
+					})
+				}else if(this.detailData.tranType=='汽运'){
+					uni.showModal({
+						content: "完货操作后,装车信息不可修改,是否确定完货?",
+						success(res) {
+							if (res.confirm) {
+								var tranProcessInfo = {}
+								tranProcessInfo.id = that.detailData.id
+								that.$api.doRequest('post', '/tranProcessInfo/api/editFeedbackStatus', tranProcessInfo).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('提交成功')
+										that.detailData = {}
+										that.freightspace = {}
+										uni.navigateBack({})
+									}
+								})
+							}
+						}
+					})
+				}
+			},
+			pass(){
+				var that = this
+				if(this.detailData.tranType=='火运'){
+					for(var i=0;i<this.freightspace.length;i++){
+						if (!this.freightspace[i].loadNetWeight) {
+							this.$api.msg('装车净重不能为空!')
+							return
+						}
+						if (
+							this.freightspace[i].loadNetWeight < 0 ||
+							this.freightspace[i].loadNetWeight > 10000
+						) {
+							this.$api.msg('装车净重输入错误!')
+							return
+						}
+						if (!this.freightspace[i].loadingDate) {
+							this.$api.msg('装车日期不能为空!')
+							return
+						}
+					}
 					uni.showModal({
 						content: "提交成功后提醒司机及时签订运输合同,确定提交装车信息?",
 						success(res) {
-							if (res.confirm) { 
+							if (res.confirm) {
 								that.tranCarInfoList = that.freightspace
 								that.tranCarInfoList.driver = that.detailData.driver
 								that.tranCarInfoList.driverPhone = that.detailData.driverPhone
@@ -321,7 +657,81 @@
 								that.tranCarInfoList.loadNetWeight = that.detailData.loadNetWeight
 								that.tranCarInfoList.tranType = that.tranType
 								that.tranCarInfoList.loadPoundImg = that.detailData.loadPoundImg
-								  // this.tranCarInfoList.boxNo = this.arr.toString()
+								            // this.tranCarInfoList.boxNo = this.arr.toString()
+								for (var i = 0; i < that.tranCarInfoList.length; i++) {
+									that.tranCarInfoList[i].id = that.freightspace[i].id
+									if (that.tranCarInfoList[i].temporaryDriverFlag != 0) {
+											that.tranCarInfoList[i].temporaryDriverFlag = 1
+											that.tranCarInfoList[i].tranType = that.tranType
+									}
+								}
+								var tranProcessInfo = {}
+								tranProcessInfo.id = that.detailData.id
+								tranProcessInfo.infoId = that.detailData.infoId
+								tranProcessInfo.processNo = that.detailData.processNo
+								tranProcessInfo.tranPrice = that.detailData.tranPrice
+								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
+								that.$api.doRequest('post', '/tranProcessInfo/api/insertTranCar', tranProcessInfo).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('提交成功')
+										that.detailData = {}
+										that.freightspace = {}
+										uni.navigateBack({
+											
+										})
+									}
+								})
+							}
+						}
+					})
+				}else if(this.detailData.tranType=='船运'){
+					for(var i=0;i<this.freightspace.length;i++){
+						if (this.freightspace[i].loadNetWeight&&this.freightspace[i].loadNetWeight < 0 ||this.freightspace[i].loadNetWeight&&this.freightspace[i].loadNetWeight > 10000) {
+							this.$api.msg('装船净重输入错误!')
+							return
+						}
+					}
+					uni.showModal({
+						content: "提交成功后装船信息不可修改,是否确定提交?",
+						success(res) {
+							if (res.confirm) {
+								that.tranCarInfoList = that.freightspace
+								that.tranCarInfoList[0].sendDateStart = that.detailData.sendDateStart
+								for (var i = 0; i < that.tranCarInfoList.length; i++) {
+									that.tranCarInfoList[i].id = that.freightspace[i].id
+								}
+								var tranProcessInfo = {}
+								tranProcessInfo.id = that.detailData.id
+								tranProcessInfo.infoId = that.detailData.infoId
+								tranProcessInfo.processNo = that.detailData.processNo
+								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
+								that.$api.doRequest('post', '/tranProcessInfo/api/insertTranCar', tranProcessInfo).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('提交成功')
+										that.detailData = {}
+										that.freightspace = {}
+										uni.navigateBack({
+											
+										})
+									}
+								})
+							}
+						}
+					})
+				}else if(this.detailData.tranType=='汽运'){
+					uni.showModal({
+						content: "提交成功后提醒司机及时签订运输合同,确定提交装车信息?",
+						success(res) {
+							if (res.confirm) {
+								that.tranCarInfoList = that.freightspace
+								that.tranCarInfoList.driver = that.detailData.driver
+								that.tranCarInfoList.driverPhone = that.detailData.driverPhone
+								that.tranCarInfoList.tranCarNo = that.detailData.tranCarNo
+								that.tranCarInfoList.carNo = that.detailData.carNo
+								that.tranCarInfoList.loadNetWeight = that.detailData.loadNetWeight
+								that.tranCarInfoList.tranType = that.tranType
+								that.tranCarInfoList.loadPoundImg = that.detailData.loadPoundImg
+								            // this.tranCarInfoList.boxNo = this.arr.toString()
 								for (var i = 0; i < that.tranCarInfoList.length; i++) {
 									that.tranCarInfoList[i].id = that.freightspace[i].id
 									if (that.tranCarInfoList[i].temporaryDriverFlag != 0) {
@@ -335,9 +745,7 @@
 								tranProcessInfo.processNo = that.detailData.processNo
 								tranProcessInfo.tranPrice = that.detailData.tranPrice
 								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
-								that.$api.doRequest('post', '/tranProcessInfo/api/insertTranCar', {
-									id:this.id
-								}).then(res => {
+								that.$api.doRequest('post', '/tranProcessInfo/api/insertTranCar', tranProcessInfo).then(res => {
 									if (res.data.code == 200) {
 										that.$api.msg('提交成功')
 										that.detailData = {}
@@ -359,10 +767,13 @@
 					if (res.data.code == 200) {
 						this.detailData = res.data.data
 						if(res.data.data.tranType=='火运'){
-							if(res.data.data.tranCarInfoList.length){
+							if(res.data.data.tranCarInfoList.length>0){
 								 if(res.data.data.tranCarInfoList[0].driver){
 									this.detailData.driver = res.data.data.tranCarInfoList[0].driver
 								}
+								for (var i = 0; i < res.data.data.tranCarInfoList.length; i++) {
+									res.data.data.tranCarInfoList[i].show2=false
+								}
 								this.detailData.driverPhone =res.data.data.tranCarInfoList[0].driverPhone
 								this.$set(this.detailData,'sendDateStart',res.data.data.tranCarInfoList[0].sendDateStart)
 								this.detailData.receiveDateEnd =
@@ -371,10 +782,16 @@
 								this.freightspace=res.data.data.tranCarInfoList
 							}
 						}else if(res.data.data.tranType=='汽运'){
+							for (var i = 0; i < res.data.data.tranCarInfoList.length; i++) {
+								res.data.data.tranCarInfoList[i].show2=false
+							}
 							this.freightspace=res.data.data.tranCarInfoList
 							
 						}else if(res.data.data.tranType=='船运'){
 							if (res.data.data.tranCarInfoList.length > 0) {
+								for (var i = 0; i < res.data.data.tranCarInfoList.length; i++) {
+									res.data.data.tranCarInfoList[i].show2=false
+								}
 							            this.detailData.driver = res.data.data.tranCarInfoList[0].driver
 							            this.detailData.driverPhone =
 							              res.data.data.tranCarInfoList[0].driverPhone
@@ -391,7 +808,7 @@
 							            this.detailData.boxNumber = res.data.data.tranCarInfoList[0].boxNumber
 							            //上传附件计数
 							            if(this.detailData.tranCarInfoList[0].loadPoundImg){
-							              this.pictureTotal =  this.detailData.tranCarInfoList[0].loadPoundImg.split(",").length
+							              this.pictureTotal =  this.detailData.tranCarInfoList[0].loadPoundImg.split(",")
 							            }
 							            this.freightspace = res.data.data.tranCarInfoList
 							          }
@@ -403,14 +820,13 @@
 			},
 			getImgUrl(res1,res2,res3,res4) {
 				// debugger
-				console.log(res1,res2,res3,res4,res5)
 				this.freightspace[res4].loadPoundImg=res1
 				// this.detailData.addressUrl = res
 				// console.log(res)
 				// console.log('------------res-----------')
 			},
 			setImgUrl(val){
-				debugger
+				// debugger
 				for(let i = 0;i<freightspace.length;i++){
 					
 				}
@@ -430,8 +846,15 @@
 			dateChange(e) {
 				this.detailData.sendDateStart = e.year + "-" + e.month + "-" + e.day
 			},
-			dateChange1(e,index){
-				this.$set(this.freightspace[index],'loadingDate',e.year + "-" + e.month + "-" + e.day)
+			train(index){
+				console.log(index)
+				
+				this.freightspace[index].show2=true
+				this.$forceUpdate();
+				this.index=index
+			},
+			dateChange1(e){
+				this.$set(this.freightspace[this.index],'loadingDate',e.year + "-" + e.month + "-" + e.day)
 			},
 			statuschange(e) {
 				this.status = this.statusList[e[0]].name
@@ -455,7 +878,7 @@
 	}
 	.wrap {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 140rpx 20rpx;
+		padding: 20rpx 20rpx 240rpx 20rpx;
 	
 		.top {
 			display: flex;
@@ -466,7 +889,25 @@
 			}
 		}
 	}
-	
+	.bottom-btn {
+			width: 100%;
+			position: fixed;
+			bottom:0;
+			display: flex;
+			z-index: 2;
+			left: 0;
+			background-color: #f8f8f8;
+			flex-direction: column;
+			.btn1,.btn2{
+				width: 100%;
+				margin-bottom: 26rpx;
+				border-radius: 90rpx;
+			}
+			.btn1{
+				background: white;
+				color: #00C265;
+			}
+			}
 	.content,
 	.content1,
 	.content2 {
@@ -535,13 +976,20 @@
 		align-items: center;
 	}
 	
-	.bottom-btn {
-	    padding: 30rpx;
-		background: #FFFFFF;
-		width: 92%;
-		position: fixed;
-		bottom: 0rpx;
-		display: flex;
-		z-index: 9999;
+	// .bottom-btn {
+	//     padding: 30rpx;
+	// 	background: #FFFFFF;
+	// 	width: 92%;
+	// 	position: fixed;
+	// 	bottom: 0rpx;
+	// 	display: flex;
+	// 	z-index: 9999;
+	// }
+	.shade{
+		background:#000;
+		position:fixed;
+		top:0;left:0;
+	   width:100%;height:100%;
+	   z-index:10000;
 	}
 </style>

+ 18 - 18
pages/erp/index.vue

@@ -105,24 +105,24 @@
 						url: `/pages/erp/improvedExWaehousing/improvedExWaehousing`,
 						show: true
 					},
-					// {
-					// 	num: 4,
-					// 	name: '发货反馈',
-					// 	// icon: 'cuIcon-copy',
-					// 	src: '../../static/img/erp/shougoujianjin@3x.png',
-					// 	tips: 0,
-					// 	url: '/pages/erp/deliveryfeedback/list',
-					// 	show: true
-					// },
-					// {
-					// 	num: 5,
-					// 	name: '收货反馈',
-					// 	// icon: 'cuIcon-edit',
-					// 	src: '../../static/img/erp/shougouzhijian@3x.png',
-					// 	tips: 0,
-					// 	url: `/pages/erp/receivingfeedback/list`,
-					// 	show: true
-					// },
+					{
+						num: 4,
+						name: '发货反馈',
+						// icon: 'cuIcon-copy',
+						src: '../../static/img/erp/shougoujianjin@3x.png',
+						tips: 0,
+						url: '/pages/erp/deliveryfeedback/list',
+						show: true
+					},
+					{
+						num: 5,
+						name: '收货反馈',
+						// icon: 'cuIcon-edit',
+						src: '../../static/img/erp/shougouzhijian@3x.png',
+						tips: 0,
+						url: `/pages/erp/receivingfeedback/list`,
+						show: true
+					},
 					// {
 					// 	num: 4,
 					// 	name: '开通业务',

+ 1013 - 1
pages/erp/receivingfeedback/details.vue

@@ -1,8 +1,1020 @@
 <template>
+	<view class="wrap">
+		<view>
+			<view style='margin-left:10px;'>任务详情</view>
+			<view class="content">
+				<view class="row">
+					<view class="left">任务编号</view>
+					<view>{{detailData.processNo}}</view>
+				</view>
+				<view class="row">
+					<view class="left">货名</view>
+					<view>{{detailData.goodsName}}</view>
+				</view>
+				<view class="row">
+					<view class="left">重量</view>
+					<view>{{detailData.weight}}</view>
+				</view>
+				<view class="row">
+					<view class="left">发货地址</view>
+					<view>{{detailData.sendPrivate}}{{detailData.sendCity}}{{detailData.sendArea}}</view>
+				</view>
+				<view class="row">
+					<view class="left">发货人</view>
+					<view>{{detailData.sender}}</view>
+				</view>
+				<view class="row">
+					<view class="left">发货人电话</view>
+					<view>{{detailData.senderPhone}}</view>
+				</view>
+				<view class="row">
+					<view class="left">收货地址</view>
+					<view>{{detailData.receivePrivate}}{{detailData.receiveCity}}{{detailData.receiveArea}}</view>
+				</view>
+				<view class="row">
+					<view class="left">收货人</view>
+					<view>{{detailData.receiver}}</view>
+				</view>
+				<view class="row">
+					<view class="left">收货人电话</view>
+					<view>{{detailData.receiverPhone}}</view>
+				</view>
+				<view class="row">
+					<view class="left">发货日期</view>
+					<view>{{detailData.deliveryDateStart}}</view>
+				</view>
+				<view class="row">
+					<view class="left">最晚到货日期</view>
+					<view>{{detailData.deliveryDateEnd}}</view>
+				</view>
+				<view class="row">
+					<view class="left">合同编号</view>
+					<view>{{detailData.contractNo}}</view>
+				</view>
+				<view class="row">
+					<view class="left">运输方式</view>
+					<view>{{detailData.tranType}}</view>
+				</view>
+			</view>
+		</view>
+		
+		<view>
+			<view v-if='detailData.tranType=="火运"' style='margin-left:10px;'>联络员及车次</view>
+			<view v-if='detailData.tranType=="火运"' class="content">
+				<view class="row">
+					<view class="left">姓名</view>
+					<view>{{detailData.driver}}</view>
+				</view>
+				<view class="row">
+					<view class="left">电话</view>
+					<view>{{detailData.driverPhone}}</view>
+				</view>
+				<view class="row">
+					<view class="left">发车日期</view>
+					<view>
+						<view @click='show1=true'>{{detailData.sendDateStart}}</view>
+						<u-picker v-model="show1" mode="time" @confirm='dateChange($event)' :params="params">
+						</u-picker>
+					</view>
+				</view>
+				<view class="row">
+					<view class="left">预计到站日期</view>
+					<view> 
+						<view>{{detailData.receiveDateEnd}}</view>
+					</view>
+				</view>
+				<view class="row">
+					<view class="left">车型</view>
+					<view> 
+						<view>{{detailData.carModel}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<view v-if='detailData.tranType=="船运"' class="content">
+			<view class="row">
+				<view class="left">姓名</view>
+				<view>{{detailData.driver}}</view>
+			</view>
+			<view class="row">
+				<view class="left">电话</view>
+				<view>{{detailData.driverPhone}}</view>
+			</view>
+			<view class="row">
+				<view class="left">发船日期</view>
+				<view>
+					<view @click='show1=true'>{{detailData.sendDateStart}}</view>
+					<u-picker v-model="show1" mode="time" @confirm='dateChange($event)' :params="params">
+					</u-picker>
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">预计到港日期</view>
+				<view> 
+					<view>{{detailData.receiveDateEnd}}</view>
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">船名</view>
+				<view> 
+					<view>{{detailData.shipName}}</view>
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">航次</view>
+				<view> 
+					<view>{{detailData.shipNo}}</view>
+				</view>
+			</view>
+			<view class="row">
+				<view class="left">类型</view>
+				<view> 
+					<view>{{detailData.shipType}}</view>
+				</view>
+			</view>
+			<view v-if="detailData.shipType == '集装箱'" class="row">
+				<view class="left">数量</view>
+				<view> 
+					<view>{{detailData.boxNumber}}</view>
+				</view>
+			</view>
+		</view>
+		<view v-if='detailData.tranType=="火运"'>
+			<view style='margin-left:10px;'>卸车详情</view>
+			<view v-for='(item,index) in freightspace' class="content">
+				<view class="row">
+					<view class="left">车厢号-{{index+1}}</view>
+					<view>{{item.boxNo}}</view>
+				</view>
+				<view class="row">
+					<view class="left">装车净重</view>
+					<view>{{item.loadNetWeight}}</view>
+				</view>
+				<view class="row">
+					<view class="left">卸车净重</view>
+					<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.unloadNetWeight}}</view>
+					<view style='text-align:right;' v-else>
+						<input  v-model='item.unloadNetWeight' class="right-bottom"
+					placeholder="输入毛重"></input>
+					</view>
+				</view>
+				<view class="row">
+					<view class="left">磅单</view>
+					<view v-if="item.status == '已装车' || item.status == '已送达'">
+						<image v-if="item.unloadPoundImg" @click='shadeshow(item.unloadPoundImg)' style='width:100px;height:100px;' :src="item.unloadPoundImg" mode=""></image>
+						<view v-else>暂无图片</view>
+					</view>
+					<view v-else>
+						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1" :file-list="imgUrl"
+							:size-type="['compressed']" :imgIndex='index' @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+							@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
+					</view>
+				</view>
+				<view class="row">
+					<view class="left">卸车日期</view>
+					<view>
+						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.unloadingDate}}</view>
+						<view v-else @click='train(index)'>{{item.unloadingDate?item.unloadingDate:'请选择日期'}}</view>
+						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,item)' :params="params">
+						</u-picker>
+					</view>
+				</view>
+				<view style='text-align:right;' v-if="item.status == '已装车' || item.status == '已送达'">{{item.status}}</view>
+				<u-button v-else @click='submit(index,2)' type="success">保存</u-button>
+			</view>
+		</view>
+		<view v-if='detailData.tranType=="汽运"'>
+			<view style='margin-left:10px;'>卸车详情</view>
+			<view v-for='(item,index) in freightspace' class="content">
+				<view class="row">
+					<view class="left">司机-{{index+1}}</view>
+					<view>{{item.status}}</view>
+				</view>
+				<view class="row">
+					<view class="left">姓名</view>
+					<view>{{item.driver}}</view>
+				</view>
+				<view class="row">
+					<view class="left">司机电话</view>
+					<view>{{item.driverPhone}}</view>
+				</view>
+				<view class="row">
+					<view class="left">车牌号</view>
+					<view>{{item.carNo}}</view>
+				</view>
+				<view class="row">
+					<view class="left">装车净重</view>
+					<view>{{item.loadNetWeight}}</view>
+				</view>
+				<view class="row">
+					<view class="left">卸车净重</view>
+					<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.unloadNetWeight}}</view>
+					<view style='text-align:right;' v-else>
+						<input  v-model='item.unloadNetWeight' class="right-bottom"
+					placeholder="输入卸车净重"></input>
+					</view>
+				</view>
+				<view class="row">
+					<view class="left">卸车日期</view>
+					<view>
+						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.receiveDateEnd}}</view>
+						<view v-else @click='train(index)'>{{item.receiveDateEnd?item.receiveDateEnd:'请选择日期'}}</view>
+						<u-picker v-model="item.show2" mode="time" @confirm='dateChange2($event,index)' :params="params">
+						</u-picker>
+					</view>
+				</view>
+				<view class="row">
+					<view class="left">磅单</view>
+					<view  v-if="item.status == '已装车' || item.status == '已送达'">
+						<image v-if="item.unloadPoundImg" @click='shadeshow(item.unloadPoundImg)' style='width:100px;height:100px;' :src="item.unloadPoundImg" mode=""></image>
+						<view v-else>暂无图片</view>
+					</view>
+					<view v-else>
+						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1" :file-list="imgUrl"
+							:size-type="['compressed']" :imgIndex='index' @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+							@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
+					</view>
+				</view>
+				<view class="row">
+					<view class="left">箱号</view>
+					<view>{{item.caseNo}}</view>
+				</view>
+				<view class="row">
+					<view class="left">封号</view>
+					<view>{{item.titleNo}}</view>
+				</view>
+				<view v-if="item.signStatus == '未签合同'">未签合同</view>
+				<view v-if="item.signStatus == '已签合同'">已签合同</view>
+				<u-button v-if="item.status != '已装车' && item.status != '已送达'" @click='submit(index,1)' type="success">保存</u-button>
+			</view>
+		</view>
+		<view v-if='detailData.tranType=="船运"'>
+			<view style='margin-left:10px;'>卸船详情</view>
+			<view v-for='(item,index) in freightspace' class="content">
+				<view v-if="item.shipType == '集装箱'" class="row">
+					<view class="left">集装箱-{{index+1}}</view>
+					<view v-if="item.status == '未装车'">未装船</view>
+					<view v-if="item.status == '已装车'">未卸船</view>
+					<view v-if="item.status == '已送达'">已卸船</view>
+				</view>
+				<view v-if="item.shipType == '散船'" class="row">
+					<view class="left">仓位号-{{index+1}}</view>
+					<view v-if="item.status == '未装车'">未装船</view>
+					<view v-if="item.status == '已装车'">未卸船</view>
+					<view v-if="item.status == '已送达'">已卸船</view>
+				</view>
+				<view v-if="item.shipType == '集装箱'" class="row">
+					<view class="left">箱号</view>
+					<view style='text-align:right;'>
+						<view  v-if="item.status == '已装车' || item.status == '已送达'">{{item.caseNo}}</view>
+						<input v-else placeholder="请输入箱号" v-model='item.caseNo' type="text">
+					</view>
+				</view>
+				<view v-if="item.shipType == '集装箱'" class="row">
+					<view class="left">封号</view>
+					<view style='text-align:right;'>
+						<view  v-if="item.status == '已装车' || item.status == '已送达'">{{item.titleNo}}</view>
+						<input v-else placeholder="请输入封号" v-model='item.titleNo' type="text">
+					</view>
+				</view>
+				<view v-if="item.shipType == '散船'" class="row">
+					<view class="left">仓位号</view>
+					<view>
+						<view>{{item.binNumber}}</view>
+					</view>
+				</view>
+				<view v-if="item.shipType == '散船'" class="row">
+					<view class="left">计划重量</view>
+					<view>
+						<view>{{item.positionWeight}}</view>
+					</view>
+				</view>
+				<view class="row">
+					<view class="left">装船净重</view>
+					<view>{{item.loadNetWeight}}</view>
+				</view>
+				<view class="row">
+					<view class="left">卸船净重</view>
+					<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.unloadNetWeight}}</view>
+					<view style='text-align:right;' v-else>
+						<input  v-model='item.unloadNetWeight' class="right-bottom"
+					placeholder="输入卸船净重"></input>
+					</view>
+				</view>
+				<view class="row">
+					<view class="left">卸船日期</view>
+					<view>
+						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.unloadingDate}}</view>
+						<view v-else @click='train(index)'>{{item.unloadingDate?item.unloadingDate:'请选择日期'}}</view>
+						<u-picker v-model="item.show2" mode="time" @confirm='dateChange1($event,index)' :params="params">
+						</u-picker>
+					</view>
+				</view>
+				<view style='text-align:right;' v-if="item.status == '已装车' || item.status == '已送达'">{{item.status}}</view>
+				<u-button v-else @click='submit(index,3)' type="success">保存</u-button>
+			</view>
+			<view class="row">
+				<view style='margin-left:10px;' class="left">运单</view>
+				<view v-if="pictureTotal.length>0">
+					<image v-for='item in pictureTotal'  @click='shadeshow(item)' style='width:100px;height:100px;' :src="item" mode=""></image>
+				</view>
+				<view v-else>
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1" :file-list="imgUrl"
+						:size-type="['compressed']"  @on-success="getImgUrl1" @on-error="onError" @on-remove="onRemove"
+						@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress"></upload>
+				</view>
+			</view>
+		</view>
+		<view>合计吨:{{ total }}/{{ detailData.weight }}
+			<text style='margin-left:10px;'
+			class="noservice"
+			v-show="detailData.receivingStatus == '执行中'">未完货</text>
+			<text
+			class="service"
+			v-show="detailData.receivingStatus == '已完货'">{{ detailData.receivingStatus }}</text>
+		</view>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button  @click='pass' type="error" class="btn1" hover-class='none'>提交</u-button>
+			<u-button  @click='finishedgoods' type="success" class="btn2">完货</u-button>
+		</view>
+		<view @click='imgShow=false' v-if="imgShow" class="shade">
+			<image style='position:absolute;top:0;left:0;right:0;bottom:0;margin:auto;' :src="url" mode=""></image>
+		</view>
+	</view>
 </template>
 
 <script>
+	import upload from '@/components/upload.vue';
+	import helper from '@/common/helper.js';
+	export default {
+		components: {
+			upload
+		},
+		data() {
+			return {
+				id:'',
+				show1: false,
+				show2: false,
+				currentPage: 1,
+				pageSize: 10,
+				show1:false,
+				positionId: "",
+				binNumber: "",
+				maxSize: 50 * 1024 * 1024,
+				status: '执行中',
+				positionName: '',
+				statusList: [
+					{name:'执行中',value:1},
+					{name:'已完货',value:2},
+					{name:'全部任务',value:3},
+				],
+				params: {
+					year: true,
+					month: true,
+					day: true,
+				},
+				imgUrl:[],
+				unloadPoundImg:'',
+				action: this.$uploadUrl,
+				freightspace:[],
+				feedbackFlag:1,
+				detailData:{},
+				allWarehouse: [],
+				pictureTotal:[],
+				showTime: '',
+				index:0,
+				imgShow:false,
+				url:''
+			}
+		},
+		onLoad(options) {
+			this.id = options.id
+		},
+		onShow() {
+			this.getList()
+		},
+		computed: {
+		    total: function () {
+		      var maxStorage = 0
+			  if(this.detailData.tranCarInfoList){
+				for (var i = 0; i < this.detailData.tranCarInfoList.length; i++) {
+					maxStorage += Number(
+					  this.detailData.tranCarInfoList[i].unloadNetWeight
+					)
+				  } 
+			  }
+		      return maxStorage
+		    },
+		 },
+		methods: {
+			shadeshow(url){
+				this.imgShow=true
+				this.url=url
+			},
+			submit(index,status){
+				var that = this
+				if(this.detailData.tranType=='火运'){
+					if (!this.freightspace[index].unloadNetWeight) {
+						this.$api.msg('卸车净重不能为空!')
+						return
+					}
+					if (
+						this.freightspace[index].unloadNetWeight < 0 ||
+						this.freightspace[index].unloadNetWeight > 10000
+					) {
+						this.$api.msg('卸车净重输入错误!')
+						return
+					}
+					if (!this.freightspace[index].unloadNetWeight) {
+						this.$api.msg('卸车日期不能为空!')
+						return
+					}
+					var tranProcessInfo = {}
+					tranProcessInfo.flag=0
+					tranProcessInfo.id=that.freightspace[index].id
+					tranProcessInfo.infoId = that.detailData.infoId
+					tranProcessInfo.processId = that.detailData.id
+					tranProcessInfo.driver = that.detailData.driver
+					tranProcessInfo.driverPhone = that.detailData.driverPhone
+					tranProcessInfo.tranCarNo = that.detailData.tranCarNo
+					tranProcessInfo.carNo = that.detailData.carNo
+					tranProcessInfo.unloadNetWeight = that.freightspace[index].unloadNetWeight
+					tranProcessInfo.unloadingDate = that.freightspace[index].unloadingDate
+					tranProcessInfo.unloadPoundImg = that.freightspace[index].unloadPoundImg
+					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({})
+						}
+					})
+							// }
+						// }
+					// })
+				}else if(this.detailData.tranType=='船运'){
+					if (this.freightspace[index].shipType == '集装箱'&&!this.freightspace[index].caseNo) {
+						this.$api.msg('箱号不能为空!')
+						return
+					}
+					if (
+						this.freightspace[index].shipType == '集装箱'&&this.freightspace[index].caseNo.length > 15 ||
+						this.freightspace[index].shipType == '集装箱'&&this.freightspace[index].caseNo.length < 1) {
+						this.$api.msg('箱号输入错误!')
+						return
+					}
+					if (this.freightspace[index].shipType == '集装箱'&&!this.freightspace[index].titleNo) {
+						this.$api.msg('封号不能为空!')
+						return
+					}
+					if (
+						this.freightspace[index].shipType == '集装箱'&&this.freightspace[index].titleNo.length > 15 ||
+						this.freightspace[index].shipType == '集装箱'&&this.freightspace[index].titleNo.length < 1
+					) {
+						this.$api.msg('封号输入错误!')
+						return
+					}
+					if (!this.freightspace[index].unloadNetWeight) {
+						this.$api.msg('卸船净重不能为空!')
+						return
+					}
+					if (
+						this.freightspace[index].unloadNetWeight < 0 ||
+						this.freightspace[index].unloadNetWeight > 10000
+					) {
+						this.$api.msg('卸船净重输入错误!')
+						return
+					}
+					if (!this.freightspace[index].unloadingDate) {
+						this.$api.msg('卸船日期不能为空!')
+						return
+					}
+					var tranProcessInfo = {}
+					tranProcessInfo.flag=0
+					tranProcessInfo.id=that.freightspace[index].id
+					tranProcessInfo.infoId = that.detailData.infoId
+					tranProcessInfo.processId = that.detailData.id
+					tranProcessInfo.driver = that.detailData.driver
+					tranProcessInfo.driverPhone = that.detailData.driverPhone
+					tranProcessInfo.tranCarNo = that.detailData.tranCarNo
+					tranProcessInfo.caseNo = that.freightspace[index].caseNo
+					tranProcessInfo.titleNo = that.freightspace[index].titleNo                    
+					tranProcessInfo.unloadNetWeight = that.freightspace[index].unloadNetWeight
+					tranProcessInfo.unloadingDate = that.freightspace[index].unloadingDate
+					tranProcessInfo.unloadPoundImg = that.freightspace[index].unloadPoundImg
+					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({})
+						}
+					})
+				}else if(this.detailData.tranType=='汽运'){
+					if (!this.freightspace[index].driver) {
+						that.$api.msg('司机姓名不能为空!')
+						return
+					}
+					if (!this.freightspace[index].driverPhone) {
+						that.$api.msg('司机电话不能为空!')
+						return
+					}
+					if (!this.freightspace[index].carNo) {
+						that.$api.msg('车牌号不能为空!')	
+						return
+					}
+					if (!this.freightspace[index].unloadNetWeight) {
+						that.$api.msg('卸重不能为空!')
+						return
+					}
+					var tranProcessInfo = {}
+					tranProcessInfo.flag=0
+					tranProcessInfo.id=that.freightspace[index].id
+					tranProcessInfo.infoId = that.detailData.infoId
+					tranProcessInfo.processId = that.detailData.id
+					tranProcessInfo.driver = that.detailData.driver
+					tranProcessInfo.driverPhone = that.detailData.driverPhone
+					tranProcessInfo.tranCarNo = that.detailData.tranCarNo
+					tranProcessInfo.carNo = that.freightspace[index].carNo
+					tranProcessInfo.caseNo = that.freightspace[index].caseNo
+					tranProcessInfo.titleNo = that.freightspace[index].titleNo                    
+					tranProcessInfo.unloadNetWeight = that.freightspace[index].unloadNetWeight
+					tranProcessInfo.receiveDateEnd = that.freightspace[index].receiveDateEnd
+					tranProcessInfo.unloadPoundImg = that.freightspace[index].unloadPoundImg
+					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({})
+						}
+					})
+				}
+			},
+			finishedgoods(){
+				var that = this
+				if(this.detailData.tranType=='火运'){
+					uni.showModal({
+						content: "完货操作后,装车信息不可修改,是否确定完货?",
+						success(res) {
+							if (res.confirm) {
+								that.tranCarInfoList = that.freightspace
+								that.tranCarInfoList.driver = that.detailData.driver
+								that.tranCarInfoList.driverPhone = that.detailData.driverPhone
+								that.tranCarInfoList.tranCarNo = that.detailData.tranCarNo
+								that.tranCarInfoList.carNo = that.detailData.carNo
+								that.tranCarInfoList[0].sendDateStart = that.detailData.sendDateStart
+								that.tranCarInfoList.loadNetWeight = that.detailData.loadNetWeight
+								that.tranCarInfoList.tranType = that.tranType
+								that.tranCarInfoList.unloadPoundImg = that.detailData.unloadPoundImg
+								            // this.tranCarInfoList.boxNo = this.arr.toString()
+								for (var i = 0; i < that.tranCarInfoList.length; i++) {
+									that.tranCarInfoList[i].id = that.freightspace[i].id
+									if (that.tranCarInfoList[i].temporaryDriverFlag != 0) {
+											that.tranCarInfoList[i].temporaryDriverFlag = 1
+											that.tranCarInfoList[i].tranType = that.tranType
+									}
+								}
+								var tranProcessInfo = {}
+								tranProcessInfo.id = that.detailData.id
+								tranProcessInfo.weight = that.total
+								tranProcessInfo.infoId = that.detailData.infoId
+								tranProcessInfo.processNo = that.detailData.processNo
+								tranProcessInfo.tranPrice = that.detailData.tranPrice
+								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
+								that.$api.doRequest('post', '/tranProcessInfo/api/editFeedbackStatus', tranProcessInfo).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('提交成功')
+										that.detailData = {}
+										that.freightspace = {}
+										uni.navigateBack({})
+									}
+								})
+							}
+						}
+					})
+				}else if(this.detailData.tranType=='船运'){
+					uni.showModal({
+						content: "完货操作后,装船信息不可修改,是否确定完货?",
+						success(res) {
+							if (res.confirm) {
+								var tranProcessInfo = {}
+								tranProcessInfo.id = that.detailData.id
+								tranProcessInfo.weight = that.total
+								that.$api.doRequest('post', '/tranProcessInfo/api/editFeedbackStatus', tranProcessInfo).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('提交成功')
+										that.detailData = {}
+										that.freightspace = {}
+										uni.navigateBack({})
+									}
+								})
+							}
+						}
+					})
+				}else if(this.detailData.tranType=='汽运'){
+					uni.showModal({
+						content: "完货操作后,装车信息不可修改,是否确定完货?",
+						success(res) {
+							if (res.confirm) {
+								var tranProcessInfo = {}
+								tranProcessInfo.id = that.detailData.id
+								tranProcessInfo.weight = that.total
+								that.$api.doRequest('post', '/tranProcessInfo/api/editFeedbackStatus', tranProcessInfo).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('提交成功')
+										that.detailData = {}
+										that.freightspace = {}
+										uni.navigateBack({})
+									}
+								})
+							}
+						}
+					})
+				}
+			},
+			pass(){
+				var that = this
+				if(this.detailData.tranType=='火运'){
+					// for(var i=0;i<this.freightspace.length;i++){
+					// 	if (!this.freightspace[i].unloadPoundImg) {
+					// 		this.$api.msg('卸车净重不能为空!')
+					// 		return
+					// 	}
+					// 	if (
+					// 		this.freightspace[i].unloadPoundImg < 0 ||
+					// 		this.freightspace[i].unloadPoundImg > 10000
+					// 	) {
+					// 		this.$api.msg('装车净重输入错误!')
+					// 		return
+					// 	}
+					// 	if (!this.freightspace[i].unloadingDate) {
+					// 		this.$api.msg('装车日期不能为空!')
+					// 		return
+					// 	}
+					// }
+					uni.showModal({
+						content: "提交成功后提醒司机及时签订运输合同,确定提交卸车信息?",
+						success(res) {
+							if (res.confirm) {
+								that.tranCarInfoList = that.freightspace
+								that.tranCarInfoList.driver = that.detailData.driver
+								that.tranCarInfoList.driverPhone = that.detailData.driverPhone
+								that.tranCarInfoList.tranCarNo = that.detailData.tranCarNo
+								that.tranCarInfoList.carNo = that.detailData.carNo
+								that.tranCarInfoList[0].sendDateStart = that.detailData.sendDateStart
+								that.tranCarInfoList.unloadNetWeight = that.detailData.unloadNetWeight
+								that.tranCarInfoList.tranType = that.tranType
+								that.tranCarInfoList.loadPoundImg = that.detailData.loadPoundImg
+								            // this.tranCarInfoList.boxNo = this.arr.toString()
+								for (var i = 0; i < that.tranCarInfoList.length; i++) {
+									that.tranCarInfoList[i].id = that.freightspace[i].id
+									if (that.tranCarInfoList[i].temporaryDriverFlag != 0) {
+											that.tranCarInfoList[i].temporaryDriverFlag = 1
+											that.tranCarInfoList[i].tranType = that.tranType
+									}
+								}
+								var tranProcessInfo = {}
+								tranProcessInfo.id = that.detailData.id
+								tranProcessInfo.infoId = that.detailData.infoId
+								tranProcessInfo.processNo = that.detailData.processNo
+								tranProcessInfo.tranPrice = that.detailData.tranPrice
+								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
+								that.$api.doRequest('post', '/tranProcessInfo/api/insertTranCar', tranProcessInfo).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('提交成功')
+										that.detailData = {}
+										that.freightspace = {}
+										uni.navigateBack({
+											
+										})
+									}
+								})
+							}
+						}
+					})
+				}else if(this.detailData.tranType=='船运'){
+					for(var i=0;i<this.freightspace.length;i++){
+						if (this.freightspace[i].loadNetWeight&&this.freightspace[i].loadNetWeight < 0 ||this.freightspace[i].loadNetWeight&&this.freightspace[i].loadNetWeight > 10000) {
+							this.$api.msg('装船净重输入错误!')
+							return
+						}
+					}
+					uni.showModal({
+						content: "提交成功后装船信息不可修改,是否确定提交?",
+						success(res) {
+							if (res.confirm) {
+								that.tranCarInfoList = that.freightspace
+								that.tranCarInfoList[0].sendDateStart = that.detailData.sendDateStart
+								for (var i = 0; i < that.tranCarInfoList.length; i++) {
+									that.tranCarInfoList[i].id = that.freightspace[i].id
+								}
+								var tranProcessInfo = {}
+								tranProcessInfo.id = that.detailData.id
+								tranProcessInfo.infoId = that.detailData.infoId
+								tranProcessInfo.processNo = that.detailData.processNo
+								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
+								that.$api.doRequest('post', '/tranProcessInfo/api/insertTranCar', tranProcessInfo).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('提交成功')
+										that.detailData = {}
+										that.freightspace = {}
+										uni.navigateBack({
+											
+										})
+									}
+								})
+							}
+						}
+					})
+				}else if(this.detailData.tranType=='汽运'){
+					uni.showModal({
+						content: "所有车辆完成卸车任务后,请及时修改任务状态,确定提交卸车信息?",
+						success(res) {
+							if (res.confirm) {
+								that.tranCarInfoList = that.freightspace
+								that.tranCarInfoList.driver = that.detailData.driver
+								that.tranCarInfoList.driverPhone = that.detailData.driverPhone
+								that.tranCarInfoList.tranCarNo = that.detailData.tranCarNo
+								that.tranCarInfoList.carNo = that.detailData.carNo
+								that.tranCarInfoList.unloadNetWeight = that.detailData.unloadNetWeight
+								that.tranCarInfoList.tranType = that.tranType
+								that.tranCarInfoList.unloadPoundImg = that.detailData.unloadPoundImg
+								            // this.tranCarInfoList.boxNo = this.arr.toString()
+								for (var i = 0; i < that.tranCarInfoList.length; i++) {
+									that.tranCarInfoList[i].id = that.freightspace[i].id
+									if (that.tranCarInfoList[i].temporaryDriverFlag != 0) {
+										that.tranCarInfoList[i].temporaryDriverFlag = 1
+										that.tranCarInfoList[i].tranType = that.tranType
+									}
+								}
+								var tranProcessInfo = {}
+								tranProcessInfo.id = that.detailData.id
+								tranProcessInfo.infoId = that.detailData.infoId
+								tranProcessInfo.processNo = that.detailData.processNo
+								tranProcessInfo.tranPrice = that.detailData.tranPrice
+								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
+								that.$api.doRequest('post', '/tranProcessInfo/api/insertTranCar', tranProcessInfo).then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('提交成功')
+										that.detailData = {}
+										that.freightspace = {}
+										uni.navigateBack({})
+									}
+								})
+							}
+						}
+					})
+				}
+			},
+			getList() {
+				this.$api.doRequest('get', '/tranProcessInfo/getTranProcess', {
+					id:this.id
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.detailData = res.data.data
+						if(res.data.data.tranType=='火运'){
+							if(res.data.data.tranCarInfoList.length>0){
+								 if(res.data.data.tranCarInfoList[0].driver){
+									this.detailData.driver = res.data.data.tranCarInfoList[0].driver
+								}
+								for (var i = 0; i < res.data.data.tranCarInfoList.length; i++) {
+									res.data.data.tranCarInfoList[i].show2=false
+								}
+								this.detailData.driverPhone =res.data.data.tranCarInfoList[0].driverPhone
+								this.$set(this.detailData,'sendDateStart',res.data.data.tranCarInfoList[0].sendDateStart)
+								this.detailData.receiveDateEnd =
+								            res.data.data.tranCarInfoList[0].receiveDateEnd
+								this.detailData.carModel = res.data.data.tranCarInfoList[0].carModel
+								this.freightspace=res.data.data.tranCarInfoList
+							}
+						}else if(res.data.data.tranType=='汽运'){
+							for (var i = 0; i < res.data.data.tranCarInfoList.length; i++) {
+								res.data.data.tranCarInfoList[i].show2=false
+							}
+							this.freightspace=res.data.data.tranCarInfoList
+							
+						}else if(res.data.data.tranType=='船运'){
+							if (res.data.data.tranCarInfoList.length > 0) {
+								for (var i = 0; i < res.data.data.tranCarInfoList.length; i++) {
+									res.data.data.tranCarInfoList[i].show2=false
+								}
+							            this.detailData.driver = res.data.data.tranCarInfoList[0].driver
+							            this.detailData.driverPhone =
+							              res.data.data.tranCarInfoList[0].driverPhone
+							            this.$set(
+							              this.detailData,
+							              'sendDateStart',
+							              res.data.data.tranCarInfoList[0].sendDateStart
+							            )
+							            this.detailData.receiveDateEnd =
+							              res.data.data.tranCarInfoList[0].receiveDateEnd
+							            this.detailData.shipName = res.data.data.tranCarInfoList[0].shipName
+							            this.detailData.shipNo = res.data.data.tranCarInfoList[0].shipNo
+							            this.detailData.shipType = res.data.data.tranCarInfoList[0].shipType
+							            this.detailData.boxNumber = res.data.data.tranCarInfoList[0].boxNumber
+							            //上传附件计数
+							            if(this.detailData.tranCarInfoList[0].unloadPoundImg){
+							              this.pictureTotal =  this.detailData.tranCarInfoList[0].unloadPoundImg.split(",")
+							            }
+							            this.freightspace = res.data.data.tranCarInfoList
+							          }
+							
+						}
+						
+					}
+				})
+			},
+			getImgUrl(res1,res2,res3,res4) {
+				// debugger
+				this.freightspace[res4].unloadPoundImg=res1
+				
+				// this.detailData.addressUrl = res
+				// console.log(res)
+				// console.log('------------res-----------')
+			},
+			getImgUrl1(res1,res2,res3,res4){
+				console.log(res1,res2,res3,res4)
+				if (this.freightspace[0].unloadPoundImg) {
+					this.freightspace[0].unloadPoundImg += ',' + res1
+				} else {
+					this.freightspace[0].unloadPoundImg = res1
+				}
+			},
+			setImgUrl(val){
+				// debugger
+				for(let i = 0;i<freightspace.length;i++){
+					
+				}
+			},
+			filterFileType(index, lists) {
+				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
+					lists.splice(index, 1);
+					// 当前文件不支持
+					uni.showModal({
+						title: '暂不支持当前图片类型',
+						showCancel: false
+					});
+				} else {
+					this.isAdd = false;
+				}
+			},
+			dateChange(e) {
+				this.detailData.sendDateStart = e.year + "-" + e.month + "-" + e.day
+			},
+			train(index){
+				console.log(index)
+				
+				this.freightspace[index].show2=true
+				this.$forceUpdate();
+				this.index=index
+			},
+			dateChange1(e){
+				this.$set(this.freightspace[this.index],'unloadingDate',e.year + "-" + e.month + "-" + e.day)
+			},
+			dateChange2(e){
+				this.$set(this.freightspace[this.index],'receiveDateEnd',e.year + "-" + e.month + "-" + e.day)
+			},
+			statuschange(e) {
+				this.status = this.statusList[e[0]].name
+				this.getList()
+			},
+			goDetail(val) {
+				uni.navigateTo({
+					url: '/pages/erp/deliveryfeedback/details?id=' + val.id,
+				})
+			}
+		}
+	}
 </script>
 
-<style>
+<style scoped lang="scss">
+	uni-page-body {
+		overflow: hidden;
+	}
+	.content{
+		margin:10px 0;
+	}
+	.wrap {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 240rpx 20rpx;
+	
+		.top {
+			display: flex;
+			margin-bottom: 20rpx;
+	
+			.top-left {
+				margin-right: 20rpx;
+			}
+		}
+	}
+	.bottom-btn {
+			width: 100%;
+			position: fixed;
+			bottom:0;
+			display: flex;
+			z-index: 2;
+			left: 0;
+			background-color: #f8f8f8;
+			flex-direction: column;
+			.btn1,.btn2{
+				width: 100%;
+				margin-bottom: 26rpx;
+				border-radius: 90rpx;
+			}
+			.btn1{
+				background: white;
+				color: #00C265;
+			}
+			}
+	.content,
+	.content1,
+	.content2 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+	
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+		}
+	
+		.row {
+			display: flex;
+			justify-content: space-between;
+			// border-bottom: 1px solid #EEEEEE;
+			padding: 21rpx 0;
+	
+			.right,
+			input {
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+	
+		.row-bottom {
+	
+			// border: 0;
+			.right-bottom {
+				width: 280rpx;
+				text-align: right;
+			}
+		}
+	}
+	
+	.content1 {
+		margin-top: 20rpx;
+	}
+	
+	.content2 {
+		margin-top: 10px;
+		// display: flex;
+		align-items: center;
+	
+		.left {
+			margin-right: 20px;
+		}
+	}
+	
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+	
+	.edit-btn {
+		background: #22C572;
+		width: 100rpx;
+		height: 50rpx;
+		margin: 0;
+		color: white;
+	}
+	
+	.has-btn {
+		align-items: center;
+	}
+	.shade{
+		background:#000;
+		position:fixed;
+		top:0;left:0;
+	   width:100%;height:100%;
+	   z-index:10000;
+	}
+	// .bottom-btn {
+	//     padding: 30rpx;
+	// 	background: #FFFFFF;
+	// 	width: 92%;
+	// 	position: fixed;
+	// 	bottom: 0rpx;
+	// 	display: flex;
+	// 	z-index: 9999;
+	// }
 </style>

+ 2 - 2
pages/erp/receivingfeedback/list.vue

@@ -57,7 +57,7 @@
 					{name:'已完货',value:2},
 					{name:'全部任务',value:3},
 				],
-				feedbackFlag:1,
+				feedbackFlag:4,
 				dataList: [],
 				allWarehouse: [],
 				showTime: ''
@@ -94,7 +94,7 @@
 			},
 			goDetail(val) {
 				uni.navigateTo({
-					url: '/pages/erp/receivingfeedback/details?data=' + JSON.stringify(val),
+					url: '/pages/erp/receivingfeedback/details?id=' + val.id,
 				})
 			}
 		}

+ 80 - 46
pages/task/audit/Issueandreceipt_task_approval.vue

@@ -64,7 +64,7 @@
 							<view class="right">{{retreatList.predictDate}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">出库经办人</view>
+							<view class="left">收货人</view>
 							<view class="right">{{retreatList.publisher}}</view>
 						</view>
 					</view>
@@ -124,7 +124,7 @@
 							<view class="right">{{OutList.predictDate}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">出库经办人</view>
+							<view class="left">发货人</view>
 							<view class="right">{{OutList.publisher}}</view>
 						</view>
 					</view>
@@ -197,7 +197,7 @@
 							<view class="right">{{EnterList.predictDate}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">出库经办人</view>
+							<view class="left">收货人</view>
 							<view class="right">{{EnterList.publisher}}</view>
 						</view>
 					</view>
@@ -236,19 +236,30 @@
 		</view>
 		<u-popup v-model="show1" mode="center">
 			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
-				<view class="rejectText">驳回原因</view>
-				<u-input v-model="rejectInfo" type="textarea" :border="border" class="rejectInfoCss"
-					placeholder="请输入驳回原因" />
+				<view class="rejectText">审核意见(驳回)</view>
+				<u-input v-model="rejectInfo" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
 				<view class="flex">
 					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
 					<u-button @click="rejectSubmit()" type="success">确定</u-button>
 				</view>
 			</view>
 		</u-popup>
+		<u-popup v-model="show2" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见(通过)</view>
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="passSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<u-button @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button>
+			<u-button @click='show2 = true' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 
@@ -261,6 +272,9 @@
 	export default {
 		data() {
 			return {
+				height: 200,
+				autoHeight: true,
+				border: false,
 				id: "",
 				OutList: {}, //出
 				EnterList: {}, //入
@@ -268,8 +282,9 @@
 				type: '移库',
 				show: false,
 				show1: false,
-				border: false,
+				show2: false,
 				rejectInfo: "", //驳回原因
+				rejectInfo1: "",//通过意见
 				pjList: [{
 						type: '一等品'
 					},
@@ -336,38 +351,42 @@
 				this.EnterList.gradeKey = e[0] + 1
 			},
 			passSubmit() {
-				let that = this
-				uni.showModal({
-					content: "是否确定通过?",
-					showCancel: true,
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							debugger
-							that.OutList.inOutFlag = 1
-							that.EnterList.inOutFlag = 2
-							if (that.OutList.taskTypeKey == 1) {
-								that.requestadd(that.OutList)
-							} else if (that.EnterList.taskTypeKey == 2) {
-								that.requestadd(that.EnterList)
-							} else if (
-								that.OutList.taskTypeKey == 3 ||
-								that.OutList.taskTypeKey == 4
-							) {
-								that.requestadd(that.OutList, 'repetition')
-								if (!that.deletetask) {
-									that.requestadd(that.EnterList, 'repetition')
+				if (!this.rejectInfo1) {
+					this.$api.msg('审核意见不能为空!')
+				} else {
+					let that = this
+					that.show2 = false
+					uni.showModal({
+						content: "是否确定通过?",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.OutList.inOutFlag = 1
+								that.EnterList.inOutFlag = 2
+								if (that.OutList.taskTypeKey == 1) {
+									that.requestadd(that.OutList)
+								} else if (that.EnterList.taskTypeKey == 2) {
+									that.requestadd(that.EnterList)
+								} else if (
+									that.OutList.taskTypeKey == 3 ||
+									that.OutList.taskTypeKey == 4
+								) {
+									that.requestadd(that.OutList, 'repetition')
+									if (!that.deletetask) {
+										that.requestadd(that.EnterList, 'repetition')
+									}
+								}
+								if (that.retreatList.taskTypeKey == 1 || that.retreatList.taskTypeKey == 2) {
+									that.requestadd(that.retreatList)
+								} else if (that.retreatList.taskTypeKey == 3 || that.retreatList.taskTypeKey ==
+									4) {
+									that.requestadd(that.retreatList, 'repetition')
 								}
-							}
-							if (that.retreatList.taskTypeKey == 1 || that.retreatList.taskTypeKey == 2) {
-								that.requestadd(that.retreatList)
-							} else if (that.retreatList.taskTypeKey == 3 || that.retreatList.taskTypeKey ==
-								4) {
-								that.requestadd(that.retreatList, 'repetition')
 							}
 						}
-					}
-				})
+					})
+				}
 			},
 			rejectSubmit() {
 				// (1出库2入库3移库4退库并出库)
@@ -382,7 +401,6 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-
 								if (that.OutList.taskTypeKey == 1) {
 									that.requestaudit(that.OutList)
 								} else if (that.OutList.taskTypeKey == 2) {
@@ -430,7 +448,7 @@
 						this.$api.doRequest('post', '/workflow/api/handle', {
 							taskId: list.taskId,
 							approved: true,
-							auditMind: '34',
+							auditMind: this.rejectInfo1,
 							needReapply: false
 						}).then(res => {
 							uni.hideLoading()
@@ -776,13 +794,15 @@
 	// 	padding: 30rpx;
 	// 	border-radius: 20rpx;
 	// }
-	.rejectInfoCss {
-		border: 1px solid #ccc;
-		border-radius: 10rpx;
-		background-color: #F9F9FA;
-		height: 100px;
-		margin: 30rpx;
-	}
+	// .rejectInfoCss {
+	// 	border: 1px solid #ccc;
+	// 	border-radius: 10rpx;
+	// 	background-color: #F9F9FA;
+	// 	margin: 30rpx;
+	// 	overflow-y: auto;
+	// 	// height: 300rpx;
+	// 	background: red;
+	// }
 
 	.uForm_item {
 		padding: 20rpx;
@@ -825,4 +845,18 @@
 			}
 		}
 	}
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		// height: 100px;
+		overflow-y: auto;
+		margin: 30rpx;
+	}
+	.rejectText {
+		text-align: center;
+	}
+	/deep/.u-input__textarea{
+		height: 300rpx!important;
+	}
 </style>

+ 3 - 3
pages/task/audit/Issueandreceipt_task_details.vue

@@ -61,7 +61,7 @@
 							<view class="right">{{retreatList.predictDate}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">出库经办人</view>
+							<view class="left">收货人</view>
 							<view class="right">{{retreatList.publisher}}</view>
 						</view>
 					</view>
@@ -119,7 +119,7 @@
 							<view class="right">{{OutList.predictDate}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">出库经办人</view>
+							<view class="left">发货人</view>
 							<view class="right">{{OutList.publisher}}</view>
 						</view>
 					</view>
@@ -190,7 +190,7 @@
 							<view class="right">{{EnterList.predictDate}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">出库经办人</view>
+							<view class="left">收货人</view>
 							<view class="right">{{EnterList.publisher}}</view>
 						</view>
 					</view>

+ 78 - 21
pages/task/audit/acquisition_settlement_approval.vue

@@ -36,11 +36,35 @@
 				</view>
 			</view>
 		</view>
+		<u-popup v-model="show1" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见(驳回)</view>
+				<u-input v-model="rejectInfo" type="textarea" :border="border" class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="rejectSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="show2" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见(通过)</view>
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="passSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<!-- getRoles("acquisitionQuality.initial") -->
-			<u-button @click='rejectSubmit()' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button>
+			<u-button @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button @click='show2 = true' type="success" class="btn2">通过</u-button>
+<!-- 			<u-button @click='rejectSubmit()' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button> -->
 		</view>
 	</view>
 </template>
@@ -52,9 +76,16 @@
 	export default {
 		data() {
 			return {
+				height: 200,
+				autoHeight: true,
+				border: false,
+				show2:false,
+				show1:false,
 				id: "",
 				currentPage: 1,
 				pageSize: 100,
+				rejectInfo: "", //审核驳回意见
+				rejectInfo1: "", //审核通过意见
 				List: [{
 					approveStatus: "",
 				}],
@@ -98,33 +129,45 @@
 			},
 			//驳回
 			rejectSubmit() {
-				var that = this
-				if (this.List.length > 0) {
+				if (!this.rejectInfo) {
+					this.$api.msg('驳回原因不能为空!')
+				}else{
+					var that = this
+					that.show1 = false
+					if (this.List.length > 0) {
+						uni.showModal({
+							content: "确定驳回付款申请?",
+							showCancel: true,
+							confirmText: '确定',
+							success: function(res) {
+								if (res.confirm) {
+									that.audit(that.List[0], 0, false, '', '')
+								}
+							}
+						})
+					}
+				}
+		
+			},
+			//通過
+			passSubmit() {
+				if (!this.rejectInfo1) {
+					this.$api.msg('审核意见不能为空!')
+				}else{
+					var that = this
+					this.show2 = false
 					uni.showModal({
-						content: "确定驳回付款申请?",
+						content: "确定通过付款申请?",
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.audit(that.List[0], 0, false, '', '')
+								that.audit(that.List[0], 0, true)
 							}
 						}
 					})
 				}
-			},
-			//通過
-			passSubmit() {
-				var that = this
-				uni.showModal({
-					content: "确定通过付款申请?",
-					showCancel: true,
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							that.audit(that.List[0], 0, true)
-						}
-					}
-				})
+		
 			},
 			audit(item, index, status, status2, reason) {
 				if (this.List.length > 0) {
@@ -141,7 +184,7 @@
 						this.$api.doRequest('post', '/workflow/api/handle', {
 							taskId: item.taskId,
 							approved: status,
-							auditMind: reason ? '已驳回' : '34',
+							auditMind: reason ? this.rejectInfo : this.rejectInfo1,
 							needReapply: status2 ? true : false
 						}).then(res => {
 							if (res.data.code == 200) {
@@ -274,4 +317,18 @@
 			}
 		}
 	}
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		// height: 100px;
+		overflow-y: auto;
+		margin: 30rpx;
+	}
+	.rejectText {
+		text-align: center;
+	}
+	/deep/.u-input__textarea{
+		height: 300rpx!important;
+	}
 </style>

+ 38 - 2
pages/task/audit/freight_setting_approval.vue

@@ -38,6 +38,18 @@
 				</u-form-item>
 			</u-form>
 		</view>
+		<!-- 审核意见弹窗 -->
+		<!-- <u-popup v-model="show1" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见</view>
+				<u-input v-model="rejectInfo" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="passSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup> -->
 		<u-button type="primary" class="submit" @click="passSubmit()" v-if="list.priceStatus == '审核中'">通过</u-button>
 	</view>
 </template>
@@ -53,6 +65,12 @@
 					priceStatus: "",
 				},
 				id: "",
+				show1:false,
+				rejectInfo:"",//审核意见
+				//弹窗属性
+				// height:200,
+				// autoHeight: true,
+				// border: false,
 			}
 		},
 		onLoad(options) {
@@ -71,12 +89,16 @@
 				})
 			},
 			passSubmit() {
-				console.log(this.list.id)
 				var that = this
 				if (!this.list.tranPriceIng) {
 					this.$api.msg('运费单价不能为空')
 					return
 				}
+				// if (!this.rejectInfo1) {
+				// 	this.$api.msg('审核意见不能为空!')
+				// }else{
+				
+				// }
 				uni.showModal({
 					content: "是否通过该设置?",
 					showCancel: true,
@@ -88,7 +110,7 @@
 							tranProcessInfo.flag = "2"
 							tranProcessInfo.tranPriceIng = that.list.tranPriceIng
 							tranProcessInfo.reviewer = that.userInfo.userName
-							tranProcessInfo.tranTypeKey = 1
+							tranProcessInfo.tranTypeKey = that.list.tranTypeKey
 							that.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo)
 								.then(res => {
 									if (res.data.code == 200) {
@@ -167,4 +189,18 @@
 		border-radius: 40rpx;
 		margin-top: 40rpx;
 	}
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		// height: 100px;
+		overflow-y: auto;
+		margin: 30rpx;
+	}
+	.rejectText {
+		text-align: center;
+	}
+	/deep/.u-input__textarea{
+		height: 300rpx!important;
+	}
 </style>

+ 58 - 4
pages/task/audit/freight_settlement_approval.vue

@@ -8,7 +8,7 @@
 							style="height: 40rpx;"></image><!-- 驳回 -->
 						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].approveStatus == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
-						<image src="../../../static/img/daishenhe.png" mode="" v-if="list[0].approveStatus == '待决策人审核'"
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="list[0].approveStatus == '待决策人审核'|| list[0].approveStatus == '待财务审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
 					<view class="infoText">{{list[0].approveStatus}}</view>
@@ -51,10 +51,32 @@
 				</view>
 			</view>
 		</view>
+		<u-popup v-model="show1" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见(驳回)</view>
+				<u-input v-model="rejectInfo" type="textarea" :border="border" class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="rejectSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="show2" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见(通过)</view>
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="passSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button @click="rejectSubmit()" type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button  @click="passSubmit()" type="success" class="btn2">通过</u-button>
+			<u-button @click="show1 = true" type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button  @click="show2 = true" type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -70,6 +92,13 @@
 						approveStatus:"",
 					}
 				],
+				rejectInfo:"",
+				rejectInfo1:"",
+				show1:false,
+				show2:false,
+				height:200,
+				autoHeight: true,
+				border: false,
 			}
 		},
 		onLoad() {
@@ -94,6 +123,10 @@
 				if (this.list.length == 0) {
 						this.$api.msg('没有要审核的条目!')
 				} else {
+					if (!this.rejectInfo) {
+						this.$api.msg('驳回原因不能为空!')
+					}else{
+					this.show1 = false
 					uni.showModal({
 						content: "是否确定驳回?",
 						showCancel: true,
@@ -104,6 +137,7 @@
 							}
 						}
 					})
+					}
 				}
 			},
 			//通过
@@ -112,6 +146,10 @@
 				if (this.list.length == 0) {
 					this.$api.msg('没有要审核的条目!')
 				} else {
+					if (!this.rejectInfo1) {
+						this.$api.msg('审核意见不能为空!')
+					}else{
+					this.show2 = false
 					uni.showModal({
 						content: "是否确定通过?",
 						showCancel: true,
@@ -122,7 +160,9 @@
 							}
 						}
 					})
+					}
 				}
+				
 			},
 			//审核方法
 			audit(item, index, status, status2, reason) {
@@ -130,7 +170,7 @@
 					this.$api.doRequest('post', '/workflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
-						auditMind: reason != undefined ? '已驳回' : '34',
+						auditMind: reason != undefined ? this.rejectInfo : this.rejectInfo1,
 						needReapply: status2 != undefined ? true : false,
 					}).then(res => {
 						this.audit(this.list[index + 1], index + 1, status)
@@ -272,4 +312,18 @@
 			}
 		}
 	}
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		// height: 100px;
+		overflow-y: auto;
+		margin: 30rpx;
+	}
+	.rejectText {
+		text-align: center;
+	}
+	/deep/.u-input__textarea{
+		height: 300rpx!important;
+	}
 </style>

+ 60 - 26
pages/task/audit/purchase_settlement_approval.vue

@@ -43,14 +43,33 @@
 				</view>
 			</view>
 		</view>
+		<u-popup v-model="show1" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见(驳回)</view>
+				<u-input v-model="rejectInfo" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="rejectSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="show2" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见(通过)</view>
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="passSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
 		<u-toast ref="uToast" />
-		<!-- <view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
-		</view> -->
+		
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button  @click='rejectSubmit' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button  @click='passSubmit' type="success" class="btn2">通过</u-button>
+			<u-button  @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button  @click='show2 = true' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -68,6 +87,13 @@
 					}
 				],
 				contractNo: "",
+				rejectInfo: "",
+				rejectInfo1: "",
+				show1:false,
+				show2:false,
+				height: 200,
+				autoHeight: true,
+				border: false,
 			}
 		},
 		onLoad(options) {
@@ -100,15 +126,10 @@
 				if (this.list.length == 0) {
 					that.$api.msg('没有要审核的条目!')
 				} else {
-					// uni.showModal({
-					// 	content: "是否确定驳回?",
-					// 	success(res) {
-					// 		if(res)
-					// 		this.audit(this.list[0], 0, false, true, '已驳回')
-					// 	}
-					// })
-
-
+					if (!this.rejectInfo) {
+						this.$api.msg('驳回原因不能为空!')
+					}else{
+						that.show1 = false
 					uni.showModal({
 						content: "是否确定驳回?",
 						showCancel: true,
@@ -119,6 +140,7 @@
 							}
 						}
 					})
+					}
 				}
 			},
 			//通过
@@ -127,13 +149,10 @@
 				if (this.list.length == 0) {
 					that.$api.msg('没有要审核的条目!')
 				} else {
-					// uni.showModal({
-					// 	content: "是否确定通过?",
-					// 	success(res) {
-					// 		if(res)
-					// 		this.audit(this.list[0], 0, true, 2)
-					// 	}
-					// })
+				if (!this.rejectInfo1) {
+					this.$api.msg('审核意见不能为空!')
+				}else{
+					that.show2 = false
 					uni.showModal({
 						content: "是否确定通过?",
 						showCancel: true,
@@ -144,6 +163,7 @@
 							}
 						}
 					})
+					}
 				}
 			},
 			//审核方法
@@ -152,7 +172,7 @@
 					this.$api.doRequest('post', '/workflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
-						auditMind: reason != undefined ? '已驳回' : '34',
+						auditMind: reason != undefined ? this.rejectInfo : this.rejectInfo1,
 						needReapply: status2 != undefined ? true : false,
 					}).then(res => {
 						this.audit(this.list[index + 1], index + 1, status)
@@ -160,9 +180,9 @@
 				} else {
 					if (status == true) {
 						this.$api.msg('通过成功')
-						setTimeout(function() {
-								uni.navigateBack()
-						}, 1000);
+						// setTimeout(function() {
+						// 		uni.navigateBack()
+						// }, 1000);
 					} else if (status == false) {
 						this.$api.msg('驳回成功')
 						setTimeout(function() {
@@ -287,4 +307,18 @@
 				}
 			}
 		}
+		.rejectInfoCss {
+			border: 1px solid #ccc;
+			border-radius: 10rpx;
+			background-color: #F9F9FA;
+			// height: 100px;
+			overflow-y: auto;
+			margin: 30rpx;
+		}
+		.rejectText {
+			text-align: center;
+		}
+		/deep/.u-input__textarea{
+			height: 300rpx!important;
+		}
 </style>

+ 109 - 62
pages/task/audit/warehouse_approval.vue

@@ -69,10 +69,32 @@
 				</view>
 			</view>
 		</view>
+		<u-popup v-model="show1" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见(驳回)</view>
+				<u-input v-model="rejectInfo" type="textarea" :border="border" class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="reject()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="show2" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见(通过)</view>
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="audit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button  @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button  @click='audit' type="success" class="btn2">通过</u-button>
+			<u-button  @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button  @click='show2 = true' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -86,14 +108,15 @@
 		data() {
 			return {
 				show: false,
+				height: 200,
+				autoHeight: true,
+				border: false,
+				show2:false,
+				show1:false,
+				rejectInfo:"",
+				rejectInfo1:"",
 				id: 0,
 				list: {},
-				form: {
-					name: '',
-					intro: '',
-					sex: ''
-				},
-				radio: '',
 				pcUserInfo: uni.getStorageSync('pcUserInfo'),
 				switchVal: false,
 				contractNoList: []
@@ -126,64 +149,74 @@
 				this.list.contractNo = item[0].value
 			},
 			audit() {
-				var that = this
-				uni.showModal({
-					content: "是否确定通过审核?",
-					showCancel: true,
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit',that.list ).then(res => {
-								if (res.data.code == 200) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
-										approved: true,
-										auditMind: "",
-										needReapply: true,
-										taskId:  that.list.taskId,
-									}).then(res1 => {
-										if (res1.data.code == 200) {
-											that.$api.msg('审核成功');
-											setTimeout(function() {
-													uni.navigateBack()
-											}, 1000);
-										} else {
-											that.$api.msg(res1.data.message);
-										}
-									})
-								} else {
-									that.$api.msg('系统异常,请联系管理员');
-								}
-							})
+				if (!this.rejectInfo1) {
+					this.$api.msg('审核意见不能为空!')
+				}else{
+					var that = this
+					that.show2 = false
+					uni.showModal({
+						content: "是否确定通过审核?",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit',that.list ).then(res => {
+									if (res.data.code == 200) {
+										that.$api.doRequest('post', '/workflow/api/handle', {
+											approved: true,
+											auditMind: that.rejectInfo1,
+											needReapply: true,
+											taskId:  that.list.taskId,
+										}).then(res1 => {
+											if (res1.data.code == 200) {
+												that.$api.msg('审核成功');
+												setTimeout(function() {
+														uni.navigateBack()
+												}, 1000);
+											} else {
+												that.$api.msg(res1.data.message);
+											}
+										})
+									} else {
+										that.$api.msg('系统异常,请联系管理员');
+									}
+								})
+							}
 						}
-					}
-				})
+					})
+				}
 			},
 			reject() {
-				var that = this
-				uni.showModal({
-					content: "是否确定驳回?",
-					showCancel: true,
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
-								taskId: that.list.taskId,
-								approved: false,
-								auditMind: '已驳回',
-								needReapply: true,
-							}).then(res1 => {
-								if (res1.data.code == 200) {
-									that.$api.msg('驳回成功');
-									setTimeout(function() {
-											uni.navigateBack()
-									}, 1000);
-								} else {
-									that.$api.msg(res1.data.message);
-								}
-							})
+				if (!this.rejectInfo) {
+					this.$api.msg('驳回原因不能为空!')
+				}else{
+					var that = this
+					that.show1 = false
+					uni.showModal({
+						content: "是否确定驳回?",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.$api.doRequest('post', '/workflow/api/handle', {
+									taskId: that.list.taskId,
+									approved: false,
+									auditMind: that.rejectInfo,
+									needReapply: true,
+								}).then(res1 => {
+									if (res1.data.code == 200) {
+										that.$api.msg('驳回成功');
+										setTimeout(function() {
+												uni.navigateBack()
+										}, 1000);
+									} else {
+										that.$api.msg(res1.data.message);
+									}
+								})
+							}
 						}
-					}
-				})
+					})
+				}
 			}
 		}
 	}
@@ -285,4 +318,18 @@
 			}
 		}
 	}
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		// height: 100px;
+		overflow-y: auto;
+		margin: 30rpx;
+	}
+	.rejectText {
+		text-align: center;
+	}
+	/deep/.u-input__textarea{
+		height: 300rpx!important;
+	}
 </style>

+ 1 - 1
pages/user/user.vue

@@ -315,7 +315,7 @@
 						// });
 					}
 				})
-				debugger
+				// debugger
 				if(!uni.getStorageSync('compName')){
 					this.$api.doRequest('get', '/commonUser/getCompOwn', {
 				phone: this.userInfo.phone