浏览代码

1.审批流程

guo 3 年之前
父节点
当前提交
4dd97b3200

+ 2 - 1
operatingCompany/pages.json

@@ -148,7 +148,8 @@
 		{
 			"path": "pages/reportManage/reportDetail",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		},
 		{

+ 6 - 3
operatingCompany/pages/entryReport/entered.vue

@@ -88,19 +88,22 @@
 			}
 		},
 		onLoad(opt) {
+			console.log('entered',opt);
           //页面加载初始化生命周期函数
 		   this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
 		   this.userInfo=uni.getStorageSync("userInfo");
 		   this.ShopName=opt.ShopName;
 		   this.Contactor=opt.Contactor;
 		   this.type=opt.type;
+		   this.shopId=opt.shopId;
+		   
 		   if(this.type){
 			   this.sheetID=opt.sheetID
 		   }else{
-			    this.shopId=opt.shopId;
+			    
 			    this.getCheckPackageInfo();
 		   }
-		  
+		  console.log(this.shopId);
 		   this.getTime();
 		  
 		   
@@ -375,7 +378,7 @@
 					this.sheetID=res.data;
 					console.log(this.sheetID);
 					uni.navigateTo({
-						url:'opinion?sheetID='+this.sheetID+'&type='+this.type+'&shopName='+this.ShopName+'&Contactor='+this.Contactor
+						url:'opinion?sheetID='+this.sheetID+'&type='+this.type+'&shopName='+this.ShopName+'&Contactor='+this.Contactor+'&shopId='+this.shopId
 					})
 				})
 			},

+ 24 - 6
operatingCompany/pages/entryReport/historyReport.vue

@@ -6,7 +6,8 @@
 				<scroll-view scroll-x="true" class="scroll">
 					<view class="tabCotn">
 						<view class="tabLine" :class="{tabactive:tabIndex==0}" @click="tabClick(0)">全部</view>
-						<view class="tabLine" :class="{tabactive:tabIndex==1}" @click="tabClick(1)">待提交</view>
+						<view class="tabLine" :class="{tabactive:tabIndex==1}" @click="tabClick(1)">待提交</view>
+						<view class="tabLine" :class="{tabactive:tabIndex==9}" @click="tabClick(9)">待审批</view>
 						<view class="tabLine" :class="{tabactive:tabIndex==2}" @click="tabClick(2)">待作业</view>
 						<view class="tabLine" :class="{tabactive:tabIndex==3}" @click="tabClick(3)">待点评</view>
 						<view class="tabLine" :class="{tabactive:tabIndex==4}" @click="tabClick(4)">待回复</view>
@@ -54,7 +55,8 @@
 						<view class="shopName">{{item.ShopName}}</view>
 
 						<!-- 订单状态 1 待提交 2 待作业 3 待点评 4 待回复 5 已完成 -->
-						<view class="type" v-if="item.State == 1">待提交</view>
+						<view class="type" v-if="item.State == 1 && (!item.ApprovalStatus || item.ApprovalStatus==3)">待提交</view>
+						<view class="type" v-if="item.ApprovalStatus == 1">待审批</view>
 						<view class="type" v-if="item.State == 2">待作业</view>
 						<view class="type" v-if="item.State == 3">待点评</view>
 						<view class="type" v-if="item.State == 4">待回复</view>
@@ -192,9 +194,9 @@
 			getShopData() {
 				uni.showLoading({
 					title: '加载中'
-				})
-				let url = 'accompany/SuperAccounts/listShopInfoCheckPage',
-					params = {
+				})
+				var dic = {}
+				 dic =  {
 						page: this.page,
 						limit: 20,
 						managerName: this.managerName,
@@ -204,7 +206,23 @@
 						state: this.status,
 						shopID:this.shopId,
 
-					}
+					}
+				 if (this.status == 9) {
+					//待审批
+					dic =  {
+						page: this.page,
+						limit: 20,
+						managerName: this.managerName,
+						shopName: this.searchValue,
+						starTime: this.starTime,
+						endTime: this.endTime,
+						shopID:this.shopId,
+						approvalStatus: 1,
+					
+						}
+				}
+				let url = 'accompany/SuperAccounts/listShopInfoCheckPage',
+					params = dic
 				this.$http(url, params, 'GET').then(res => {
 					var list = res.data.Items
 

+ 5 - 3
operatingCompany/pages/entryReport/opinion.vue

@@ -58,13 +58,14 @@
 					<view class="grayView"></view>
 					<view>
 						<view style="font-size: 30rpx;color: #3C3C3C;">审批人</view>
-						<view style="font-size: 24rpx;color: #3C3C3C;">1人审批</view>
+						<view style="font-size: 24rpx;color: #3C3C3C;" v-if="Approver.approver">1人审批</view>
+						<view style="font-size: 24rpx;color: #3C3C3C;" v-if="!Approver.approver">暂未设置审批人</view>
 					</view>
 				</view>
 
 				<view class="approveRight">
 					<image src="../../static/img/shenpiren.png" mode="" style="width: 58rpx; height: 58rpx;"></image>
-					<view style="font-size: 24rpx;color: #666666; text-align: center;">{{Approver.approver}}</view>
+					<view style="font-size: 24rpx;color: #666666; text-align: center;" v-if="Approver.approver">{{Approver.approver}}</view>
 
 				</view>
 			</view>
@@ -108,7 +109,8 @@
 				Approver:'',
 			}
 		},
-		onLoad(opt) {
+		onLoad(opt) {
+			
 			//页面加载初始化生命周期函数
 			this.sheetID = opt.sheetID;
 			this.Contactor = opt.Contactor;

+ 290 - 200
operatingCompany/pages/reportManage/reportDetail.vue

@@ -19,11 +19,11 @@
 			<view class="topCont" v-if="info.state==1 && (!info.approvalStatus || info.approvalStatus==3)">
 				<image src="../../static/img/report_icon_daitijiao@2x.png" mode="" class="topContImg"></image>
 				<view class="topContTxt">待提交</view>
-			</view>
-			
-			<view class="topCont" v-if="info.approvalStatus == 1">
-				<image src="../../static/img/report_icon_daitijiao@2x.png" mode="" class="topContImg"></image>
-				<view class="topContTxt">待审批</view>
+			</view>
+
+			<view class="topCont" v-if="info.approvalStatus == 1">
+				<image src="../../static/img/icon_shenpi.png" mode="" class="topContImg"></image>
+				<view class="topContTxt">待审批</view>
 			</view>
 			<view class="topCont" v-if="info.state==2">
 				<image src="../../static/img/report_icon_daizuoye@2x.png" mode="" class="topContImg2"></image>
@@ -59,11 +59,11 @@
 				</view>
 				<view class="shopScore" v-if="info.shopScore">{{info.shopScore}}分</view>
 			</view>
-			<!-- 审核状态 -->
+			<!-- 审核状态 -->
 			<!--  approvalStatus 1待审批 2成功 3失败 -->
 			<view class="approveState" v-if="info.approvalStatus && info.approvalStatus != 2" @click="schedule">
 				<view class="leftState" v-if="info.approvalStatus == 3">
-					<view >审批状态:{{info.approver}}<text style="color: #FF4F00; margin-left: 10rpx;">审批拒绝</text></view>
+					<view>审批状态:{{info.approver}}<text style="color: #FF4F00; margin-left: 10rpx;">审批拒绝</text></view>
 					<view style="margin-top: 28rpx;">拒绝原因:{{info.approvalComment}}</view>
 				</view>
 				<view class="leftState" v-if="info.approvalStatus == 1">
@@ -74,6 +74,16 @@
 				</image>
 			</view>
 
+			<!-- 待提交 审批人 -->
+
+			<view class="approveState"
+				v-if="info.state==1&&loginType==1 && (!info.approvalStatus || info.approvalStatus==3)">
+
+				<view class="leftState">
+					<view>审批人:{{Approver.approver?Approver.approver:'暂未设置审批人'}}</view>
+				</view>
+
+			</view>
 			<!-- 门店 -->
 			<view class="shopBox">
 				<view class="shopTop">
@@ -291,39 +301,40 @@
 			<view class="shoreDz">点评</view>
 		</view>
 
-		<view v-if="info.approvalStatus == 1">
-		
+		<view v-if="info.approvalStatus == 1">
+
 			<!--  approvalStatus 1待审批 2成功 3失败 -->
-			<!-- 待审核 -->
+			<!-- 待审核 -->
+
 			
-			<view class="approvalBottom" >
-				<view class="delBtn" style="width: 212rpx;" v-if="userInfoId == info.managerID" @click="chexiao">撤销审批</view>
-				<view class="delBtn" style="width: 212rpx;" v-if="userInfoId == info.approverID" @click="approveBtn(1)">审批拒绝</view>
-				<view class="Submit" style="width: 212rpx;" v-if="userInfoId == info.approverID" @click="approveBtn(2)">审批通过</view>
+			<view class="approvalBottom">
+				<view class="approvalBtn" v-if="userInfoId == info.managerID" @click="chexiao">撤销审批</view>
+				<view class="approvalBtn2" :style="{'margin-left':(userInfoId == info.managerID ? '34rpx' : '0rpx')}" v-if="userInfoId == info.approverID" @click="approveBtn(1)">审批拒绝</view>
+				<view class="SubmitApproval" v-if="userInfoId == info.approverID" @click="approveBtn(2)">审批通过</view>
 			</view>
 
-			
-			
-			<!-- 审批意见 -->
-			<view class="addMesBg" v-show="showMes == true">
-				<view class="addMes">
-					<view class="mesTitle" v-if="showMesType==1">审批拒绝</view>
-					<view class="mesTitle" v-if="showMesType==2">审批通过</view>
-					<view>
-						<textarea placeholder-style="color:#999999" placeholder="请输入" v-model="Mes" class="textareaMes"/>
-					</view>
-					
-					<view class="mesBottom">
-						<view class="mesBtn" @click="mesCancel">取消</view>
-						<view style="width: 1rpx; height: 98rpx; background-color: #EEEEEE;"></view>
-						<view class="mesBtn" @click="mesSure">确认</view>
-					</view>
-				</view>
-			</view>
-			
-		</view>
-		
-		
+
+			<!-- 审批意见 -->
+			<view class="addMesBg" v-show="showMes == true">
+				<view class="addMes">
+					<view class="mesTitle" v-if="showMesType==1">审批拒绝</view>
+					<view class="mesTitle" v-if="showMesType==2">审批通过</view>
+					<view>
+						<textarea placeholder-style="color:#999999" placeholder="请输入" v-model="Mes"
+							class="textareaMes" />
+					</view>
+
+					<view class="mesBottom">
+						<view class="mesBtn" @click="mesCancel">取消</view>
+						<view style="width: 1rpx; height: 98rpx; background-color: #EEEEEE;"></view>
+						<view class="mesBtn" @click="mesSure">确认</view>
+					</view>
+				</view>
+			</view>
+
+		</view>
+
+
 
 	</view>
 </template>
@@ -347,10 +358,12 @@
 				userInfoId: '',
 				mEvaluateLook: '',
 				lookShow: true,
-				backType: '',
-				showMes:false,
-				showMesType:1,//1 审批拒绝 2 审批通过
-				Mes:''
+				backType: '',
+				showMes: false,
+				showMesType: 1, //1 审批拒绝 2 审批通过
+				Mes: '',
+				Approver: '',
+
 			}
 		},
 		onLoad(opt) {
@@ -404,6 +417,8 @@
 			that.lat = '36.68013'
 			that.getSuperCheckSheetInfo()
 			// #endif
+
+
 		},
 		onShow() {
 			if (this.id) {
@@ -422,87 +437,103 @@
 				})
 			}
 		},
-		methods: {
-			chexiao(){
-				
-					var that = this;
-					uni.showModal({
-						title: '撤销报告',
-						content: '确定要撤销此报告吗?撤销后报告状态将变成待提交',
-						success: function(res) {
-							if (res.confirm) {
-								uni.showLoading({
-									title:'撤销中'
-								});
-								that.$http('accompany/superCheckSheet/approve/approveUndo', {
-									sheetId: that.id,
-				
-				
-								}, 'POST').then(res => {
-									if (res.code == 0) {
-										this.getSuperCheckSheetInfo();
-										uni.showToast({
-											title: '撤销成功',
-											icon: 'success',
-											duration: 2000,
-										});
-										
-									}
-								})
-				
-							} else if (res.cancel) {
-								console.log('用户点击取消');
-							}
-						}
-					});
-				
-			},
-			approveBtn(type){
-				this.showMes = true
-				this.showMesType = type
-			},
-			mesCancel(){
-				this.showMes = false
-				this.Mes = ''
-			},
-			mesSure(){
-				// 1 审批拒绝 2 审批通过
-				if (!this.Mes) {
-					uni.showToast({
-						title: '请填写审批意见',
-						icon: 'none',
-						duration: 3000,
-					});
-					return
-				}
-				
-					uni.showLoading({
-						title:'提交中'
-					});
-					var urlStr
-					if (this.showMesType == 1) {
-						urlStr = 'accompany/superCheckSheet/approve/approveRefuse'
-					}
-					if (this.showMesType == 2) {
-						urlStr = 'accompany/superCheckSheet/approve/approveAgree'
-					}
-					this.$http(urlStr, {
-						sheetId: this.id,
-						approvalComment:this.Mes
-				
-					}, 'POST').then(res => {
-						if (res.code == 0) {
-							this.getSuperCheckSheetInfo();
-						uni.showToast({
-							title: '审批完成',
-							icon: 'success',
-							duration: 2000,
-						});
-						}
-						
-					})
-				
-				
+		methods: {
+			//获取审批人
+			getqueryApprover() {
+				this.$http('accompany/superCheckSheet/approve/queryApprover', {
+					shopId: this.info.shopID,
+
+				}, 'GET').then(res => {
+					if (res.code == 0) {
+						this.Approver = res.data
+					}
+				})
+			},
+			chexiao() {
+
+				var that = this;
+				uni.showModal({
+					title: '撤销报告',
+					content: '确定要撤销此报告吗?撤销后报告状态将变成待提交',
+					success: function(res) {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '撤销中'
+							});
+							that.$http('accompany/superCheckSheet/approve/approveUndo', {
+								sheetId: that.id,
+
+
+							}, 'POST').then(res => {
+								if (res.code == 0) {
+									that.getSuperCheckSheetInfo();
+									uni.showToast({
+										title: '撤销成功',
+										icon: 'success',
+										duration: 2000,
+									});
+
+								}
+							})
+
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+
+			},
+			approveBtn(type) {
+				this.showMes = true
+				this.showMesType = type
+			},
+			mesCancel() {
+				this.showMes = false
+				this.Mes = ''
+			},
+			mesSure() {
+
+				// 1 审批拒绝 2 审批通过
+				if (!this.Mes && this.showMesType == 1) {
+					uni.showToast({
+						title: '请填写审批意见',
+						icon: 'none',
+						duration: 3000,
+					});
+					return
+				}
+
+				uni.showLoading({
+					title: '提交中'
+				});
+				var urlStr
+				if (this.showMesType == 1) {
+					urlStr = 'accompany/superCheckSheet/approve/approveRefuse'
+				}
+				if (this.showMesType == 2) {
+					urlStr = 'accompany/superCheckSheet/approve/approveAgree'
+				}
+				this.$http(urlStr, {
+					sheetId: this.id,
+					approvalComment: this.Mes
+
+				}, 'POST').then(res => {
+					if (res.code == 0) {
+						this.getSuperCheckSheetInfo();
+						uni.showToast({
+							title: '审批完成',
+							icon: 'success',
+							duration: 2000,
+						});
+
+						this.showMes = false
+						this.Mes = ''
+
+					}
+
+				})
+
+
 			},
 			schedule() {
 				uni.navigateTo({
@@ -625,6 +656,7 @@
 				//console.log(this.info.categoryList)
 				this.$store.commit('mutationsCategoryList', this.info.categoryList);
 				this.$store.commit('mutationssuggestList', this.info.suggestList)
+				console.log('reportDetail', this.info.shopID);
 				uni.navigateTo({
 					url: '../entryReport/entered?type=3&sheetID=' + this.id + '&shopId=' + this.info.shopID +
 						'&ShopName=' + this.info.shopName
@@ -768,6 +800,8 @@
 						}
 					}
 
+					//获取审批人
+					this.getqueryApprover();
 				})
 			},
 			editWork() {
@@ -818,23 +852,22 @@
 				this.$http('accompany/SuperCheckSheet/submitSuperCheckSheet', {
 					sheetID: this.id,
 
-				}, 'POST').then(res => {
-					if (res.code == 0) {
-						this.getSuperCheckSheetInfo();
-						uni.showToast({
-							title: '提交成功',
-							icon: 'success',
-							duration: 3000,
-						});
-					}
-					else{
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 3000,
-						});
+				}, 'POST').then(res => {
+					if (res.code == 0) {
+						this.getSuperCheckSheetInfo();
+						uni.showToast({
+							title: '提交成功',
+							icon: 'success',
+							duration: 3000,
+						});
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 3000,
+						});
 					}
-					
+
 				})
 			},
 			shareDz() {
@@ -863,7 +896,15 @@
 					console.log(res)
 				}
 			}
-		}
+		},
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+
+			this.getSuperCheckSheetInfo()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
 	}
 </script>
 
@@ -1057,7 +1098,7 @@
 	.leftState {
 		font-size: 26rpx;
 		color: #3C3C3C;
-
+		width: 90%;
 	}
 
 	.address {
@@ -1141,17 +1182,60 @@
 		display: flex;
 		justify-content: space-around;
 	}
-	.approvalBottom{
-		width: 750rpx;
-		height: 120rpx;
-		background: #FFFFFF;
-		box-shadow: 0px -4px 8px 0px rgba(153, 153, 153, 0.08);
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		display: flex;
-		
+
+	.approvalBottom {
+		width: 702rpx;
+		height: 120rpx;
+		background: #FFFFFF;
+		box-shadow: 0px -4px 8px 0px rgba(153, 153, 153, 0.08);
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 24rpx;
 	}
+
+	.approvalBtn {
+		/* width: 212rpx; */
+		height: 74rpx;
+		background: #F4F5F7;
+		border-radius: 37rpx;
+		text-align: center;
+		line-height: 74rpx;
+		color: #3C3C3C;
+		font-size: 30rpx;
+		margin-top: 24rpx;
+		flex-grow: 1;
+		
+	}
+	.approvalBtn2 {
+		/* width: 212rpx; */
+		height: 74rpx;
+		background: #F4F5F7;
+		border-radius: 37rpx;
+		text-align: center;
+		line-height: 74rpx;
+		color: #3C3C3C;
+		font-size: 30rpx;
+		margin-top: 24rpx;
+		margin-left: 34rpx;
+		margin-right: 34rpx;
+		flex-grow: 1;
+	}
+	.SubmitApproval {
+		/* width: 212rpx; */
+		height: 74rpx;
+		background: linear-gradient(124deg, #FF8700 0%, #FF4F00 100%);
+		border-radius: 37rpx;
+		text-align: center;
+		line-height: 74rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		margin-top: 24rpx;
+		flex-grow: 1;
+	}
+
 	.delBtn {
 		width: 220rpx;
 		height: 74rpx;
@@ -1175,7 +1259,7 @@
 		font-size: 30rpx;
 		margin-top: 24rpx;
 	}
-
+	SubmitApproval
 	.Submit {
 		width: 220rpx;
 		height: 74rpx;
@@ -1385,55 +1469,61 @@
 
 	.red {
 		color: #FF3B30;
-	}
-	.addMesBg{
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100vh;
-		background-color: rgba(0, 0, 0, 0.4);
-		z-index: 999;
-	}
-	.addMes{
-		position: fixed;
-		left: 62rpx;
-		top: 351rpx;
-		width: 626rpx;
-		height: 631rpx;
-		background: #FFFFFF;
-		border-radius: 24rpx;
-	}
-	.mesTitle{
-		color: #3C3C3C;
-		font-size: 32rpx;
-		text-align: center;
-		height: 98rpx;
-		line-height: 98rpx;
-		border-bottom: 1rpx solid #EEEEEE;
-	}
-	.textareaMes{
-		width: 500rpx;
-		height: 300rpx;
-		background: #FAFAFA;
-		margin: 30rpx;
-		padding: 30rpx;
-		border-radius: 10rpx;
-	}
-	.mesBottom{
-		width: 100%;
-		height: 98rpx;
-		border-top: 1rpx #EEEEEE solid;
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-	}
-	.mesBtn{
-		font-size: 30rpx;
-		width: 49%;
-		color: #3F90F7;
-		height: 98rpx;
-		line-height: 98rpx;
-		text-align: center;
+	}
+
+	.addMesBg {
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100vh;
+		background-color: rgba(0, 0, 0, 0.4);
+		z-index: 999;
+	}
+
+	.addMes {
+		position: fixed;
+		left: 62rpx;
+		top: 351rpx;
+		width: 626rpx;
+		height: 622rpx;
+		background: #FFFFFF;
+		border-radius: 24rpx;
+	}
+
+	.mesTitle {
+		color: #3C3C3C;
+		font-size: 32rpx;
+		text-align: center;
+		height: 98rpx;
+		line-height: 98rpx;
+		border-bottom: 1rpx solid #EEEEEE;
+	}
+
+	.textareaMes {
+		width: 500rpx;
+		height: 300rpx;
+		background: #FAFAFA;
+		margin: 30rpx;
+		padding: 30rpx;
+		border-radius: 10rpx;
+	}
+
+	.mesBottom {
+		width: 100%;
+		height: 98rpx;
+		border-top: 1rpx #EEEEEE solid;
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+	}
+
+	.mesBtn {
+		font-size: 30rpx;
+		width: 49%;
+		color: #3F90F7;
+		height: 98rpx;
+		line-height: 98rpx;
+		text-align: center;
 	}
 </style>

+ 16 - 9
operatingCompany/pages/reportManage/reportSchedule.vue

@@ -3,16 +3,19 @@
 		
 			<view class="itemBg" v-for="(item,index) in itemData">
 				<view class="leftView">
+					<view class="grayLine" v-if="index != 0" style="height: 10rpx;"></view>
+					<view  v-else style="height: 10rpx;"></view>
 					<view class="redCircle"></view>
-					<view class="grayLine"v-if="index < itemData.length-1"></view>
+					<view class="grayLine" v-if="index < itemData.length-1"></view>
 				</view>
 				<view class="rightView">
 					 
-					<view class="">
+					<view class="contentBg">
 						<view class="contents">{{item.contents}}</view>
-						<view class="comment" v-if="item.approvalComment">{{item.approvalComment}}</view>
+						<view class="time">{{item.createTime}}</view>
+						
 					</view>
-					<view class="time">{{item.createTime}}</view>
+					<view class="comment" v-if="item.approvalComment">{{item.approvalComment}}</view>
 				</view>
 				
 				
@@ -92,10 +95,8 @@
 		background: #F4F5F7;
 	}
 	.rightView{
-		padding: 0 20rpx 60rpx;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
+		padding: 0 20rpx 40rpx;
+		
 		width: 80%;
 	}
 	.name{
@@ -103,10 +104,16 @@
 		font-size: 28rpx;
 		font-weight: bold;
 	}
+	.contentBg{
+		width: 100%;
+		display: flex;
+		justify-content: space-between;
+		
+	}
 	.contents{
 		color: #3C3C3C;
 		font-size: 30rpx;
-		padding: 10rpx 0;
+		padding-bottom: 10rpx;
 	}
 	.comment{
 		color: #999999;

+ 6 - 3
operatingCompany/pages/upcoming/upcoming.vue

@@ -6,8 +6,8 @@
 
 				<!-- name -->
 				<view class="nameView">
-					<view class="name" v-if="item.State == 1">您有一份待提交的作业</view>
-					<view class="type" v-if="item.State == 1" @click="goAppraise(item)">去提交</view>
+					<view class="name" v-if="item.State == 1 && (!item.ApprovalStatus || item.ApprovalStatus==3)">您有一份待提交的作业</view>
+					<view class="type" v-if="item.State == 1 && (!item.ApprovalStatus || item.ApprovalStatus==3)" @click="goAppraise(item)">去提交</view>
 
 					<view class="name" v-if="item.State == 2">您有一份待作业的作业</view>
 					<view class="type" v-if="item.State == 2" @click="goAppraise(item)">去作业</view>
@@ -17,7 +17,10 @@
 
 					<view class="name" v-if="item.State == 4">您有一份待回复的作业</view>
 					<view class="type" v-if="item.State == 4" @click="goAppraise(item)">去回复</view>
-
+
+					<view class="name" v-if="item.ApprovalStatus == 1">您有一份待审批的作业</view>
+					<view class="type" v-if="item.ApprovalStatus == 1" @click="goAppraise(item)">去审批</view>
+					
 					<image src="../../static/img/icon_arrow_go.png"
 						style="width: 12rpx; height: 22rpx; margin-left: 5rpx;"></image>
 				</view>

二进制
operatingCompany/static/img/icon_shenpi.png