长连接改版，上线版本

src/api/axios.js

@@ -7,8 +7,8 @@ import {
 } from './auth.js'
 import qs from 'qs'
 const service = axios.create({
-	baseURL: process.env.VUE_APP_BASE_API, 
-	// baseURL:'https://app55493.eapps.dingtalkcloud.com/',
+	// baseURL: process.env.VUE_APP_BASE_API, 
+	baseURL:'https://app55493.eapps.dingtalkcloud.com/',
 	timeout: 20000,
 	headers: {
 		'Content-Type': 'application/x-www-form-urlencoded',

src/api/websocketTow.js

@@ -1,5 +1,6 @@
 
-let wsurl='wss://' + process.env.VUE_APP_WEBSCOKET + '/ws2/';
+// let wsurl='wss://' + process.env.VUE_APP_WEBSCOKET + '/ws2/';
+let wsurl='wss://app55493.eapps.dingtalkcloud.com/ws2/';
 let ws = null
 let weboscket_callback = null
 import {getToken,generateUUID } from '@/api/auth';

src/views/abPoint/apply_list.vue

@@ -12,7 +12,10 @@
 				<el-button type="primary" @click="dialogVisible = true">申请积分</el-button>
 				<span class="orange" style="padding-left: 10px;" v-if="config.event_review_status&&config.event_apply_review">复核开启后，积分需管理员复核后才计入排名和统计</span>
 			</div>
-			<el-input style="width: 250px;" v-model="formData.keyword" placeholder="输入申请内容" @keyup.enter.native="searchFun">
+			<el-select v-if="tabs == 'review'" style="width: 100px;margin-right: 10px;" size="medium" v-model="dc_status"  placeholder="请选择复核状态">
+				<el-option v-for="item in dcArr" :key="item.name" :label="item.name" :value="item.id"></el-option>
+			</el-select>
+			<el-input style="width: 250px;" v-model="formData.keyword" size="medium" placeholder="输入申请内容" @keyup.enter.native="searchFun">
 				<el-button slot="append" @click="searchFun" size="medium" icon="el-icon-search"></el-button>
 			</el-input>
 		</div>
@@ -105,6 +108,12 @@
 					{{$moment.unix(scope.row.event_time).format('YYYY-MM-DD')}}
 				</template>
 			</el-table-column>
+			<el-table-column label="状态"  width="150" >
+				<template slot-scope="scope">
+					<span class="green" v-if="scope.row.dc_status==1">通过</span>
+					<span class="red" v-if="scope.row.dc_status==2">不通过</span>
+				</template>
+			</el-table-column>
 		</el-table>
 
 		<center style="margin-top: 15px;">
@@ -291,7 +300,7 @@
 			</div>
 			<div v-if="!this.$authoritys('employee') && !this.$authoritys('dept_manager')" style="position: absolute; bottom: 20px; display: block; right: 20px;">
 				<el-button @click="detail_popup=false">取消</el-button>
-				<el-button type="danger" @click="del_integral_event(detail_info2)">删除</el-button>
+				<!-- <el-button type="danger" @click="del_integral_event(detail_info2)">删除</el-button> -->
 			</div>
 		</el-drawer>
 		
@@ -370,6 +379,12 @@ export default {
 				contents: [],
 				images: []
 			},
+			dcArr: [
+			  { id: '1,2', name: '全部' },
+			  { id: '1', name: '通过' },
+			  { id: '2', name: '不通过' },
+			],
+			dc_status:'1,2',
 		};
 	},
 	components: {
@@ -386,7 +401,10 @@ export default {
 			this.formData.keyword = '';
 			this.formData.type = val;
 			this.get_list();
-		}
+		},
+		dc_status(){
+			this.searchFun();
+		},
 	},
 	mounted() {
 		this.cheakAx()
@@ -502,7 +520,13 @@ export default {
 		},
 		get_list() {
 			this.table_loading = true;
-			let url=this.tabs=='review'? "/api/integral/statistics/event":'/api/integral/review/apply/list'
+			let url="";
+			if(this.tabs=='review'){
+				 url='/api/integral/statistics/event';
+				 this.formData.dc_status=this.dc_status;
+			}else{
+				 url='/api/integral/review/apply/list'
+			}
 			this.$axios('get', url, this.formData)
 				.then(res => {
 					if (res.data.code == 1) {

src/views/abPoint/award_punish.vue

@@ -4,6 +4,7 @@
 			<el-tab-pane :disabled="table_loading" label="奖扣成功" name="success"></el-tab-pane>
 			<el-tab-pane :disabled="table_loading"  label="待审批" name="waiting"></el-tab-pane>
 			<el-tab-pane :disabled="table_loading"  label="被驳回" name="refuse"></el-tab-pane>
+			<el-tab-pane :disabled="table_loading" label="已复核" name="review"></el-tab-pane>
 		</el-tabs>
 		<div class="flex-box-ce" style="margin-bottom: 15px;">
 			<div class="flex-1">
@@ -12,15 +13,18 @@
 				<span class="orange" style="padding-left: 10px;" v-if="config.event_review_status&&config.event_entry_review">复核开启后，积分需管理员复核后才计入排名和统计</span>
 			</div>
 			<div class="flex-box-ce">
-				<el-select  v-if="tabs=='success'" v-model="select_employee_id" filterable clearable placeholder="请输入或选择人员" style="width: 200px;margin-right: 10px;">
+				<el-select  v-if="tabs=='success'" size="medium" v-model="select_employee_id" filterable clearable placeholder="请输入或选择人员" style="width: 200px;margin-right: 10px;">
 					<el-option v-for="item in employee_map" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>
-				<el-input v-model="keyword" style="width: 200px;"  :placeholder="tabs=='success'?'输入内容':'输入员工姓名/事件内容'" ></el-input>
+				<el-select v-if="tabs == 'review'" style="width: 100px;margin-right: 10px;" size="medium" v-model="dc_status"  placeholder="请选择复核状态">
+					<el-option v-for="item in dcArr" :key="item.name" :label="item.name" :value="item.id"></el-option>
+				</el-select>
+				<el-input v-model="keyword" style="width: 200px;" size="medium" :placeholder="tabs=='success'||tabs == 'review'?'输入内容':'输入员工姓名/事件内容'" ></el-input>
 			</div>
 		</div>
 
-		<el-table v-if="tabs == 'success'" res="table1" :data="dataList" stripe fit v-loading="table_loading" @row-click="open_detail">
-			<el-table-column label="姓名" prop="employee_id" align="left">
+		<el-table v-if="tabs == 'success'||tabs == 'review'" res="table1" :data="dataList" stripe fit v-loading="table_loading" @row-click="open_detail">
+			<el-table-column label="姓名" prop="employee_id" align="left" width="250">
 				<template slot-scope="scope">
 					<div class="flex-box flex-contet-conter" >
 						<userImage :img_url="scope.row.employee_img_url" :user_name="scope.row.employee_name" width="50px" height="50px"></userImage>
@@ -52,6 +56,12 @@
 					<!-- {{ cuttString(scope.row.create_time) }} -->
 				</template>
 			</el-table-column>
+			<el-table-column label="状态"  width="150" v-if="tabs == 'review'">
+				<template slot-scope="scope">
+					<span class="green" v-if="scope.row.dc_status==1">通过</span>
+					<span class="red" v-if="scope.row.dc_status==2">不通过</span>
+				</template>
+			</el-table-column>
 			<template slot="empty">
 				<noData></noData>
 			</template>
@@ -97,8 +107,8 @@
 			></el-pagination>
 		</center>
 
-		<el-drawer title="奖扣详情" :visible.sync="drawer" ref="drawer" :with-header="false" :size="'600px'" direction="rtl">
-			<div class="drawer_title">奖扣详情</div>
+		<el-drawer :title="tabs != 'review'? '奖扣详情':'事件详情'" :visible.sync="drawer" ref="drawer" :with-header="false" :size="'600px'" direction="rtl">
+			<div class="drawer_title">{{tabs != 'review'? '奖扣详情':'事件详情'}}</div>
 			<div class="detail_popup" v-loading="detail_loading" v-if="detail_info !== null">
 				<el-row :gutter="10" style="padding-bottom:10px;border-bottom:1px #f8f8f8 solid;">
 					<el-col :span="24">
@@ -171,12 +181,15 @@
 				<div v-show="detail_info.process">
 					<Steps :process="detail_info.process"></Steps>
 				</div>
+				<div v-show="detail_info.dc_remark.flow"><Review :process="detail_info.dc_remark.flow" :status="detail_info.dc_status"></Review></div>
 				<template v-if="tabs == 'success'&&detail_info.dc_remark">
 					<div v-show="detail_info.dc_remark.flow"><Review :process="detail_info.dc_remark.flow" :status="detail_info.dc_status"></Review></div>
 				</template>
-				<div class="btn_danger flex-box flex-center-center" v-if="detail_info.process.length==1&&(detail_info.event_type==3||detail_info.event_type==4)">
-				  <el-button type="danger" class="danger" @click="revocation" :loading="cx_loading">撤销</el-button>
-				</div>
+				<template v-if="tabs != 'review'">
+					<div class="btn_danger flex-box flex-center-center" v-if="detail_info.process.length==1&&(detail_info.event_type==3||detail_info.event_type==4)">
+					  <el-button type="danger" class="danger" @click="revocation" :loading="cx_loading">撤销</el-button>
+					</div>
+				</template>
 			</div>
 		</el-drawer>
 
@@ -243,6 +256,7 @@
 				<div v-show="detail_info.process">
 					<Steps :process="detail_info.process"></Steps>
 				</div>
+				<div v-show="detail_info.dc_remark.flow"><Review :process="detail_info.dc_remark.flow" :status="detail_info.dc_status"></Review></div>
 <!-- 				<div v-if="detail_info.dc_remark.flow">
 					<Review :process="detail_info.dc_remark.flow" :status="detail_info.dc_status"></Review>
 				</div> -->
@@ -303,6 +317,12 @@ export default {
 			isBreak:false,//是否打开缓存的未完成奖扣
 			
 			config:{},
+			dcArr: [
+			  { id: '[1,2]', name: '全部' },
+			  { id: '[1]', name: '通过' },
+			  { id: '[2]', name: '不通过' },
+			],
+			dc_status:'[1,2]',
 		};
 	},
 	components: {
@@ -330,6 +350,10 @@ export default {
 		}, 1000)
 	},
 	watch: {
+		dc_status(){
+			this.formData.page = 1;
+			this.getData();
+		},
 		select_employee_id(){
 			this.formData.page = 1;
 			this.getData();
@@ -513,7 +537,7 @@ export default {
 					pt_id: '0',
 					type: 'waiting'
 				};
-			} else {
+			} else if(this.tabs=='refuse') {
 				data = {
 					page: this.formData.page,
 					page_size: this.formData.page_size,
@@ -521,11 +545,23 @@ export default {
 					pt_id: '0',
 					type: 'refuse'
 				};
+			}else{
+				data = {
+					page: this.formData.page,
+					page_size: this.formData.page_size,
+					recorder_id:this.userId,
+					source_type: '1',
+					keyword: this.keyword,
+					employee_ids: this.select_employee_id,
+					dc_status:this.dc_status,
+					// order_key:'update_time'
+				};
 			}
-			this.$axios('get', this.tabs == 'success' ? '/api/integral/statistics/integral' : '/api/integral/review/entry/list', data)
+			this.$axios('get', (this.tabs == 'success'||this.tabs == 'review') ? '/api/integral/statistics/integral' : '/api/integral/review/entry/list', data)
 				.then(res => {
+					console.log()
 					if (res.data.code == 1) {
-						if(this.tabs == 'success'){
+						if(this.tabs == 'success'||this.tabs == 'review'){
 							this.dataList = res.data.data.list;
 						}else{
 							this.dataList2 = res.data.data.list;

src/views/welfare/flManagement.vue

@@ -303,7 +303,7 @@
 					<div class="flex-box-ce results" v-for="(item, index) in results" :key="index">
 						<div style="border-right: 1px solid #f1f1f1;width: 50px;">{{results.length-index}}</div>
 						<div class="flex-1" style="border-right: 1px solid #f1f1f1;">{{returnName(item.task.msg.employee_id)}}</div>
-						<div class="flex-1" style="border-right: 1px solid #f1f1f1;">{{ item.task.msg.num }}</div>
+						<div class="flex-1" style="border-right: 1px solid #f1f1f1;">{{ item.task.msg.num||'-' }}</div>
 						<div class="flex-2" style="border-right: 1px solid #f1f1f1;">{{ item.task.msg.remark }}</div>
 						<div class="flex-2 green" v-if="item.status==1">{{ item.msg }}</div>
 						<div class="flex-2 red" v-else>{{ item.msg }}</div>