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

pages/task/audit/acquisition_settlement_approval.vue

@@ -16,7 +16,7 @@
 				<view class="infoData">{{updateDate}}</view>
 			</view>
 		</view>
-		<view class='content1'>
+	<!-- 	<view class='content1'>
 			<view class='row content-item'>
 				<view class="left" style="color: #878C9C ;">仓库</view>
 				<view class="right">{{warehouseName}}</view>
@@ -34,6 +34,113 @@
 					</view>
 				</view>
 			</view>
+		</view> -->
+		<view class="content1">
+			<view class="title">
+				销售外勤 张三
+			</view>
+			<view class="row">
+				<view class="left">请款金额（元）</view>
+				<view class="left">1000</view>
+			</view>
+			<view class="row">
+				<view class="left">大写</view>
+				<view class="left">1000</view>
+			</view>
+			<view class="row">
+				<view class="left">车（数）</view>
+				<view class="left">20</view>
+			</view>
+			<view class="row">
+				<view class="left">合计重量（吨）</view>
+				<view class="left">20</view>
+			</view>
+			<view class="row">
+				<view class="left">平均单价（元吨）</view>
+				<view class="left">20</view>
+			</view>
+			<view class="row">
+				<view class="left">平均单价指标</view>
+			</view>
+			<view class="row">
+				<view class="left">容重（%）</view>
+				<view class="left">20</view>
+			</view>
+			
+			<view class="row">
+				<view class="left">水分（%）</view>
+				<view class="left">20</view>
+			</view>
+			
+			<view class="row">
+				<view class="left">杂质（%）</view>
+				<view class="left">20</view>
+			</view>
+			
+			<view class="row">
+				<view class="left">热损伤（%）</view>
+				<view class="left">20</view>
+			</view>
+			<view class="row">
+				<view class="left">霉变粒（%）</view>
+				<view class="left">20</view>
+			</view>
+			<view class="row" style="border-bottom:0">
+				<view class="left">不完善粒（%）</view>
+				<view class="left">20</view>
+			</view>
+			
+			<!-- <view class="row row-bottom">
+				<view class="left">水分（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
+					placeholder="输入水分占比"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">容重（克/升）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.bulkDensity' class="right-bottom"
+					placeholder="输入容重"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">热损伤（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.jiaorenli' class="right-bottom"
+					placeholder="输入热损伤占比"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">杂质（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.impurity' class="right-bottom"
+					placeholder="输入杂质占比"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">霉变粒（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.mildewGrain' class="right-bottom"
+					placeholder="输入霉变粒占比"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">不完善粒（%）</view>
+				<input type="digit" v-model='detailData.warehouseInOutDetail.imperfectGrain' class="right-bottom"
+					placeholder="输入不完善粒占比"></input>
+			</view> -->
+		</view>
+		<view class="content2">
+			<view v-for="(item,index) in 4" :key='index'>
+				<view class="row">
+					<view class="left">
+						<view class="item1">
+							<image :src="src" style="width: 100rpx;height: 100rpx;border-radius: 500%;"></image>
+						</view>
+						<view class="item2">
+							<view class="name">张三</view>
+							<view class="status">发起审批</view>
+						</view>
+						
+					</view>
+					<view class="right">
+						02-18 10:20
+					</view>
+				</view>
+				<view class="row-line" v-if="index!=3"></view>
+			</view>
+			
 		</view>
 		<view v-if='show' class="shade">
 			<view class="wrap">
@@ -56,9 +163,8 @@
 		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<!-- getRoles("acquisitionQuality.initial") -->
-			<u-button v-if='isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button v-if='isSHowBtn' @click='pass' type="success" class="btn2">通过</u-button>
+			<u-button @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button @click='pass' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -71,13 +177,14 @@
 	export default {
 		data() {
 			return {
+				src:'https://www.uviewui.com/index/banner_1920x1080.png',
 				isSHowBtn: true,
 				height: 200,
 				autoHeight: true,
 				border: false,
 				title: '',
 				show: false,
-				auditMind:'',
+				auditMind: '',
 				id: "",
 				currentPage: 1,
 				pageSize: 100,
@@ -89,7 +196,7 @@
 			}
 		},
 		onBackPress(e) {
-			if(this.everyCheck){
+			if (this.everyCheck) {
 				uni.navigateTo({
 					url: "/pages/task/my_task"
 				})
@@ -97,7 +204,7 @@
 			}
 		},
 		onLoad(options) {
-			this.id = options.id
+			this.vesselId = options.vesselId
 			this.everyCheck = uni.getStorageSync("everyTask")
 			this.isSHowBtn = options.isShowbtn
 		},
@@ -109,25 +216,13 @@
 		},
 		methods: {
 			getList() {
-				//查仓库名
-				this.$api.doRequest('get', '/paymentManagement/getInfo', {
-					id: this.id
-				}).then(res => {
-					if (res.data.code == 200) {
-						this.status = res.data.data.approveStatus
-						this.updateDate = res.data.data.updateDate
-						this.warehouseName = res.data.data.warehouseName
-						this.$api.doRequest('get', '/paymentManagement/selectPaymentManagement', {
-							currentPage: this.currentPage,
-							pageSize: this.pageSize,
-							searchType: '1',//searchType:1待审核
-							warehouseName: res.data.data.warehouseName,
-							managementType: 1
-						}).then(res1 => {
-							if (res1.data.code == 200) {
-								this.List = res1.data.data.records
-							}
-						})
+				// /workflow/query/workflowDefinitions
+				// /workflow/query/workflowInfo
+				this.$api.doRequest('post', '/paymentManagement/exportPhone', {
+					warehouseName: this.vesselId,
+				}).then(res1 => {
+					if (res1.data.code == 200) {
+						// this.List = res1.data.data.records
 					}
 				})
 			},
@@ -198,7 +293,7 @@
 							}
 						})
 					} else {
-						for(var i=0;i<this.List.length;i++){
+						for (var i = 0; i < this.List.length; i++) {
 							this.$api.doRequest('post', '/workflow/api/handle', {
 								taskId: this.List[i].taskId,
 								approved: status,
@@ -211,7 +306,7 @@
 								}
 							})
 						}
-						
+
 					}
 				} else {
 					if (status == true) {
@@ -242,41 +337,43 @@
 	}
 
 	.content1 {
+		font-size: 28rpx;
+		color: #333333;
 		margin-top: 30rpx;
-
-		.content-item {
+		padding: 20rpx;
+		// .content-item {
 			border-radius: 20rpx;
 			background: white;
-			padding: 40rpx 20rpx;
-			margin-bottom: 30rpx;
-		}
+		// 	padding: 40rpx 20rpx;
+		// 	margin-bottom: 30rpx;
+		// }
 
-		.title {
-			font-size: 32rpx;
-			font-weight: 600;
-			color: #333333;
-			margin: 30rpx 0;
-		}
+		// .title {
+		// 	font-size: 32rpx;
+		// 	font-weight: 600;
+		// 	color: #333333;
+		// 	margin: 30rpx 0;
+		// }
 
-		.goodsInfoCss {
-			font-size: 28rpx;
-			font-weight: 600;
-			color: #878C9C;
-			margin: 26rpx 10rpx;
-		}
+		// .goodsInfoCss {
+		// 	font-size: 28rpx;
+		// 	font-weight: 600;
+		// 	color: #878C9C;
+		// 	margin: 26rpx 10rpx;
+		// }
 
-		.priceCss {
-			font-size: 40rpx;
-			margin: 26rpx 10rpx;
-			color: #22C572;
-			font-weight: 600;
-		}
+		// .priceCss {
+		// 	font-size: 40rpx;
+		// 	margin: 26rpx 10rpx;
+		// 	color: #22C572;
+		// 	font-weight: 600;
+		// }
 
 		.row {
 			display: flex;
 			justify-content: space-between;
 			border-bottom: 1px solid #EEEEEE;
-
+			padding:20rpx 0;
 			.right,
 			input {
 				font-size: 28rpx;
@@ -284,6 +381,41 @@
 			}
 		}
 	}
+	.content2{
+		background: white;
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		padding: 20rpx;
+		.row{
+			display: flex;
+			justify-content: space-between;
+			.left{
+				display: flex;
+				align-items: center;
+				.item2{
+					margin-left: 20rpx;
+					.name{
+						font-size: 32rpx;
+						font-weight: 800;
+					}
+					.status{
+						color: #6CC48C;
+					}
+				}
+			}
+			.right{
+				color: #B0B1B5;
+			}
+			
+		}
+		.row-line{
+			width: 1px;
+			height: 30px;
+			background: #F2F2F2;
+			margin: 10rpx 50rpx;
+			
+		}
+	}
 
 	.bottom-btn {
 		width: 100%;
@@ -407,6 +539,7 @@
 		right: 0;
 		color: #22C572;
 	}
+
 	.u-textarea-style {
 		margin: 20rpx;
 		background: #F9F9FA;
@@ -414,7 +547,7 @@
 		border: 1px solid #EEEEEE;
 		padding: 10rpx 20rpx;
 		position: relative;
-	
+
 		.right-bottom {
 			position: absolute;
 			right: 20rpx;

pages/task/my_task.vue

@@ -340,7 +340,7 @@
 					uni.hideLoading()
 				})
 			},
-			getIndexBuyData(status) {
+			getIndexBuyData(status) {debugger
 				const that = this
 				var pages = that.pages
 				var limit = that.limit
@@ -534,7 +534,7 @@
 				} else if (item.businessCode == 'PAYMENT-MANAGEMENT-APPROVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/acquisition_settlement_approval?id=${item.businessId}&isShowbtn=true`
+							url: `/pages/task/audit/acquisition_settlement_approval?vesselId=${item.vesselId}`
 						})
 
 					} else {