前端修改添加审核流程

config/index.js

@@ -7,9 +7,9 @@ const dev = {
 	// baseUrlNew: 'http://192.168.1.122:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
-	// baseUrlNew: 'http://192.168.110.138:8090/',
+	baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -14,8 +14,8 @@
 							v-else-if="OutList.taskStatus == '审核中'||OutList.taskStatus == '待审核'||EnterList.taskStatus == '待审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText" v-if="OutList.taskStatus">{{OutList.taskStatus}}</view>
-					<view class="infoText" v-else>{{EnterList.taskStatus}}</view>
+					<view class="infoText" v-if="OutList.taskStatus">{{OutList.approveStatus?OutList.approveStatus:OutList.taskStatus}}</view>
+					<view class="infoText" v-else>{{EnterList.approveStatus?EnterList.approveStatus:EnterList.taskStatus}}</view>
 				</view>
 				<view class="infoData" v-if="OutList.updateDate">{{OutList.updateDate}}</view>
 				<view class="infoData" v-else>{{EnterList.updateDate}}</view>
@@ -252,26 +252,37 @@
 								<view class="item1">
 									<view class="item-content">{{item.operatorTitle}}</view> 
 									<view v-if="item.status=='success'" class='status success'>
-										<u-icon name="checkmark" color="#2979ff" size="28"></u-icon>
+										<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
 									</view>
 									<view v-if="item.status=='error'" class='status error'>
-										<u-icon name="close" color="rgb(245, 108, 108)" size="28"></u-icon>
+										<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
 									</view>
 									<view  v-if="item.status=='question'" class='status question'>
-										<u-icon name="question" color="#f9ae3d" size="28"></u-icon>
+										<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
 									</view>
 								</view>
-								<view class="item2">
-									<view class="name">{{item.desc}}
+							</view>
+							<view class="right">
+								<view class="right-item">
+									<view class="item2">
+										<view class="name">{{item.desc}}
+										</view>
+										<!-- <view class='time'>{{item.updateDate}}</view> -->
+										<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
+										<view  v-if="item.status=='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text></view>
+										<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
+										<!-- <view  class="status success">吕波（已审核）</view> -->
+										
+									</view>
+									<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0' class='time'>
+									{{item.updateDate}}
 									</view>
-									<view class='time'>{{item.updateDate}}</view>
-									<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>已审核</text></view>
-									<!-- <view  v-if="item.status='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已审核":'未审核'}}</text></view> -->
-									<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
-									<!-- <view  class="status success">吕波（已审核）</view> -->
+								</view>
+								<view v-if='item.auditMind' class="right-content">
+									{{item.auditMind}}
 								</view>
 							</view>
-							<view v-if='item.commonStaffs1&&item.commonStaffs1.length>0' class="right">
+							<view v-if='item.commonStaffs1' class="right">
 								<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
 							</view>
 						</view>
@@ -339,6 +350,7 @@
 				show: false,
 				show1: false,
 				auditList:[],
+				list:{},
 				auditMind: '',
 				pjList: [{
 						type: '一等品'
@@ -372,6 +384,9 @@
 			this.everyCheck = uni.getStorageSync("everyTask")
 			this.count=0
 			this.getList()
+		},
+		onShow() {
+			
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo']),
@@ -381,10 +396,15 @@
 				item.showflow=!item.showflow
 			},
 			getList() {
+				uni.showLoading({
+					title:'加载中',
+					mask:true
+				})
 				this.$api.doRequest('get', '/inOutWarehouseTask/getTask', {
 					id: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
+						this.list=res.data.data
 						this.$api.doRequest('get', '/inOutWarehouseTask/getInOutWarehouseTask', {
 							relevanceId: res.data.data.relevanceId
 						}).then(res => {
@@ -429,65 +449,96 @@
 								})
 							}
 						})
-					}
-				})
-				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-					businessCode: 'INOUTTASK-TASK-APPROVE',
-					tmpCompId: uni.getStorageSync('pcUserInfo').compId
-				}).then(res1 => {
-					this.$api.doRequest('get', '/commonUser/getHis', {
-						workflowId: res1.data.data[0].id,
-						businessKey: this.id
-					}).then(response => {
-						// uni.hideLoading()
-						for (let i = 0; i < response.data.data.length; i++) {
-							
-							this.$set(response.data.data[i],'status','question')
-							console.log(response.data.data[i].workflowHistoricTasks,i)
-							if(response.data.data[i].commonStaffs&&response.data.data[i].commonStaffs.length>0){
-								response.data.data[i].showflow=false
-								response.data.data[i].operatorTitle=response.data.data[i].desc[0]
-								response.data.data[i].operatorName=response.data.data[i].desc
-								response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
-								if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
-									if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
-										// response.data.data[i].status='question'
-										this.$set(response.data.data[i],'status','question')
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'INOUTTASK-TASK-APPROVE',
+							tmpCompId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res1 => {
+							this.$api.doRequest('get', '/commonUser/getHis', {
+								workflowId: res1.data.data[0].id,
+								businessKey: this.id
+							}).then(response => {
+								uni.hideLoading()
+								for (let i = 0; i < response.data.data.length; i++) {
+									this.$set(response.data.data[i],'status','question')
+									console.log(response.data.data[i].workflowHistoricTasks,i)
+									if(response.data.data[i].commonStaffs){
+										response.data.data[i].showflow=false
+										response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+										response.data.data[i].operatorName=response.data.data[i].desc
+										response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+												// response.data.data[i].status='question'
+												this.$set(response.data.data[i],'status','question')
+											}else{
+												this.$set(response.data.data[i],'status','success')
+												// response.data.data[i].status='success'
+											}
+											response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+											var workflowdata=response.data.data[i].workflowHistoricTasks
+											var staffsdata=response.data.data[i].commonStaffs
+											for (let q = 0; q < staffsdata.length; q++) {
+												staffsdata[q].status=false
+												staffsdata[q].staffTitle=staffsdata[q].staffName
+												for (let k = 0; k < workflowdata.length; k++) {
+													if(staffsdata[q].staffId==workflowdata[k].operatorId){
+														staffsdata[q].status=true
+													}
+												}
+											}
+										}
+										response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
 									}else{
-										this.$set(response.data.data[i],'status','success')
-										// response.data.data[i].status='success'
-									}
-									response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
-									var workflowdata=response.data.data[i].workflowHistoricTasks
-									var staffsdata=response.data.data[i].commonStaffs
-									for (let q = 0; q < staffsdata.length; q++) {
-										staffsdata[q].status=false
-										staffsdata[q].staffTitle=staffsdata[q].staffName
-										for (let k = 0; k < workflowdata.length; k++) {
-											if(staffsdata[q].staffId==workflowdata[k].operatorId){
-												staffsdata[q].status=true
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											var len =response.data.data[i].workflowHistoricTasks.length-1
+											if(response.data.data[i].workflowHistoricTasks[len].approved){
+												this.$set(response.data.data[i],'status','success')
+											}else{
+												this.$set(response.data.data[i],'status','error')
 											}
+											response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+											response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+											var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+										}else{
+											this.$set(response.data.data[i],'status','question')
+											// response.data.data[i].status='question'
+											if(response.data.data[i].desc=='总经理助理审核'){
+												response.data.data[i].operatorTitle='总助'
+											}else if(response.data.data[i].desc=='杜大光审核'){
+												response.data.data[i].operatorTitle='大光'
+											}else{
+												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+											}
+											
+											response.data.data[i].operatorName=response.data.data[i].desc
+											var time1=new Date(response.data.data[i].updateDate).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=''
 										}
 									}
+									
 								}
-								response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
-							}else{
-								if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
-									this.$set(response.data.data[i],'status','success')
-									response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[0].operatorName[0]
-									response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[0].operatorName
-								}else{
-									this.$set(response.data.data[i],'status','question')
-									// response.data.data[i].status='question'
-									response.data.data[i].operatorTitle=response.data.data[i].desc[0]
-									response.data.data[i].operatorName=response.data.data[i].desc
-								}
-							}
-							
-						}
-						console.log(response.data.data)
-						this.auditList = response.data.data
-					})
+								console.log(response.data.data)
+								this.auditList = response.data.data
+								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+								this.auditList.unshift({
+									operatorTitle:this.list.creater.substring(0,2),
+									operatorName:this.list.creater,
+									updateDate:time3,
+									auditMind:'',
+									desc:'发起申请',
+									showflow:false,
+									commonStaffs1:null,
+									commonStaffs:null,
+									workflowHistoricTasks:[],
+									status:'success'
+								})
+							})
+						})
+					}
 				})
 			},
 			pjPicker(e) {
@@ -1134,13 +1185,12 @@
 	}
 	.content2 {
 		background: white;
-		margin: 20rpx 0;
+		margin: 20rpx 10px;
 		border-radius: 20rpx;
 		padding: 20rpx;
 	
 		.row {
 			display: flex;
-			justify-content: space-between;
 	
 			.left {
 				display: flex;
@@ -1151,18 +1201,18 @@
 						background:#22C572;
 					    width: 50px;
 					    height: 50px;
-					    border-radius: 50%;
+					    border-radius: 10px;
 					    line-height: 50px;
 					    text-align: center;
-					    font-size: 20px;
+					    font-size: 18px;
 					    color: #fff;
 					}
 					.status{
 						position:absolute;
 						border-radius: 50%;
-						padding: 1px 2px;
-						right: 0;
-						bottom: 0;
+						padding: 0px 2px;
+						right: -3px;
+						bottom: -3px;
 						background:#fff;
 					}
 					.status.success{
@@ -1175,33 +1225,46 @@
 						border:1px solid #f9ae3d;
 					}
 				}
-				.item2 {
-					margin-left: 20rpx;
-	
-					.name {
-						font-size: 32rpx;
-						font-weight: 800;
-					}
+				
+			}
 	
-					.status.success {
-						color: #6CC48C;
-					}
-					.status.error {
-						color: rgb(245, 108, 108);
-					}
-					.status.question {
-						color: #f9ae3d;
-					}
+			.right {
+				width:80%;
+				// color: #B0B1B5;
+				margin-top: 10px;
+				.right-content{
+					background:#F2F3F7;
+					margin-left:10px;
+					margin-top:10px;
+					padding:10px;
+					border-radius:5px;
+					color: #B0B1B5;
+				}
+				.right-item{
+					display: flex;
+					justify-content: space-between;
 					.time{
 						color:#999;
 					}
+					.item2 {
+						margin-left: 20rpx;
+						
+						.name {
+							font-size: 28rpx;
+							font-weight: 800;
+						}
+						.status.success {
+							color: #6CC48C;
+						}
+						.status.error {
+							color: rgb(245, 108, 108);
+						}
+						.status.question {
+							color: #f9ae3d;
+						}
+					}
 				}
-			}
-	
-			.right {
-				color: #B0B1B5;
-				margin-top: 10px;
-			}
+			}	
 		}
 		.row2{
 			display:flex;

pages/task/audit/Issueandreceipt_task_details.vue

@@ -14,11 +14,11 @@
 							v-else-if="OutList.taskStatus == '审核中'||OutList.taskStatus == '待审核'||EnterList.taskStatus == '待审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText" v-if="OutList.taskStatus">{{OutList.taskStatus}}</view>
-					<view class="infoText" v-else>{{EnterList.taskStatus}}</view>
-				</view>
-				<view class="infoData" v-if="OutList.updateDate">{{OutList.updateDate}}</view>
-				<view class="infoData" v-else>{{EnterList.updateDate}}</view>
+					<view class="infoText" v-if="OutList.taskStatus">{{OutList.approveStatus?OutList.approveStatus:OutList.taskStatus}}</view>
+						<view class="infoText" v-else>{{EnterList.approveStatus?EnterList.approveStatus:EnterList.taskStatus}}</view>
+					</view>
+					<view class="infoData" v-if="OutList.updateDate">{{OutList.updateDate}}</view>
+					<view class="infoData" v-else>{{EnterList.updateDate}}</view>
 			</view>
 		</view>
 		<view class="content1">
@@ -240,6 +240,64 @@
 				<view class="uForm_item" v-if="OutList.taskTypeKey == 3 && !EnterList.judge">
 					<view class="deleteText">移库入库（已删除）</view>
 				</view>
+				<view class="content2">
+					<view class="title row">
+						流程
+					</view>
+					<view v-for="(item,index) in auditList" :key='index' class="audit">
+						<view class="row">
+							<view class="left">
+								<view class="item1">
+									<view class="item-content">{{item.operatorTitle}}</view> 
+									<view v-if="item.status=='success'" class='status success'>
+										<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
+									</view>
+									<view v-if="item.status=='error'" class='status error'>
+										<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
+									</view>
+									<view  v-if="item.status=='question'" class='status question'>
+										<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
+									</view>
+								</view>
+							</view>
+							<view class="right">
+								<view class="right-item">
+									<view class="item2">
+										<view class="name">{{item.desc}}
+										</view>
+										<!-- <view class='time'>{{item.updateDate}}</view> -->
+										<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
+										<view  v-if="item.status=='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text></view>
+										<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
+										<!-- <view  class="status success">吕波（已审核）</view> -->
+										
+									</view>
+									<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0' class='time'>
+									{{item.updateDate}}
+									</view>
+								</view>
+								<view v-if='item.auditMind' class="right-content">
+									{{item.auditMind}}
+								</view>
+							</view>
+							<view v-if='item.commonStaffs1' class="right">
+								<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
+							</view>
+						</view>
+						<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
+							<view class='row2'>
+								<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
+									<view class="item-content">
+										<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
+										<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
+									</view> 
+									<view class="name">{{item1.staffName}}</view> 
+								</view>
+							</view>
+						</view>
+						<view class="row-line" v-if="index!= auditList.length - 1"></view>
+					</view>
+				</view>
 			</u-form>
 		</view>
 		<view style='padding:10px;' class='flex bottom-btn'>
@@ -264,6 +322,8 @@
 				show: false,
 				show1: false,
 				border: false,
+				auditList:[],
+				list:{},
 				rejectInfo: "", //驳回原因
 				pjList: [{
 						type: '一等品'
@@ -291,7 +351,14 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			showcontent(item){
+				item.showflow=!item.showflow
+			},
 			getList() {
+				uni.showLoading({
+					title:'加载中',
+					mask:true
+				})
 				this.$api.doRequest('get', '/inOutWarehouseTask/getTask', {
 					id: this.id
 				}).then(res => {
@@ -309,7 +376,8 @@
 									} else if (res.data.data[i].inOutType == "移库入库" || res.data.data[i]
 										.inOutType == "暂存入库" || res
 										.data.data[i].inOutType == "采购入库" || res.data.data[i].inOutType ==
-										"贸易服务入库") {
+										"贸易服务入库"|| res.data.data[i].inOutType ==
+										"收购入库") {
 										this.EnterList = res.data.data[i]
 										this.EnterList.judge = 2
 									} else if (res.data.data[i].inOutType == "退库") {
@@ -319,8 +387,98 @@
 								}
 							}
 						})
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'INOUTTASK-TASK-APPROVE',
+							tmpCompId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res1 => {
+							this.$api.doRequest('get', '/commonUser/getHis', {
+								workflowId: res1.data.data[0].id,
+								businessKey: this.id
+							}).then(response => {
+								uni.hideLoading()
+								for (let i = 0; i < response.data.data.length; i++) {
+									this.$set(response.data.data[i],'status','question')
+									console.log(response.data.data[i].workflowHistoricTasks,i)
+									if(response.data.data[i].commonStaffs){
+										response.data.data[i].showflow=false
+										response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+										response.data.data[i].operatorName=response.data.data[i].desc
+										response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+												// response.data.data[i].status='question'
+												this.$set(response.data.data[i],'status','question')
+											}else{
+												this.$set(response.data.data[i],'status','success')
+												// response.data.data[i].status='success'
+											}
+											response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+											var workflowdata=response.data.data[i].workflowHistoricTasks
+											var staffsdata=response.data.data[i].commonStaffs
+											for (let q = 0; q < staffsdata.length; q++) {
+												staffsdata[q].status=false
+												staffsdata[q].staffTitle=staffsdata[q].staffName
+												for (let k = 0; k < workflowdata.length; k++) {
+													if(staffsdata[q].staffId==workflowdata[k].operatorId){
+														staffsdata[q].status=true
+													}
+												}
+											}
+										}
+										response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
+									}else{
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											var len =response.data.data[i].workflowHistoricTasks.length-1
+											if(response.data.data[i].workflowHistoricTasks[len].approved){
+												this.$set(response.data.data[i],'status','success')
+											}else{
+												this.$set(response.data.data[i],'status','error')
+											}
+											response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+											response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+											var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+										}else{
+											this.$set(response.data.data[i],'status','question')
+											// response.data.data[i].status='question'
+											if(response.data.data[i].desc=='总经理助理审核'){
+												response.data.data[i].operatorTitle='总助'
+											}else if(response.data.data[i].desc=='杜大光审核'){
+												response.data.data[i].operatorTitle='大光'
+											}else{
+												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+											}
+											
+											response.data.data[i].operatorName=response.data.data[i].desc
+											var time1=new Date(response.data.data[i].updateDate).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=''
+										}
+									}
+									
+								}
+								console.log(response.data.data)
+								this.auditList = response.data.data
+								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+								this.auditList.unshift({
+									operatorTitle:this.list.creater.substring(0,2),
+									operatorName:this.list.creater,
+									updateDate:time3,
+									auditMind:'',
+									desc:'发起申请',
+									showflow:false,
+									commonStaffs1:null,
+									commonStaffs:null,
+									workflowHistoricTasks:[],
+									status:'success'
+								})
+							})
+						})
 					}
 				})
+				
 			},
 			// pjPicker(e) {
 			// 	this.OutList.grade = this.pjList[e[0]].type
@@ -473,4 +631,118 @@
 		text-align: center;
 		color: #AFB3BF;
 	}
+	.content2 {
+		background: white;
+		margin: 20rpx 10px;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	
+		.row {
+			display: flex;
+	
+			.left {
+				display: flex;
+				align-items: center;
+				.item1{
+					position:relative;
+					.item-content{
+						background:#22C572;
+					    width: 50px;
+					    height: 50px;
+					    border-radius: 10px;
+					    line-height: 50px;
+					    text-align: center;
+					    font-size: 18px;
+					    color: #fff;
+					}
+					.status{
+						position:absolute;
+						border-radius: 50%;
+						padding: 0px 2px;
+						right: -3px;
+						bottom: -3px;
+						background:#fff;
+					}
+					.status.success{
+						border:1px solid rgb(60, 156, 255);
+					}
+					.status.error{
+						border:1px solid rgb(245, 108, 108);
+					}
+					.status.question{
+						border:1px solid #f9ae3d;
+					}
+				}
+				
+			}
+	
+			.right {
+				width:80%;
+				// color: #B0B1B5;
+				margin-top: 10px;
+				.right-content{
+					background:#F2F3F7;
+					margin-left:10px;
+					margin-top:10px;
+					padding:10px;
+					border-radius:5px;
+					color: #B0B1B5;
+				}
+				.right-item{
+					display: flex;
+					justify-content: space-between;
+					.time{
+						color:#999;
+					}
+					.item2 {
+						margin-left: 20rpx;
+						
+						.name {
+							font-size: 28rpx;
+							font-weight: 800;
+						}
+						.status.success {
+							color: #6CC48C;
+						}
+						.status.error {
+							color: rgb(245, 108, 108);
+						}
+						.status.question {
+							color: #f9ae3d;
+						}
+					}
+				}
+			}	
+		}
+		.row2{
+			display:flex;
+			.item-content{
+				background:#22C572;
+			    width: 30px;
+			    height: 30px;
+			    border-radius: 50%;
+			    line-height: 30px;
+			    text-align: center;
+			    font-size: 12px;
+			    color: #fff;
+				padding:0 2px;
+				margin:0 auto;
+			}
+			.status{
+				position:absolute;
+				top:0;right:0;
+			}
+		}
+		.row-line {
+			width: 1px;
+			height: 30px;
+			background: #F2F2F2;
+			margin: 10rpx 50rpx;
+	
+		}
+	
+		.audit {
+			margin-top: 20rpx;
+		}
+	}
 </style>

pages/task/audit/acquisitioncontract.vue

@@ -124,23 +124,34 @@
 							<view class="item1">
 								<view class="item-content">{{item.operatorTitle}}</view> 
 								<view v-if="item.status=='success'" class='status success'>
-									<u-icon name="checkmark" color="#2979ff" size="28"></u-icon>
+									<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
 								</view>
 								<view v-if="item.status=='error'" class='status error'>
-									<u-icon name="close" color="rgb(245, 108, 108)" size="28"></u-icon>
+									<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
 								</view>
 								<view  v-if="item.status=='question'" class='status question'>
-									<u-icon name="question" color="#f9ae3d" size="28"></u-icon>
+									<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
 								</view>
 							</view>
-							<view class="item2">
-								<view class="name">{{item.desc}}
+						</view>
+						<view class="right">
+							<view class="right-item">
+								<view class="item2">
+									<view class="name">{{item.desc}}
+									</view>
+									<!-- <view class='time'>{{item.updateDate}}</view> -->
+									<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
+									<view  v-if="item.status=='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text></view>
+									<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
+									<!-- <view  class="status success">吕波（已审核）</view> -->
+									
+								</view>
+								<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0' class='time'>
+								{{item.updateDate}}
 								</view>
-								<view class='time'>{{item.updateDate}}</view>
-								<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>已审核</text></view>
-								<!-- <view  v-if="item.status='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已审核":'未审核'}}</text></view> -->
-								<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
-								<!-- <view  class="status success">吕波（已审核）</view> -->
+							</view>
+							<view v-if='item.auditMind' class="right-content">
+								{{item.auditMind}}
 							</view>
 						</view>
 						<view v-if='item.commonStaffs1' class="right">
@@ -162,7 +173,7 @@
 				</view>
 			</view>
 		</u-form>
-		<view style='padding:10px;' class='flex bottom-btn'>
+		<view v-if='list.taskId' style='padding:10px;' class='flex bottom-btn'>
 			<u-button v-if='list.approveStatus||isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>
 				驳回
 			</u-button>
@@ -237,11 +248,14 @@
 		},
 		onLoad(options) {
 			this.id = options.id
-			this.getList()
+			
 			this.everyCheck = uni.getStorageSync("everyTask")
 			this.isSHowBtn = options.isShowbtn
 
 		},
+		onShow(){
+			this.getList()
+		},
 		methods: {
 			openDocument(src){
 				uni.downloadFile({
@@ -266,6 +280,10 @@
 				item.showflow=!item.showflow
 			},
 			getList(id) {
+				uni.showLoading({
+					title:'加载中',
+					mask:true
+				})
 				var that = this
 				this.$api.doRequest('get', '/contractManagementInfo/getInfo', {
 					id: this.id
@@ -279,6 +297,7 @@
 						}else if (this.list.deliverType == 3) {
 							this.list.deliverType1 = '对方送货(临时库)'
 						}
+						// 查合同附件
 						this.$api.doRequest('get', '/appendix/query/getFileList', {
 							appendixIds: that.list.addressUrl
 						}).then(res1 => {
@@ -286,65 +305,99 @@
 								that.imglist.push(res1.data.data[i].appendixPath)
 							}
 						})
-					}
-				})
-				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-					businessCode: 'SHOU-CONTRACT-APPROVE',
-					tmpCompId: uni.getStorageSync('pcUserInfo').compId
-				}).then(res1 => {
-					this.$api.doRequest('get', '/commonUser/getHis', {
-						workflowId: res1.data.data[0].id,
-						businessKey: this.id
-					}).then(response => {
-						// uni.hideLoading()
-						for (let i = 0; i < response.data.data.length; i++) {
-							this.$set(response.data.data[i],'status','question')
-							console.log(response.data.data[i].workflowHistoricTasks,i)
-							if(response.data.data[i].commonStaffs){
-								response.data.data[i].showflow=false
-								response.data.data[i].operatorTitle=response.data.data[i].desc[0]
-								response.data.data[i].operatorName=response.data.data[i].desc
-								response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
-								if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
-									if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
-										// response.data.data[i].status='question'
-										this.$set(response.data.data[i],'status','question')
+						// 查流程
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'SHOU-CONTRACT-APPROVE',
+							tmpCompId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res1 => {
+							this.$api.doRequest('get', '/commonUser/getHis', {
+								workflowId: res1.data.data[0].id,
+								businessKey: this.id
+							}).then(response => {
+								uni.hideLoading()
+								for (let i = 0; i < response.data.data.length; i++) {
+									this.$set(response.data.data[i],'status','question')
+									console.log(response.data.data[i].workflowHistoricTasks,i)
+									if(response.data.data[i].commonStaffs){
+										response.data.data[i].showflow=false
+										response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+										response.data.data[i].operatorName=response.data.data[i].desc
+										response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+												// response.data.data[i].status='question'
+												this.$set(response.data.data[i],'status','question')
+											}else{
+												this.$set(response.data.data[i],'status','success')
+												// response.data.data[i].status='success'
+											}
+											response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+											var workflowdata=response.data.data[i].workflowHistoricTasks
+											var staffsdata=response.data.data[i].commonStaffs
+											for (let q = 0; q < staffsdata.length; q++) {
+												staffsdata[q].status=false
+												staffsdata[q].staffTitle=staffsdata[q].staffName
+												for (let k = 0; k < workflowdata.length; k++) {
+													if(staffsdata[q].staffId==workflowdata[k].operatorId){
+														staffsdata[q].status=true
+													}
+												}
+											}
+										}
+										response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
 									}else{
-										this.$set(response.data.data[i],'status','success')
-										// response.data.data[i].status='success'
-									}
-									response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
-									var workflowdata=response.data.data[i].workflowHistoricTasks
-									var staffsdata=response.data.data[i].commonStaffs
-									for (let q = 0; q < staffsdata.length; q++) {
-										staffsdata[q].status=false
-										staffsdata[q].staffTitle=staffsdata[q].staffName
-										for (let k = 0; k < workflowdata.length; k++) {
-											if(staffsdata[q].staffId==workflowdata[k].operatorId){
-												staffsdata[q].status=true
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											var len =response.data.data[i].workflowHistoricTasks.length-1
+											if(response.data.data[i].workflowHistoricTasks[len].approved){
+												this.$set(response.data.data[i],'status','success')
+											}else{
+												this.$set(response.data.data[i],'status','error')
+											}
+											response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+											response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+											var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+										}else{
+											this.$set(response.data.data[i],'status','question')
+											// response.data.data[i].status='question'
+											if(response.data.data[i].desc=='总经理助理审核'){
+												response.data.data[i].operatorTitle='总助'
+											}else if(response.data.data[i].desc=='杜大光审核'){
+												response.data.data[i].operatorTitle='大光'
+											}else{
+												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
 											}
+											
+											response.data.data[i].operatorName=response.data.data[i].desc
+											var time1=new Date(response.data.data[i].updateDate).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=''
 										}
 									}
+									
 								}
-								response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
-							}else{
-								if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
-									this.$set(response.data.data[i],'status','success')
-									response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[0].operatorName[0]
-									response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[0].operatorName
-								}else{
-									this.$set(response.data.data[i],'status','question')
-									// response.data.data[i].status='question'
-									response.data.data[i].operatorTitle=response.data.data[i].desc[0]
-									response.data.data[i].operatorName=response.data.data[i].desc
-								}
-							}
-							
-						}
-						console.log(response.data.data)
-						this.auditList = response.data.data
-					})
+								console.log(response.data.data)
+								this.auditList = response.data.data
+								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+								this.auditList.unshift({
+									operatorTitle:this.list.creater.substring(0,2),
+									operatorName:this.list.creater,
+									updateDate:time3,
+									auditMind:'',
+									desc:'发起申请',
+									showflow:false,
+									commonStaffs1:null,
+									commonStaffs:null,
+									workflowHistoricTasks:[],
+									status:'success'
+								})
+							})
+						})
+					}
 				})
+				
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
@@ -687,7 +740,6 @@
 	
 		.row {
 			display: flex;
-			justify-content: space-between;
 	
 			.left {
 				display: flex;
@@ -698,18 +750,18 @@
 						background:#22C572;
 					    width: 50px;
 					    height: 50px;
-					    border-radius: 50%;
+					    border-radius: 10px;
 					    line-height: 50px;
 					    text-align: center;
-					    font-size: 20px;
+					    font-size: 18px;
 					    color: #fff;
 					}
 					.status{
 						position:absolute;
 						border-radius: 50%;
-						padding: 1px 2px;
-						right: 0;
-						bottom: 0;
+						padding: 0px 2px;
+						right: -3px;
+						bottom: -3px;
 						background:#fff;
 					}
 					.status.success{
@@ -722,33 +774,46 @@
 						border:1px solid #f9ae3d;
 					}
 				}
-				.item2 {
-					margin-left: 20rpx;
-	
-					.name {
-						font-size: 32rpx;
-						font-weight: 800;
-					}
+				
+			}
 	
-					.status.success {
-						color: #6CC48C;
-					}
-					.status.error {
-						color: rgb(245, 108, 108);
-					}
-					.status.question {
-						color: #f9ae3d;
-					}
+			.right {
+				width:80%;
+				// color: #B0B1B5;
+				margin-top: 10px;
+				.right-content{
+					background:#F2F3F7;
+					margin-left:10px;
+					margin-top:10px;
+					padding:10px;
+					border-radius:5px;
+					color: #B0B1B5;
+				}
+				.right-item{
+					display: flex;
+					justify-content: space-between;
 					.time{
 						color:#999;
 					}
+					.item2 {
+						margin-left: 20rpx;
+						
+						.name {
+							font-size: 28rpx;
+							font-weight: 800;
+						}
+						.status.success {
+							color: #6CC48C;
+						}
+						.status.error {
+							color: rgb(245, 108, 108);
+						}
+						.status.question {
+							color: #f9ae3d;
+						}
+					}
 				}
-			}
-	
-			.right {
-				color: #B0B1B5;
-				margin-top: 10px;
-			}
+			}	
 		}
 		.row2{
 			display:flex;

pages/task/audit/charge_against_revenue.vue

@@ -13,7 +13,7 @@
 						<!-- 待审核 -->
 					</view>
 					<!-- {{auditList.length > 0 ?auditList[auditList.length - 1].operatorMajorRoleName:""}} -->
-					<view class="infoText">待决策人审核</view>
+					<view class="infoText">{{auditInfo.approveStatus?auditInfo.approveStatus:auditInfo.status}}</view>
 				</view>
 				<view class="infoData">{{auditInfo.updateDate}}</view>
 			</view>
@@ -140,21 +140,55 @@
 				<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">{{item.operatorName ? item.operatorName:item.operatorMajorRoleName}}
+							<view class="item-content">{{item.operatorTitle}}</view> 
+							<view v-if="item.status=='success'" class='status success'>
+								<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
+							</view>
+							<view v-if="item.status=='error'" class='status error'>
+								<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
+							</view>
+							<view  v-if="item.status=='question'" class='status question'>
+								<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
 							</view>
-							<view class="status">{{item.approved ? "已审核":"待决策人审核"}}</view>
 						</view>
 					</view>
 					<view class="right">
-						{{item.updateDate}}
+						<view class="right-item">
+							<view class="item2">
+								<view class="name">{{item.desc}}
+								</view>
+								<!-- <view class='time'>{{item.updateDate}}</view> -->
+								<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
+								<view  v-if="item.status=='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text></view>
+								<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
+								<!-- <view  class="status success">吕波（已审核）</view> -->
+								
+							</view>
+							<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0' class='time'>
+							{{item.updateDate}}
+							</view>
+						</view>
+						<view v-if='item.auditMind' class="right-content">
+							{{item.auditMind}}
+						</view>
+					</view>
+					<view v-if='item.commonStaffs1' class="right">
+						<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
+					</view>
+				</view>
+				<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
+					<view class='row2'>
+						<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
+							<view class="item-content">
+								<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
+								<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
+							</view> 
+							<view class="name">{{item1.staffName}}</view> 
+						</view>
 					</view>
 				</view>
 				<view class="row-line" v-if="index!= auditList.length - 1"></view>
 			</view>
-
 		</view>
 		<view v-if='show' class="shade">
 			<view class="wrap">
@@ -346,22 +380,112 @@
 						}
 						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo
 							.amountIngPayableTotal)
-					}
-				})
-				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-					businessCode: 'FEIYONGGUANLI-APPROVE',
-					tmpCompId: uni.getStorageSync('pcUserInfo').compId
-				}).then(res1 => {
-					this.updateDate = res1.data.data[0].updateDate
-					this.$api.doRequest('get', '/commonUser/getHis', {
-						workflowId: res1.data.data[0].id,
-						businessKey: this.id
-					}).then(response => {
-						// uni.hideLoading()
-						this.auditList = response.data.data
-
+					this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+						businessCode: 'FEIYONGGUANLI-APPROVE',
+						tmpCompId: uni.getStorageSync('pcUserInfo').compId
+					}).then(res1 => {
+						this.$api.doRequest('get', '/commonUser/getHis', {
+							workflowId: res1.data.data[0].id,
+							businessKey: this.id
+						}).then(response => {
+							uni.hideLoading()
+							for (let i = 0; i < response.data.data.length; i++) {
+								this.$set(response.data.data[i],'status','question')
+								console.log(response.data.data[i].workflowHistoricTasks,i)
+								if(response.data.data[i].commonStaffs){
+									response.data.data[i].showflow=false
+									response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+									response.data.data[i].operatorName=response.data.data[i].desc
+									response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+									if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+										if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+											// response.data.data[i].status='question'
+											this.$set(response.data.data[i],'status','question')
+										}else{
+											this.$set(response.data.data[i],'status','success')
+											// response.data.data[i].status='success'
+										}
+										response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+										var workflowdata=response.data.data[i].workflowHistoricTasks
+										var staffsdata=response.data.data[i].commonStaffs
+										for (let q = 0; q < staffsdata.length; q++) {
+											staffsdata[q].status=false
+											staffsdata[q].staffTitle=staffsdata[q].staffName
+											for (let k = 0; k < workflowdata.length; k++) {
+												if(staffsdata[q].staffId==workflowdata[k].operatorId){
+													staffsdata[q].status=true
+												}
+											}
+										}
+									}
+									response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
+								}else{
+									if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+										var len =response.data.data[i].workflowHistoricTasks.length-1
+										if(response.data.data[i].workflowHistoricTasks[len].approved){
+											this.$set(response.data.data[i],'status','success')
+										}else{
+											this.$set(response.data.data[i],'status','error')
+										}
+										response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+										response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+										var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+										response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+										response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+									}else{
+										this.$set(response.data.data[i],'status','question')
+										// response.data.data[i].status='question'
+										if(response.data.data[i].desc=='总经理助理审核'){
+											response.data.data[i].operatorTitle='总助'
+										}else if(response.data.data[i].desc=='杜大光审核'){
+											response.data.data[i].operatorTitle='大光'
+										}else{
+											response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+										}
+										
+										response.data.data[i].operatorName=response.data.data[i].desc
+										var time1=new Date(response.data.data[i].updateDate).getTime()
+										response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+										response.data.data[i].auditMind=''
+									}
+								}
+								
+							}
+							console.log(response.data.data)
+							this.auditList = response.data.data
+							var time2=new Date(this.auditList[0].createDate).getTime()
+							var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+							this.auditList.unshift({
+								operatorTitle:this.auditInfo.creater.substring(0,2),
+								operatorName:this.auditInfo.creater,
+								updateDate:time3,
+								auditMind:'',
+								desc:'发起申请',
+								showflow:false,
+								commonStaffs1:null,
+								commonStaffs:null,
+								workflowHistoricTasks:[],
+								status:'success'
+							})
+						})
 					})
+					}
+					
 				})
+				// this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+				// 	businessCode: 'FEIYONGGUANLI-APPROVE',
+				// 	tmpCompId: uni.getStorageSync('pcUserInfo').compId
+				// }).then(res1 => {
+				// 	this.updateDate = res1.data.data[0].updateDate
+				// 	this.$api.doRequest('get', '/commonUser/getHis', {
+				// 		workflowId: res1.data.data[0].id,
+				// 		businessKey: this.id
+				// 	}).then(response => {
+				// 		// uni.hideLoading()
+				// 		this.auditList = response.data.data
+
+				// 	})
+				// })
 			},
 			close() {
 				this.show = false
@@ -405,7 +529,7 @@
 						this.$api.msg('驳回原因不能为空！')
 					} else {
 						uni.showModal({
-							content: "确定驳回付款申请？",
+							content: "确定驳回费用支出申请？",
 							showCancel: true,
 							confirmText: '确定',
 							success: function(res) {
@@ -441,7 +565,7 @@
 					var that = this
 					this.show = false
 					uni.showModal({
-						content: "确定通过付款申请？",
+						content: "确定通过费用支出申请？",
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
@@ -619,43 +743,111 @@
 		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;
+				.item1{
+					position:relative;
+					.item-content{
+						background:#22C572;
+					    width: 50px;
+					    height: 50px;
+					    border-radius: 10px;
+					    line-height: 50px;
+					    text-align: center;
+					    font-size: 18px;
+					    color: #fff;
 					}
-
-					.status {
-						color: #6CC48C;
+					.status{
+						position:absolute;
+						border-radius: 50%;
+						padding: 0px 2px;
+						right: -3px;
+						bottom: -3px;
+						background:#fff;
+					}
+					.status.success{
+						border:1px solid rgb(60, 156, 255);
+					}
+					.status.error{
+						border:1px solid rgb(245, 108, 108);
+					}
+					.status.question{
+						border:1px solid #f9ae3d;
 					}
 				}
+				
 			}
-
+	
 			.right {
-				color: #B0B1B5;
+				width:80%;
+				// color: #B0B1B5;
 				margin-top: 10px;
+				.right-content{
+					background:#F2F3F7;
+					margin-left:10px;
+					margin-top:10px;
+					padding:10px;
+					border-radius:5px;
+					color: #B0B1B5;
+				}
+				.right-item{
+					display: flex;
+					justify-content: space-between;
+					.time{
+						color:#999;
+					}
+					.item2 {
+						margin-left: 20rpx;
+						
+						.name {
+							font-size: 28rpx;
+							font-weight: 800;
+						}
+						.status.success {
+							color: #6CC48C;
+						}
+						.status.error {
+							color: rgb(245, 108, 108);
+						}
+						.status.question {
+							color: #f9ae3d;
+						}
+					}
+				}
+			}	
+		}
+		.row2{
+			display:flex;
+			.item-content{
+				background:#22C572;
+			    width: 30px;
+			    height: 30px;
+			    border-radius: 50%;
+			    line-height: 30px;
+			    text-align: center;
+			    font-size: 12px;
+			    color: #fff;
+				padding:0 2px;
+				margin:0 auto;
+			}
+			.status{
+				position:absolute;
+				top:0;right:0;
 			}
 		}
-
 		.row-line {
 			width: 1px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;
-
+	
 		}
-
+	
 		.audit {
 			margin-top: 20rpx;
 		}

pages/task/audit/charge_against_revenue_detail.vue

@@ -13,7 +13,7 @@
 						<!-- 待审核 -->
 					</view>
 					<!-- {{auditList.length > 0 ?auditList[auditList.length - 1].operatorMajorRoleName:""}} -->
-					<view class="infoText">{{auditInfo.status}}</view>
+					<view class="infoText">{{auditInfo.approveStatus?auditInfo.approveStatus:auditInfo.status}}</view>
 				</view>
 				<view class="infoData">{{auditInfo.updateDate}}</view>
 			</view>
@@ -123,6 +123,15 @@
 				暂无附件
 			</view>
 		</view>
+		<view class="content1" v-if="url && url != 'ng'&&auditInfo.expenseAllocationInfoList">
+			<view class="title ">
+				费用分配附件
+			</view>
+			<view class="file" @click="openXls">
+				<image src="../../../static/img/excle.png" mode="" class="img_css"></image>
+				<text class="text_css">明细.xls</text>
+			</view>
+		</view>
 		<view class="content2">
 			<view class="title row">
 				流程
@@ -131,25 +140,78 @@
 				<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">{{item.operatorName ? item.operatorName:item.operatorMajorRoleName}}
+							<view class="item-content">{{item.operatorTitle}}</view> 
+							<view v-if="item.status=='success'" class='status success'>
+								<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
+							</view>
+							<view v-if="item.status=='error'" class='status error'>
+								<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
+							</view>
+							<view  v-if="item.status=='question'" class='status question'>
+								<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
 							</view>
-							<view class="status">{{item.approved ? "已审核":"待决策人审核"}}</view>
 						</view>
 					</view>
 					<view class="right">
-						{{item.updateDate}}
+						<view class="right-item">
+							<view class="item2">
+								<view class="name">{{item.desc}}
+								</view>
+								<!-- <view class='time'>{{item.updateDate}}</view> -->
+								<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
+								<view  v-if="item.status=='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text></view>
+								<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
+								<!-- <view  class="status success">吕波（已审核）</view> -->
+								
+							</view>
+							<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0' class='time'>
+							{{item.updateDate}}
+							</view>
+						</view>
+						<view v-if='item.auditMind' class="right-content">
+							{{item.auditMind}}
+						</view>
+					</view>
+					<view v-if='item.commonStaffs1' class="right">
+						<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
+					</view>
+				</view>
+				<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
+					<view class='row2'>
+						<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
+							<view class="item-content">
+								<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
+								<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
+							</view> 
+							<view class="name">{{item1.staffName}}</view> 
+						</view>
 					</view>
 				</view>
 				<view class="row-line" v-if="index!= auditList.length - 1"></view>
 			</view>
-
+		</view>
+		<view v-if='show' class="shade">
+			<view class="wrap">
+				<view class="alert-top">
+					<view class="title">
+						{{title}}
+					</view>
+					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
+				</view>
+				<view class="u-textarea-style">
+					<view class="right-bottom">
+						{{auditMind.length}}/100个字
+					</view>
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="100" />
+				</view>
+				<view @click='close()' class="cancel">取消</view>
+				<view @click='passSubmit()' class="confirm">确定</view>
+			</view>
 		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button @click='fanHui' type="success" class="btn2">返回</u-button>
+			<u-button @click='fanhui' type="success" class="btn2">返回</u-button>
 		</view>
 	</view>
 </template>
@@ -207,6 +269,52 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			previewImageFn(index) {
+				/* 预览图片 */
+				uni.previewImage({
+					current: index,
+					/* 需要是数组 */
+					urls: this.auditInfo.srcList,
+					/* 默认底部圆点  number顶部数字1234 */
+					// indicator:'default',
+					indicator: 'number',
+					loop: false,
+					/* 长按图片底部显示选项 */
+					longPressActions: {
+						itemList: ['保存图片'],
+						itemColor: '#d60000',
+						success: data => {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+							/* 保存图片到系统相册 */
+							plus.nativeUI.closePreviewImage();
+							if (data.tapIndex == 0) {
+								uni.saveImageToPhotosAlbum({
+									filePath: this.auditInfo.srcList[data.index],
+									success: res => {
+										// console.log(this.userImgList[data.index])
+										// console.log(res.path,"res")
+										// plus.nativeUI.closePreviewImage();
+										plus.nativeUI.closePreviewImage();
+										// uni.closePreviewImage()
+										plus.nativeUI.toast("保存成功", {
+											background: "#c3002f"
+										});
+										// this.$http.showTK({title:"保存成功",duration:500,position:"bottom"})
+									},
+									fail: err => {
+										console.log(err, "err")
+									}
+								})
+							} else if (data.tapIndex == 1) {
+								this.uniShare()
+							}
+						},
+						fail: err => {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			},
 			openXls() {
 				if (this.url && this.url != "ng") {
 					uni.downloadFile({
@@ -229,6 +337,29 @@
 					title: "加载中...",
 					mask: true
 				})
+				this.$api.doRequest('get', '/paymentManagement/selectPaymentManagement', {
+					currentPage: 1,
+					pageSize: 100,
+					searchType: '1', //searchType:1待审核
+					warehouseName: this.vesselId,
+					managementType: 1
+				}).then(res1 => {
+					uni.hideLoading()
+					if (res1.data.code == 200) {
+						this.List = res1.data.data.records
+					}
+				})
+				// this.$api.doRequest('get', '/paymentManagement/getInfo', {
+				// 	id: this.id
+				// }).then(res => {
+				// 	if (res.data.code == 200) {
+				// 		uni.showLoading({
+				// 			title: "加载中...",
+				// 			mask: true
+				// 		})
+
+				// 	}
+				// })
 				this.$api.doRequest('post', '/expenseInfo/exportPhone', {
 					id: this.id
 				}).then(res1 => {
@@ -248,24 +379,202 @@
 						}
 						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo
 							.amountIngPayableTotal)
-						uni.hideLoading()
+					this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+						businessCode: 'FEIYONGGUANLI-APPROVE',
+						tmpCompId: uni.getStorageSync('pcUserInfo').compId
+					}).then(res1 => {
+						this.$api.doRequest('get', '/commonUser/getHis', {
+							workflowId: res1.data.data[0].id,
+							businessKey: this.id
+						}).then(response => {
+							uni.hideLoading()
+							for (let i = 0; i < response.data.data.length; i++) {
+								this.$set(response.data.data[i],'status','question')
+								console.log(response.data.data[i].workflowHistoricTasks,i)
+								if(response.data.data[i].commonStaffs){
+									response.data.data[i].showflow=false
+									response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+									response.data.data[i].operatorName=response.data.data[i].desc
+									response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+									if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+										if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+											// response.data.data[i].status='question'
+											this.$set(response.data.data[i],'status','question')
+										}else{
+											this.$set(response.data.data[i],'status','success')
+											// response.data.data[i].status='success'
+										}
+										response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+										var workflowdata=response.data.data[i].workflowHistoricTasks
+										var staffsdata=response.data.data[i].commonStaffs
+										for (let q = 0; q < staffsdata.length; q++) {
+											staffsdata[q].status=false
+											staffsdata[q].staffTitle=staffsdata[q].staffName
+											for (let k = 0; k < workflowdata.length; k++) {
+												if(staffsdata[q].staffId==workflowdata[k].operatorId){
+													staffsdata[q].status=true
+												}
+											}
+										}
+									}
+									response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
+								}else{
+									if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+										var len =response.data.data[i].workflowHistoricTasks.length-1
+										if(response.data.data[i].workflowHistoricTasks[len].approved){
+											this.$set(response.data.data[i],'status','success')
+										}else{
+											this.$set(response.data.data[i],'status','error')
+										}
+										response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+										response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+										var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+										response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+										response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+									}else{
+										this.$set(response.data.data[i],'status','question')
+										// response.data.data[i].status='question'
+										if(response.data.data[i].desc=='总经理助理审核'){
+											response.data.data[i].operatorTitle='总助'
+										}else if(response.data.data[i].desc=='杜大光审核'){
+											response.data.data[i].operatorTitle='大光'
+										}else{
+											response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+										}
+										
+										response.data.data[i].operatorName=response.data.data[i].desc
+										var time1=new Date(response.data.data[i].updateDate).getTime()
+										response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+										response.data.data[i].auditMind=''
+									}
+								}
+								
+							}
+							console.log(response.data.data)
+							this.auditList = response.data.data
+							var time2=new Date(this.auditList[0].createDate).getTime()
+							var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+							this.auditList.unshift({
+								operatorTitle:this.auditInfo.creater.substring(0,2),
+								operatorName:this.auditInfo.creater,
+								updateDate:time3,
+								auditMind:'',
+								desc:'发起申请',
+								showflow:false,
+								commonStaffs1:null,
+								commonStaffs:null,
+								workflowHistoricTasks:[],
+								status:'success'
+							})
+						})
+					})
 					}
+					
 				})
-				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-					businessCode: 'FEIYONGGUANLI-APPROVE',
-					tmpCompId: uni.getStorageSync('pcUserInfo').compId
-				}).then(res1 => {
-					this.updateDate = res1.data.data[0].updateDate
-					this.$api.doRequest('get', '/commonUser/getHis', {
-						workflowId: res1.data.data[0].id,
-						businessKey: this.id
-					}).then(response => {
-						// uni.hideLoading()
-						this.auditList = response.data.data
-
-					})
+				// this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+				// 	businessCode: 'FEIYONGGUANLI-APPROVE',
+				// 	tmpCompId: uni.getStorageSync('pcUserInfo').compId
+				// }).then(res1 => {
+				// 	this.updateDate = res1.data.data[0].updateDate
+				// 	this.$api.doRequest('get', '/commonUser/getHis', {
+				// 		workflowId: res1.data.data[0].id,
+				// 		businessKey: this.id
+				// 	}).then(response => {
+				// 		// uni.hideLoading()
+				// 		this.auditList = response.data.data
+
+				// 	})
+				// })
+			},
+			close() {
+				this.show = false
+			},
+			pass() {
+				this.show = true
+				this.title = '审核意见（通过）'
+			},
+			reject() {
+				this.show = true
+				this.title = '驳回原因（驳回）'
+			},
+			//驳回
+			// rejectSubmit() {
+			// 	if (!this.auditMind) {
+			// 		this.$api.msg('驳回原因不能为空！')
+			// 	} else {
+			// 		var that = this
+			// 		that.show = false
+			// 		if (this.List.length > 0) {
+			// 			uni.showModal({
+			// 				content: "确定驳回付款申请？",
+			// 				showCancel: true,
+			// 				confirmText: '确定',
+			// 				success: function(res) {
+			// 					if (res.confirm) {
+			// 						that.audit(that.List[0], 0, false, '', '')
+			// 					}
+			// 				}
+			// 			})
+			// 		}
+			// 	}
+			// },
+			fanhui(){
+				uni.navigateBack({
+					delta:1
 				})
 			},
+			// audit(list, index, status, status2, reason) {
+			// 	uni.showLoading({
+			// 		title: "审核中"
+			// 	})
+			// 	if (this.List.length > 0) {
+			// 		if (status == true && list.status == "已驳回") {
+			// 			this.$api.doRequest('get', '/paymentManagement/api/openAuditFlow', {
+			// 				compId: "2710b21efc1e4393930c5dc800010dc4",
+			// 				id: list.id
+			// 			}).then(res => {
+			// 				if (res.data.code == 200) {
+			// 					this.audit(this.List[index + 1], index + 1, status, status2, reason)
+			// 				}
+			// 			})
+			// 		} else {
+			// 			for (var i = 0; i < this.List.length; i++) {
+			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 					taskId: this.List[i].taskId,
+			// 					approved: status,
+			// 					auditMind: this.auditMind ? this.auditMind : "",
+			// 					needReapply: status2 ? true : false
+			// 				}).then(res => {
+			// 					if (res.data.code == 200) {
+			// 						uni.hideLoading()
+			// 						// this.audit(this.List[index + 1], index + 1, status, status2, reason)
+			// 						this.$api.msg('通过成功')
+			// 					}else{
+			// 						uni.hideLoading()
+			// 						this.$api.msg('审核失败')
+			// 					}
+			// 				})
+			// 			}
+
+			// 		}
+			// 	} else {
+			// 		if (status == true) {
+			// 			this.$api.msg('通过成功')
+			// 		} else if (status == false) {
+			// 			this.$api.msg('驳回成功')
+			// 		}
+			// 		let that = this
+			// 		setTimeout(function() {
+
+			// 			if (that.everyCheck) {
+			// 				helper.setAudit(that.list)
+			// 			} else {
+			// 				uni.navigateBack()
+			// 			}
+			// 			uni.hideLoading()
+			// 		}, 1000);
+			// 	}
+			// },
 		}
 	}
 </script>
@@ -359,43 +668,111 @@
 		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;
+				.item1{
+					position:relative;
+					.item-content{
+						background:#22C572;
+					    width: 50px;
+					    height: 50px;
+					    border-radius: 10px;
+					    line-height: 50px;
+					    text-align: center;
+					    font-size: 18px;
+					    color: #fff;
 					}
-
-					.status {
-						color: #6CC48C;
+					.status{
+						position:absolute;
+						border-radius: 50%;
+						padding: 0px 2px;
+						right: -3px;
+						bottom: -3px;
+						background:#fff;
+					}
+					.status.success{
+						border:1px solid rgb(60, 156, 255);
+					}
+					.status.error{
+						border:1px solid rgb(245, 108, 108);
+					}
+					.status.question{
+						border:1px solid #f9ae3d;
 					}
 				}
+				
 			}
-
+	
 			.right {
-				color: #B0B1B5;
+				width:80%;
+				// color: #B0B1B5;
 				margin-top: 10px;
+				.right-content{
+					background:#F2F3F7;
+					margin-left:10px;
+					margin-top:10px;
+					padding:10px;
+					border-radius:5px;
+					color: #B0B1B5;
+				}
+				.right-item{
+					display: flex;
+					justify-content: space-between;
+					.time{
+						color:#999;
+					}
+					.item2 {
+						margin-left: 20rpx;
+						
+						.name {
+							font-size: 28rpx;
+							font-weight: 800;
+						}
+						.status.success {
+							color: #6CC48C;
+						}
+						.status.error {
+							color: rgb(245, 108, 108);
+						}
+						.status.question {
+							color: #f9ae3d;
+						}
+					}
+				}
+			}	
+		}
+		.row2{
+			display:flex;
+			.item-content{
+				background:#22C572;
+			    width: 30px;
+			    height: 30px;
+			    border-radius: 50%;
+			    line-height: 30px;
+			    text-align: center;
+			    font-size: 12px;
+			    color: #fff;
+				padding:0 2px;
+				margin:0 auto;
+			}
+			.status{
+				position:absolute;
+				top:0;right:0;
 			}
 		}
-
 		.row-line {
 			width: 1px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;
-
+	
 		}
-
+	
 		.audit {
 			margin-top: 20rpx;
 		}

pages/task/audit/purchasecontract.vue

@@ -140,8 +140,66 @@
 					</view>
 				</view>
 			</u-form-item>
+			<view class="content2">
+				<view class="title row">
+					流程
+				</view>
+				<view v-for="(item,index) in auditList" :key='index' class="audit">
+					<view class="row">
+						<view class="left">
+							<view class="item1">
+								<view class="item-content">{{item.operatorTitle}}</view> 
+								<view v-if="item.status=='success'" class='status success'>
+									<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
+								</view>
+								<view v-if="item.status=='error'" class='status error'>
+									<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
+								</view>
+								<view  v-if="item.status=='question'" class='status question'>
+									<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
+								</view>
+							</view>
+						</view>
+						<view class="right">
+							<view class="right-item">
+								<view class="item2">
+									<view class="name">{{item.desc}}
+									</view>
+									<!-- <view class='time'>{{item.updateDate}}</view> -->
+									<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
+									<view  v-if="item.status=='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text></view>
+									<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
+									<!-- <view  class="status success">吕波（已审核）</view> -->
+									
+								</view>
+								<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0' class='time'>
+								{{item.updateDate}}
+								</view>
+							</view>
+							<view v-if='item.auditMind' class="right-content">
+								{{item.auditMind}}
+							</view>
+						</view>
+						<view v-if='item.commonStaffs1' class="right">
+							<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
+						</view>
+					</view>
+					<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
+						<view class='row2'>
+							<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
+								<view class="item-content">
+									<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
+									<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
+								</view> 
+								<view class="name">{{item1.staffName}}</view> 
+							</view>
+						</view>
+					</view>
+					<view class="row-line" v-if="index!= auditList.length - 1"></view>
+				</view>
+			</view>
 		</u-form>
-		<view style='padding:10px;' class='flex bottom-btn'>
+		<view v-if='list.taskId' style='padding:10px;' class='flex bottom-btn'>
 			<u-button v-if='list.approveStatus||isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>
 				驳回
 			</u-button>
@@ -191,6 +249,7 @@
 					contractProcessInfo: {}
 				},
 				imglist: [],
+				auditList:[],
 				auditMind: '',
 				show: false,
 				title: '',
@@ -223,7 +282,14 @@
 				this.imgShow = true
 				this.url = url
 			},
+			showcontent(item){
+				item.showflow=!item.showflow
+			},
 			getList(id) {
+				uni.showLoading({
+					title:'加载中',
+					mask:true
+				})
 				var that = this
 				this.$api.doRequest('get', '/contractManagementInfo/getInfo', {
 					id: this.id
@@ -244,6 +310,95 @@
 								that.imglist.push(res1.data.data[i].appendixPath)
 							}
 						})
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'BUY-CONTRACT-APPROVE',
+							tmpCompId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res1 => {
+							this.$api.doRequest('get', '/commonUser/getHis', {
+								workflowId: res1.data.data[0].id,
+								businessKey: this.id
+							}).then(response => {
+								uni.hideLoading()
+								for (let i = 0; i < response.data.data.length; i++) {
+									this.$set(response.data.data[i],'status','question')
+									// console.log(response.data.data[i].workflowHistoricTasks,i)
+									if(response.data.data[i].commonStaffs){
+										response.data.data[i].showflow=false
+										response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+										response.data.data[i].operatorName=response.data.data[i].desc
+										response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+												// response.data.data[i].status='question'
+												this.$set(response.data.data[i],'status','question')
+											}else{
+												this.$set(response.data.data[i],'status','success')
+												// response.data.data[i].status='success'
+											}
+											response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+											var workflowdata=response.data.data[i].workflowHistoricTasks
+											var staffsdata=response.data.data[i].commonStaffs
+											for (let q = 0; q < staffsdata.length; q++) {
+												staffsdata[q].status=false
+												staffsdata[q].staffTitle=staffsdata[q].staffName
+												for (let k = 0; k < workflowdata.length; k++) {
+													if(staffsdata[q].staffId==workflowdata[k].operatorId){
+														staffsdata[q].status=true
+													}
+												}
+											}
+										}
+										response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
+									}else{
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											var len =response.data.data[i].workflowHistoricTasks.length-1
+											if(response.data.data[i].workflowHistoricTasks[len].approved){
+												this.$set(response.data.data[i],'status','success')
+											}else{
+												this.$set(response.data.data[i],'status','error')
+											}
+											response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+											response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+											var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+										}else{
+											this.$set(response.data.data[i],'status','question')
+											// response.data.data[i].status='question'
+											if(response.data.data[i].desc=='总经理助理审核'){
+												response.data.data[i].operatorTitle='总助'
+											}else if(response.data.data[i].desc=='杜大光审核'){
+												response.data.data[i].operatorTitle='大光'
+											}else{
+												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+											}
+											
+											response.data.data[i].operatorName=response.data.data[i].desc
+											var time1=new Date(response.data.data[i].updateDate).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=''
+										}
+									}
+									
+								}
+								console.log(response.data.data)
+								this.auditList = response.data.data
+								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+								this.auditList.unshift({
+									operatorTitle:this.list.creater.substring(0,2),
+									operatorName:this.list.creater,
+									updateDate:time3,
+									auditMind:'',
+									desc:'发起申请',
+									showflow:false,
+									commonStaffs1:null,
+									commonStaffs:null,
+									workflowHistoricTasks:[],
+									status:'success'
+								})
+							})
+						})
 					}
 				})
 			},
@@ -580,4 +735,118 @@
 			color: #AFB3BF;
 		}
 	}
+	.content2 {
+		background: white;
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	
+		.row {
+			display: flex;
+	
+			.left {
+				display: flex;
+				align-items: center;
+				.item1{
+					position:relative;
+					.item-content{
+						background:#22C572;
+					    width: 50px;
+					    height: 50px;
+					    border-radius: 10px;
+					    line-height: 50px;
+					    text-align: center;
+					    font-size: 18px;
+					    color: #fff;
+					}
+					.status{
+						position:absolute;
+						border-radius: 50%;
+						padding: 0px 2px;
+						right: -3px;
+						bottom: -3px;
+						background:#fff;
+					}
+					.status.success{
+						border:1px solid rgb(60, 156, 255);
+					}
+					.status.error{
+						border:1px solid rgb(245, 108, 108);
+					}
+					.status.question{
+						border:1px solid #f9ae3d;
+					}
+				}
+				
+			}
+	
+			.right {
+				width:80%;
+				// color: #B0B1B5;
+				margin-top: 10px;
+				.right-content{
+					background:#F2F3F7;
+					margin-left:10px;
+					margin-top:10px;
+					padding:10px;
+					border-radius:5px;
+					color: #B0B1B5;
+				}
+				.right-item{
+					display: flex;
+					justify-content: space-between;
+					.time{
+						color:#999;
+					}
+					.item2 {
+						margin-left: 20rpx;
+						
+						.name {
+							font-size: 28rpx;
+							font-weight: 800;
+						}
+						.status.success {
+							color: #6CC48C;
+						}
+						.status.error {
+							color: rgb(245, 108, 108);
+						}
+						.status.question {
+							color: #f9ae3d;
+						}
+					}
+				}
+			}	
+		}
+		.row2{
+			display:flex;
+			.item-content{
+				background:#22C572;
+			    width: 30px;
+			    height: 30px;
+			    border-radius: 50%;
+			    line-height: 30px;
+			    text-align: center;
+			    font-size: 12px;
+			    color: #fff;
+				padding:0 2px;
+				margin:0 auto;
+			}
+			.status{
+				position:absolute;
+				top:0;right:0;
+			}
+		}
+		.row-line {
+			width: 1px;
+			height: 30px;
+			background: #F2F2F2;
+			margin: 10rpx 50rpx;
+	
+		}
+	
+		.audit {
+			margin-top: 20rpx;
+		}
+	}
 </style>

pages/task/audit/salecontract.vue

@@ -144,8 +144,66 @@
 				</view>
 
 			</u-form-item>
+			<view class="content2">
+				<view class="title row">
+					流程
+				</view>
+				<view v-for="(item,index) in auditList" :key='index' class="audit">
+					<view class="row">
+						<view class="left">
+							<view class="item1">
+								<view class="item-content">{{item.operatorTitle}}</view> 
+								<view v-if="item.status=='success'" class='status success'>
+									<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
+								</view>
+								<view v-if="item.status=='error'" class='status error'>
+									<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
+								</view>
+								<view  v-if="item.status=='question'" class='status question'>
+									<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
+								</view>
+							</view>
+						</view>
+						<view class="right">
+							<view class="right-item">
+								<view class="item2">
+									<view class="name">{{item.desc}}
+									</view>
+									<!-- <view class='time'>{{item.updateDate}}</view> -->
+									<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
+									<view  v-if="item.status=='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text></view>
+									<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
+									<!-- <view  class="status success">吕波（已审核）</view> -->
+									
+								</view>
+								<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0' class='time'>
+								{{item.updateDate}}
+								</view>
+							</view>
+							<view v-if='item.auditMind' class="right-content">
+								{{item.auditMind}}
+							</view>
+						</view>
+						<view v-if='item.commonStaffs1' class="right">
+							<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
+						</view>
+					</view>
+					<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
+						<view class='row2'>
+							<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
+								<view class="item-content">
+									<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
+									<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
+								</view> 
+								<view class="name">{{item1.staffName}}</view> 
+							</view>
+						</view>
+					</view>
+					<view class="row-line" v-if="index!= auditList.length - 1"></view>
+				</view>
+			</view>
 		</u-form>
-		<view style='padding:10px;' class='flex bottom-btn'>
+		<view v-if='list.taskId' style='padding:10px;' class='flex bottom-btn'>
 			<u-button v-if='list.approveStatus||isSHowBtn' @click='reject' type="error" class="btn1" hover-class='none'>
 				驳回
 			</u-button>
@@ -199,6 +257,7 @@
 				imglist: [],
 				title: '',
 				auditMind: '',
+				auditList:[],
 				show: false,
 				contractNo: "",
 				action: this.$uploadUrl,
@@ -233,8 +292,15 @@
 				this.imgShow = true
 				this.url = url
 			},
+			showcontent(item){
+				item.showflow=!item.showflow
+			},
 			getList(id) {
 				var that = this
+				uni.showLoading({
+					title:'加载中',
+					mask:true
+				})
 				this.$api.doRequest('get', '/contractManagementInfo/getInfo', {
 					id: this.id
 				}).then(res => {
@@ -254,6 +320,95 @@
 								)
 							}
 						})
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'SALE-CONTRACT-APPROVE',
+							tmpCompId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res1 => {
+							this.$api.doRequest('get', '/commonUser/getHis', {
+								workflowId: res1.data.data[0].id,
+								businessKey: this.id
+							}).then(response => {
+								uni.hideLoading()
+								for (let i = 0; i < response.data.data.length; i++) {
+									this.$set(response.data.data[i],'status','question')
+									// console.log(response.data.data[i].workflowHistoricTasks,i)
+									if(response.data.data[i].commonStaffs){
+										response.data.data[i].showflow=false
+										response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+										response.data.data[i].operatorName=response.data.data[i].desc
+										response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+												// response.data.data[i].status='question'
+												this.$set(response.data.data[i],'status','question')
+											}else{
+												this.$set(response.data.data[i],'status','success')
+												// response.data.data[i].status='success'
+											}
+											response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+											var workflowdata=response.data.data[i].workflowHistoricTasks
+											var staffsdata=response.data.data[i].commonStaffs
+											for (let q = 0; q < staffsdata.length; q++) {
+												staffsdata[q].status=false
+												staffsdata[q].staffTitle=staffsdata[q].staffName
+												for (let k = 0; k < workflowdata.length; k++) {
+													if(staffsdata[q].staffId==workflowdata[k].operatorId){
+														staffsdata[q].status=true
+													}
+												}
+											}
+										}
+										response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
+									}else{
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											var len =response.data.data[i].workflowHistoricTasks.length-1
+											if(response.data.data[i].workflowHistoricTasks[len].approved){
+												this.$set(response.data.data[i],'status','success')
+											}else{
+												this.$set(response.data.data[i],'status','error')
+											}
+											response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+											response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+											var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+										}else{
+											this.$set(response.data.data[i],'status','question')
+											// response.data.data[i].status='question'
+											if(response.data.data[i].desc=='总经理助理审核'){
+												response.data.data[i].operatorTitle='总助'
+											}else if(response.data.data[i].desc=='杜大光审核'){
+												response.data.data[i].operatorTitle='大光'
+											}else{
+												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+											}
+											
+											response.data.data[i].operatorName=response.data.data[i].desc
+											var time1=new Date(response.data.data[i].updateDate).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=''
+										}
+									}
+									
+								}
+								console.log(response.data.data)
+								this.auditList = response.data.data
+								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+								this.auditList.unshift({
+									operatorTitle:this.list.creater.substring(0,2),
+									operatorName:this.list.creater,
+									updateDate:time3,
+									auditMind:'',
+									desc:'发起申请',
+									showflow:false,
+									commonStaffs1:null,
+									commonStaffs:null,
+									workflowHistoricTasks:[],
+									status:'success'
+								})
+							})
+						})
 					}
 				})
 			},
@@ -605,4 +760,118 @@
 	/deep/.u-input__textarea {
 		height: 300rpx !important;
 	}
+	.content2 {
+		background: white;
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	
+		.row {
+			display: flex;
+	
+			.left {
+				display: flex;
+				align-items: center;
+				.item1{
+					position:relative;
+					.item-content{
+						background:#22C572;
+					    width: 50px;
+					    height: 50px;
+					    border-radius: 10px;
+					    line-height: 50px;
+					    text-align: center;
+					    font-size: 18px;
+					    color: #fff;
+					}
+					.status{
+						position:absolute;
+						border-radius: 50%;
+						padding: 0px 2px;
+						right: -3px;
+						bottom: -3px;
+						background:#fff;
+					}
+					.status.success{
+						border:1px solid rgb(60, 156, 255);
+					}
+					.status.error{
+						border:1px solid rgb(245, 108, 108);
+					}
+					.status.question{
+						border:1px solid #f9ae3d;
+					}
+				}
+				
+			}
+	
+			.right {
+				width:80%;
+				// color: #B0B1B5;
+				margin-top: 10px;
+				.right-content{
+					background:#F2F3F7;
+					margin-left:10px;
+					margin-top:10px;
+					padding:10px;
+					border-radius:5px;
+					color: #B0B1B5;
+				}
+				.right-item{
+					display: flex;
+					justify-content: space-between;
+					.time{
+						color:#999;
+					}
+					.item2 {
+						margin-left: 20rpx;
+						
+						.name {
+							font-size: 28rpx;
+							font-weight: 800;
+						}
+						.status.success {
+							color: #6CC48C;
+						}
+						.status.error {
+							color: rgb(245, 108, 108);
+						}
+						.status.question {
+							color: #f9ae3d;
+						}
+					}
+				}
+			}	
+		}
+		.row2{
+			display:flex;
+			.item-content{
+				background:#22C572;
+			    width: 30px;
+			    height: 30px;
+			    border-radius: 50%;
+			    line-height: 30px;
+			    text-align: center;
+			    font-size: 12px;
+			    color: #fff;
+				padding:0 2px;
+				margin:0 auto;
+			}
+			.status{
+				position:absolute;
+				top:0;right:0;
+			}
+		}
+		.row-line {
+			width: 1px;
+			height: 30px;
+			background: #F2F2F2;
+			margin: 10rpx 50rpx;
+	
+		}
+	
+		.audit {
+			margin-top: 20rpx;
+		}
+	}
 </style>

pages/task/audit/warehouse_approval.vue

@@ -11,7 +11,7 @@
 						<image src="../../../static/img/daishenhe.png" mode="" v-if="list.status == '审核中'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText">{{list.status}}</view>
+					<view class="infoText">{{list.approveStatus?list.approveStatus:list.status}}</view>
 				</view>
 				<view class="infoData">{{list.updateDate}}</view>
 			</view>
@@ -81,23 +81,34 @@
 						<view class="item1">
 							<view class="item-content">{{item.operatorTitle}}</view> 
 							<view v-if="item.status=='success'" class='status success'>
-								<u-icon name="checkmark" color="#2979ff" size="28"></u-icon>
+								<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
 							</view>
 							<view v-if="item.status=='error'" class='status error'>
-								<u-icon name="close" color="rgb(245, 108, 108)" size="28"></u-icon>
+								<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
 							</view>
 							<view  v-if="item.status=='question'" class='status question'>
-								<u-icon name="question" color="#f9ae3d" size="28"></u-icon>
+								<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
 							</view>
 						</view>
-						<view class="item2">
-							<view class="name">{{item.desc}}
+					</view>
+					<view class="right">
+						<view class="right-item">
+							<view class="item2">
+								<view class="name">{{item.desc}}
+								</view>
+								<!-- <view class='time'>{{item.updateDate}}</view> -->
+								<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
+								<view  v-if="item.status=='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text></view>
+								<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
+								<!-- <view  class="status success">吕波（已审核）</view> -->
+								
+							</view>
+							<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0' class='time'>
+							{{item.updateDate}}
 							</view>
-							<view class='time'>{{item.updateDate}}</view>
-							<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>已审核</text></view>
-							<!-- <view  v-if="item.status='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已审核":'未审核'}}</text></view> -->
-							<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
-							<!-- <view  class="status success">吕波（已审核）</view> -->
+						</view>
+						<view v-if='item.auditMind' class="right-content">
+							{{item.auditMind}}
 						</view>
 					</view>
 					<view v-if='item.commonStaffs1' class="right">
@@ -226,70 +237,106 @@
 				item.showflow=!item.showflow
 			},
 			getData() {
+				uni.showLoading({
+					title:'加载中',
+					mask:true
+				})
 				var data = []
 				this.$api.doRequest('get', '/purchasePrice/purchasePriceLook', {
 					id: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.list = res.data.data
-					}
-				})
-				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
-					businessCode: 'PROCUREMENT-PRICE-APPROVE',
-					tmpCompId: uni.getStorageSync('pcUserInfo').compId
-				}).then(res1 => {
-					this.$api.doRequest('get', '/commonUser/getHis', {
-						workflowId: res1.data.data[0].id,
-						businessKey: this.id
-					}).then(response => {
-						// uni.hideLoading()
-						for (let i = 0; i < response.data.data.length; i++) {
-							this.$set(response.data.data[i],'status','question')
-							console.log(response.data.data[i].workflowHistoricTasks,i)
-							if(response.data.data[i].commonStaffs){
-								response.data.data[i].showflow=false
-								response.data.data[i].operatorTitle=response.data.data[i].desc[0]
-								response.data.data[i].operatorName=response.data.data[i].desc
-								response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
-								if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
-									if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
-										// response.data.data[i].status='question'
-										this.$set(response.data.data[i],'status','question')
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'PROCUREMENT-PRICE-APPROVE',
+							tmpCompId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res1 => {
+							this.$api.doRequest('get', '/commonUser/getHis', {
+								workflowId: res1.data.data[0].id,
+								businessKey: this.id
+							}).then(response => {
+								uni.hideLoading()
+								for (let i = 0; i < response.data.data.length; i++) {
+									this.$set(response.data.data[i],'status','question')
+									// console.log(response.data.data[i].workflowHistoricTasks,i)
+									if(response.data.data[i].commonStaffs){
+										response.data.data[i].showflow=false
+										response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+										response.data.data[i].operatorName=response.data.data[i].desc
+										response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+												// response.data.data[i].status='question'
+												this.$set(response.data.data[i],'status','question')
+											}else{
+												this.$set(response.data.data[i],'status','success')
+												// response.data.data[i].status='success'
+											}
+											response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+											var workflowdata=response.data.data[i].workflowHistoricTasks
+											var staffsdata=response.data.data[i].commonStaffs
+											for (let q = 0; q < staffsdata.length; q++) {
+												staffsdata[q].status=false
+												staffsdata[q].staffTitle=staffsdata[q].staffName
+												for (let k = 0; k < workflowdata.length; k++) {
+													if(staffsdata[q].staffId==workflowdata[k].operatorId){
+														staffsdata[q].status=true
+													}
+												}
+											}
+										}
+										response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
 									}else{
-										this.$set(response.data.data[i],'status','success')
-										// response.data.data[i].status='success'
-									}
-									response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
-									var workflowdata=response.data.data[i].workflowHistoricTasks
-									var staffsdata=response.data.data[i].commonStaffs
-									for (let q = 0; q < staffsdata.length; q++) {
-										staffsdata[q].status=false
-										staffsdata[q].staffTitle=staffsdata[q].staffName
-										for (let k = 0; k < workflowdata.length; k++) {
-											if(staffsdata[q].staffId==workflowdata[k].operatorId){
-												staffsdata[q].status=true
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											var len =response.data.data[i].workflowHistoricTasks.length-1
+											if(response.data.data[i].workflowHistoricTasks[len].approved){
+												this.$set(response.data.data[i],'status','success')
+											}else{
+												this.$set(response.data.data[i],'status','error')
+											}
+											response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+											response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+											var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+										}else{
+											this.$set(response.data.data[i],'status','question')
+											// response.data.data[i].status='question'
+											if(response.data.data[i].desc=='总经理助理审核'){
+												response.data.data[i].operatorTitle='总助'
+											}else if(response.data.data[i].desc=='杜大光审核'){
+												response.data.data[i].operatorTitle='大光'
+											}else{
+												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
 											}
+											
+											response.data.data[i].operatorName=response.data.data[i].desc
+											var time1=new Date(response.data.data[i].updateDate).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=''
 										}
 									}
+									
 								}
-								response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
-							}else{
-								if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
-									this.$set(response.data.data[i],'status','success')
-									response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[0].operatorName[0]
-									response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[0].operatorName
-								}else{
-									this.$set(response.data.data[i],'status','question')
-									// response.data.data[i].status='question'
-									response.data.data[i].operatorTitle=response.data.data[i].desc[0]
-									response.data.data[i].operatorName=response.data.data[i].desc
-								}
-							}
-							
-						}
-						console.log(response.data.data)
-						this.auditList = response.data.data
-					})
+								console.log(response.data.data)
+								this.auditList = response.data.data
+								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+								this.auditList.unshift({
+									operatorTitle:this.list.creater.substring(0,2),
+									operatorName:this.list.creater,
+									updateDate:time3,
+									auditMind:'',
+									desc:'发起申请',
+									showflow:false,
+									commonStaffs1:null,
+									commonStaffs:null,
+									workflowHistoricTasks:[],
+									status:'success'
+								})
+							})
+						})
+					}
 				})
 			},
 			confirm(item) {
@@ -596,7 +643,6 @@
 	
 		.row {
 			display: flex;
-			justify-content: space-between;
 	
 			.left {
 				display: flex;
@@ -607,18 +653,18 @@
 						background:#22C572;
 					    width: 50px;
 					    height: 50px;
-					    border-radius: 50%;
+					    border-radius: 10px;
 					    line-height: 50px;
 					    text-align: center;
-					    font-size: 20px;
+					    font-size: 18px;
 					    color: #fff;
 					}
 					.status{
 						position:absolute;
 						border-radius: 50%;
-						padding: 1px 2px;
-						right: 0;
-						bottom: 0;
+						padding: 0px 2px;
+						right: -3px;
+						bottom: -3px;
 						background:#fff;
 					}
 					.status.success{
@@ -631,33 +677,46 @@
 						border:1px solid #f9ae3d;
 					}
 				}
-				.item2 {
-					margin-left: 20rpx;
-	
-					.name {
-						font-size: 32rpx;
-						font-weight: 800;
-					}
+				
+			}
 	
-					.status.success {
-						color: #6CC48C;
-					}
-					.status.error {
-						color: rgb(245, 108, 108);
-					}
-					.status.question {
-						color: #f9ae3d;
-					}
+			.right {
+				width:80%;
+				// color: #B0B1B5;
+				margin-top: 10px;
+				.right-content{
+					background:#F2F3F7;
+					margin-left:10px;
+					margin-top:10px;
+					padding:10px;
+					border-radius:5px;
+					color: #B0B1B5;
+				}
+				.right-item{
+					display: flex;
+					justify-content: space-between;
 					.time{
 						color:#999;
 					}
+					.item2 {
+						margin-left: 20rpx;
+						
+						.name {
+							font-size: 28rpx;
+							font-weight: 800;
+						}
+						.status.success {
+							color: #6CC48C;
+						}
+						.status.error {
+							color: rgb(245, 108, 108);
+						}
+						.status.question {
+							color: #f9ae3d;
+						}
+					}
 				}
-			}
-	
-			.right {
-				color: #B0B1B5;
-				margin-top: 10px;
-			}
+			}	
 		}
 		.row2{
 			display:flex;

pages/task/audit/warehouse_details.vue

@@ -11,7 +11,7 @@
 						<image src="../../../static/img/daishenhe.png" mode="" v-if="list.status == '审核中'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
-					<view class="infoText">{{list.status}}</view>
+					<view class="infoText">{{list.approveStatus?list.approveStatus:list.status}}</view>
 				</view>
 				<view class="infoData">{{list.updateDate}}</view>
 			</view>
@@ -69,6 +69,64 @@
 				</view>
 			</view>
 		</view>
+		<view class="content3">
+			<view class="title row">
+				流程
+			</view>
+			<view v-for="(item,index) in auditList" :key='index' class="audit">
+				<view class="row">
+					<view class="left">
+						<view class="item1">
+							<view class="item-content">{{item.operatorTitle}}</view> 
+							<view v-if="item.status=='success'" class='status success'>
+								<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
+							</view>
+							<view v-if="item.status=='error'" class='status error'>
+								<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
+							</view>
+							<view  v-if="item.status=='question'" class='status question'>
+								<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
+							</view>
+						</view>
+					</view>
+					<view class="right">
+						<view class="right-item">
+							<view class="item2">
+								<view class="name">{{item.desc}}
+								</view>
+								<!-- <view class='time'>{{item.updateDate}}</view> -->
+								<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
+								<view  v-if="item.status=='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text></view>
+								<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
+								<!-- <view  class="status success">吕波（已审核）</view> -->
+								
+							</view>
+							<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0' class='time'>
+							{{item.updateDate}}
+							</view>
+						</view>
+						<view v-if='item.auditMind' class="right-content">
+							{{item.auditMind}}
+						</view>
+					</view>
+					<view v-if='item.commonStaffs1' class="right">
+						<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
+					</view>
+				</view>
+				<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
+					<view class='row2'>
+						<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
+							<view class="item-content">
+								<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
+								<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
+							</view> 
+							<view class="name">{{item1.staffName}}</view> 
+						</view>
+					</view>
+				</view>
+				<view class="row-line" v-if="index!= auditList.length - 1"></view>
+			</view>
+		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<u-button  @click='fanHui' type="success" class="btn2">返回</u-button>
@@ -95,7 +153,8 @@
 				radio: '',
 				pcUserInfo: uni.getStorageSync('pcUserInfo'),
 				switchVal: false,
-				contractNoList: []
+				contractNoList: [],
+				auditList:[],
 			};
 		},
 		computed: {
@@ -111,13 +170,109 @@
 			})
 		},
 		methods: {
+			showcontent(item){
+				item.showflow=!item.showflow
+			},
 			getData() {
+				uni.showLoading({
+					title:'加载中',
+					mask:true
+				})
 				var data = []
 				this.$api.doRequest('get', '/purchasePrice/purchasePriceLook', {
 					id: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
 						this.list = res.data.data
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'PROCUREMENT-PRICE-APPROVE',
+							tmpCompId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res1 => {
+							this.$api.doRequest('get', '/commonUser/getHis', {
+								workflowId: res1.data.data[0].id,
+								businessKey: this.id
+							}).then(response => {
+								uni.hideLoading()
+								for (let i = 0; i < response.data.data.length; i++) {
+									this.$set(response.data.data[i],'status','question')
+									// console.log(response.data.data[i].workflowHistoricTasks,i)
+									if(response.data.data[i].commonStaffs){
+										response.data.data[i].showflow=false
+										response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+										response.data.data[i].operatorName=response.data.data[i].desc
+										response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+												// response.data.data[i].status='question'
+												this.$set(response.data.data[i],'status','question')
+											}else{
+												this.$set(response.data.data[i],'status','success')
+												// response.data.data[i].status='success'
+											}
+											response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+											var workflowdata=response.data.data[i].workflowHistoricTasks
+											var staffsdata=response.data.data[i].commonStaffs
+											for (let q = 0; q < staffsdata.length; q++) {
+												staffsdata[q].status=false
+												staffsdata[q].staffTitle=staffsdata[q].staffName
+												for (let k = 0; k < workflowdata.length; k++) {
+													if(staffsdata[q].staffId==workflowdata[k].operatorId){
+														staffsdata[q].status=true
+													}
+												}
+											}
+										}
+										response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
+									}else{
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											var len =response.data.data[i].workflowHistoricTasks.length-1
+											if(response.data.data[i].workflowHistoricTasks[len].approved){
+												this.$set(response.data.data[i],'status','success')
+											}else{
+												this.$set(response.data.data[i],'status','error')
+											}
+											response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+											response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+											var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+										}else{
+											this.$set(response.data.data[i],'status','question')
+											// response.data.data[i].status='question'
+											if(response.data.data[i].desc=='总经理助理审核'){
+												response.data.data[i].operatorTitle='总助'
+											}else if(response.data.data[i].desc=='杜大光审核'){
+												response.data.data[i].operatorTitle='大光'
+											}else{
+												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+											}
+											
+											response.data.data[i].operatorName=response.data.data[i].desc
+											var time1=new Date(response.data.data[i].updateDate).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=''
+										}
+									}
+									
+								}
+								// console.log(response.data.data)
+								this.auditList = response.data.data
+								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+								this.auditList.unshift({
+									operatorTitle:this.list.creater.substring(0,2),
+									operatorName:this.list.creater,
+									updateDate:time3,
+									auditMind:'',
+									desc:'发起申请',
+									showflow:false,
+									commonStaffs1:null,
+									commonStaffs:null,
+									workflowHistoricTasks:[],
+									status:'success'
+								})
+							})
+						})
 					}
 				})
 			},
@@ -227,4 +382,118 @@
 			}
 		}
 	}
+	.content3 {
+		background: white;
+		margin: 20rpx 0;
+		border-radius: 20rpx;
+		padding: 20rpx;
+	
+		.row {
+			display: flex;
+	
+			.left {
+				display: flex;
+				align-items: center;
+				.item1{
+					position:relative;
+					.item-content{
+						background:#22C572;
+					    width: 50px;
+					    height: 50px;
+					    border-radius: 10px;
+					    line-height: 50px;
+					    text-align: center;
+					    font-size: 18px;
+					    color: #fff;
+					}
+					.status{
+						position:absolute;
+						border-radius: 50%;
+						padding: 0px 2px;
+						right: -3px;
+						bottom: -3px;
+						background:#fff;
+					}
+					.status.success{
+						border:1px solid rgb(60, 156, 255);
+					}
+					.status.error{
+						border:1px solid rgb(245, 108, 108);
+					}
+					.status.question{
+						border:1px solid #f9ae3d;
+					}
+				}
+				
+			}
+	
+			.right {
+				width:80%;
+				// color: #B0B1B5;
+				margin-top: 10px;
+				.right-content{
+					background:#F2F3F7;
+					margin-left:10px;
+					margin-top:10px;
+					padding:10px;
+					border-radius:5px;
+					color: #B0B1B5;
+				}
+				.right-item{
+					display: flex;
+					justify-content: space-between;
+					.time{
+						color:#999;
+					}
+					.item2 {
+						margin-left: 20rpx;
+						
+						.name {
+							font-size: 28rpx;
+							font-weight: 800;
+						}
+						.status.success {
+							color: #6CC48C;
+						}
+						.status.error {
+							color: rgb(245, 108, 108);
+						}
+						.status.question {
+							color: #f9ae3d;
+						}
+					}
+				}
+			}	
+		}
+		.row2{
+			display:flex;
+			.item-content{
+				background:#22C572;
+			    width: 30px;
+			    height: 30px;
+			    border-radius: 50%;
+			    line-height: 30px;
+			    text-align: center;
+			    font-size: 12px;
+			    color: #fff;
+				padding:0 2px;
+				margin:0 auto;
+			}
+			.status{
+				position:absolute;
+				top:0;right:0;
+			}
+		}
+		.row-line {
+			width: 1px;
+			height: 30px;
+			background: #F2F2F2;
+			margin: 10rpx 50rpx;
+	
+		}
+	
+		.audit {
+			margin-top: 20rpx;
+		}
+	}
 </style>

pages/task/audit/warehouse_warrant.vue

@@ -13,7 +13,7 @@
 						<!-- 待审核 -->
 					</view>
 					<!-- {{auditList.length > 0 ?auditList[auditList.length - 1].operatorMajorRoleName:""}} -->
-					<view class="infoText">待决策人审核</view>
+					<view class="infoText">{{auditInfo.approveStatus?auditInfo.approveStatus:'待付款'}}</view>
 				</view>
 				<view class="infoData">{{updateDate}}</view>
 			</view>
@@ -107,7 +107,7 @@
 				<text class="text_css">明细.xls</text>
 			</view>
 		</view>
-		<!-- <view class="content2">
+		<view class="content2">
 			<view class="title row">
 				流程
 			</view>
@@ -115,22 +115,56 @@
 				<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">{{item.operatorName ? item.operatorName:item.operatorMajorRoleName}}
+							<view class="item-content">{{item.operatorTitle}}</view> 
+							<view v-if="item.status=='success'" class='status success'>
+								<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
+							</view>
+							<view v-if="item.status=='error'" class='status error'>
+								<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
+							</view>
+							<view  v-if="item.status=='question'" class='status question'>
+								<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
 							</view>
-							<view class="status">{{item.approved ? "已审核":"待决策人审核"}}</view>
 						</view>
 					</view>
 					<view class="right">
-						{{item.updateDate}}
+						<view class="right-item">
+							<view class="item2">
+								<view class="name">{{item.desc}}
+								</view>
+								<!-- <view class='time'>{{item.updateDate}}</view> -->
+								<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
+								<view  v-if="item.status=='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text></view>
+								<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
+								<!-- <view  class="status success">吕波（已审核）</view> -->
+								
+							</view>
+							<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0' class='time'>
+							{{item.updateDate}}
+							</view>
+						</view>
+						<view v-if='item.auditMind' class="right-content">
+							{{item.auditMind}}
+						</view>
+					</view>
+					<view v-if='item.commonStaffs1' class="right">
+						<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
+					</view>
+				</view>
+				<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
+					<view class='row2'>
+						<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
+							<view class="item-content">
+								<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
+								<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
+							</view> 
+							<view class="name">{{item1.staffName}}</view> 
+						</view>
 					</view>
 				</view>
 				<view class="row-line" v-if="index!= auditList.length - 1"></view>
 			</view>
-		
-		</view> -->
+		</view>
 		<view v-if='show' class="shade">
 			<view class="wrap">
 				<view class="alert-top">
@@ -209,6 +243,9 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
+			showcontent(item){
+				item.showflow=!item.showflow
+			},
 			openXls() {
 				if (this.url && this.url != "ng") {
 					uni.downloadFile({
@@ -270,7 +307,96 @@
 						this.auditInfo = res1.data.data
 						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo
 							.amountIngPayableTotal)
-						uni.hideLoading()
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'WAREHOUSING-ORDER-APPROVE',
+							tmpCompId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res1 => {
+							this.$api.doRequest('get', '/commonUser/getHis', {
+								workflowId: res1.data.data[0].id,
+								businessKey: this.id
+							}).then(response => {
+								uni.hideLoading()
+								for (let i = 0; i < response.data.data.length; i++) {
+									this.$set(response.data.data[i],'status','question')
+									console.log(response.data.data[i].workflowHistoricTasks,i)
+									if(response.data.data[i].commonStaffs){
+										response.data.data[i].showflow=false
+										response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+										response.data.data[i].operatorName=response.data.data[i].desc
+										response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+												// response.data.data[i].status='question'
+												this.$set(response.data.data[i],'status','question')
+											}else{
+												this.$set(response.data.data[i],'status','success')
+												// response.data.data[i].status='success'
+											}
+											response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+											var workflowdata=response.data.data[i].workflowHistoricTasks
+											var staffsdata=response.data.data[i].commonStaffs
+											for (let q = 0; q < staffsdata.length; q++) {
+												staffsdata[q].status=false
+												staffsdata[q].staffTitle=staffsdata[q].staffName
+												for (let k = 0; k < workflowdata.length; k++) {
+													if(staffsdata[q].staffId==workflowdata[k].operatorId){
+														staffsdata[q].status=true
+													}
+												}
+											}
+										}
+										response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
+									}else{
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											var len =response.data.data[i].workflowHistoricTasks.length-1
+											if(response.data.data[i].workflowHistoricTasks[len].approved){
+												this.$set(response.data.data[i],'status','success')
+											}else{
+												this.$set(response.data.data[i],'status','error')
+											}
+											response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+											response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+											var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+										}else{
+											this.$set(response.data.data[i],'status','question')
+											// response.data.data[i].status='question'
+											if(response.data.data[i].desc=='总经理助理审核'){
+												response.data.data[i].operatorTitle='总助'
+											}else if(response.data.data[i].desc=='杜大光审核'){
+												response.data.data[i].operatorTitle='大光'
+											}else{
+												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+											}
+											
+											response.data.data[i].operatorName=response.data.data[i].desc
+											var time1=new Date(response.data.data[i].updateDate).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=''
+										}
+									}
+									
+								}
+								console.log(response.data.data)
+								this.auditList = response.data.data
+								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+								this.auditList.unshift({
+									operatorTitle:this.auditInfo.creater.substring(0,2),
+									operatorName:this.auditInfo.creater,
+									updateDate:time3,
+									auditMind:'',
+									desc:'发起申请',
+									showflow:false,
+									commonStaffs1:null,
+									commonStaffs:null,
+									workflowHistoricTasks:[],
+									status:'success'
+								})
+							})
+						})
+						
 					}
 				})
 				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
@@ -330,7 +456,7 @@
 						this.$api.msg('驳回原因不能为空！')
 					} else {
 						uni.showModal({
-							content: "确定驳回付款申请？",
+							content: "确定驳回入库单申请？",
 							showCancel: true,
 							confirmText: '确定',
 							success: function(res) {
@@ -365,7 +491,7 @@
 					var that = this
 					this.show = false
 					uni.showModal({
-						content: "确定通过付款申请？",
+						content: "确定通过入库单申请？",
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
@@ -542,43 +668,111 @@
 		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;
+				.item1{
+					position:relative;
+					.item-content{
+						background:#22C572;
+					    width: 50px;
+					    height: 50px;
+					    border-radius: 10px;
+					    line-height: 50px;
+					    text-align: center;
+					    font-size: 18px;
+					    color: #fff;
 					}
-
-					.status {
-						color: #6CC48C;
+					.status{
+						position:absolute;
+						border-radius: 50%;
+						padding: 0px 2px;
+						right: -3px;
+						bottom: -3px;
+						background:#fff;
+					}
+					.status.success{
+						border:1px solid rgb(60, 156, 255);
+					}
+					.status.error{
+						border:1px solid rgb(245, 108, 108);
+					}
+					.status.question{
+						border:1px solid #f9ae3d;
 					}
 				}
+				
 			}
-
+	
 			.right {
-				color: #B0B1B5;
+				width:80%;
+				// color: #B0B1B5;
 				margin-top: 10px;
+				.right-content{
+					background:#F2F3F7;
+					margin-left:10px;
+					margin-top:10px;
+					padding:10px;
+					border-radius:5px;
+					color: #B0B1B5;
+				}
+				.right-item{
+					display: flex;
+					justify-content: space-between;
+					.time{
+						color:#999;
+					}
+					.item2 {
+						margin-left: 20rpx;
+						
+						.name {
+							font-size: 28rpx;
+							font-weight: 800;
+						}
+						.status.success {
+							color: #6CC48C;
+						}
+						.status.error {
+							color: rgb(245, 108, 108);
+						}
+						.status.question {
+							color: #f9ae3d;
+						}
+					}
+				}
+			}	
+		}
+		.row2{
+			display:flex;
+			.item-content{
+				background:#22C572;
+			    width: 30px;
+			    height: 30px;
+			    border-radius: 50%;
+			    line-height: 30px;
+			    text-align: center;
+			    font-size: 12px;
+			    color: #fff;
+				padding:0 2px;
+				margin:0 auto;
+			}
+			.status{
+				position:absolute;
+				top:0;right:0;
 			}
 		}
-
 		.row-line {
 			width: 1px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;
-
+	
 		}
-
+	
 		.audit {
 			margin-top: 20rpx;
 		}

pages/task/audit/warehouse_warrant_detail.vue

@@ -13,14 +13,14 @@
 						<!-- 待审核 -->
 					</view>
 					<!-- {{auditList.length > 0 ?auditList[auditList.length - 1].operatorMajorRoleName:""}} -->
-					<view class="infoText">{{auditInfo.status}}</view>
+					<view class="infoText">{{auditInfo.approveStatus?auditInfo.approveStatus:'待付款'}}</view>
 				</view>
-				<view class="infoData">{{auditInfo.updateDate}}</view>
+				<view class="infoData">{{updateDate}}</view>
 			</view>
 		</view>
 
 		<view class="content1">
-			<view class="title">
+			<view class="title ">
 				基本信息
 			</view>
 			<view class="row">
@@ -43,7 +43,20 @@
 				<view class="left">合计金额（元）</view>
 				<view class="right">{{auditInfo.requestFundsTotal}}</view>
 			</view>
+			<!-- 	<view class="row">
+				<view class="left">仓库名称</view>
+				<view class="right">{{auditInfo.warehouseName}}</view>
+			</view>
+			<view class="row">
+				<view class="left">入库日期</view>
+				<view class="right">{{auditInfo.issuingTime}}</view>
+			</view>
+			<view class="row" style="border-bottom:0">
+				<view class="left">车数</view>
+				<view class="right">{{auditInfo.count}}</view>
+			</view> -->
 		</view>
+
 		<view class="content1">
 			<view class="title ">
 				支付明细
@@ -94,7 +107,7 @@
 				<text class="text_css">明细.xls</text>
 			</view>
 		</view>
-		<!-- 	<view class="content2">
+		<view class="content2">
 			<view class="title row">
 				流程
 			</view>
@@ -102,25 +115,78 @@
 				<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">{{item.operatorName ? item.operatorName:item.operatorMajorRoleName}}
+							<view class="item-content">{{item.operatorTitle}}</view> 
+							<view v-if="item.status=='success'" class='status success'>
+								<u-icon name="checkmark" color="#2979ff" size="24"></u-icon>
+							</view>
+							<view v-if="item.status=='error'" class='status error'>
+								<u-icon name="close" color="rgb(245, 108, 108)" size="24"></u-icon>
+							</view>
+							<view  v-if="item.status=='question'" class='status question'>
+								<u-icon name="question" color="#f9ae3d" size="24"></u-icon>
 							</view>
-							<view class="status">{{item.approved ? "已审核":"待决策人审核"}}</view>
 						</view>
 					</view>
 					<view class="right">
-						{{item.updateDate}}
+						<view class="right-item">
+							<view class="item2">
+								<view class="name">{{item.desc}}
+								</view>
+								<!-- <view class='time'>{{item.updateDate}}</view> -->
+								<view  v-if="item.status=='success'" class="status success">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1&&index!=0'>已审核</text></view>
+								<view  v-if="item.status=='error'" class="status error">{{item.commonStaffs1?item.staffscontent:item.operatorName}}<text v-if='!item.commonStaffs1'>{{item.workflowHistoricTasks ? "已驳回":''}}</text></view>
+								<view  v-if="item.status=='question'" class="status question">{{item.commonStaffs1?item.staffscontent:''}}<text v-if='!item.commonStaffs1'>未审核</text></view>
+								<!-- <view  class="status success">吕波（已审核）</view> -->
+								
+							</view>
+							<view v-if='index==0||item.workflowHistoricTasks&&item.workflowHistoricTasks.length>0' class='time'>
+							{{item.updateDate}}
+							</view>
+						</view>
+						<view v-if='item.auditMind' class="right-content">
+							{{item.auditMind}}
+						</view>
+					</view>
+					<view v-if='item.commonStaffs1' class="right">
+						<u-icon @click='showcontent(item)' :name="item.showflow?'arrow-up':'arrow-down'"  size="28"></u-icon>
+					</view>
+				</view>
+				<view v-if='item.showflow' style='padding:10px 0 0 50px;'>
+					<view class='row2'>
+						<view v-for='item1 in item.commonStaffs1' style='margin:5px;text-align:center;'>
+							<view class="item-content">
+								<u-icon v-if='item1.status' name="checkmark" color="#fff" size="14"></u-icon>
+								<u-icon v-if='!item1.status' name="question" color="#f9ae3d" size="14"></u-icon>
+							</view> 
+							<view class="name">{{item1.staffName}}</view> 
+						</view>
 					</view>
 				</view>
 				<view class="row-line" v-if="index!= auditList.length - 1"></view>
 			</view>
-
-		</view> -->
+		</view>
+		<view v-if='show' class="shade">
+			<view class="wrap">
+				<view class="alert-top">
+					<view class="title">
+						{{title}}
+					</view>
+					<u-icon name="close" class="close" color="#8890B1" @click="close()"></u-icon>
+				</view>
+				<view class="u-textarea-style">
+					<view class="right-bottom">
+						{{auditMind.length}}/100个字
+					</view>
+					<u-input class="" v-model='auditMind' placeholder="请在此输入审核意见" type="textarea" height="414"
+						maxlength="100" />
+				</view>
+				<view @click='close()' class="cancel">取消</view>
+				<view @click='passSubmit()' class="confirm">确定</view>
+			</view>
+		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button @click='fanHui' type="success" class="btn2">返回</u-button>
+			<u-button @click='fanhui' type="success" class="btn2">返回</u-button>
 		</view>
 	</view>
 </template>
@@ -176,8 +242,8 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		methods: {
-			fanHui() {
-				uni.navigateBack()
+			showcontent(item){
+				item.showflow=!item.showflow
 			},
 			openXls() {
 				if (this.url && this.url != "ng") {
@@ -201,40 +267,240 @@
 					title: "加载中...",
 					mask: true
 				})
+				// this.$api.doRequest('get', '/warehousingOrder/selectInfo', {
+				// 	currentPage: 1,
+				// 	pageSize: 100,
+				// 	searchType: '2', //searchType:1待审核
+				// 	// warehouseName: this.vesselId,
+				// 	managementType: 1
+				// }).then(res1 => {
+				// 	uni.hideLoading()
+				// 	if (res1.data.code == 200) {
+				// 		this.List = res1.data.data.records
+				// 	}
+				// })
+				// this.$api.doRequest('get', '/paymentManagement/getInfo', {
+				// 	id: this.id
+				// }).then(res => {
+				// 	if (res.data.code == 200) {
+				// 		uni.showLoading({
+				// 			title: "加载中...",
+				// 			mask: true
+				// 		})
+
+				// 	}
+				// })
 				this.$api.doRequest('post', '/warehousingOrder/exportPhone', {
 					batchId: this.id,
+					// searchType: 1,
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.url = res1.data.data
 					}
 				})
 				this.$api.doRequest('post', '/warehousingOrder/exportPhoneData', {
+					// searchType: 1,
 					batchId: this.id
 				}).then(res1 => {
 					if (res1.data.code == 200) {
 						this.auditInfo = res1.data.data
 						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo
 							.amountIngPayableTotal)
-						uni.hideLoading()
+						this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+							businessCode: 'WAREHOUSING-ORDER-APPROVE',
+							tmpCompId: uni.getStorageSync('pcUserInfo').compId
+						}).then(res1 => {
+							this.$api.doRequest('get', '/commonUser/getHis', {
+								workflowId: res1.data.data[0].id,
+								businessKey: this.id
+							}).then(response => {
+								uni.hideLoading()
+								for (let i = 0; i < response.data.data.length; i++) {
+									this.$set(response.data.data[i],'status','question')
+									console.log(response.data.data[i].workflowHistoricTasks,i)
+									if(response.data.data[i].commonStaffs){
+										response.data.data[i].showflow=false
+										response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+										response.data.data[i].operatorName=response.data.data[i].desc
+										response.data.data[i].staffscontent='共'+response.data.data[i].commonStaffs.length+'人，当前审核'+response.data.data[i].workflowHistoricTasks.length+'人'
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											if(response.data.data[i].workflowHistoricTasks.length!=response.data.data[i].commonStaffs.length){
+												// response.data.data[i].status='question'
+												this.$set(response.data.data[i],'status','question')
+											}else{
+												this.$set(response.data.data[i],'status','success')
+												// response.data.data[i].status='success'
+											}
+											response.data.data[i].workflowlen=response.data.data[i].workflowHistoricTasks.length
+											var workflowdata=response.data.data[i].workflowHistoricTasks
+											var staffsdata=response.data.data[i].commonStaffs
+											for (let q = 0; q < staffsdata.length; q++) {
+												staffsdata[q].status=false
+												staffsdata[q].staffTitle=staffsdata[q].staffName
+												for (let k = 0; k < workflowdata.length; k++) {
+													if(staffsdata[q].staffId==workflowdata[k].operatorId){
+														staffsdata[q].status=true
+													}
+												}
+											}
+										}
+										response.data.data[i].commonStaffs1=response.data.data[i].commonStaffs
+									}else{
+										if(response.data.data[i].workflowHistoricTasks&&response.data.data[i].workflowHistoricTasks.length>0){
+											var len =response.data.data[i].workflowHistoricTasks.length-1
+											if(response.data.data[i].workflowHistoricTasks[len].approved){
+												this.$set(response.data.data[i],'status','success')
+											}else{
+												this.$set(response.data.data[i],'status','error')
+											}
+											response.data.data[i].operatorTitle=response.data.data[i].workflowHistoricTasks[len].operatorName.substring(response.data.data[i].workflowHistoricTasks[0].operatorName.length - 2)
+											response.data.data[i].operatorName=response.data.data[i].workflowHistoricTasks[len].operatorName
+											var time=new Date(response.data.data[i].workflowHistoricTasks[len].claimTime).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=response.data.data[i].workflowHistoricTasks[len].auditMind
+										}else{
+											this.$set(response.data.data[i],'status','question')
+											// response.data.data[i].status='question'
+											if(response.data.data[i].desc=='总经理助理审核'){
+												response.data.data[i].operatorTitle='总助'
+											}else if(response.data.data[i].desc=='杜大光审核'){
+												response.data.data[i].operatorTitle='大光'
+											}else{
+												response.data.data[i].operatorTitle=response.data.data[i].desc.substring(0,2)
+											}
+											
+											response.data.data[i].operatorName=response.data.data[i].desc
+											var time1=new Date(response.data.data[i].updateDate).getTime()
+											response.data.data[i].updateDate=this.$u.timeFormat(time1, 'mm.dd hh:MM')
+											response.data.data[i].auditMind=''
+										}
+									}
+									
+								}
+								console.log(response.data.data)
+								this.auditList = response.data.data
+								var time2=new Date(this.auditList[0].createDate).getTime()
+								var time3=this.$u.timeFormat(time2, 'mm.dd hh:MM')
+								this.auditList.unshift({
+									operatorTitle:this.auditInfo.creater.substring(0,2),
+									operatorName:this.auditInfo.creater,
+									updateDate:time3,
+									auditMind:'',
+									desc:'发起申请',
+									showflow:false,
+									commonStaffs1:null,
+									commonStaffs:null,
+									workflowHistoricTasks:[],
+									status:'success'
+								})
+							})
+						})
+						
 					}
 				})
-				// 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', '/commonUser/getHis', {
-				// 		workflowId: res1.data.data[0].id,
-				// 		businessKey: this.id
-				// 	}).then(response => {
-				// 		// uni.hideLoading()
-				// 		this.auditList = response.data.data
-
-				// 	})
-				// })
+				this.$api.doRequest('get', '/workflow/query/workflowDefinitions', {
+					businessCode: 'WAREHOUSING-ORDER-APPROVE',
+					tmpCompId: uni.getStorageSync('pcUserInfo').compId
+				}).then(res1 => {
+					this.updateDate = res1.data.data[0].updateDate
+					this.$api.doRequest('get', '/commonUser/getHis', {
+						workflowId: res1.data.data[0].id,
+						businessKey: this.id
+					}).then(response => {
+						// uni.hideLoading()
+						this.auditList = response.data.data
+
+					})
+				})
 			},
-
-
+			close() {
+				this.show = false
+			},
+			fanHui(){
+				uni.navigateBack()
+			},
+			pass() {
+				this.show = true
+				this.title = '审核意见（通过）'
+			},
+			reject() {
+				this.show = true
+				this.title = '驳回原因（驳回）'
+			},
+			//驳回
+			// rejectSubmit() {
+			// 	if (!this.auditMind) {
+			// 		this.$api.msg('驳回原因不能为空！')
+			// 	} else {
+			// 		var that = this
+			// 		that.show = false
+			// 		if (this.List.length > 0) {
+			// 			uni.showModal({
+			// 				content: "确定驳回付款申请？",
+			// 				showCancel: true,
+			// 				confirmText: '确定',
+			// 				success: function(res) {
+			// 					if (res.confirm) {
+			// 						that.audit(that.List[0], 0, false, '', '')
+			// 					}
+			// 				}
+			// 			})
+			// 		}
+			// 	}
+			// },
+			
+			// audit(list, index, status, status2, reason) {
+			// 	uni.showLoading({
+			// 		title: "审核中"
+			// 	})
+			// 	if (this.List.length > 0) {
+			// 		if (status == true && list.status == "已驳回") {
+			// 			this.$api.doRequest('get', '/paymentManagement/api/openAuditFlow', {
+			// 				compId: "2710b21efc1e4393930c5dc800010dc4",
+			// 				id: list.id
+			// 			}).then(res => {
+			// 				if (res.data.code == 200) {
+			// 					this.audit(this.List[index + 1], index + 1, status, status2, reason)
+			// 				}
+			// 			})
+			// 		} else {
+			// 			for (var i = 0; i < this.List.length; i++) {
+			// 				this.$api.doRequest('post', '/workflow/api/handle', {
+			// 					taskId: this.List[i].taskId,
+			// 					approved: status,
+			// 					auditMind: this.auditMind ? this.auditMind : "",
+			// 					needReapply: status2 ? true : false
+			// 				}).then(res => {
+			// 					if (res.data.code == 200) {
+			// 						uni.hideLoading()
+			// 						// this.audit(this.List[index + 1], index + 1, status, status2, reason)
+			// 						this.$api.msg('通过成功')
+			// 					}else{
+			// 						uni.hideLoading()
+			// 						this.$api.msg('审核失败')
+			// 					}
+			// 				})
+			// 			}
+
+			// 		}
+			// 	} else {
+			// 		if (status == true) {
+			// 			this.$api.msg('通过成功')
+			// 		} else if (status == false) {
+			// 			this.$api.msg('驳回成功')
+			// 		}
+			// 		let that = this
+			// 		setTimeout(function() {
+
+			// 			if (that.everyCheck) {
+			// 				helper.setAudit(that.list)
+			// 			} else {
+			// 				uni.navigateBack()
+			// 			}
+			// 			uni.hideLoading()
+			// 		}, 1000);
+			// 	}
+			// },
 		}
 	}
 </script>
@@ -328,43 +594,111 @@
 		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;
+				.item1{
+					position:relative;
+					.item-content{
+						background:#22C572;
+					    width: 50px;
+					    height: 50px;
+					    border-radius: 10px;
+					    line-height: 50px;
+					    text-align: center;
+					    font-size: 18px;
+					    color: #fff;
 					}
-
-					.status {
-						color: #6CC48C;
+					.status{
+						position:absolute;
+						border-radius: 50%;
+						padding: 0px 2px;
+						right: -3px;
+						bottom: -3px;
+						background:#fff;
+					}
+					.status.success{
+						border:1px solid rgb(60, 156, 255);
+					}
+					.status.error{
+						border:1px solid rgb(245, 108, 108);
+					}
+					.status.question{
+						border:1px solid #f9ae3d;
 					}
 				}
+				
 			}
-
+	
 			.right {
-				color: #B0B1B5;
+				width:80%;
+				// color: #B0B1B5;
 				margin-top: 10px;
+				.right-content{
+					background:#F2F3F7;
+					margin-left:10px;
+					margin-top:10px;
+					padding:10px;
+					border-radius:5px;
+					color: #B0B1B5;
+				}
+				.right-item{
+					display: flex;
+					justify-content: space-between;
+					.time{
+						color:#999;
+					}
+					.item2 {
+						margin-left: 20rpx;
+						
+						.name {
+							font-size: 28rpx;
+							font-weight: 800;
+						}
+						.status.success {
+							color: #6CC48C;
+						}
+						.status.error {
+							color: rgb(245, 108, 108);
+						}
+						.status.question {
+							color: #f9ae3d;
+						}
+					}
+				}
+			}	
+		}
+		.row2{
+			display:flex;
+			.item-content{
+				background:#22C572;
+			    width: 30px;
+			    height: 30px;
+			    border-radius: 50%;
+			    line-height: 30px;
+			    text-align: center;
+			    font-size: 12px;
+			    color: #fff;
+				padding:0 2px;
+				margin:0 auto;
+			}
+			.status{
+				position:absolute;
+				top:0;right:0;
 			}
 		}
-
 		.row-line {
 			width: 1px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;
-
+	
 		}
-
+	
 		.audit {
 			margin-top: 20rpx;
 		}

pages/task/my_task.vue

@@ -389,9 +389,9 @@
 							// 	_str.showRow = false
 							// }.split(' ')[0]
 							this.taskInfo[i].department = this.taskInfo[i].messageTitle
-							if (this.taskInfo[i].messageContent.split(' ').length > 1) {
-								this.taskInfo[i].messageContent = this.taskInfo[i].messageContent.split(' ')[1]
-							}
+							// if (this.taskInfo[i].messageContent.split(' ').length > 1) {
+							// 	this.taskInfo[i].messageContent = this.taskInfo[i].messageContent.split(' ')[1]
+							// }
 							if (this.taskInfo[i].businessType == 'WAREHOUSE') {
 								if (this.taskInfo[i].businessCode == 'INOUTTASK-TASK-APPROVE') {
 									this.taskInfo[i].messageTitle = '出入库任务'
@@ -479,6 +479,7 @@
 				this.getIndexBuyData(statusFlag)
 			},
 			navToDetailPage(item) {
+				uni.setStorageSync('taskContent',item.messageContent)
 				if (item.businessCode == 'PROCUREMENT-ORDER-APPROVE') {
 					uni.navigateTo({
 						url: '/pages/task/procurement_details?id=' + item.businessId + "&isShowbtn=true"