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

pages/task/audit/acquisition_settlement_approval.vue

@@ -86,9 +86,7 @@
 				pageSize: 100,
 				rejectInfo: "", //审核驳回意见
 				rejectInfo1: "", //审核通过意见
-				List: [{
-					approveStatus: "",
-				}],
+				List: [],
 				status: "",
 				updateDate:"",
 				warehouseName:"",

pages/task/audit/acquisition_settlement_details.vue

@@ -53,9 +53,7 @@
 				id: "",
 				currentPage: 1,
 				pageSize: 100,
-				List: [{
-					approveStatus: "",
-				}],
+				List: [],
 				status: "",
 				updateDate:"",
 				warehouseName:"",

pages/task/audit/freight_settlement_approval.vue

@@ -8,7 +8,8 @@
 							style="height: 40rpx;"></image><!-- 驳回 -->
 						<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.approveStatus == '待决策人审核'|| list.approveStatus == '待财务审核'"
+						<image src="../../../static/img/daishenhe.png" mode=""
+							v-if="list.approveStatus == '待决策人审核'|| list.approveStatus == '待财务审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
 					<view class="infoText">{{list.approveStatus}}</view>
@@ -22,34 +23,34 @@
 				<view>{{list.contractNo}}</view>
 			</view>
 			<view class="car-container">
-					<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">{{list.loadingWeight}}吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="center">卸</view>
-						<view class="textInfo">{{list.unloadingWeight}}吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="right">结</view>
-						<view class="textInfo">{{list.settlementWeight}}吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="left">运</view>
-						<view class="textInfo">{{list.transportPrice}}元/吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="center">扣</view>
-						<view class="textInfo">{{list.deductionAmount}}元</view>
-					</view>
-					<view class="car-type-item">
-						<view class="right">付</view>
-						<view class="textInfo">{{list.amountIngPayable}}元</view>
-					</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">{{list.loadingWeight}}吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="center">卸</view>
+					<view class="textInfo">{{list.unloadingWeight}}吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="right">结</view>
+					<view class="textInfo">{{list.settlementWeight}}吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">运</view>
+					<view class="textInfo">{{list.transportPrice}}元/吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="center">扣</view>
+					<view class="textInfo">{{list.deductionAmount}}元</view>
+				</view>
+				<view class="car-type-item">
+					<view class="right">付</view>
+					<view class="textInfo">{{list.amountIngPayable}}元</view>
+				</view>
 			</view>
 		</view>
 		<u-popup v-model="show1" mode="center">
@@ -66,8 +67,8 @@
 		<u-popup v-model="show2" mode="center">
 			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
 				<view class="rejectText">审核意见（通过）</view>
-				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
-					placeholder="请输入审核意见" />
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height"
+					:auto-height="autoHeight" class="rejectInfoCss" placeholder="请输入审核意见" />
 				<view class="flex">
 					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
 					<u-button @click="passSubmit()" type="success">确定</u-button>
@@ -77,7 +78,7 @@
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<u-button @click="show1 = true" type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button  @click="show2 = true" type="success" class="btn2">通过</u-button>
+			<u-button @click="show2 = true" type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -88,16 +89,14 @@
 			return {
 				currentPage: 1,
 				pageSize: 10,
-				list: [
-					{
-						approveStatus:"",
-					}
-				],
-				rejectInfo:"",
-				rejectInfo1:"",
-				show1:false,
-				show2:false,
-				height:200,
+				list: {
+					approveStatus: "",
+				},
+				rejectInfo: "",
+				rejectInfo1: "",
+				show1: false,
+				show2: false,
+				height: 200,
 				autoHeight: true,
 				border: false,
 			}
@@ -119,11 +118,11 @@
 							currentPage: this.currentPage,
 							pageSize: this.pageSize,
 							contractNo: this.contractNo,
-							carId:this.carId,
+							carId: this.carId,
 						}).then(res => {
 							if (res.data.code == 200) {
-								this.list= res.data.data.records[0]
-								console.log(this.list,124)
+								this.list = res.data.data.records[0]
+								console.log(this.list, 124)
 							}
 						})
 					}
@@ -134,19 +133,19 @@
 				var that = this
 				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)
+				} 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)
+							}
 						}
-					}
-				})
-			}
+					})
+				}
 
 			},
 			//通过
@@ -154,19 +153,19 @@
 				var that = this
 				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)
+				} 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(list, index, status, status2, reason) {
@@ -178,12 +177,12 @@
 						needReapply: status2 != undefined ? true : false,
 					}).then(res => {
 						if (status == true) {
-								this.$api.msg('通过成功')
+							this.$api.msg('通过成功')
 							setTimeout(function() {
 								uni.navigateBack()
 							}, 1000);
 						} else if (status == false) {
-								this.$api.msg('驳回成功')
+							this.$api.msg('驳回成功')
 							setTimeout(function() {
 								uni.navigateBack()
 							}, 1000);
@@ -219,11 +218,12 @@
 			text-align: left;
 			margin-bottom: 30rpx;
 		}
-		.car-container{
+
+		.car-container {
 			padding: 10rpx 20rpx;
 			border-radius: 20rpx;
 			background: white;
-			margin:30rpx 0 ;
+			margin: 30rpx 0;
 			// border-bottom: 2rpx solid #EEEEEE;
 		}
 
@@ -231,27 +231,32 @@
 			display: inline-flex;
 			// justify-content: center;
 			width: 33.33%;
-			margin-bottom: 40rpx ;
+			margin-bottom: 40rpx;
 		}
-		.title{
+
+		.title {
 			font-size: 36rpx;
 		}
 	}
+
 	.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;
 		}
@@ -262,51 +267,59 @@
 		background: #22C572;
 		border-radius: 10rpx;
 	}
-	.left{
+
+	.left {
 		background: #FEECE6;
 		color: #FE6430;
 	}
-	.center{
+
+	.center {
 		background: #EBEEFA;
 		color: #5C76DF;
 	}
-	.right{
-		background: #E9F8F0 ;
-		color: #22C572 ;
+
+	.right {
+		background: #E9F8F0;
+		color: #22C572;
 	}
-	.left,.center,.right{
+
+	.left,
+	.center,
+	.right {
 		width: 50rpx;
 		height: 50rpx;
 		text-align: center;
 		line-height: 50rpx;
 		border-radius: 10rpx;
 	}
-	.textInfo{
+
+	.textInfo {
 		margin: 6rpx 0 0 10rpx;
 	}
+
 	.topInfo {
 		height: 210rpx;
 		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
 		padding: 30rpx;
-	
+
 		.topInfo-item {
 			height: 158rpx;
 			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;
@@ -314,6 +327,7 @@
 			}
 		}
 	}
+
 	.rejectInfoCss {
 		border: 1px solid #ccc;
 		border-radius: 10rpx;
@@ -322,10 +336,12 @@
 		overflow-y: auto;
 		margin: 30rpx;
 	}
+
 	.rejectText {
 		text-align: center;
 	}
-	/deep/.u-input__textarea{
-		height: 300rpx!important;
+
+	/deep/.u-input__textarea {
+		height: 300rpx !important;
 	}
 </style>

pages/task/audit/freight_settlement_details.vue

@@ -20,34 +20,34 @@
 				<view>{{list.contractNo}}</view>
 			</view>
 			<view class="car-container">
-					<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">{{list.loadingWeight}}吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="center">卸</view>
-						<view class="textInfo">{{list.unloadingWeight}}吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="right">结</view>
-						<view class="textInfo">{{list.settlementWeight}}吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="left">运</view>
-						<view class="textInfo">{{list.transportPrice}}元/吨</view>
-					</view>
-					<view class="car-type-item">
-						<view class="center">扣</view>
-						<view class="textInfo">{{list.deductionAmount}}元</view>
-					</view>
-					<view class="car-type-item">
-						<view class="right">付</view>
-						<view class="textInfo">{{list.amountIngPayable}}元</view>
-					</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">{{list.loadingWeight}}吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="center">卸</view>
+					<view class="textInfo">{{list.unloadingWeight}}吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="right">结</view>
+					<view class="textInfo">{{list.settlementWeight}}吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">运</view>
+					<view class="textInfo">{{list.transportPrice}}元/吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="center">扣</view>
+					<view class="textInfo">{{list.deductionAmount}}元</view>
+				</view>
+				<view class="car-type-item">
+					<view class="right">付</view>
+					<view class="textInfo">{{list.amountIngPayable}}元</view>
+				</view>
 			</view>
 		</view>
 		<u-toast ref="uToast" />
@@ -63,11 +63,9 @@
 			return {
 				currentPage: 1,
 				pageSize: 10,
-				list: [
-					{
-						approveStatus:"",
-					}
-				],
+				list: {
+					approveStatus: "",
+				},
 			}
 		},
 		onLoad(options) {
@@ -87,16 +85,16 @@
 							currentPage: this.currentPage,
 							pageSize: this.pageSize,
 							contractNo: this.contractNo,
-							carId:this.carId,
+							carId: this.carId,
 						}).then(res => {
 							if (res.data.code == 200) {
-								this.list= res.data.data.records[0]
+								this.list = res.data.data.records[0]
 							}
 						})
 					}
 				})
 			},
-			fanHui(){
+			fanHui() {
 				uni.navigateBack()
 			}
 		}
@@ -127,11 +125,12 @@
 			text-align: left;
 			margin-bottom: 30rpx;
 		}
-		.car-container{
+
+		.car-container {
 			padding: 10rpx 20rpx;
 			border-radius: 20rpx;
 			background: white;
-			margin:30rpx 0 ;
+			margin: 30rpx 0;
 			// border-bottom: 2rpx solid #EEEEEE;
 		}
 
@@ -139,27 +138,32 @@
 			display: inline-flex;
 			// justify-content: center;
 			width: 33.33%;
-			margin-bottom: 40rpx ;
+			margin-bottom: 40rpx;
 		}
-		.title{
+
+		.title {
 			font-size: 36rpx;
 		}
 	}
+
 	.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;
 		}
@@ -170,51 +174,59 @@
 		background: #22C572;
 		border-radius: 10rpx;
 	}
-	.left{
+
+	.left {
 		background: #FEECE6;
 		color: #FE6430;
 	}
-	.center{
+
+	.center {
 		background: #EBEEFA;
 		color: #5C76DF;
 	}
-	.right{
-		background: #E9F8F0 ;
-		color: #22C572 ;
+
+	.right {
+		background: #E9F8F0;
+		color: #22C572;
 	}
-	.left,.center,.right{
+
+	.left,
+	.center,
+	.right {
 		width: 50rpx;
 		height: 50rpx;
 		text-align: center;
 		line-height: 50rpx;
 		border-radius: 10rpx;
 	}
-	.textInfo{
+
+	.textInfo {
 		margin: 6rpx 0 0 10rpx;
 	}
+
 	.topInfo {
 		height: 210rpx;
 		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
 		padding: 30rpx;
-	
+
 		.topInfo-item {
 			height: 158rpx;
 			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;
@@ -222,6 +234,7 @@
 			}
 		}
 	}
+
 	.rejectInfoCss {
 		border: 1px solid #ccc;
 		border-radius: 10rpx;
@@ -230,11 +243,12 @@
 		overflow-y: auto;
 		margin: 30rpx;
 	}
+
 	.rejectText {
 		text-align: center;
 	}
-	/deep/.u-input__textarea{
-		height: 300rpx!important;
+
+	/deep/.u-input__textarea {
+		height: 300rpx !important;
 	}
 </style>
-

pages/task/audit/purchasecontract.vue

@@ -172,10 +172,11 @@
 				id: "",
 				currentPage: 1,
 				pageSize: 10,
-				list: [{
+				list: {
 					status: "",
 					contractGoodsInfo: {},
-				}],
+					contractProcessInfo:{}
+				},
 				imglist: [],
 				auditMind: '',
 				show: false,
@@ -501,7 +502,8 @@
 	   z-index:10000;
 	}
 	.textarea{
-		margin:0 auto;
+		margin:20px auto;
+		width: 100%;
 		background: #F9F9FA;
 		border-radius: 10px;
 		border: 1px solid #EEEEEE;

pages/task/audit/salecontract.vue

@@ -55,7 +55,7 @@
 				</view>
 			</u-form-item>
 			<u-form-item label-width='260' label="货源详细地址">
-				<u-input v-model="list.sourceGoods" input-align="right" placeholder="" disabled/>
+				<u-input v-model="list.sourceGoods" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="交货地所在地区">
 				<view class="textCss">
@@ -63,7 +63,7 @@
 				</view>
 			</u-form-item>
 			<u-form-item label-width='260' label="交货地详细地址">
-				<u-input v-model="list.placeDelivery" input-align="right" placeholder="" disabled/>
+				<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 />
@@ -83,8 +83,8 @@
 			<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 />
@@ -117,7 +117,7 @@
 			</u-form-item>
 			<u-form-item label-width='260' label="备注信息">
 			</u-form-item>
-			<u-form-item >
+			<u-form-item>
 				<textarea class='textarea' v-model="list.remarks" input-align="right" placeholder="" disabled />
 			</u-form-item>
 			<u-form-item label-width='260' label="附件">
@@ -173,9 +173,9 @@
 				id: "",
 				currentPage: 1,
 				pageSize: 10,
-				list: [{
+				list: {
 					status: "",
-				}],
+				},
 				imglist: [],
 				auditMind: '',
 				show: false,
@@ -184,8 +184,8 @@
 				action: this.$uploadUrl,
 				maxSize: 50 * 1024 * 1024, //限制文件大小 50M
 				isAdd: true,
-				url:"",
-				imgShow:false
+				url: "",
+				imgShow: false
 			}
 		},
 		onLoad(options) {
@@ -193,9 +193,9 @@
 			this.getList()
 		},
 		methods: {
-			shadeshow(url){
-				this.imgShow=true
-				this.url=url
+			shadeshow(url) {
+				this.imgShow = true
+				this.url = url
 			},
 			getList(id) {
 				var that = this
@@ -487,19 +487,23 @@
 		justify-content: flex-end;
 		width: 100%;
 	}
-	.shade{
-		background:#000;
-		position:fixed;
-		top:0;left:0;
-	   width:100%;height:100%;
-	   z-index:10000;
+
+	.shade {
+		background: #000;
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 10000;
 	}
-	.textarea{
-		margin:0 auto;
+
+	.textarea {
+		margin: 0 auto;
 		background: #F9F9FA;
 		border-radius: 10px;
 		border: 1px solid #EEEEEE;
-		font-size:28rpx;
-		padding:10px;
+		font-size: 28rpx;
+		padding: 10px;
 	}
 </style>