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

components/upload.vue

@@ -41,6 +41,9 @@
 			}" class="u-add-tips">{{ options.text }}</view>
 			</view>
 		</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 class="custom-style" v-if="custom"
 					:style="{backgroundImage: 'url(' + options.bgc + ')', backgroundSize:'100% 100%'}">
 
@@ -223,7 +226,7 @@
 			},
 			customBorder:{
 				type: String,
-				default: '2px dashed #C6CBCE'
+				// default: '2px dashed #C6CBCE'
 			},
 			customBtnFontSize:{
 				type: String,
@@ -271,7 +274,6 @@
 				type: Number,
 				default: false
 			}
-
 		},
 		mounted() {},
 		data() {
@@ -279,7 +281,9 @@
 				lists: [],
 				isInCount: true,
 				uploading: false,
-				isSelectFile: false
+				isSelectFile: false,
+				imgShow:false,
+				url:''
 			};
 		},
 		watch: {
@@ -530,19 +534,22 @@
 				console.log(this.lists,url,index)
 				if (!this.previewFullImage) return;
 				const images = this.lists.map(item => item.url || item.path);
-				uni.previewImage({
-					urls: images,
-					current: url,
-					success: () => {
-						this.$emit('on-preview', url, this.lists);
-					},
-					fail: () => {
-						uni.showToast({
-							title: '预览图片失败',
-							icon: 'none'
-						});
-					}
-				});
+				this.url=url
+				this.imgShow=true
+				// 图片预览调用onShow清空数据
+				// uni.previewImage({
+				// 	urls: images,
+				// 	current: url,
+				// 	success: () => {
+				// 		this.$emit('on-preview', url, this.lists);
+				// 	},
+				// 	fail: () => {
+				// 		uni.showToast({
+				// 			title: '预览图片失败',
+				// 			icon: 'none'
+				// 		});
+				// 	}
+				// });
 			},
 			// 判断是否json字符串
 			checkIsJSON(str) {
@@ -731,11 +738,11 @@
 	}
 
 	.customStyle {
-		width: 100% !important;
+		width: 712rpx !important;
 		height: 440rpx !important;
 		background: #F5F6FA;
 		border-radius: 20rpx;
-		border: 2px dashed #C6CBCE;
+		// border: 2px dashed #C6CBCE;
 		display: flex !important;
 		justify-content: center;
 		align-items: center;
@@ -771,4 +778,11 @@
 			border:1px dashed #AFB3BF;
 		}
 	}
+	.shade{
+		background:#000;
+		position:fixed;
+		top:0;left:0;
+	   width:100%;height:100%;
+	   z-index:10000;
+	}
 </style>

config/index.js

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

pageD/identity/companyIdentity.vue

@@ -33,6 +33,7 @@
 			</view>
 			<view v-else>
 				<view>
+					<!-- <image src="../../static/img/authentication/business.png" mode=""></image> -->
 					<!-- 个人身份证正面 -->
 					<upload class="upload" ref="upload1" :action="action" :max-size="maxSize" :max-count="1"
 						:size-type="['compressed']" @on-success="getImgUrl1" @on-remove="onRemove"
@@ -44,7 +45,8 @@
 						@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
 						:custom="uploadCustom2"></upload>
 				</view>
-				<view class="c-row b-b">
+				<view class="person-info">
+					<view class="c-row b-b">
 					<text class="tit_red">*</text>
 					<text class="tit">姓名</text>
 					<view class="con-list">
@@ -59,6 +61,8 @@
 							v-model="identityAuthenticationInfo.customerNumberCard"></input>
 					</view>
 				</view>
+				</view>
+				
 			</view>
 			<button class="btns btn" @click="jumpUrl">下一步</button>
 		</view>
@@ -91,7 +95,7 @@
 				businesslicense:[],
 				uploadOptions: {
 					"text": "上传营业执照",
-					"bgc": ""
+					"bgc": "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/0dd1401f54e34affaa11c711d808a0a0.png"
 				},
 				uploadOptions1: {
 					"text": "上传身份证头像页",

pageD/identity/companyIdentityThree.vue

@@ -12,7 +12,8 @@
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions1"
 				:custom="uploadCustom"></upload>
 		</view>
-		<view class="c-row b-b">
+		<view class="person-info">
+			<view class="c-row b-b">
 			<text class="tit">银行卡号</text>
 			<view class="con-list">
 				<input type='number' placeholder="请填写银行卡号" name="input"
@@ -79,6 +80,8 @@
 				<input placeholder="请填写联系地址" name="input" v-model="identityAuthenticationInfo.compAddress"></input>
 			</view>
 		</view>
+		</view>
+		
 		<button class="btns btn" @click="commit">提交</button>
 	</view>
 </template>
@@ -715,4 +718,10 @@
 	.tit_red {
 		color: #E54D42;
 	}
+	.person-info{
+		background: white;
+		padding: 20rpx;
+		border-radius: 20rpx;
+		margin-bottom: 50rpx;
+	}
 </style>

pageD/identity/companyIdentityTwo.vue

@@ -12,6 +12,7 @@
 				@on-uploaded="isAdd = true" :before-upload="filterFileType" :options="uploadOptions2"
 				:custom="uploadCustom1" ></upload>
 		</view>
+		<view class="person-info">
 		<view class="c-row b-b">
 			<text class="tit_red">*</text>
 			<text class="tit">姓名</text>
@@ -19,13 +20,14 @@
 				<input placeholder="请填写姓名" name="input" v-model="identityAuthenticationInfo.customerName"></input>
 			</view>
 		</view>
-		<view class="c-row b-b">
+		<view class="c-row">
 			<text class="tit">身份证号</text>
 			<view class="con-list">
 				<input  placeholder="请填写身份证号" name="input"
 					v-model="identityAuthenticationInfo.customerNumberCard"></input>
 			</view>
 		</view>
+			</view>
 		<button class="btns btn" @click="jumpUrl">下一步</button>
 	</view>
 </template>
@@ -267,4 +269,10 @@
 	.tit_red{
 		color: #E54D42;
 	}
+	.person-info{
+		background: white;
+		padding: 20rpx;
+		border-radius: 20rpx;
+		margin-bottom: 50rpx;
+	}
 </style>

pageD/identity/driverIdentityThree.vue

@@ -95,11 +95,11 @@
 				},
 				uploadOptions2: {
 					"text": "上传道路运营证",
-					"bgc": ""
+					"bgc": "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/0dd1401f54e34affaa11c711d808a0a0.png"
 				},
 				uploadOptions3: {
 					"text": "上传从业资格证",
-					"bgc": ""
+					"bgc": "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/0dd1401f54e34affaa11c711d808a0a0.png"
 				},
 				travels: "../../static/img/authentication/travel(3).png",
 				drives: "../../static/img/authentication/drive(3).png",

pages/attestation/index.vue

@@ -2,23 +2,39 @@
 	<view class="center">
 		<view class="homePage">
 			<view @click="liangShang">
-				<image src="../../static/img/authentication/bg@2x.png"   class="background"></image>
-				<view class="title" >
-					粮商身份
+				<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
+				<view class="title-warp">
+					<view>
+						<view class="title">
+							粮商身份
+						</view>
+						<view class="textTips_Css">
+							{{textTips}}
+						</view>
+					</view>
+					<image src="../../static/img/authentication/liangshang@3x.png" class="portrait1"></image>
 				</view>
 			</view>
 			<view class="arrows1" @click="addliangShang">
 				<text style="margin-right: 30px;">新增身份</text>
 				<image src="../../static/img/authentication/jiantou@3x.png" class="arrow"></image>
 			</view>
-			<image src="../../static/img/authentication/liangshang@3x.png" class="portrait1"></image>
 		</view>
 
 		<view class="homePage1">
 			<view @click="siJi">
 				<image src="../../static/img/authentication/bg@2x.png" class="background"></image>
-				<view class="title" @click="siJi">
-					司机身份
+				
+				<view class="title-warp">
+					<view>
+						<view class="title">
+							司机身份
+						</view>
+						<view class="textTips_Css">
+							{{textTips1}}
+						</view>
+					</view>
+					<image src="../../static/img/authentication/siji@3x.png" class="portrait1"></image>
 				</view>
 			</view>
 			
@@ -26,7 +42,6 @@
 				<text style="margin-right: 30px;">新增身份</text>
 				<image src="../../static/img/authentication/jiantou@3x.png" class="arrow"></image>
 			</view>
-			<image src="../../static/img/authentication/siji@3x.png" class="portrait1"></image>
 		</view>
 		
 		 <!-- <view class="homePage2">
@@ -72,6 +87,8 @@
 					id: "",
 				},
 				id:"",
+				textTips:"",
+				textTips1:"",
 			};
 		},
 		computed: {
@@ -305,6 +322,20 @@
 							})
 						}
 					});
+					//查看是否有粮商身份
+					this.$api.doRequest('get', '/identityAuthenticationInfo/getInfo',{commonId:this.userInfo.id}).then(res => {
+						if(res.data.code==11016){
+							this.textTips = "您还未认证粮商身份"
+						}
+					})
+					// 查看是否有司机身份
+					this.$api.doRequest('get', '/driverViewInfo/getInfo',{commonId:this.userInfo.id}).then(res => {
+						if(res.data.code==11019){
+							this.textTips1 = "您还未认证司机身份"
+						}
+						//res.data.code==11020 司机身份在审核
+					})
+					
 				// this.$api.doRequest('get', '/identityAuthenticationInfo/selectCount', {
 				// 	customerTypeFlag:3,customerType:"粮农"
 				// 	}, 'application/json;charset=UTF-8').then(res => {
@@ -355,26 +386,32 @@
 						url: `/pageD/identity/driverIdentityLook?id=${item.id}`
 					})
 				}
-
 			}
 		}
 	}
 </script>
 
-<style>
+<style scoped>
 	.center {
 		overflow-x: hidden;
-		padding: 10px 20px;
+		padding: 0rpx 10rpx;
+		height: calc(100vh - 90rpx);
 	}
 
 	.title {
 		font-size: 22px;
-		font-weight: 900;
-		/* margin-top: 30px; */
-		top: 50px;
-		left: 24px;
-		position: relative;
-
+		font-weight: 600;
+	}
+	.title-warp{
+		position: absolute;
+		width: calc(100% - 40rpx);
+		z-index: 2;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 35rpx;
+		top: 80rpx;
+		left: 10rpx;
 	}
 
 	.company {
@@ -383,7 +420,6 @@
 	}
 
 	.infos {
-		/* margin: 10px 20px; */
 		width: 100%;
 		display: inline-table;
 	}
@@ -400,7 +436,8 @@
 	.homePage {
 		width: 100%;
 		height: 350rpx;
-		margin-top: 20rpx;
+		margin-top: 8rpx;
+		position: relative;
 	}
 
 	.arrows {
@@ -411,10 +448,11 @@
 	}
 
 	.arrow {
-		width: 16px;
-		height: 16px;
+		width: 36rpx;
+		height: 26rpx;
 		float: right;
 		right: 20px;
+		top: 6rpx;
 	}
 
 	.portrait {
@@ -424,35 +462,33 @@
 		right: -70px;
 	}
 
-	.homePage1 {
-		width: 100%;
-		height: 350rpx;
-		margin-top: 50rpx;
-	}
-	.homePage2 {
+	.homePage1,.homePage2 {
 		width: 100%;
 		height: 350rpx;
 		margin-top: 50rpx;
+		position: relative;
 	}
 
 	.background {
-		width: 90%;
+		width: 100%;
 		height: 200px;
-		margin: 0 auto;
-		position: absolute;
 	}
 
 	.arrows1 {
 		position: absolute;
-		right: 30px;
-		margin-top: 120px;
+		right: 10rpx;
+		bottom: 4rpx;
+		z-index: 3;
 	}
 
 	.portrait1 {
-		width: 75px;
-		height: 75px;
-		margin-right: 20px;
-		float: right;
-
+		width:150rpx;
+		height:150rpx;
+		border-radius: 8rpx;
+	}
+	.textTips_Css{
+		color: #AFB3BF;
+		font-size: 28rpx;
+		margin-top: 10rpx;
 	}
 </style>

pages/erp/deliveryfeedback/details.vue

@@ -105,7 +105,7 @@
 				<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 :mask-close-able='false' v-model="show1" mode="time" @confirm='dateChange($event)' :params="params">
 					</u-picker>
 				</view>
 			</view>
@@ -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,12 +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>
-						<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1" :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>
@@ -172,7 +181,7 @@
 					<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" @cancel='datecancel()' @confirm='dateChange1($event,item)' :params="params">
+						<u-picker :mask-close-able='false' v-model="item.show2" mode="time" @cancel='datecancel()' @confirm='dateChange1($event,item)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -210,9 +219,9 @@
 				<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" @cancel='datecancel()' @confirm='dateChange1($event,index)' :params="params">
+						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.sendDateStart}}</view>
+						<view v-else @click='train(index)'>{{item.sendDateStart?item.sendDateStart:'请选择日期'}}</view>
+						<u-picker :mask-close-able='false' v-model="item.show2" mode="time" @cancel='datecancel()' @confirm='dateChange2($event,index)' :params="params">
 						</u-picker>
 					</view>
 				</view>
@@ -221,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="1" :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>
@@ -246,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>
@@ -294,20 +303,21 @@
 					<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"  @cancel='datecancel()' @confirm='dateChange1($event,index)' :params="params">
+						<u-picker :mask-close-able='false' v-model="item.show2" mode="time"  @cancel='datecancel()' @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 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>
 				<view v-if="pictureTotal.length>0">
-					<image  v-for='item in pictureTotal' @click='shadeshow(item)' style='width:100px;height:100px;' :src="item" mode=""></image>
+					<image  v-for='item in pictureTotal' @click='shadeshow(item)' style='width:100px;height:100px;margin:5px;' :src="item" mode=""></image>
 				</view>
-				<view v-else>
-					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="1" :file-list="imgUrl"
+				<view >
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="9" :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>
@@ -365,7 +375,12 @@
 				imgUrl:[],
 				unloadPoundImg:'',
 				action: this.$uploadUrl,
-				freightspace:[],
+				freightspace:[
+					{
+						imgUrl:[],
+					}
+					
+				],
 				feedbackFlag:1,
 				detailData:{},
 				allWarehouse: [],
@@ -403,6 +418,14 @@
 				this.freightspace[this.index].show2=true
 				this.$forceUpdate();
 			},
+			getImgUrl1(res1,res2,res3,res4){
+				console.log(res1,res2,res3,res4)
+				if (this.freightspace[0].loadPoundImg) {
+					this.freightspace[0].loadPoundImg += ',' + res1
+				} else {
+					this.freightspace[0].loadPoundImg = res1
+				}
+			},
 			submit(index,status){
 				var that = this
 				if(this.detailData.tranType=='火运'){
@@ -535,7 +558,7 @@
 					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.sendDateStart = that.freightspace[index].sendDateStart
 					tranProcessInfo.loadPoundImg = that.freightspace[index].loadPoundImg
 					tranProcessInfo.tranType = status
 					tranProcessInfo.contractNo = that.detailData.contractNo
@@ -556,6 +579,7 @@
 						content: "完货操作后，装车信息不可修改，是否确定完货？",
 						success(res) {
 							if (res.confirm) {
+								uni.showLoading({title: '加载中'});
 								that.tranCarInfoList = that.freightspace
 								that.tranCarInfoList.driver = that.detailData.driver
 								that.tranCarInfoList.driverPhone = that.detailData.driverPhone
@@ -581,10 +605,13 @@
 								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
 								that.$api.doRequest('post', '/tranProcessInfo/api/editFeedbackStatus', tranProcessInfo).then(res => {
 									if (res.data.code == 200) {
-										that.$api.msg('提交成功')
+										uni.hideLoading()
+										that.$api.msg('完货成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({})
+										setTimeout(function() {
+										         uni.navigateBack({})
+										     }, 1000);
 									}
 								})
 							}
@@ -595,14 +622,18 @@
 						content: "完货操作后，装船信息不可修改，是否确定完货？",
 						success(res) {
 							if (res.confirm) {
+								uni.showLoading({title: '加载中'});
 								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('提交成功')
+										uni.hideLoading()
+										that.$api.msg('完货成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({})
+										setTimeout(function() {
+										         uni.navigateBack({})
+										     }, 1000);
 									}
 								})
 							}
@@ -613,14 +644,19 @@
 						content: "完货操作后，装车信息不可修改，是否确定完货？",
 						success(res) {
 							if (res.confirm) {
+								uni.showLoading({title: '加载中'});
 								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('提交成功')
+										uni.hideLoading()
+										that.$api.msg('完货成功')
 										that.detailData = {}
 										that.freightspace = {}
 										uni.navigateBack({})
+										setTimeout(function() {
+										         uni.navigateBack({})
+										     }, 1000);
 									}
 								})
 							}
@@ -629,6 +665,7 @@
 				}
 			},
 			pass(){
+				
 				var that = this
 				if(this.detailData.tranType=='火运'){
 					for(var i=0;i<this.freightspace.length;i++){
@@ -652,6 +689,7 @@
 						content: "提交成功后提醒司机及时签订运输合同，确定提交装车信息？",
 						success(res) {
 							if (res.confirm) {
+								uni.showLoading({title: '加载中'});
 								that.tranCarInfoList = that.freightspace
 								that.tranCarInfoList.driver = that.detailData.driver
 								that.tranCarInfoList.driverPhone = that.detailData.driverPhone
@@ -677,12 +715,13 @@
 								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
 								that.$api.doRequest('post', '/tranProcessInfo/api/insertTranCar', tranProcessInfo).then(res => {
 									if (res.data.code == 200) {
+										uni.hideLoading()
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({
-											
-										})
+										setTimeout(function() {
+										         uni.navigateBack({})
+										     }, 1000);
 									}
 								})
 							}
@@ -699,6 +738,7 @@
 						content: "提交成功后装船信息不可修改，是否确定提交？",
 						success(res) {
 							if (res.confirm) {
+								uni.showLoading({title: '加载中'});
 								that.tranCarInfoList = that.freightspace
 								that.tranCarInfoList[0].sendDateStart = that.detailData.sendDateStart
 								for (var i = 0; i < that.tranCarInfoList.length; i++) {
@@ -711,12 +751,16 @@
 								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
 								that.$api.doRequest('post', '/tranProcessInfo/api/insertTranCar', tranProcessInfo).then(res => {
 									if (res.data.code == 200) {
+										uni.hideLoading()
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({
-											
-										})
+										setTimeout(function() {
+										         uni.navigateBack({})
+										     }, 1000);
+									}else{
+										uni.hideLoading()
+										that.$api.msg('系统异常，请联系管理员')
 									}
 								})
 							}
@@ -727,6 +771,7 @@
 						content: "提交成功后提醒司机及时签订运输合同，确定提交装车信息？",
 						success(res) {
 							if (res.confirm) {
+								uni.showLoading({title: '加载中'});
 								that.tranCarInfoList = that.freightspace
 								that.tranCarInfoList.driver = that.detailData.driver
 								that.tranCarInfoList.driverPhone = that.detailData.driverPhone
@@ -751,12 +796,16 @@
 								tranProcessInfo.tranCarInfoList = that.tranCarInfoList
 								that.$api.doRequest('post', '/tranProcessInfo/api/insertTranCar', tranProcessInfo).then(res => {
 									if (res.data.code == 200) {
+										uni.hideLoading()
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({
-											
-										})
+										setTimeout(function() {
+										         uni.navigateBack({})
+										     }, 1000);
+									}else{
+										uni.hideLoading()
+										that.$api.msg('系统异常，请联系管理员')
 									}
 								})
 							}
@@ -775,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++) {
@@ -860,6 +915,9 @@
 			dateChange1(e){
 				this.$set(this.freightspace[this.index],'loadingDate',e.year + "-" + e.month + "-" + e.day)
 			},
+			dateChange2(e){
+				this.$set(this.freightspace[this.index],'sendDateStart',e.year + "-" + e.month + "-" + e.day)
+			},
 			statuschange(e) {
 				this.status = this.statusList[e[0]].name
 				this.getList()
@@ -996,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/exWarehousing/exWarehousing.vue

@@ -75,7 +75,7 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">出库类型</view>
-				<input v-model='detailData.inOutType'  class="right-bottom"  :disabled="isSelectType"></input>
+				<input v-model='detailData.inOutType'  class="right-bottom"  :disabled="isSelectType" placeholder="自动获取"></input>
 			<!-- 	<u-picker :range="warehousingTypeList" range-key="constValue" @confirm='warehousingTypePicker($event)'
 					v-model="show5" mode="selector">
 				</u-picker> -->
@@ -240,15 +240,15 @@
 					inOutType: "请选择出库类型",
 					warehouseInOutDetail: {},
 					gradeKey: "",
-					grossWeight: 0,
-					tare: 0,
+					grossWeight: "",
+					tare: "",
 				},
 				params: {
 					year: true,
 					month: true,
 					day: true,
 				},
-				netWeight: 0,
+				// netWeight: 0,
 			}
 		},
 		computed: {

pages/erp/receivingfeedback/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 style='text-align:right;' v-if="item.status == '未装车'">{{item.status}}</view>
+					<view style='text-align:right;' v-else-if="item.status == '已送达'">已卸车</view>
+				</view>
+				<view class="row">
+					<view class="left">车厢号</view>
 					<view>{{item.boxNo}}</view>
 				</view>
 				<view class="row">
@@ -153,20 +158,28 @@
 				</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>
+					placeholder="输入卸车净重"></input>
+					</view>
+				</view>
+				<view v-if="detailData.priceType!=null&&detailData.priceType=='随行就市'" class="row">
+					<view class="left">单价(元/吨)</view>
+					<view v-if="item.status == '未装车' || item.status == '已送达'">{{item.contractPrice}}</view>
+					<view style='text-align:right;' v-else>
+						<input  v-model='item.contractPrice' class="right-bottom"
+					placeholder="输入单价"></input>
 					</view>
 				</view>
 				<view class="row">
 					<view class="left">磅单</view>
-					<view v-if="item.status == '已装车' || item.status == '已送达'">
+					<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"
+					<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>
 					</view>
@@ -174,14 +187,13 @@
 				<view class="row">
 					<view class="left">卸车日期</view>
 					<view>
-						<view v-if="item.status == '已装车' || item.status == '已送达'">{{item.unloadingDate}}</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"  @cancel='datecancel()' @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>
+				<u-button v-if="item.status == '已装车'" @click='submit(index,2)' type="success">保存</u-button>
 			</view>
 		</view>
 		<view v-if='detailData.tranType=="汽运"'>
@@ -189,7 +201,9 @@
 			<view v-for='(item,index) in freightspace' class="content">
 				<view class="row">
 					<view class="left">司机-{{index+1}}</view>
-					<view>{{item.status}}</view>
+					<view v-if="item.status == '未装车'">未装车</view>
+					<view v-if="item.status == '已装车'">未卸车</view>
+					<view v-if="item.status == '已送达'">已卸车</view>
 				</view>
 				<view class="row">
 					<view class="left">姓名</view>
@@ -209,29 +223,37 @@
 				</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>
 					</view>
 				</view>
+				<view v-if="detailData.priceType!=null&&detailData.priceType=='随行就市'" class="row">
+					<view class="left">单价(元/吨)</view>
+					<view v-if="item.status == '未装车' || item.status == '已送达'">{{item.contractPrice}}</view>
+					<view style='text-align:right;' v-else>
+						<input  v-model='item.contractPrice' 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>
+						<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>
 				</view>
 				<view class="row">
 					<view class="left">磅单</view>
-					<view  v-if="item.status == '已装车' || item.status == '已送达'">
+					<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"
+					<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>
 					</view>
@@ -246,7 +268,7 @@
 				</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>
+				<u-button v-if="item.status != '未装车' && item.status != '已送达'" @click='submit(index,1)' type="success">保存</u-button>
 			</view>
 		</view>
 		<view v-if='detailData.tranType=="船运"'>
@@ -267,14 +289,14 @@
 				<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>
+						<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>
+						<view  v-if="item.status == '未装车' || item.status == '已送达'">{{item.titleNo}}</view>
 						<input v-else placeholder="请输入封号" v-model='item.titleNo' type="text">
 					</view>
 				</view>
@@ -296,23 +318,31 @@
 				</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>
 					</view>
 				</view>
+				<view v-if="detailData.priceType!=null&&detailData.priceType=='随行就市'" class="row">
+					<view class="left">单价(元/吨)</view>
+					<view v-if="item.status == '未装车' || item.status == '已送达'">{{item.contractPrice}}</view>
+					<view style='text-align:right;' v-else>
+						<input  v-model='item.contractPrice' 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-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"  @cancel='datecancel()' @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 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>
@@ -320,7 +350,7 @@
 					<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"
+					<upload class="upload" ref="upload" :action="action" :max-size="maxSize" :max-count="9" :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>
@@ -413,7 +443,7 @@
 				this.url=url
 			},
 			datecancel(){
-				this.freightspace[this.index].show2=true
+				this.freightspace[this.index].show2 = true
 				this.$forceUpdate();
 			},
 			submit(index,status){
@@ -557,7 +587,7 @@
 							that.$api.msg('保存成功')
 							that.detailData = {}
 							that.freightspace = {}
-							uni.navigateBack({})
+								uni.navigateBack()
 						}
 					})
 				}
@@ -598,7 +628,10 @@
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({})
+										setTimeout(function(){
+											uni.navigateBack()
+										},1000)
+										
 									}
 								})
 							}
@@ -617,7 +650,10 @@
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({})
+										setTimeout(function(){
+											uni.navigateBack()
+										},1000)
+										
 									}
 								})
 							}
@@ -636,7 +672,9 @@
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({})
+										setTimeout(function(){
+											uni.navigateBack()
+										},1000)
 									}
 								})
 							}
@@ -696,9 +734,10 @@
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({
-											
-										})
+										setTimeout(function(){
+											uni.navigateBack()
+										},1000)
+										
 									}
 								})
 							}
@@ -730,9 +769,10 @@
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({
-											
-										})
+										setTimeout(function(){
+											uni.navigateBack()
+										},1000)
+										
 									}
 								})
 							}
@@ -770,7 +810,10 @@
 										that.$api.msg('提交成功')
 										that.detailData = {}
 										that.freightspace = {}
-										uni.navigateBack({})
+										setTimeout(function(){
+											uni.navigateBack()
+										},1000)
+										
 									}
 								})
 							}
@@ -802,9 +845,11 @@
 						}else if(res.data.data.tranType=='汽运'){
 							for (var i = 0; i < res.data.data.tranCarInfoList.length; i++) {
 								res.data.data.tranCarInfoList[i].show2=false
+								if(res.data.data.tranCarInfoList[i].unloadPoundImg){
+									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++) {
@@ -830,7 +875,6 @@
 							            }
 							            this.freightspace = res.data.data.tranCarInfoList
 							          }
-							
 						}
 						
 					}
@@ -875,8 +919,8 @@
 			},
 			train(index){
 				console.log(index)
-				
-				this.freightspace[index].show2=true
+				// debugger
+				this.freightspace[index].show2 = true
 				this.$forceUpdate();
 				this.index=index
 			},
@@ -985,9 +1029,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/erp/warehousing/warehousing.vue

@@ -84,7 +84,7 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">入库类型</view>
-				<input v-model='detailData.inOutType' class="right-bottom" :disabled="isSelectType" @click="selectType"></input>
+				<input v-model='detailData.inOutType' class="right-bottom" :disabled="isSelectType" @click="selectType" placeholder="自动获取"></input>
 				<u-picker :range="warehousingTypeList" range-key="constValue" @confirm='warehousingTypePicker($event)'
 					v-model="show5" mode="selector">
 				</u-picker>
@@ -251,7 +251,7 @@
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				btnLoading: false, //防止重复点击
 				isAdd: true,
-				netWeight: 0,
+				// netWeight: 0,
 				inOutDate1: "",
 				detailData: {
 					contractNo: "请选择合同编号",

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -56,7 +56,7 @@
 							<view class="right">{{retreatList.goodsName}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">数量</view>
+							<view class="left">重量(吨)</view>
 							<view class="right">{{retreatList.weight}}</view>
 						</view>
 						<view class='row'>
@@ -69,7 +69,7 @@
 						</view>
 						<view class='row'>
 							<view class="left">收货人</view>
-							<view class="right">{{retreatList.publisher}}</view>
+							<view class="right">{{retreatList.agent}}</view>
 						</view>
 					</view>
 					<view class="uForm_item">
@@ -120,7 +120,7 @@
 							<view class="right">{{OutList.goodsName}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">数量</view>
+							<view class="left">重量(吨)</view>
 							<view class="right">{{OutList.weight}}</view>
 						</view>
 						<view class='row'>
@@ -133,7 +133,7 @@
 						</view>
 						<view class='row'>
 							<view class="left">发货人</view>
-							<view class="right">{{OutList.publisher}}</view>
+							<view class="right">{{OutList.agent}}</view>
 						</view>
 					</view>
 
@@ -197,7 +197,7 @@
 							<view class="right">{{EnterList.goodsName}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">数量</view>
+							<view class="left">重量(吨)</view>
 							<view class="right">{{EnterList.weight}}</view>
 						</view>
 						<view class='row'>
@@ -210,7 +210,7 @@
 						</view>
 						<view class='row'>
 							<view class="left">收货人</view>
-							<view class="right">{{EnterList.publisher}}</view>
+							<view class="right">{{EnterList.agent}}</view>
 						</view>
 					</view>
 
@@ -451,7 +451,7 @@
 			requestadd(list, status) {
 
 				list.compId = sessionStorage.getItem('ws-pf_compId')
-				list.publisher = this.userInfo.userName
+				// list.publisher = this.userInfo.userName
 				uni.showLoading({
 					title:"审核中"
 				})
@@ -514,7 +514,7 @@
 			},
 			requestaudit(list, status) {
 				list.compId = '2710b21efc1e4393930c5dc800010dc4'
-				list.publisher = this.userInfo.userName
+				// list.publisher = this.userInfo.userName
 				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
 					if (res.data.code == 200) {
 						this.$api.doRequest('post', '/workflow/api/handle', {

pages/task/audit/Issueandreceipt_task_details.vue

@@ -66,7 +66,7 @@
 						</view>
 						<view class='row'>
 							<view class="left">收货人</view>
-							<view class="right">{{retreatList.publisher}}</view>
+							<view class="right">{{retreatList.agent}}</view>
 						</view>
 					</view>
 					<view class="uForm_item">
@@ -128,7 +128,7 @@
 						</view>
 						<view class='row'>
 							<view class="left">发货人</view>
-							<view class="right">{{OutList.publisher}}</view>
+							<view class="right">{{OutList.agent}}</view>
 						</view>
 					</view>
 
@@ -203,7 +203,7 @@
 						</view>
 						<view class='row'>
 							<view class="left">收货人</view>
-							<view class="right">{{EnterList.publisher}}</view>
+							<view class="right">{{EnterList.agent}}</view>
 						</view>
 					</view>
 
@@ -319,115 +319,14 @@
 					}
 				})
 			},
-			pjPicker(e) {
-				this.OutList.grade = this.pjList[e[0]].type
-				this.OutList.gradeKey = e[0] + 1
-			},
-			pjPicker1(e) {
-				this.EnterList.grade = this.pjList[e[0]].type
-				this.EnterList.gradeKey = e[0] + 1
-			},
-			passSubmit() {
-				this.OutList.inOutFlag = 1
-				this.EnterList.inOutFlag = 2
-				if (this.OutList.taskTypeKey == 1) {
-					this.requestadd(this.OutList)
-				} else if (this.EnterList.taskTypeKey == 2) {
-					this.requestadd(this.EnterList)
-				} else if (
-					this.OutList.taskTypeKey == 3 ||
-					this.OutList.taskTypeKey == 4
-				) {
-					this.requestadd(this.OutList, 'repetition')
-					if (!this.deletetask) {
-						this.requestadd(this.EnterList, 'repetition')
-					}
-				}
-				if(this.retreatList.taskTypeKey == 1 || this.retreatList.taskTypeKey == 2){
-					this.requestadd(this.retreatList)
-				}else if(this.retreatList.taskTypeKey == 3 || this.retreatList.taskTypeKey == 4){
-					this.requestadd(this.retreatList, 'repetition')
-				}
-			},
-			rejectSubmit() {
-				// （1出库2入库3移库4退库并出库）taskTypeKey
-				if (!this.rejectInfo) {
-					this.$api.msg('驳回原因不能为空！')
-				} else {
-					this.show1 = false
-					if (this.OutList.taskTypeKey == 1 ) {
-						this.requestaudit(this.OutList)
-					} else if (this.OutList.taskTypeKey == 2) {
-						this.requestaudit(this.OutList)
-					} else if (
-						this.OutList.taskTypeKey == 3 ||
-						this.OutList.taskTypeKey == 4
-					) {
-						this.requestaudit(this.OutList, 'repetition')
-						if (!this.deletetask) {
-							this.requestaudit(this.OutList, 'repetition')
-						}
-					}
-					if(this.EnterList){
-						if(this.EnterList.taskTypeKey == 1 || this.EnterList.taskTypeKey == 2){
-						this.requestaudit(this.EnterList)
-					}else if(this.EnterList.taskTypeKey == 3 || this.EnterList.taskTypeKey == 4){
-						this.requestaudit(this.EnterList, 'repetition')
-					}
-					}
-					
-					if(this.retreatList){
-						if(this.retreatList.taskTypeKey == 1 || this.retreatList.taskTypeKey == 2){
-							this.requestaudit(this.retreatList)
-						}else if(this.retreatList.taskTypeKey == 3 || this.retreatList.taskTypeKey == 4){
-							this.requestaudit(this.retreatList, 'repetition')
-						}
-					}
-				}
-			},
-			requestadd(list, status) {
-				
-				list.compId = sessionStorage.getItem('ws-pf_compId')
-				list.publisher = this.userInfo.userName
-				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
-					if (res.data.code == 200) {
-						this.$api.doRequest('post', '/workflow/api/handle', {
-							taskId: list.taskId,
-							approved: true,
-							auditMind: '34',
-							needReapply: false
-						}).then(res => {
-							if (res.data.code == 200) {
-								this.$api.msg('审核成功！')
-								setTimeout(function() {
-										uni.navigateBack()
-								}, 1000);
-							}
-						})
-					}
-				})
-			},
-			requestaudit(list, status) {
-				list.compId = '2710b21efc1e4393930c5dc800010dc4'
-				list.publisher = this.userInfo.userName
-				this.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(res => {
-					if (res.data.code == 200) {
-						this.$api.doRequest('post', '/workflow/api/handle', {
-							taskId: list.taskId,
-							approved: false,
-							auditMind: this.rejectInfo,
-							needReapply: true
-						}).then(res => {
-							if (res.data.code == 200) {
-								this.$api.msg('驳回成功！')
-								setTimeout(function() {
-										uni.navigateBack()
-								}, 1000);
-							}
-						})
-					}
-				})
-			},
+			// pjPicker(e) {
+			// 	this.OutList.grade = this.pjList[e[0]].type
+			// 	this.OutList.gradeKey = e[0] + 1
+			// },
+			// pjPicker1(e) {
+			// 	this.EnterList.grade = this.pjList[e[0]].type
+			// 	this.EnterList.gradeKey = e[0] + 1
+			// },
 			fanHui(){
 				uni.navigateBack()
 			}

pages/task/audit/acquisition_settlement_approval.vue

@@ -125,7 +125,6 @@
 						})
 					}
 				})
-
 			},
 			//驳回
 			rejectSubmit() {

pages/task/audit/acquisition_settlement_details.vue

@@ -94,69 +94,6 @@
 				})
 
 			},
-			//驳回
-			rejectSubmit() {
-				var that = this
-				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() {
-				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) {
-					if (status == true && item.status == "已驳回") {
-						this.$api.doRequest('get', '/paymentManagement/api/openAuditFlow', {
-							compId: "2710b21efc1e4393930c5dc800010dc4",
-							id: item.id
-						}).then(res => {
-							if (res.data.code == 200) {
-								this.audit(this.List[index + 1], index + 1, status, status2, reason)
-							}
-						})
-					} else {
-						this.$api.doRequest('get', '/workflow/api/handle', {
-							taskId: item.taskId,
-							approved: status,
-							auditMind: reason ? '已驳回' : '34',
-							needReapply: status2 ? true : false
-						}).then(res => {
-							if (res.data.code == 200) {
-								this.audit(this.List[index + 1], index + 1, status, status2, reason)
-							}
-						})
-					}
-				} else {
-					if (status == true) {
-						that.$api.msg('通过成功')
-						this.getList()
-					} else if (status == false) {
-						that.$api.msg('驳回成功')
-						this.getList()
-					}
-				}
-			},
 			fanHui(){
 				uni.navigateBack()
 			}

pages/task/audit/freight_setting_approval.vue

@@ -28,10 +28,18 @@
 					<u-input v-model="list.goodsName" input-align="right" placeholder="" disabled />
 				</u-form-item>
 				<u-form-item label="发货地址" prop="sendDetailedAddress" label-width="140">
-					<u-input v-model="list.sendDetailedAddress" input-align="right" placeholder="发货地址" disabled />
+					<!-- <u-input v-model="list.sendDetailedAddress" input-align="right" placeholder="发货地址" disabled /> -->
+					<view class="text_info">
+						{{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 />
+					<!-- <u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="收货地址" disabled /> -->
+					<view class="text_info">
+						{{list.receivePrivate}}{{list.receiveCity}}{{list.receiveArea}}{{list.receiveDetailedAddress}}
+					</view>
+					
 				</u-form-item>
 				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
 					<u-input v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" />
@@ -203,4 +211,9 @@
 	/deep/.u-input__textarea{
 		height: 300rpx!important;
 	}
+	.text_info{
+		display: flex;
+		width: 100%;
+		justify-content: flex-end;
+	}
 </style>

pages/task/audit/freight_setting_details.vue

@@ -70,23 +70,6 @@
 					this.list = res.data.data
 				})
 			},
-			passSubmit() {
-				var that = this
-				var tranProcessInfo = {}
-				tranProcessInfo.id = this.list.id
-				tranProcessInfo.flag = "1"
-				tranProcessInfo.tranPriceIng = this.list.tranPriceIng
-				tranProcessInfo.reviewer = this.userInfo.userName
-				this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo).then(res => {
-					if (res.data.code == 200) {
-						this.$api.msg('审核通过成功!')
-						setTimeout(function() {
-							uni.navigateBack()
-						}, 1000);
-					}
-
-				})
-			},
 			fanHui(){
 				uni.navigateBack()
 			}

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/purchase_settlement_approval.vue

@@ -18,8 +18,8 @@
 		</view>
 		<view class="content">
 			<view class="top content-item">
-				<view>{{contractNo}}</view>
-				<view>元/吨</view>
+				<view>{{contractNo}} ({{goodsName}})</view>
+				<view>{{unitPrice}}元/吨</view>
 			</view>
 			<view class="content-item">
 				<view class="car-container" v-for="(item,index) in list">
@@ -94,6 +94,8 @@
 				height: 200,
 				autoHeight: true,
 				border: false,
+				unitPrice:"",
+				goodsName:"",
 			}
 		},
 		onLoad(options) {
@@ -106,6 +108,8 @@
 					id: this.id
 				}).then(res => {
 					this.contractNo = res.data.data.contractNo
+					this.unitPrice = res.data.data.price
+					this.goodsName = res.data.data.goodsName
 					if (res.data.code == 200) {
 						this.$api.doRequest('get', '/stockPurchaseReceiptReport/selectPurchaseOrder', {
 							compId: "2710b21efc1e4393930c5dc800010dc4",

pages/task/audit/purchase_settlement_details.vue

@@ -18,8 +18,8 @@
 		</view>
 		<view class="content">
 			<view class="top content-item">
-				<view>{{contractNo}}</view>
-				<view>元/吨</view>
+				<view>{{contractNo}}({{goodsName}})</view>
+				<view>{{unitPrice}}元/吨</view>
 			</view>
 			<view class="content-item">
 				<view class="car-container" v-for="(item,index) in list">
@@ -61,6 +61,8 @@
 					{status:"",}
 				],
 				contractNo: "",
+				unitPrice: "",
+				goodsName:"",
 			}
 		},
 		onLoad(options) {
@@ -72,7 +74,11 @@
 				this.$api.doRequest('get', '/stockPurchaseReceiptReport/getInfo', {
 					id: this.id
 				}).then(res => {
+					debugger
 					this.contractNo = res.data.data.contractNo
+					this.unitPrice = res.data.data.price
+					this.goodsName = res.data.data.goodsName
+					console.log(this.goodsName)
 					if (res.data.code == 200) {
 						this.$api.doRequest('get', '/stockPurchaseReceiptReport/selectPurchaseOrder', {
 							compId: "2710b21efc1e4393930c5dc800010dc4",
@@ -87,79 +93,6 @@
 					}
 				})
 			},
-			//驳回
-			rejectSubmit() {
-				var that = this
-				if (this.list.length == 0) {
-					that.$api.msg('没有要审核的条目！')
-				} else {
-					// uni.showModal({
-					// 	content: "是否确定驳回?",
-					// 	success(res) {
-					// 		if(res)
-					// 		this.audit(this.list[0], 0, false, true, '已驳回')
-					// 	}
-					// })
-
-
-					uni.showModal({
-						content: "是否确定驳回？",
-						showCancel: true,
-						confirmText: '确定',
-						success: function(res) {
-							if (res.confirm) {
-								that.audit(that.list[0], 0, false, true, '已驳回')
-							}
-						}
-					})
-				}
-			},
-			//通过
-			passSubmit() {
-				var that = this
-				if (this.list.length == 0) {
-					that.$api.msg('没有要审核的条目！')
-				} else {
-					// uni.showModal({
-					// 	content: "是否确定通过?",
-					// 	success(res) {
-					// 		if(res)
-					// 		this.audit(this.list[0], 0, true, 2)
-					// 	}
-					// })
-					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()
 			}

pages/task/audit/purchasecontract.vue

@@ -2,10 +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-form-item>
-			<u-form-item  label-width='260' label="货名">
-				<u-input v-model="list.contractGoodsInfo.goodsName" 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 />
@@ -14,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 />
@@ -46,124 +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>
-			
-			<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' placeholder="请输入审核意见,不超过100字" 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:"",
-					}
-				],
-				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) {
@@ -176,26 +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
+				});
 				var that = this
 				that.$api.doRequest('post', '/workflow/api/handle', {
 					taskId: that.list.taskId,
@@ -203,44 +231,50 @@
 					auditMind: this.auditMind,
 					needReapply: true,
 				}).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{
+				} 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
+						that.show = false
 						setTimeout(function() {
 							uni.navigateBack()
 						}, 1000);
 					})
 				}
-				
+
 			},
 			//审核方法
 			audit(item, index, status, status2, reason) {
@@ -271,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;
@@ -301,7 +339,8 @@
 			text-align: left;
 			margin: 20rpx 0;
 		}
-		.car-container{
+
+		.car-container {
 			border-bottom: 2rpx solid #EEEEEE;
 		}
 
@@ -316,6 +355,7 @@
 			color: #333333;
 			font-weight: 500;
 		}
+
 		.row {
 			display: flex;
 			justify-content: space-between;
@@ -329,7 +369,7 @@
 		.money {
 			font-size: 32rpx;
 			font-weight: 500;
-			margin-bottom: 30rpx ;
+			margin-bottom: 30rpx;
 		}
 
 		.moneyInfo {
@@ -337,88 +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{
-			justify-content: flex-end;
-			width: 100%;
+	}
+
+	.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

@@ -2,122 +2,128 @@
 	<view class="container">
 		<u-form ref="uForm">
 			<u-form-item label-width='260' label="合同编号">
-				{{list.contractNo}}
+				<u-input v-model="list.contractNo" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item label-width='260' label="运输方式">
-				{{list.shippingType}}
+				<u-input v-model="list.shippingType" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item label-width='260' label="买方">
-				{{list.buyer}}
+				<u-input v-model="list.buyer" input-align="right" placeholder="" disabled/>
 			</u-form-item>
-			<u-form-item label-width='260' label="结算方式">
-				{{ list.settlementMethod }}
+			<u-form-item label-width='260' label="买方电话">
+				<u-input v-model="list.buyerPhone" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item label-width='260' label="卖方">
-				{{list.seller}}
+				<u-input v-model="list.seller" input-align="right" placeholder="" disabled/>
 			</u-form-item>
-			<u-form-item label-width='260' label="交货方式">
-				{{list.deliverType1}}
+			<u-form-item label-width='260' label="卖方电话">
+				<u-input v-model="list.sellerPhone" input-align="right" placeholder="" disabled/>
 			</u-form-item>
-			<u-form-item label-width='260' label="买方电话">
-				{{list.buyerPhone}}
+			<u-form-item label-width='260' label="结算方式">
+				<u-input v-model="list.settlementMethod" input-align="right" placeholder="" disabled/>
 			</u-form-item>
-			<u-form-item label-width='260' label="包装方式">
-				{{list.packingMethod}}
+			<u-form-item label-width='260' label="交货方式">
+				<u-input v-model="list.deliverType1" input-align="right" placeholder="" disabled/>
 			</u-form-item>
-			<u-form-item label-width='260' label="卖方电话">
-				{{list.sellerPhone}}
+			<u-form-item label-width='260' label="包装方式">
+				<u-input v-model="list.packingMethod" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item label-width='260' label="验收方式">
-				{{list.acceptanceMethod}}
+				<u-input v-model="list.acceptanceMethod" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item label-width='260' label="重量（吨）">
-				{{list.weight}}
+				<u-input v-model="list.weight" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item label-width='260' label="交货日期（起）">
-				{{list.deliveryDateStart}}
+				<u-input v-model="list.deliveryDateStart" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item label-width='260' label="溢短装（%）">
-				{{list.overShort}}
+				<u-input v-model="list.overShort" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item label-width='260' label="交货日期（止）">
-				{{list.deliveryDateEnd}}
+				<u-input v-model="list.deliveryDateEnd" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="合同单价（元/吨）">
-				{{list.unitContractPrice}}
+				<u-input v-model="list.unitContractPrice" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="合同总价（元）">
-				{{list.totalContractPrice}}
+				<u-input v-model="list.totalContractPrice" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="货源所在地区">
-				{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
+				<view class="textCss">
+					{{list.sourceProvince}}{{list.sourceCity}}{{list.sourceArea}}
+				</view>
 			</u-form-item>
 			<u-form-item  label-width='260' label="货源详细地址">
-				{{list.sourceGoods}}
+				<u-input v-model="list.sourceGoods" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="交货地所在地区">
-				{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
+				<view class="textCss">
+					{{list.deliveryProvince}}{{list.deliveryCity}}{{list.deliveryArea}}
+				</view>
 			</u-form-item>
 			<u-form-item  label-width='260' label="交货地详细地址">
-				{{list.placeDelivery}}
+				<u-input v-model="list.placeDelivery" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item label-width='260' label="签订日期">
-				{{list.signingDate}}
+				<u-input v-model="list.signingDate" input-align="right" placeholder="" disabled/>
 			</u-form-item>
-			<u-form-item  label-width='260' label="最终实际交易量 (吨)">
-				{{list.finalTradingVolume}}
+			<u-form-item  label-width='300' label="最终实际交易量 (吨)">
+				<u-input v-model="list.finalTradingVolume" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="货名">
-				{{list.contractGoodsInfo.goodsName}}
+				<u-input v-model="list.contractGoodsInfo.goodsName" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="水分（%）<=">
-				{{list.contractGoodsInfo.waterContent}}
+				<u-input v-model="list.contractGoodsInfo.waterContent" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="品级">
-				{{list.contractGoodsInfo.grade}}
+				<u-input v-model="list.contractGoodsInfo.grade" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="杂质（%）<=">
-				{{list.contractGoodsInfo.impurity}}
+				<u-input v-model="list.contractGoodsInfo.impurity" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="容重(克/升)>=">
-				{{list.contractGoodsInfo.bulkDensity}}
+				<u-input v-model="list.contractGoodsInfo.bulkDensity" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="霉变粒（%）<=">
-				{{list.contractGoodsInfo.mildewGrain}}
+				<u-input v-model="list.contractGoodsInfo.mildewGrain" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="热损伤（%）<=">
-				{{list.contractGoodsInfo.jiaorenli}}
+				<u-input v-model="list.contractGoodsInfo.jiaorenli" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="不完善粒（%）<=">
-				{{list.contractGoodsInfo.imperfectGrain}}
+				<u-input v-model="list.contractGoodsInfo.imperfectGrain" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="合同收入（元）">
-				{{list.contractProcessInfo.goodsNameKey}}
+				<u-input v-model="list.contractProcessInfo.goodsNameKey" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="已开发票（元）">
-				{{list.contractProcessInfo.goodsName}}
+				<u-input v-model="list.contractProcessInfo.goodsName" input-align="right" placeholder="" disabled/>
 			</u-form-item>
+			
+			
 			<u-form-item  label-width='260' label="费用支出（元）">
-				{{list.contractProcessInfo.waterContent}}
+				<u-input v-model="list.contractProcessInfo.waterContent" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="未开发票（元）">
-				{{list.contractProcessInfo.impurity}}
+				<u-input v-model="list.contractProcessInfo.impurity" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="未回款（元）">
-				{{list.contractProcessInfo.mildewGrain}}
+				<u-input v-model="list.contractProcessInfo.mildewGrain" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="双章原件回收情况">
-				{{list.contractProcessInfo.grade}}
+				<u-input v-model="list.contractProcessInfo.grade" input-align="right" placeholder="" disabled/>
 			</u-form-item>
 			<u-form-item  label-width='260' label="备注信息">
-				{{list.remarks}}
+				<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'>
@@ -131,7 +137,7 @@
 				<view style='padding:10px;'>
 					<input v-model='auditMind' placeholder="请输入审核意见,不超过100字" type="text" value="" />
 				</view>
-				<view  @click='close()' class="cancel">取消</view>
+				<view  @click='passSubmit()' class="cancel">取消</view>
 				<view  @click='passSubmit()' class="confirm">确定</view>
 			</view>
 		</view>
@@ -139,7 +145,11 @@
 </template>
 
 <script>
+	import upload from '@/components/upload.vue';
 	export default {
+		components: {
+			upload
+		},
 		data() {
 			return {
 				id: "",
@@ -155,6 +165,9 @@
 				show:false,
 				title:'',
 				contractNo: "",
+				action: this.$uploadUrl,
+				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
+				isAdd: true,
 			}
 		},
 		onLoad(options) {
@@ -178,13 +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
@@ -196,16 +225,9 @@
 				}).then(res => {
 					that.$api.msg('驳回成功')
 					that.show=false
-					setTimeout(function() {
-						uni.navigateBack()
-					}, 1000);
 				})
 			},
-			close(){
-				this.show=false
-			},
 			pass(){
-				console.log(1111)
 				this.show=true
 				this.title='审核意见'
 			},
@@ -216,9 +238,6 @@
 			//通过
 			passSubmit() {
 				var that = this
-				if(this.title=='驳回原因'){
-					this.rejectSubmit()
-				}else{
 				that.$api.doRequest('post', '/workflow/api/handle', {
 					taskId: that.list.taskId,
 					approved: true,
@@ -231,7 +250,6 @@
 						uni.navigateBack()
 					}, 1000);
 				})
-				}
 			},
 			//审核方法
 			audit(item, index, status, status2, reason) {
@@ -408,4 +426,10 @@
 		.confirm{
 			right:0;
 		}
+	.textCss{
+		display:flex;
+		justify-content: flex-end;
+		width: 100%;
+	}
 </style>
+

pages/task/audit/warehouse_details.vue

@@ -124,66 +124,6 @@
 			confirm(item) {
 				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('系统异常，请联系管理员');
-								}
-							})
-						}
-					}
-				})
-			},
-			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);
-								}
-							})
-						}
-					}
-				})
-			},
 			fanHui(){
 				uni.navigateBack()
 			}