1.录入报告 ,报告管理,加审批流程

operatingCompany/pages.json

@@ -209,7 +209,16 @@
 		}
 
 
-	],
+	    ,{
+            "path" : "pages/reportManage/reportSchedule",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "审批进度",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

operatingCompany/pages/entryReport/entered.vue

@@ -266,7 +266,7 @@
 						this.sheetID=res.data;
 						this.editType=2;
 						uni.navigateTo({
-							url:'opinion?sheetID='+this.sheetID+'&shopName='+this.ShopName+'&Contactor='+this.Contactor
+							url:'opinion?sheetID='+this.sheetID+'&shopName='+this.ShopName+'&Contactor='+this.Contactor+'&shopId='+this.shopId
 						})
 					})
 				}

operatingCompany/pages/reportManage/reportManage.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>
@@ -62,12 +63,13 @@
 						<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>
 						<view class="type" v-if="item.State == 5">已完成</view>
-
+						
 
 					</view>
 
@@ -175,7 +177,9 @@
 
 				if (num == 0) {
 					this.status = ''
-				} else {
+				}
+				
+				 else {
 					this.status = num;
 				}
 				this.page = 1;
@@ -240,9 +244,9 @@
 			getShopData() {
 				uni.showLoading({
 					title: '加载中'
-				})
-				let url = 'accompany/SuperAccounts/listShopInfoByDeptCheckPage',
-					params = {
+				})
+				var dic = {}
+				 dic =  {
 						page: this.page,
 						limit: 20,
 						provinceCode: this.data.provinceCode,
@@ -254,7 +258,26 @@
 						endTime: this.endTime,
 						state: this.status,
 
-					}
+					}
+				 if (this.status == 9) {
+					//待审批
+					dic =  {
+							page: this.page,
+							limit: 20,
+							provinceCode: this.data.provinceCode,
+							cityCode: this.data.cityCode,
+							areaCode: this.data.areaCode,
+							managerID: this.managerId,
+							shopName: this.searchValue,
+							starTime: this.starTime,
+							endTime: this.endTime,
+							approvalStatus: 1,
+					
+						}
+				}
+				
+				let url = 'accompany/SuperAccounts/listShopInfoByDeptCheckPage',
+					params = dic
 				this.$http(url, params, 'GET').then(res => {
 					var list = res.data.Items
 

operatingCompany/pages/reportManage/reportSchedule.vue

@@ -0,0 +1,121 @@
+<template>
+	<view class="content">
+		
+			<view class="itemBg" v-for="(item,index) in itemData">
+				<view class="leftView">
+					<view class="redCircle"></view>
+					<view class="grayLine"v-if="index < itemData.length-1"></view>
+				</view>
+				<view class="rightView">
+					 
+					<view class="">
+						<view class="contents">{{item.contents}}</view>
+						<view class="comment" v-if="item.approvalComment">{{item.approvalComment}}</view>
+					</view>
+					<view class="time">{{item.createTime}}</view>
+				</view>
+				
+				
+			</view>
+		
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				itemData:[],
+				id:'',
+			}
+		},
+		onLoad(opt) {
+			this.id = opt.id
+			this.getData();
+		},
+		methods: {
+			getData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				
+				let url = 'accompany/superCheckSheet/approve/queryApproveFlow',
+					params = {
+						sheetId: this.id,
+						
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading()
+					
+					this.itemData = res.data
+					
+					
+			
+			
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	.content {
+		background-color: #FFFFFF;
+		min-height: 100vh;
+		padding: 30rpx 0;
+	}
+	
+	.itemBg {
+		background-color: #FFFFFF;
+		display: flex;
+		
+	}
+	.leftView{
+		width: 40rpx;
+		padding: 0 20rpx;
+		display:flex;
+		flex-direction:column;
+		align-items:center;
+		
+	}
+	.redCircle{
+		width: 22rpx;
+		height: 22rpx;
+		border-radius: 50%;
+		background: #FF2400;
+		
+	}
+	.grayLine{
+		width: 2px;
+		height: 80%;
+		background: #F4F5F7;
+	}
+	.rightView{
+		padding: 0 20rpx 60rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		width: 80%;
+	}
+	.name{
+		color: #333333;
+		font-size: 28rpx;
+		font-weight: bold;
+	}
+	.contents{
+		color: #3C3C3C;
+		font-size: 30rpx;
+		padding: 10rpx 0;
+	}
+	.comment{
+		color: #999999;
+		font-size: 24rpx;
+		
+	}
+	.time{
+		color: #999999;
+		font-size: 22rpx;
+		
+	}
+</style>