任务 付款页面修改

pages/task/audit/acquisition_settlement_approval.vue

@@ -8,15 +8,16 @@
 							style="height: 40rpx;"></image><!-- 驳回 -->
 						<image src="../../../static/img/tongguo.png" mode="" v-if="status == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
+							<!-- v-if="status == '审核中' || status == '待决策人审核'" -->
 						<image src="../../../static/img/daishenhe.png" mode=""
-							v-if="status == '审核中' || status == '待决策人审核'" style="height: 40rpx;"></image><!-- 待审核 -->
+							 style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText">{{status}}</view>
+					<view class="infoText">待决策人审核</view>
 				</view>
 				<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>
@@ -41,55 +42,55 @@
 			</view>
 			<view class="row">
 				<view class="left">请款金额（元）</view>
-				<view class="left">1000</view>
+				<view class="left">{{auditInfo.amountIngPayableTotal}}</view>
 			</view>
 			<view class="row">
 				<view class="left">大写</view>
-				<view class="left">1000</view>
+				<view class="left">{{auditInfo.jiaorenliTotal}}</view>
 			</view>
 			<view class="row">
 				<view class="left">车（数）</view>
-				<view class="left">20</view>
+				<view class="left">{{auditInfo.carTotal}}</view>
 			</view>
 			<view class="row">
 				<view class="left">合计重量（吨）</view>
-				<view class="left">20</view>
+				<view class="left">{{auditInfo.netWeightTotal}}</view>
 			</view>
 			<view class="row">
 				<view class="left">平均单价（元吨）</view>
-				<view class="left">20</view>
+				<view class="left">{{auditInfo.averageUnitPrice}}</view>
 			</view>
 			<view class="row">
 				<view class="left">平均单价指标</view>
 			</view>
 			<view class="row">
 				<view class="left">容重（%）</view>
-				<view class="left">20</view>
+				<view class="left">{{auditInfo.bulkDensityTotal}}</view>
 			</view>
-			
+
 			<view class="row">
 				<view class="left">水分（%）</view>
-				<view class="left">20</view>
+				<view class="left">{{auditInfo.waterContentTotal}}</view>
 			</view>
-			
+
 			<view class="row">
 				<view class="left">杂质（%）</view>
-				<view class="left">20</view>
+				<view class="left">{{auditInfo.impurityTotal}}</view>
 			</view>
-			
+
 			<view class="row">
 				<view class="left">热损伤（%）</view>
-				<view class="left">20</view>
+				<view class="left">{{auditInfo.jiaorenliTotal}}</view>
 			</view>
 			<view class="row">
 				<view class="left">霉变粒（%）</view>
-				<view class="left">20</view>
+				<view class="left">{{auditInfo.mildewGrainTotal}}</view>
 			</view>
 			<view class="row" style="border-bottom:0">
 				<view class="left">不完善粒（%）</view>
-				<view class="left">20</view>
+				<view class="left">{{auditInfo.imperfectGrainTotal}}</view>
 			</view>
-			
+
 			<!-- <view class="row row-bottom">
 				<view class="left">水分（%）</view>
 				<input type="digit" v-model='detailData.warehouseInOutDetail.waterContent' class="right-bottom"
@@ -122,25 +123,25 @@
 			</view> -->
 		</view>
 		<view class="content2">
-			<view v-for="(item,index) in 4" :key='index'>
+			<view v-for="(item,index) in auditList" :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="name">{{item.desc}}</view>
 							<view class="status">发起审批</view>
 						</view>
-						
+
 					</view>
 					<view class="right">
-						02-18 10:20
+						{{item.updateDate}}
 					</view>
 				</view>
 				<view class="row-line" v-if="index!=3"></view>
 			</view>
-			
+
 		</view>
 		<view v-if='show' class="shade">
 			<view class="wrap">
@@ -177,7 +178,7 @@
 	export default {
 		data() {
 			return {
-				src:'https://www.uviewui.com/index/banner_1920x1080.png',
+				src: 'https://www.uviewui.com/index/banner_1920x1080.png',
 				isSHowBtn: true,
 				height: 200,
 				autoHeight: true,
@@ -192,7 +193,10 @@
 				status: "",
 				updateDate: "",
 				warehouseName: "",
-				everyCheck: ''
+				everyCheck: '',
+				auditInfo: {},
+				id: "",
+				auditList:[],
 			}
 		},
 		onBackPress(e) {
@@ -204,6 +208,7 @@
 			}
 		},
 		onLoad(options) {
+			this.id = options.id
 			this.vesselId = options.vesselId
 			this.everyCheck = uni.getStorageSync("everyTask")
 			this.isSHowBtn = options.isShowbtn
@@ -217,14 +222,49 @@
 		methods: {
 			getList() {
 				// /workflow/query/workflowDefinitions
-				// /workflow/query/workflowInfo
+				// /workflow/query/workflowInfo  exportPhoneData
 				this.$api.doRequest('post', '/paymentManagement/exportPhone', {
 					warehouseName: this.vesselId,
 				}).then(res1 => {
 					if (res1.data.code == 200) {
-						// this.List = res1.data.data.records
+						uni.downloadFile({
+							url: res1.data.data,
+							success: function(res1) {
+								var filePath = res1.tempFilePath;
+								uni.openDocument({
+									filePath: filePath,
+									showMenu: true,
+									success: function(res1) {
+										console.log('打开文档成功');
+									}
+								});
+							}
+						});
 					}
 				})
+				this.$api.doRequest('post', '/paymentManagement/exportPhoneData', {
+					warehouseName: this.vesselId
+				}).then(res1 => {
+					if (res1.data.code == 200) {
+						this.auditInfo = res1.data.data
+					}
+				})
+				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+					businessCode: 'PAYMENT-MANAGEMENT-APPROVE',
+					tmpCompId: uni.getStorageSync('pcUserInfo').compId
+				}).then(res1 => {
+					this.updateDate = res1.data.data[0].updateDate 
+					this.$api.doRequest('get', '/workflow/query/workflowInfo', {
+						workflowId: res1.data.data[0].id
+					}).then(response => {
+						this.auditList = response.data.data.steps
+					})
+				})
+				// this.$api.doRequest('get', '/workflow/query/workflowInfo',
+				// {workflowId:this.id}).then(res1 => {
+
+				// })
+
 			},
 			close() {
 				this.show = false
@@ -342,8 +382,8 @@
 		margin-top: 30rpx;
 		padding: 20rpx;
 		// .content-item {
-			border-radius: 20rpx;
-			background: white;
+		border-radius: 20rpx;
+		background: white;
 		// 	padding: 40rpx 20rpx;
 		// 	margin-bottom: 30rpx;
 		// }
@@ -373,7 +413,8 @@
 			display: flex;
 			justify-content: space-between;
 			border-bottom: 1px solid #EEEEEE;
-			padding:20rpx 0;
+			padding: 20rpx 0;
+
 			.right,
 			input {
 				font-size: 28rpx;
@@ -381,39 +422,48 @@
 			}
 		}
 	}
-	.content2{
+
+	.content2 {
 		background: white;
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
-		.row{
+
+		.row {
 			display: flex;
 			justify-content: space-between;
-			.left{
+
+			.left {
 				display: flex;
 				align-items: center;
-				.item2{
+
+				.item2 {
 					margin-left: 20rpx;
-					.name{
+
+					.name {
 						font-size: 32rpx;
 						font-weight: 800;
 					}
-					.status{
+
+					.status {
 						color: #6CC48C;
 					}
 				}
 			}
-			.right{
+
+			.right {
 				color: #B0B1B5;
+				margin-top: 10px;
 			}
-			
+
 		}
-		.row-line{
+
+		.row-line {
 			width: 1px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;
-			
+
 		}
 	}
 

pages/task/my_task.vue

@@ -330,7 +330,6 @@
 							})
 							uni.hideLoading(this.taskInfo, "信息")
 						}
-						console.log()
 					}).catch(res => {
 					uni.showToast({
 						title: res.data.message,
@@ -340,7 +339,7 @@
 					uni.hideLoading()
 				})
 			},
-			getIndexBuyData(status) {debugger
+			getIndexBuyData(status) {
 				const that = this
 				var pages = that.pages
 				var limit = that.limit
@@ -534,7 +533,7 @@
 				} else if (item.businessCode == 'PAYMENT-MANAGEMENT-APPROVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/acquisition_settlement_approval?vesselId=${item.vesselId}`
+							url: `/pages/task/audit/acquisition_settlement_approval?vesselId=${item.vesselId}&id=${item.acceptId}`
 						})
 
 					} else {

pages/user/contractLook/inventoryCost.vue

@@ -155,7 +155,6 @@
 				this.isShowDetailBtn = true
 			},
 			init() {
-				debugger
 				if (!this.hasLogin) {
 					this.isShowAlert = true;
 				} else {