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

components/upload.vue

@@ -274,7 +274,6 @@
 				type: Number,
 				default: false
 			}
-
 		},
 		mounted() {},
 		data() {

pages/erp/deliveryfeedback/details.vue

@@ -144,7 +144,12 @@
 			<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 class="left">车厢-{{index+1}}</view>
+					<view v-if="item.status == '' ||item.status == null ||item.status == '未装车'">未装车</view>
+					<view v-if="item.status == '已装车' ||item.status == '已送达'">已装车</view>
+				</view>
+				<view class="row">
+					<view class="left">车厢号</view>
 					<view>{{item.boxNo}}</view>
 				</view>
 				<view class="row">
@@ -157,13 +162,16 @@
 				</view>
 				<view class="row">
 					<view class="left">磅单</view>
-					<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 v-if="item.status == '已装车' || item.status == '已送达'" v-for="(items,count) in item.imgUrl">
+						<view class="pound_list1">
+							<image v-if="items.url"  @click='shadeshow(item.loadPoundImg)' style='width:100px;height:100px;margin: 0rpx;' :src="items.url" mode=""></image>
+						     <view v-else>暂无图片</view>
+						</view>
+						
 					</view>
-					<view v-else>
-						<image v-if="item.loadPoundImg"  @click='shadeshow(item.loadPoundImg)' style='width:100px;height:100px;' :src="item.loadPoundImg" mode=""></image>
-						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="9" :file-list="imgUrl"
+					<view v-else class="pound_list">
+						<!-- <image v-if="item.loadPoundImg"  @click='shadeshow(item.loadPoundImg)' style='width:100px;height:100px;' :src="item.loadPoundImg" mode=""></image> -->
+						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="9" :file-list="item.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>
@@ -222,8 +230,8 @@
 					<view v-if="item.loadPoundImg">
 						<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="9" :file-list="imgUrl"
+					<view v-else class="pound_list">
+						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="9" :file-list="item.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>
@@ -247,14 +255,14 @@
 				<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 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 == '已送达'">{{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>
@@ -299,9 +307,9 @@
 						</u-picker>
 					</view>
 				</view>
-				<view style='text-align:right;' v-if="item.status == '已装车'">未装船</view>
-				<view style='text-align:right;' v-else-if="item.status == '已送达'">已装船</view>
-				<u-button v-else @click='submit(index,3)' type="success">保存</u-button>
+			<!-- 	<view style='text-align:right;' v-if="item.status == '已装车'">未装船</view>
+				<view style='text-align:right;' v-else-if="item.status == '已送达'">已装船</view> -->
+				<u-button v-if="item.status == '未装车'" @click='submit(index,3)' type="success">保存</u-button>
 			</view>
 			<view class="row">
 				<view style='margin-left:10px;' class="left">运单</view>
@@ -367,7 +375,12 @@
 				imgUrl:[],
 				unloadPoundImg:'',
 				action: this.$uploadUrl,
-				freightspace:[],
+				freightspace:[
+					{
+						imgUrl:[],
+					}
+					
+				],
 				feedbackFlag:1,
 				detailData:{},
 				allWarehouse: [],
@@ -561,7 +574,6 @@
 			},
 			finishedgoods(){
 				var that = this
-				
 				if(this.detailData.tranType=='火运'){
 					uni.showModal({
 						content: "完货操作后，装车信息不可修改，是否确定完货？",
@@ -812,15 +824,21 @@
 								 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
+								for (var i = 0; i < res.data.data.tranCarInfoList.length; i++) {
+									this.imgUrl = []
+									res.data.data.tranCarInfoList[i].show2=false
+									let imgs = res.data.data.tranCarInfoList[i].loadPoundImg.split(",")
+									for(let j = 0 ; j < imgs.length ; j++){
+										this.imgUrl.push({url:imgs[j]})
+									}
+									this.freightspace[i].imgUrl = this.imgUrl
+								}
 							}
 						}else if(res.data.data.tranType=='汽运'){
 							for (var i = 0; i < res.data.data.tranCarInfoList.length; i++) {
@@ -1036,4 +1054,10 @@
 	   width:100%;height:100%;
 	   z-index:10000;
 	}
+	.pound_list{
+		width: 452rpx;
+		display: flex;
+		justify-content: flex-end;
+		text-align: right;
+	}
 </style>

pages/erp/deliveryfeedback/list.vue

@@ -36,9 +36,9 @@
 				</view>
 			</view>
 		</view>
-		<view v-show="isContent">
+		<!-- <view v-show="isContent">
 			<uni-load-more :status="loadStatus"></uni-load-more>
-		</view>
+		</view> -->
 	</view>
 </template>
 

pages/erp/receivingfeedback/details.vue

@@ -153,7 +153,7 @@
 				</view>
 				<view class="row">
 					<view class="left">卸车净重</view>
-					<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.unloadNetWeight}}</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>
@@ -165,7 +165,7 @@
 						<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>
+					<view v-else class="pound_list">
 						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="9" :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>
@@ -221,8 +221,8 @@
 				<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>
+						<view v-if="item.status == '未装车' || item.status == '已送达'">{{item.receiveDateEnd}}</view>
+						<view @click='train(index)'>{{item.receiveDateEnd?item.receiveDateEnd:'请选择日期'}}</view>
 						<u-picker v-model="item.show2" mode="time"  @cancel='datecancel()' @confirm='dateChange2($event,index)' :params="params">
 						</u-picker>
 					</view>
@@ -233,7 +233,7 @@
 						<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>
+					<view v-else class="pound_list">
 						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="9" :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>
@@ -314,8 +314,8 @@
 						</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 style='text-align:right;' v-if="item.status == '未装车' || item.status == '已送达'">{{item.status}}</view> -->
+				<u-button v-if="item.status == '已装车'" @click='submit(index,3)' type="success">保存</u-button>
 			</view>
 			<view class="row">
 				<view style='margin-left:10px;' class="left">运单</view>
@@ -416,7 +416,7 @@
 				this.url=url
 			},
 			datecancel(){
-				this.freightspace[this.index].show2=true
+				this.freightspace[this.index].show2 = true
 				this.$forceUpdate();
 			},
 			submit(index,status){
@@ -560,7 +560,7 @@
 							that.$api.msg('保存成功')
 							that.detailData = {}
 							that.freightspace = {}
-							uni.navigateBack({})
+								uni.navigateBack()
 						}
 					})
 				}
@@ -601,7 +601,10 @@
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({})
+										setTimeout(function(){
+											uni.navigateBack()
+										},1000)
+										
 									}
 								})
 							}
@@ -620,7 +623,10 @@
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({})
+										setTimeout(function(){
+											uni.navigateBack()
+										},1000)
+										
 									}
 								})
 							}
@@ -639,7 +645,9 @@
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({})
+										setTimeout(function(){
+											uni.navigateBack()
+										},1000)
 									}
 								})
 							}
@@ -699,9 +707,10 @@
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({
-											
-										})
+										setTimeout(function(){
+											uni.navigateBack()
+										},1000)
+										
 									}
 								})
 							}
@@ -733,9 +742,10 @@
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({
-											
-										})
+										setTimeout(function(){
+											uni.navigateBack()
+										},1000)
+										
 									}
 								})
 							}
@@ -773,7 +783,10 @@
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({})
+										setTimeout(function(){
+											uni.navigateBack()
+										},1000)
+										
 									}
 								})
 							}
@@ -805,9 +818,9 @@
 						}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.imgUrl.push({url:res.data.data.tranCarInfoList[i].unloadPoundImg.split(",")[i]})
 							}
 							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++) {
@@ -878,8 +891,8 @@
 			},
 			train(index){
 				console.log(index)
-				
-				this.freightspace[index].show2=true
+				// debugger
+				this.freightspace[index].show2 = true
 				this.$forceUpdate();
 				this.index=index
 			},
@@ -988,9 +1001,19 @@
 	
 		.left {
 			margin-right: 20px;
+			width: 300rpx;
 		}
 	}
-	
+	// .left {
+	// 	margin-right: 20px;
+	// 	width: 300rpx;
+	// }
+	.pound_list{
+		width: 452rpx;
+		display: flex;
+		justify-content: flex-end;
+		text-align: right;
+	}
 	.submit {
 		width: 40%;
 		background: #22C572;

pages/erp/receivingfeedback/list.vue

@@ -36,9 +36,9 @@
 				</view>
 			</view>
 		</view>
-		<view v-show="isContent">
+		<!-- <view v-show="isContent">
 			<uni-load-more :status="loadStatus"></uni-load-more>
-		</view>
+		</view> -->
 	</view>
 </template>
 

pages/task/audit/freight_setting_approval.vue

@@ -30,14 +30,14 @@
 				<u-form-item label="发货地址" prop="sendDetailedAddress" label-width="140">
 					<!-- <u-input v-model="list.sendDetailedAddress" input-align="right" placeholder="发货地址" disabled /> -->
 					<view class="text_info">
-						{{list.sendPrivate}}{{list.receiveCity}}{{list.sendDetailedAddress}}{{list.sendDetailedAddress}}
+						{{list.sendPrivate}}{{list.sendCity}}{{list.sendArea}}{{list.sendDetailedAddress}}
 					</view>
 					
 				</u-form-item>
 				<u-form-item label="收货地址" prop="receiveDetailedAddress" label-width="140">
 					<!-- <u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="收货地址" disabled /> -->
 					<view class="text_info">
-						{{list.receivePrivate}}{{list.sendCity}}{{list.receiveArea}}{{list.receiveDetailedAddress}}
+						{{list.receivePrivate}}{{list.receiveCity}}{{list.receiveArea}}{{list.receiveDetailedAddress}}
 					</view>
 					
 				</u-form-item>

pages/task/audit/freight_settlement_approval.vue

@@ -4,51 +4,52 @@
 			<view class="topInfo-item">
 				<view class="flex info">
 					<view class="logo">
-						<image src="../../../static/img/reject.png" mode="" v-if="list[0].approveStatus == '已驳回'"
+						<image src="../../../static/img/reject.png" mode="" v-if="list.approveStatus == '已驳回'"
 							style="height: 40rpx;"></image><!-- 驳回 -->
-						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].approveStatus == '已通过'"
+						<image src="../../../static/img/tongguo.png" mode="" v-if="list.approveStatus == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
-						<image src="../../../static/img/daishenhe.png" mode="" v-if="list[0].approveStatus == '待决策人审核'|| list[0].approveStatus == '待财务审核'"
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="list.approveStatus == '待决策人审核'|| list.approveStatus == '待财务审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText">{{list[0].approveStatus}}</view>
+					<view class="infoText">{{list.approveStatus}}</view>
 				</view>
-				<view class="infoData">{{list[0].updateDate}}</view>
+				<view class="infoData">{{list.updateDate}}</view>
 			</view>
 		</view>
 		<view class="content">
 			<view class="top">
 				<view>合同编号</view>
-				<view>{{list[0].contractNo}}</view>
+				<view>{{list.contractNo}}</view>
 			</view>
 			<view class="car-container">
-				<view v-for="(item,index) in list" style="border-bottom: 2rpx solid #EEEEEE;margin-top: 30rpx;">
-					<view class="car-num title">{{item.carNo}} ({{item.tranCarNo}})</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '1'">{{list.carNo}} ({{list.tranCarNo}})</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '2'">车厢号{{list.boxNo}}</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '3'&&list.shipType== '散船'">仓位号{{list.boxNo}}</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '3'&&list.shipType== '集装箱'">箱号{{list.boxNo}}</view>
 					<view class="car-type-item">
 						<view class="left">装</view>
-						<view class="textInfo">{{item.loadingWeight}}吨</view>
+						<view class="textInfo">{{list.loadingWeight}}吨</view>
 					</view>
 					<view class="car-type-item">
 						<view class="center">卸</view>
-						<view class="textInfo">{{item.unloadingWeight}}吨</view>
+						<view class="textInfo">{{list.unloadingWeight}}吨</view>
 					</view>
 					<view class="car-type-item">
 						<view class="right">结</view>
-						<view class="textInfo">{{item.settlementWeight}}吨</view>
+						<view class="textInfo">{{list.settlementWeight}}吨</view>
 					</view>
 					<view class="car-type-item">
 						<view class="left">运</view>
-						<view class="textInfo">{{item.transportPrice}}元/吨</view>
+						<view class="textInfo">{{list.transportPrice}}元/吨</view>
 					</view>
 					<view class="car-type-item">
 						<view class="center">扣</view>
-						<view class="textInfo">{{item.deductionAmount}}元</view>
+						<view class="textInfo">{{list.deductionAmount}}元</view>
 					</view>
 					<view class="car-type-item">
 						<view class="right">付</view>
-						<view class="textInfo">{{item.amountIngPayable}}元</view>
+						<view class="textInfo">{{list.amountIngPayable}}元</view>
 					</view>
-				</view>
 			</view>
 		</view>
 		<u-popup v-model="show1" mode="center">
@@ -101,92 +102,93 @@
 				border: false,
 			}
 		},
-		onLoad() {
+		onLoad(options) {
+			this.id = options.id
 			this.getList()
 		},
 		methods: {
 			getList() {
-				this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
-					compId: "2710b21efc1e4393930c5dc800010dc4",
-					currentPage: this.currentPage,
-					pageSize: this.pageSize,
-					contractNo: "全部合同"
+				this.$api.doRequest('get', '/tranSettlementReport/getInfo', {
+					id: this.id
 				}).then(res => {
+					this.contractNo = res.data.data.contractNo
+					this.carId = res.data.data.carId
 					if (res.data.code == 200) {
-						this.list = res.data.data.records
+						this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
+							compId: "2710b21efc1e4393930c5dc800010dc4",
+							currentPage: this.currentPage,
+							pageSize: this.pageSize,
+							contractNo: this.contractNo,
+							carId:this.carId,
+						}).then(res => {
+							if (res.data.code == 200) {
+								this.list= res.data.data.records[0]
+								console.log(this.list,124)
+							}
+						})
 					}
 				})
 			},
 			// 驳回
 			rejectSubmit() {
 				var that = this
-				if (this.list.length == 0) {
-						this.$api.msg('没有要审核的条目！')
-				} else {
-					if (!this.rejectInfo) {
-						this.$api.msg('驳回原因不能为空！')
-					}else{
-					this.show1 = false
-					uni.showModal({
-						content: "是否确定驳回?",
-						showCancel: true,
-						confirmText: '确定',
-						success: function(res) {
-							if (res.confirm) {
-								that.audit(that.list[0], 0, false, true, '已驳回')
-							}
+				if (!this.rejectInfo) {
+					this.$api.msg('驳回原因不能为空！')
+				}else{
+				this.show1 = false
+				uni.showModal({
+					content: "是否确定驳回?",
+					showCancel: true,
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							that.audit(that.list, 0, false, true, that.rejectInfo)
 						}
-					})
 					}
-				}
+				})
+			}
+
 			},
 			//通过
 			passSubmit() {
 				var that = this
-				if (this.list.length == 0) {
-					this.$api.msg('没有要审核的条目！')
-				} else {
-					if (!this.rejectInfo1) {
-						this.$api.msg('审核意见不能为空！')
-					}else{
-					this.show2 = false
-					uni.showModal({
-						content: "是否确定通过?",
-						showCancel: true,
-						confirmText: '确定',
-						success: function(res) {
-							if (res.confirm) {
-								that.audit(that.list[0], 0, true, 2)
-							}
+				if (!this.rejectInfo1) {
+					this.$api.msg('审核意见不能为空！')
+				}else{
+				this.show2 = false
+				uni.showModal({
+					content: "是否确定通过?",
+					showCancel: true,
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							that.audit(that.list, 0, true, 2,that.rejectInfo1)
 						}
-					})
 					}
-				}
-				
+				})
+			}
 			},
 			//审核方法
-			audit(item, index, status, status2, reason) {
-				if (index < this.list.length) {
+			audit(list, index, status, status2, reason) {
+				if (this.list) {
 					this.$api.doRequest('post', '/workflow/api/handle', {
-						taskId: item.taskId,
+						taskId: list.taskId,
 						approved: status,
 						auditMind: reason != undefined ? this.rejectInfo : this.rejectInfo1,
 						needReapply: status2 != undefined ? true : false,
 					}).then(res => {
-						this.audit(this.list[index + 1], index + 1, status)
+						if (status == true) {
+								this.$api.msg('通过成功')
+							setTimeout(function() {
+								uni.navigateBack()
+							}, 1000);
+						} else if (status == false) {
+								this.$api.msg('驳回成功')
+							setTimeout(function() {
+								uni.navigateBack()
+							}, 1000);
+						}
 					})
-				} else {
-					if (status == true) {
-							this.$api.msg('通过成功')
-						setTimeout(function() {
-							uni.navigateBack()
-						}, 1000);
-					} else if (status == false) {
-							this.$api.msg('驳回成功')
-						setTimeout(function() {
-							uni.navigateBack()
-						}, 1000);
-					}
 				}
 			},
 		}

pages/task/audit/freight_settlement_details.vue

@@ -4,51 +4,50 @@
 			<view class="topInfo-item">
 				<view class="flex info">
 					<view class="logo">
-						<image src="../../../static/img/reject.png" mode="" v-if="list[0].approveStatus == '已驳回'"
+						<image src="../../../static/img/reject.png" mode="" v-if="list.status == '已驳回'"
 							style="height: 40rpx;"></image><!-- 驳回 -->
-						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].approveStatus == '已通过'"
+						<image src="../../../static/img/tongguo.png" mode="" v-if="list.status == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
-						<image src="../../../static/img/daishenhe.png" mode="" v-if="list[0].approveStatus == '待决策人审核'"
-							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText">{{list[0].approveStatus}}</view>
+					<view class="infoText">{{list.status}}</view>
 				</view>
-				<view class="infoData">{{list[0].updateDate}}</view>
+				<view class="infoData">{{list.updateDate}}</view>
 			</view>
 		</view>
 		<view class="content">
 			<view class="top">
 				<view>合同编号</view>
-				<view>{{list[0].contractNo}}</view>
+				<view>{{list.contractNo}}</view>
 			</view>
 			<view class="car-container">
-				<view v-for="(item,index) in list" style="border-bottom: 2rpx solid #EEEEEE;margin-top: 30rpx;">
-					<view class="car-num title">{{item.carNo}} ({{item.tranCarNo}})</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '1'">{{list.carNo}} ({{list.tranCarNo}})</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '2'">车厢号{{list.boxNo}}</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '3'&&list.shipType== '散船'">仓位号{{list.boxNo}}</view>
+					<view class="car-num title" v-if="list.tranTypeKey== '3'&&list.shipType== '集装箱'">箱号{{list.boxNo}}</view>
 					<view class="car-type-item">
 						<view class="left">装</view>
-						<view class="textInfo">{{item.loadingWeight}}吨</view>
+						<view class="textInfo">{{list.loadingWeight}}吨</view>
 					</view>
 					<view class="car-type-item">
 						<view class="center">卸</view>
-						<view class="textInfo">{{item.unloadingWeight}}吨</view>
+						<view class="textInfo">{{list.unloadingWeight}}吨</view>
 					</view>
 					<view class="car-type-item">
 						<view class="right">结</view>
-						<view class="textInfo">{{item.settlementWeight}}吨</view>
+						<view class="textInfo">{{list.settlementWeight}}吨</view>
 					</view>
 					<view class="car-type-item">
 						<view class="left">运</view>
-						<view class="textInfo">{{item.transportPrice}}元/吨</view>
+						<view class="textInfo">{{list.transportPrice}}元/吨</view>
 					</view>
 					<view class="car-type-item">
 						<view class="center">扣</view>
-						<view class="textInfo">{{item.deductionAmount}}元</view>
+						<view class="textInfo">{{list.deductionAmount}}元</view>
 					</view>
 					<view class="car-type-item">
 						<view class="right">付</view>
-						<view class="textInfo">{{item.amountIngPayable}}元</view>
+						<view class="textInfo">{{list.amountIngPayable}}元</view>
 					</view>
-				</view>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
@@ -71,78 +70,31 @@
 				],
 			}
 		},
-		onLoad() {
+		onLoad(options) {
+			this.id = options.id
 			this.getList()
 		},
 		methods: {
 			getList() {
-				this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
-					compId: "2710b21efc1e4393930c5dc800010dc4",
-					currentPage: this.currentPage,
-					pageSize: this.pageSize,
-					contractNo: "全部合同"
+				this.$api.doRequest('get', '/tranSettlementReport/getInfo', {
+					id: this.id
 				}).then(res => {
+					this.contractNo = res.data.data.contractNo
+					this.carId = res.data.data.carId
 					if (res.data.code == 200) {
-						this.list = res.data.data.records
-					}
-				})
-			},
-			// 驳回
-			rejectSubmit() {
-				var that = this
-				if (this.list.length == 0) {
-						this.$api.msg('没有要审核的条目！')
-				} else {
-					uni.showModal({
-						content: "是否确定驳回?",
-						showCancel: true,
-						confirmText: '确定',
-						success: function(res) {
-							if (res.confirm) {
-								that.audit(that.list[0], 0, false, true, '已驳回')
+						this.$api.doRequest('get', '/tranSettlementReport/selectTranSettlementReport', {
+							compId: "2710b21efc1e4393930c5dc800010dc4",
+							currentPage: this.currentPage,
+							pageSize: this.pageSize,
+							contractNo: this.contractNo,
+							carId:this.carId,
+						}).then(res => {
+							if (res.data.code == 200) {
+								this.list= res.data.data.records[0]
 							}
-						}
-					})
-				}
-			},
-			//通过
-			passSubmit() {
-				var that = this
-				if (this.list.length == 0) {
-					this.$api.msg('没有要审核的条目！')
-				} else {
-					uni.showModal({
-						content: "是否确定通过?",
-						showCancel: true,
-						confirmText: '确定',
-						success: function(res) {
-							if (res.confirm) {
-								that.audit(that.list[0], 0, true, 2)
-							}
-						}
-					})
-				}
-			},
-			//审核方法
-			audit(item, index, status, status2, reason) {
-				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
-						taskId: item.taskId,
-						approved: status,
-						auditMind: reason != undefined ? '已驳回' : '34',
-						needReapply: status2 != undefined ? true : false,
-					}).then(res => {
-						this.audit(this.list[index + 1], index + 1, status)
-					})
-				} else {
-					if (status == true) {
-							that.$api.msg('通过成功')
-						this.getList()
-					} else if (status == false) {
-							that.$api.msg('驳回成功')
-						this.getList()
+						})
 					}
-				}
+				})
 			},
 			fanHui(){
 				uni.navigateBack()
@@ -154,7 +106,7 @@
 <style scoped lang="scss">
 	.container {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 110rpx 20rpx;
+		padding: 20rpx 20rpx 230rpx 20rpx;
 	}
 
 	.content {
@@ -270,4 +222,19 @@
 			}
 		}
 	}
+	.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>
+

pages/task/audit/purchasecontract.vue

@@ -2,7 +2,7 @@
 	<view class="container">
 		<u-form ref="uForm">
 			<u-form-item label-width='260' label="合同编号">
-				<u-input  v-model="list.contractNo" input-align="right" placeholder="" disabled />
+				<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="买方">
 				<u-input v-model="list.buyer" input-align="right" placeholder="" disabled />
@@ -11,7 +11,7 @@
 				<u-input v-model="list.buyerPhone" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="卖方">
-				<u-input  v-model="list.seller" input-align="right" placeholder="" disabled />
+				<u-input v-model="list.seller" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="卖方电话">
 				<u-input v-model="list.sellerPhone" input-align="right" placeholder="" disabled />
@@ -43,128 +43,137 @@
 			<u-form-item label-width='260' label="交货日期（止）">
 				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="合同单价（元/吨）">
+			<u-form-item label-width='260' label="合同单价（元/吨）">
 				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="合同总价（元）">
+			<u-form-item label-width='260' label="合同总价（元）">
 				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="货源所在地区">
+			<u-form-item label-width='260' label="货源所在地区">
 				<view class="textCss">
 					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
 				</view>
 			</u-form-item>
-			<u-form-item  label-width='260' label="货源详细地址">
+			<u-form-item label-width='260' label="货源详细地址">
 				<u-input v-model="list.sourceGoods" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="交货地所在地区">
+			<u-form-item label-width='260' label="交货地所在地区">
 				<view class="textCss">
 					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
 				</view>
-				
 			</u-form-item>
-			<u-form-item  label-width='260' label="交货地详细地址">
-				<u-input v-model="list.placeDelivery" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="交货地详细地址">
+				<u-input v-model="list.placeDelivery" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="签订日期">
-				<u-input v-model="list.signingDate" input-align="right" placeholder="" disabled/>
+				<u-input v-model="list.signingDate" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='300' label="最终实际交易量 (吨)">
-				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='300' label="最终实际交易量 (吨)">
+				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item v-if='list.deliverType == 1' label-width='260' label="临时仓库负责人">
-				<u-input v-model="list.personCharge" input-align="right" placeholder="" disabled/>
+				<u-input v-model="list.personCharge" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="货名">
-				<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="货名">
+				<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="水分（%）<=">
-				<u-input v-model="list.contractGoodsInfo.waterContent" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="水分（%）<=">
+				<u-input v-model="list.contractGoodsInfo.waterContent" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="品级">
-				<u-input v-model="list.contractGoodsInfo.grade" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="品级">
+				<u-input v-model="list.contractGoodsInfo.grade" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="杂质（%）<=">
-				<u-input v-model="list.contractGoodsInfo.impurity" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="杂质（%）<=">
+				<u-input v-model="list.contractGoodsInfo.impurity" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="容重(克/升)>=">
-				<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="容重(克/升)>=">
+				<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="霉变粒（%）<=">
-				<u-input v-model="list.contractGoodsInfo.mildewGrain" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="霉变粒（%）<=">
+				<u-input v-model="list.contractGoodsInfo.mildewGrain" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="热损伤（%）<=">
-				<u-input v-model="list.contractGoodsInfo.jiaorenli" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="热损伤（%）<=">
+				<u-input v-model="list.contractGoodsInfo.jiaorenli" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="不完善粒（%）<=">
-				<u-input v-model="list.contractGoodsInfo.imperfectGrain" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="不完善粒（%）<=">
+				<u-input v-model="list.contractGoodsInfo.imperfectGrain" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="合同收入（元）">
-				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="合同收入（元）">
+				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="已开发票（元）">
-				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="已开发票（元）">
+				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="费用支出（元）">
-				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="费用支出（元）">
+				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="未开发票（元）">
-				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="未开发票（元）">
+				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="未回款（元）">
-				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="未回款（元）">
+				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="双章原件回收情况">
-				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="双章原件回收情况">
+				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="备注信息">
-				<u-input v-model="list.remarks" input-align="right" placeholder="" disabled/>
+			<u-form-item label-width='260' label="备注信息">
+				<u-input v-model="list.remarks" input-align="right" placeholder="" disabled />
 			</u-form-item>
-			<u-form-item  label-width='260' label="附件">
-				<!-- {{list.contractProcessInfo.grade}} -->
-				<view v-for='item in imglist'>
-					<image style='width:100px;height:100px;' :src="item" mode=""></image>
+			<u-form-item label-width='260' label="附件">
+				<view class="textCss">
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1"
+						:file-list="imglist" :size-type="['compressed']" @on-success="getImgUrl" @on-error="onError"
+						@on-remove="onRemove" @on-uploaded="isAdd = true" :before-upload="filterFileType"
+						@on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
 				</view>
-				
 			</u-form-item>
 		</u-form>
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button v-if='list.approveStatus'  @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button v-if='list.approveStatus'  @click='pass' type="success" class="btn2">通过</u-button>
+			<u-button v-if='list.approveStatus' @click='reject' type="error" class="btn1" hover-class='none'>驳回
+			</u-button>
+			<u-button v-if='list.approveStatus' @click='pass' type="success" class="btn2">通过</u-button>
 		</view>
 		<view v-if='show' class="shade">
 			<view class="wrap">
-				<view style='border-bottom:1px solid #eee;padding:10px;display:flex;justify-content:space-between;'>{{title}}
-				<u-icon name="close"></u-icon></view>
+				<view style='border-bottom:1px solid #eee;padding:10px;display:flex;justify-content:space-between;'>
+					{{title}}
+					<u-icon name="close"></u-icon>
+				</view>
 				<view style='padding:10px;'>
-					<input v-model='auditMind'  v-if="this.title=='审核意见'" placeholder="请输入审核意见,不超过100字" type="text" value="" />
-					<input v-model='auditMind'  v-if="this.title=='驳回原因'" placeholder="请输入原因" type="text" value="" />
+					<input v-model='auditMind' v-if="this.title=='审核意见'" placeholder="请输入审核意见,不超过100字" type="text"
+						value="" />
+					<input v-model='auditMind' v-if="this.title=='驳回原因'" placeholder="请输入原因" type="text" value="" />
 				</view>
-				<view  @click='close()' class="cancel">取消</view>
-				<view  @click='passSubmit()' class="confirm">确定</view>
+				<view @click='close()' class="cancel">取消</view>
+				<view @click='passSubmit()' class="confirm">确定</view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import upload from '@/components/upload.vue';
 	export default {
+		components: {
+			upload
+		},
 		data() {
 			return {
 				id: "",
 				currentPage: 1,
 				pageSize: 10,
-				list: [
-					{
-						status:"",
-						contractGoodsInfo:{},
-					}
-				],
-				imglist:[],
-				auditMind:'',
-				show:false,
-				title:'',
+				list: [{
+					status: "",
+					contractGoodsInfo: {},
+				}],
+				imglist: [],
+				auditMind: '',
+				show: false,
+				title: '',
 				contractNo: "",
+				action: this.$uploadUrl,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
+				isAdd: true,
 			}
 		},
 		onLoad(options) {
@@ -177,28 +186,44 @@
 				this.$api.doRequest('get', '/contractManagementInfo/getInfo', {
 					id: this.id
 				}).then(res => {
-					if(res.data.code==200){
-						this.list=res.data.data
+					if (res.data.code == 200) {
+						this.list = res.data.data
 						if (this.list.deliverType == 1) {
 							this.list.deliverType1 = '我方自提'
 						} else if (this.list.deliverType == 2) {
 							this.list.deliverType1 = '对方送货'
 						}
 						this.$api.doRequest('get', '/appendix/query/getFileList', {
-							appendixIds:that.list.addressUrl
+							appendixIds: that.list.addressUrl
 						}).then(res1 => {
-							for(var i=0;i<res1.data.data.length;i++){
-								that.imglist.push(res1.data.data[i].appendixPath)
+							for (var i = 0; i < res1.data.data.length; i++) {
+								that.imglist.push({
+									url: res1.data.data[i].appendixPath
+								})
 							}
-							
-					   })
+
+						})
 					}
 				})
-				
+			},
+			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;
+				}
 			},
 			//驳回
 			rejectSubmit() {
-				uni.showLoading({title: '加载中',mask:true});
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
 				var that = this
 				that.$api.doRequest('post', '/workflow/api/handle', {
 					taskId: that.list.taskId,
@@ -208,30 +233,33 @@
 				}).then(res => {
 					uni.hideLoading()
 					that.$api.msg('驳回成功')
-					that.show=false
+					that.show = false
 					setTimeout(function() {
 						uni.navigateBack()
 					}, 1000);
 				})
 			},
-			close(){
-				this.show=false
+			close() {
+				this.show = false
 			},
-			pass(){
-				this.show=true
-				this.title='审核意见'
+			pass() {
+				this.show = true
+				this.title = '审核意见'
 			},
 			reject() {
-				this.show=true
-				this.title='驳回原因'
+				this.show = true
+				this.title = '驳回原因'
 			},
 			//通过
 			passSubmit() {
 				var that = this
-				if(this.title=='驳回原因'){
+				if (this.title == '驳回原因') {
 					this.rejectSubmit()
-				}else{
-					uni.showLoading({title: '加载中',mask:true});
+				} else {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					});
 					that.$api.doRequest('post', '/workflow/api/handle', {
 						taskId: that.list.taskId,
 						approved: true,
@@ -240,13 +268,13 @@
 					}).then(res => {
 						uni.hideLoading()
 						that.$api.msg('通过成功')
-						that.show=false
+						that.show = false
 						setTimeout(function() {
 							uni.navigateBack()
 						}, 1000);
 					})
 				}
-				
+
 			},
 			//审核方法
 			audit(item, index, status, status2, reason) {
@@ -277,17 +305,21 @@
 	.container {
 		padding: 20rpx 20rpx 250rpx 20rpx;
 	}
-	.u-form{
-		background:#fff;
-		border-radius:10px;
-		padding:0 10px;
-		.u-form-item{
-			line-height:30px;
-			padding:5px 0;
+
+	.u-form {
+		background: #fff;
+		border-radius: 10px;
+		padding: 0 10px;
+
+		.u-form-item {
+			line-height: 30px;
+			padding: 5px 0;
 		}
 	}
+
 	.content {
 		margin-top: 30rpx;
+
 		.top {
 			display: flex;
 			justify-content: space-between;
@@ -307,7 +339,8 @@
 			text-align: left;
 			margin: 20rpx 0;
 		}
-		.car-container{
+
+		.car-container {
 			border-bottom: 2rpx solid #EEEEEE;
 		}
 
@@ -322,6 +355,7 @@
 			color: #333333;
 			font-weight: 500;
 		}
+
 		.row {
 			display: flex;
 			justify-content: space-between;
@@ -335,7 +369,7 @@
 		.money {
 			font-size: 32rpx;
 			font-weight: 500;
-			margin-bottom: 30rpx ;
+			margin-bottom: 30rpx;
 		}
 
 		.moneyInfo {
@@ -343,90 +377,107 @@
 			font-size: 32rpx;
 		}
 	}
-.bottom-btn {
+
+	.bottom-btn {
 		width: 100%;
 		position: fixed;
-		bottom:0;
+		bottom: 0;
 		display: flex;
 		z-index: 2;
 		left: 0;
 		background-color: #f8f8f8;
 		flex-direction: column;
-		.btn1,.btn2{
+
+		.btn1,
+		.btn2 {
 			width: 100%;
 			margin-bottom: 26rpx;
 			border-radius: 90rpx;
 		}
-		.btn1{
+
+		.btn1 {
 			background: white;
 			color: #00C265;
 		}
-		}
-		.topInfo {
-			height: 210rpx;
-			background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
-			padding: 30rpx;
-		
-			.topInfo-item {
-				height: 150rpx;
-				background-color: #FFFFFF;
-				border-radius: 20rpx;
-				padding: 40rpx;
-		
-				.logo {
-					width: 40rpx;
-					height: 40rpx;
-					margin-top: 8rpx;
-				}
-		
-				.infoText {
-					font-size: 36rpx;
-					font-weight: 600;
-					margin-left: 20rpx;
-				}
-		
-				.infoData {
-					color: #878C9C;
-					font-size: 26rpx;
-					margin-top: 10rpx;
-				}
+	}
+
+	.topInfo {
+		height: 210rpx;
+		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
+		padding: 30rpx;
+
+		.topInfo-item {
+			height: 150rpx;
+			background-color: #FFFFFF;
+			border-radius: 20rpx;
+			padding: 40rpx;
+
+			.logo {
+				width: 40rpx;
+				height: 40rpx;
+				margin-top: 8rpx;
 			}
-		}
-		.shade{
-			position:fixed;
-			top:0;
-			left:0;
-			height:100%;width:100%;
-			background:rgba(0,0,0,0.1);
-			z-index:3;
-			.wrap{
-				position:absolute;
-				left:0;top:0;right:0;bottom:0;margin:auto;
-				background:#fff;
-				width:80%;
-				height:30%;
+
+			.infoText {
+				font-size: 36rpx;
+				font-weight: 600;
+				margin-left: 20rpx;
+			}
+
+			.infoData {
+				color: #878C9C;
+				font-size: 26rpx;
+				margin-top: 10rpx;
 			}
 		}
-		.cancel,.confirm{
-			position:absolute;
-			display:inline-block;
-			width:50%;
-			text-align:center;
-			bottom:0;
-			padding:10px;
-			border-top:1px solid #eee;
-		}
-		.cancel{
-			left:0;
-			border-right:1px solid #eee;
-		}
-		.confirm{
-			right:0;
-		}
-		.textCss{
-			display: flex;
-			justify-content: flex-end;
-			width: 100%;
-			text-align: right;
+	}
+
+	.shade {
+		position: fixed;
+		top: 0;
+		left: 0;
+		height: 100%;
+		width: 100%;
+		background: rgba(0, 0, 0, 0.1);
+		z-index: 3;
+
+		.wrap {
+			position: absolute;
+			left: 0;
+			top: 0;
+			right: 0;
+			bottom: 0;
+			margin: auto;
+			background: #fff;
+			width: 80%;
+			height: 30%;
 		}
+	}
+
+	.cancel,
+	.confirm {
+		position: absolute;
+		display: inline-block;
+		width: 50%;
+		text-align: center;
+		bottom: 0;
+		padding: 10px;
+		border-top: 1px solid #eee;
+	}
+
+	.cancel {
+		left: 0;
+		border-right: 1px solid #eee;
+	}
+
+	.confirm {
+		right: 0;
+	}
+
+	.textCss {
+		display: flex;
+		justify-content: flex-end;
+		width: 100%;
+		text-align: right;
+	}
 </style>

pages/task/audit/salecontract.vue

@@ -119,11 +119,11 @@
 				<u-input v-model="list.remarks" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="附件">
-				<!-- {{list.contractProcessInfo.grade}} -->
-				<view v-for='item in imglist'>
-					<image style='width:100px;height:100px;' :src="item" mode=""></image>
+				<view class="textCss">
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1" :file-list="imglist"
+					:size-type="['compressed']" @on-success="getImgUrl" @on-error="onError" @on-remove="onRemove"
+					@on-uploaded="isAdd = true" :before-upload="filterFileType" @on-progress="onProgress" :deletable="false" :showProgress = "false"></upload>
 				</view>
-				
 			</u-form-item>
 		</u-form>
 		<view style='padding:10px;' class='flex bottom-btn'>
@@ -145,7 +145,11 @@
 </template>
 
 <script>
+	import upload from '@/components/upload.vue';
 	export default {
+		components: {
+			upload
+		},
 		data() {
 			return {
 				id: "",
@@ -161,6 +165,9 @@
 				show:false,
 				title:'',
 				contractNo: "",
+				action: this.$uploadUrl,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
+				isAdd: true,
 			}
 		},
 		onLoad(options) {
@@ -184,12 +191,29 @@
 							appendixIds:that.list.addressUrl
 						}).then(res1 => {
 							for(var i=0;i<res1.data.data.length;i++){
-								that.imglist.push(res1.data.data[i].appendixPath)
+								that.imglist.push({url:res1.data.data[i].appendixPath})
+								console.log(that.imglist,"kfoguio")
 							}
 					   })
 					}
 				})
 			},
+			onRemove(){
+		
+				return
+			},
+			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;
+				}
+			},
 			//驳回
 			rejectSubmit() {
 				var that = this
@@ -222,6 +246,9 @@
 				}).then(res => {
 					that.$api.msg('通过成功')
 					that.show=false
+					setTimeout(function() {
+						uni.navigateBack()
+					}, 1000);
 				})
 			},
 			//审核方法
@@ -405,420 +432,4 @@
 		width: 100%;
 	}
 </style>
-=======
-<template>
-	<view class="container">
-		<u-form ref="uForm">
-			<u-form-item label-width='260' label="合同编号">
-				<view style='text-align:right;width:100%;'>{{list.contractNo}}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="运输方式">
-				<view style='text-align:right;width:100%;'>{{list.shippingType}}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="买方">
-				<view style='text-align:right;width:100%;'>{{list.buyer}}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="结算方式">
-				<view style='text-align:right;width:100%;'>{{ list.settlementMethod }}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="卖方">
-				<view style='text-align:right;width:100%;'>{{list.seller}}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="交货方式">
-				<view style='text-align:right;width:100%;'>{{list.deliverType1}}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="买方电话">
-				<view style='text-align:right;width:100%;'>{{list.buyerPhone}}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="包装方式">
-				<view style='text-align:right;width:100%;'>{{list.packingMethod}}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="卖方电话">
-				<view style='text-align:right;width:100%;'>{{list.sellerPhone}}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="验收方式">
-				<view style='text-align:right;width:100%;'>{{list.acceptanceMethod}}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="重量（吨）">
-				<view style='text-align:right;width:100%;'>{{list.weight}}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="交货日期（起）">
-				<view style='text-align:right;width:100%;'>{{list.deliveryDateStart}}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="溢短装（%）">
-				<view style='text-align:right;width:100%;'>{{list.overShort}}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="交货日期（止）">
-				<view style='text-align:right;width:100%;'>{{list.deliveryDateEnd}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="合同单价（元/吨）">
-				<view style='text-align:right;width:100%;'>{{list.unitContractPrice}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="合同总价（元）">
-				<view style='text-align:right;width:100%;'>{{list.totalContractPrice}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="货源所在地区">
-				<view style='text-align:right;width:100%;'>{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="货源详细地址">
-				<view style='text-align:right;width:100%;'>{{list.sourceGoods}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="交货地所在地区">
-				<view style='text-align:right;width:100%;'>{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="交货地详细地址">
-				<view style='text-align:right;width:100%;'>{{list.placeDelivery}}</view>
-			</u-form-item>
-			<u-form-item label-width='260' label="签订日期">
-				<view style='text-align:right;width:100%;'>{{list.signingDate}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="最终实际交易量 (吨)">
-				<view style='text-align:right;width:100%;'>{{list.finalTradingVolume}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="货名">
-				<view style='text-align:right;width:100%;'>{{list.contractGoodsInfo.goodsName}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="水分（%）<=">
-				<view style='text-align:right;width:100%;'>{{list.contractGoodsInfo.waterContent}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="品级">
-				<view style='text-align:right;width:100%;'>{{list.contractGoodsInfo.grade}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="杂质（%）<=">
-				<view style='text-align:right;width:100%;'>{{list.contractGoodsInfo.impurity}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="容重(克/升)>=">
-				<view style='text-align:right;width:100%;'>{{list.contractGoodsInfo.bulkDensity}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="霉变粒（%）<=">
-				<view style='text-align:right;width:100%;'>{{list.contractGoodsInfo.mildewGrain}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="热损伤（%）<=">
-				<view style='text-align:right;width:100%;'>{{list.contractGoodsInfo.jiaorenli}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="不完善粒（%）<=">
-				<view style='text-align:right;width:100%;'>{{list.contractGoodsInfo.imperfectGrain}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="合同收入（元）">
-				<view style='text-align:right;width:100%;'>{{list.contractProcessInfo.goodsNameKey}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="已开发票（元）">
-				<view style='text-align:right;width:100%;'>{{list.contractProcessInfo.goodsName}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="费用支出（元）">
-				<view style='text-align:right;width:100%;'>{{list.contractProcessInfo.waterContent}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="未开发票（元）">
-				<view style='text-align:right;width:100%;'>{{list.contractProcessInfo.impurity}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="未回款（元）">
-				<view style='text-align:right;width:100%;'>{{list.contractProcessInfo.mildewGrain}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="双章原件回收情况">
-				<view style='text-align:right;width:100%;'>{{list.contractProcessInfo.grade}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="备注信息">
-				<view style='text-align:right;width:100%;'>{{list.remarks}}</view>
-			</u-form-item>
-			<u-form-item  label-width='260' label="附件">
-				<!-- {{list.contractProcessInfo.grade}} -->
-				<view v-for='item in imglist'>
-					<image style='width:100px;height:100px;' :src="item" mode=""></image>
-				</view>
-				
-			</u-form-item>
-		</u-form>
-		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button v-if='list.approveStatus'  @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button v-if='list.approveStatus'  @click='pass' type="success" class="btn2">通过</u-button>
-		</view>
-		<view v-if='show' class="shade">
-			<view class="wrap">
-				<view style='border-bottom:1px solid #eee;padding:10px;display:flex;justify-content:space-between;'>{{title}}
-				<u-icon name="close"></u-icon></view>
-				<view style='padding:10px;'>
-					<input v-model='auditMind'  v-if="this.title=='审核意见'" placeholder="请输入审核意见,不超过100字" type="text" value="" />
					<input v-model='auditMind'  v-if="this.title=='驳回原因'" placeholder="请输入原因" type="text" value="" />
-				</view>
-				<view  @click='close()' class="cancel">取消</view>
-				<view  @click='passSubmit()' class="confirm">确定</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				id: "",
-				currentPage: 1,
-				pageSize: 10,
-				list: [
-					{
-						status:"",
-					}
-				],
-				imglist:[],
-				auditMind:'',
-				show:false,
-				title:'',
-				contractNo: "",
-			}
-		},
-		onLoad(options) {
-			this.id = options.id
-			this.getList()
-		},
-		methods: {
-			getList(id) {
-				var that = this
-				this.$api.doRequest('get', '/contractManagementInfo/getInfo', {
-					id: this.id
-				}).then(res => {
-					if(res.data.code==200){
-						this.list=res.data.data
-						if (this.list.deliverType == 1) {
-							this.list.deliverType1 = '我方送货'
-						} else if (this.list.deliverType == 2) {
-							this.list.deliverType1 = '对方自提'
-						}
-						this.$api.doRequest('get', '/appendix/query/getFileList', {
-							appendixIds:that.list.addressUrl
-						}).then(res1 => {
-							for(var i=0;i<res1.data.data.length;i++){
-								that.imglist.push(res1.data.data[i].appendixPath)
-							}
-							
-					   })
-					}
-				})
-			},
-			//驳回
-			rejectSubmit() {
-				uni.showLoading({title: '加载中',mask:true});
-				var that = this
-				that.$api.doRequest('post', '/workflow/api/handle', {
-					taskId: that.list.taskId,
-					approved: false,
-					auditMind: this.auditMind,
-					needReapply: true,
-				}).then(res => {
-					uni.hideLoading()
-					that.$api.msg('驳回成功')
-					that.show=false
-					setTimeout(function() {
-						uni.navigateBack()
-					}, 1000);
-				})
-			},
-			close(){
-				this.show=false
-			},
-			pass(){
-				console.log(1111)
-				this.show=true
-				this.title='审核意见'
-			},
-			reject() {
-				this.show=true
-				this.title='驳回原因'
-			},
-			//通过
-			passSubmit() {
-				var that = this
-				if(this.title=='驳回原因'){
-					this.rejectSubmit()
-				}else{
-					uni.showLoading({title: '加载中',mask:true});
-				that.$api.doRequest('post', '/workflow/api/handle', {
-					taskId: that.list.taskId,
-					approved: true,
-					auditMind: this.auditMind,
-					needReapply: true,
-				}).then(res => {
-					uni.hideLoading()
-					that.$api.msg('通过成功')
-					that.show=false
-					setTimeout(function() {
-						uni.navigateBack()
-					}, 1000);
-				})
-				}
-			},
-			//审核方法
-			audit(item, index, status, status2, reason) {
-				if (index < this.list.length) {
-					this.$api.doRequest('post', '/workflow/api/handle', {
-						taskId: item.taskId,
-						approved: status,
-						auditMind: reason != undefined ? '已驳回' : '34',
-						needReapply: status2 != undefined ? true : false,
-					}).then(res => {
-						this.audit(this.list[index + 1], index + 1, status)
-					})
-				} else {
-					if (status == true) {
-						that.$api.msg('通过成功')
-						this.getList()
-					} else if (status == false) {
-						that.$api.msg('驳回成功')
-						this.getList()
-					}
-				}
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.container {
-		padding: 20rpx 20rpx 250rpx 20rpx;
-	}
-	.u-form{
-		background:#fff;
-		border-radius:10px;
-		padding:0 10px;
-		.u-form-item{
-			line-height:30px;
-			padding:5px 0;
-		}
-	}
-	.content {
-		margin-top: 30rpx;
-		.top {
-			display: flex;
-			justify-content: space-between;
-		}
-
-		.content-item {
-			border-radius: 20rpx;
-			background: white;
-			padding: 40rpx 20rpx;
-			margin-bottom: 30rpx;
-		}
-
-		.title {
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #333333;
-			text-align: left;
-			margin: 20rpx 0;
-		}
-		.car-container{
-			border-bottom: 2rpx solid #EEEEEE;
-		}
-
-		.car-type-item {
-			font-size: 28rpx;
-			margin: 20rpx 0;
-			color: #878C9C;
-		}
-
-		.weightInfoCss {
-			font-size: 28rpx;
-			color: #333333;
-			font-weight: 500;
-		}
-		.row {
-			display: flex;
-			justify-content: space-between;
-			// .right,
-			// input {
-			// 	font-size: 28rpx;
-			// 	// color: #333333;
-			// }
-		}
-
-		.money {
-			font-size: 32rpx;
-			font-weight: 500;
-			margin-bottom: 30rpx ;
-		}
-
-		.moneyInfo {
-			color: #22C572;
-			font-size: 32rpx;
-		}
-	}
-.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;
-		}
-		}
-		.topInfo {
-			height: 210rpx;
-			background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
-			padding: 30rpx;
-		
-			.topInfo-item {
-				height: 150rpx;
-				background-color: #FFFFFF;
-				border-radius: 20rpx;
-				padding: 40rpx;
-		
-				.logo {
-					width: 40rpx;
-					height: 40rpx;
-					margin-top: 8rpx;
-				}
-		
-				.infoText {
-					font-size: 36rpx;
-					font-weight: 600;
-					margin-left: 20rpx;
-				}
-		
-				.infoData {
-					color: #878C9C;
-					font-size: 26rpx;
-					margin-top: 10rpx;
-				}
-			}
-		}
-		.shade{
-			position:fixed;
-			top:0;
-			left:0;
-			height:100%;width:100%;
-			background:rgba(0,0,0,0.1);
-			z-index:3;
-			.wrap{
-				position:absolute;
-				left:0;top:0;right:0;bottom:0;margin:auto;
-				background:#fff;
-				width:80%;
-				height:30%;
-			}
-		}
-		.cancel,.confirm{
-			position:absolute;
-			display:inline-block;
-			width:50%;
-			text-align:center;
-			bottom:0;
-			padding:10px;
-			border-top:1px solid #eee;
-		}
-		.cancel{
-			left:0;
-			border-right:1px solid #eee;
-		}
-		.confirm{
-			right:0;
-		}
-</style>
->>>>>>> 49be1654324e86f64e708549561aaf5e93133cfe
+