解决选人组件人数过多问题

src/components/EmployeeSelector.vue

@@ -341,17 +341,17 @@ export default {
 		},
 		filtration() {
 			//获取员工列表,限制已禁用的员工
-			this.$axios('get', '/api/employee/index', { dept_id: this.pid, page: 0, page_size: 2000 })
+			this.$axios('get', '/api/employee/index', { dept_id: this.pid, page: 0, page_size: 3000,is_official:1 })
 				.then(res => {
 					if (res.data.code == 1) {
 						let list = res.data.data.list;
 						let data = [];
-						list.forEach((item, index) => {
-							if (item.is_official == 1) {
-								data.push(item);
-							}
-						});
-						this.userdatars(data);
+						// list.forEach((item, index) => {
+						// 	if (item.is_official == 1) {
+						// 		data.push(item);
+						// 	}
+						// });
+						this.userdatars(list);
 					} else {
 						this.userdatars();
 					}
@@ -388,7 +388,7 @@ export default {
 				return false;
 			}
 			this.list = [];
-			this.$axios('get', '/api/employee/index', { dept_id: this.pid, keywords: this.keyword, page: 0, page_size: 2000 })
+			this.$axios('get', '/api/employee/index', { dept_id: this.pid, keywords: this.keyword, page: 0, page_size: 3000,is_official:1 })
 				.then(res => {
 					var employee = res.data.data.list || [];
 					if (this.use_Administrator_list) {
@@ -403,9 +403,13 @@ export default {
 						} else if (this.my_no_select == item.id) {
 							//过滤掉当前设置人
 							return null;
-						} else if (item.is_official == 1) {
+						} else if (item.id) {
 							userAll.push(item);
 						}
+						// 前端先隐藏过滤未开启的人员的功能
+						// } else if (item.is_official == 1) {
+						// 	userAll.push(item);
+						// }
 					});
 					userAll.map(item => {
 						item['checked'] = false;
@@ -420,7 +424,7 @@ export default {
 				})
 				.finally(() => {
 					that.table_loading = false;
-				});
+			});
 		},
 		useAdministratorList(list) {
 			//过滤掉普通员工，返回管理员

src/components/Steps.vue

@@ -2,7 +2,7 @@
   <div>
     <p class="row_title">
       审批
-      <span class="row_tips">多人审批时，以最后一人为准</span>
+      <span class="row_tips fontColorB">多人审批时，以最后一人为准</span>
     </p>
     <div class="examine_steps">
       <el-steps direction="vertical" :space="50">
@@ -80,4 +80,7 @@ export default {
     color: #606266;
   }
 }
+.row_tips{
+	font-size: 12px;
+}
 </style>

src/components/examinePopup.vue

@@ -49,11 +49,10 @@
 						</el-col>
 						<el-col :span="20" v-else>{{ item.value }}</el-col>
 					</el-row>
-
-				  <el-row :gutter="10" v-if="detail_info.files != null && detail_info.files > 0">
-					<el-col :span="4">图片</el-col>
-					<el-col :span="20"><el-image style="width: 100px; height: 100px" :src="detail_info.files[0]" :preview-src-list="detail_info.files"></el-image></el-col>
-				  </el-row>
+				    <el-row :gutter="10" v-if="detail_info.files != null && detail_info.files > 0">
+					 <el-col :span="4">图片</el-col>
+					 <el-col :span="20"><el-image style="width: 100px; height: 100px" :src="detail_info.files[0]" :preview-src-list="detail_info.files"></el-image></el-col>
+				    </el-row>
 
 					<div v-show="detail_info.item_name != ''">
 						<p class="row_title">
@@ -77,33 +76,8 @@
 						</el-row>
 					</div>
 
-					<div v-show="detail_info.process != null && detail_info.process.length > 0">
-						<p class="row_title">
-							审批人 &nbsp;
-							<span class="row_tips" style="font-size:12px;color:#909399">多人审批时，以最后一人为准</span>
-						</p>
-						<div class="examine_steps">
-							<el-steps direction="vertical" :space="50">
-								<el-step v-for="(item, index) in detail_info.process" :key="index">
-									<template slot="icon">
-										<userImage width="36px" height="36px" :img_url="item.img_url" :user_name="item.name"></userImage>
-									</template>
-									<template slot="title">
-										<div style="color: #303133;font-size:14px;margin-top:-2px;">
-											{{ item.name }}
-											<span v-if="item.remark == '待审核'" class="yellow">待审批</span>
-											<span v-else-if="item.remark == '审核通过'" class="green">审批通过</span>
-											<span v-else-if="item.remark == '审核驳回'" class="red">审批驳回</span>
-											<span v-else>{{ item.remark }}</span>
-										</div>
-									</template>
-									<template slot="description">
-										<div>{{ item.time }}</div>
-										<div style="color: #333; margin-bottom: 15px;">{{ item.review_remark }}</div>
-									</template>
-								</el-step>
-							</el-steps>
-						</div>
+					<div v-show="detail_info.process">
+						<Steps :process="detail_info.process"></Steps>	
 					</div>
 
 					<el-row style="border-top: 1px #f8f8f8 solid;">
@@ -288,7 +262,7 @@
 
 <script>
 import EmployeeSelector from '@/components/EmployeeSelector';
-
+import Steps from '@/components/Steps'; 
 export default {
 	name: 'examinePopup',
 	data() {
@@ -380,7 +354,7 @@ export default {
 			}
 		}
 	},
-	components: { EmployeeSelector },
+	components: { EmployeeSelector,Steps },
 	mounted() {
 		this.getRuleItem();
 		this.getRuleItemTree();

src/home.vue

@@ -183,7 +183,7 @@
 								<div class="noimg" style="width: 150px;height: 150px;margin-top:94px;"></div>
 								<span class="title1">
 									暂无积分数据，
-									<span @click="$router.push({ path: '/award_punish' })" style="color:#409EFF;cursor:pointer;">去奖扣积分></span>
+									<span v-if="$supremeAuthority()!='employee'" @click="$router.push({ path: '/award_punish' })" style="color:#409EFF;cursor:pointer;">去奖扣积分></span>
 								</span>
 							</div>
 							<div v-show="!IntegralFormnone" style="margin-top:20px;"><div ref="IntegralFormChart" :style="{ width: '100%', height: '400px' }"></div></div>

src/index.vue

@@ -275,7 +275,7 @@ export default {
 		},
 		//获取员工列表
 		getEmployee() {
-			this.$axios('get', '/api/employee/index', { dept_id: 0, page: 1, page_size: 3000 }).then(res => {
+			this.$axios('get', '/api/employee/index', { dept_id: 0, page: 1, page_size: 3000,is_official:1 }).then(res => {
 				let map={};
 				res.data.data.list.map(item=>{
 					 map[item.id]=item

src/init.vue

@@ -88,7 +88,6 @@ export default {
 						var is = false;
 						if (res.data.code == 1) {
 							var { token, user } = res.data.data;
-							// that.getEmployee()//缓存人员列表
 							if (user.is_official==1) {
 								that.$setUserData(user);
 								that.$router.replace({ path: '/index' });
@@ -121,16 +120,6 @@ export default {
 			}
 			return theRequest;
 		},
-		//获取员工列表
-		getEmployee() {
-			this.$axios('get', '/api/employee/index', { dept_id: 0, page: 1, page_size: 3000 }).then(res => {
-				let map={};
-				res.data.data.list.map(item=>{
-					 map[item.id]=item
-				})
-				localStorage.setItem("userList",JSON.stringify(map))
-			})
-		},
 	}
 };
 </script>

src/views/abPoint/apply_list.vue

@@ -163,28 +163,8 @@
 					<el-col :span="4">图片</el-col>
 					<el-col :span="20"><el-image v-for="(item, index) in detail_info.files" :key="index" style="width: 100px; height: 100px" :src="item"></el-image></el-col>
 				</el-row>
-				<div v-show="detail_info.process != false">
-					<p class="row_title">
-						审批
-						<span class="row_tips">多人审批时，以最后一人为准</span>
-					</p>
-
-					<div class="examine_steps">
-						<el-steps direction="vertical" :space="50">
-							<el-step v-for="(item, index) in detail_info.process" :key="index">
-								<template slot="icon">
-									<userImage width="36px" height="36px" :img_url="item.img_url" :user_name="item.name"></userImage>
-								</template>
-								<template slot="title">
-									<div style="color: #303133;font-size:14px;margin-top:-2px;">{{ item.name }} {{ item.remark }}</div>
-								</template>
-								<template slot="description">
-									<div>{{ item.time }}</div>
-									<div style="color: #333; margin-bottom: 15px;">{{ item.review_remark }}</div>
-								</template>
-							</el-step>
-						</el-steps>
-					</div>
+				<div v-show="detail_info.process">
+					<Steps :process="detail_info.process"></Steps>
 				</div>
 				<div class="btn_danger flex-box flex-center-center" v-if="detail_info.applyor_id == userId && detail_info.can_refuse == '1' && detail_info.source_type == 2">
 					<el-button type="danger" class="danger" @click="revocation" :loading="cx_loading">撤销</el-button>
@@ -200,6 +180,7 @@
 import moment from 'moment';
 import EmployeeSelector from '@/components/EmployeeSelector.vue';
 import applicationIntegrationPopup from '@/components/applicationIntegrationPopup';
+import Steps from '@/components/Steps'; 
 export default {
 	data() {
 		return {
@@ -229,7 +210,8 @@ export default {
 	},
 	components: {
 		EmployeeSelector,
-		applicationIntegrationPopup
+		applicationIntegrationPopup,
+		Steps
 	},
 	watch: {
 		tabs(val) {

src/views/abPoint/award_punish.vue

@@ -117,7 +117,11 @@
 					<el-col :span="4">事件时间</el-col>
 					<el-col :span="20">{{ detail_info.date }}</el-col>
 				</el-row>
-
+				<el-row :gutter="10" v-show="detail_info.source_type_mark">
+				  <el-col :span="4" style="margin-bottom:5px;">来源类型</el-col>
+				  <el-col :span="20">{{ detail_info.source_type_mark }}</el-col>
+				</el-row>
+				
 				<el-row :gutter="10" v-show="detail_info.source_type_mark">
 					<el-col :span="4">来源类型</el-col>
 					<el-col :span="20">{{ detail_info.source_type_mark }}</el-col>
@@ -160,27 +164,8 @@
 					</el-row>
 				</div>
 
-				<div v-show="detail_info.process != false">
-					<p class="row_title">
-						审批
-						<span class="row_tips">多人审批时，以最后一人为准</span>
-					</p>
-					<div class="examine_steps">
-						<el-steps direction="vertical" :space="50">
-							<el-step v-for="(item, index) in detail_info.process" :key="index">
-								<template slot="icon">
-									<userImage width="36px" height="36px" :img_url="item.img_url" :user_name="item.name"></userImage>
-								</template>
-								<template slot="title">
-									<div style="color: #303133;font-size:14px;margin-top:-2px;">{{ item.name }} {{ item.remark }}</div>
-								</template>
-								<template slot="description" style="display:flex;">
-									<div style="color:#828282;">{{ item.time }}</div>
-									<div style="color:#717171;font-size:14px;margin-bottom:15px;">{{item.review_remark}}</div>
-								</template>
-							</el-step>
-						</el-steps>
-					</div>
+				<div v-show="detail_info.process">
+					<Steps :process="detail_info.process"></Steps>
 				</div>
 				<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>
@@ -229,30 +214,8 @@
 					</el-col>
 				</el-row>
 
-				<div v-show="detail_info.rule_id && detail_info.process !== null && detail_info.process.length > 0">
-					<p class="row_title">
-						审批
-						<span class="row_tips">多人审批时，以最后一人为准</span>
-					</p>
-
-					<div class="examine_steps">
-						<el-steps direction="vertical" :space="50">
-							<el-step v-for="(item, index) in detail_info.process" :key="index">
-								<template slot="icon">
-									<userImage width="36px" height="36px" :img_url="item.img_url" :user_name="item.name"></userImage>
-								</template>
-								<template slot="title">
-									<div style="color: #303133;font-size:14px;margin-top:-2px;">
-										{{ item.name }} {{ item.remark }}
-									</div>
-								</template>
-								<template slot="description" style="">
-									<div style="color:#828282">{{ item.time }}</div>
-									<div style="color:#717171;font-size:14px;margin-bottom:15px;">{{item.review_remark}}</div>
-								</template>
-							</el-step>
-						</el-steps>
-					</div>
+				<div v-show="detail_info.process">
+					<Steps :process="detail_info.process"></Steps>
 				</div>
 				<div class="btn_danger flex-box flex-center-center" v-if="detail_info.applyor_id==userId&&detail_info.status==0&&detail_info.source_type==3">
 				  <el-button type="danger" class="danger" @click="revocation2" :loading="cx_loading">撤销</el-button>
@@ -269,7 +232,7 @@ import EmployeeSelector from '@/components/EmployeeSelector.vue';
 import moment from 'moment';
 import noData from '@/components/noData';
 import bonusPointsPopup from '@/components/bonusPointsPopup';
-
+import Steps from '@/components/Steps'; 
 export default {
 	data() {
 		return {
@@ -304,7 +267,8 @@ export default {
 	components: {
 		EmployeeSelector,
 		bonusPointsPopup,
-		noData
+		noData,
+		Steps
 	},
 	mounted() {
 		this.userId=this.$getUserData().id

src/views/ranking/dept_rank.vue

@@ -431,6 +431,7 @@ export default {
 			this.get_list(this.formData);
 		},
 		handleSizeChange(val) {
+			this.formData.page = 1;
 			this.formData.page_size = val;
 			this.get_list(this.formData);
 		},

src/views/ranking/individual_statistics.vue

@@ -457,7 +457,7 @@ export default {
 		
 		//获取员工列表
 		getEmployee() {
-			this.$axios('get', '/api/employee/index', { dept_id: 0, keywords: '', page: 1, page_size: 2000 })
+			this.$axios('get', '/api/employee/index', { dept_id: 0, keywords: '', page: 1, page_size: 3000,is_official:1 })
 				.then(res => {
 					let list = res.data.data.list;
 					this.employee_map = list;

src/views/ranking/integral_event.vue

@@ -178,7 +178,9 @@
 						</el-col>
 					</el-row>
 				</div>
-				<div v-show="detail_info.rule_id"><Steps :process="detail_info.process"></Steps></div>
+				<div v-show="detail_info.process">
+					<Steps :process="detail_info.process"></Steps>
+				</div>
 
 				<div style="text-align: center;margin-top: 30px;" v-if="detail_info.source_type == 10">
 					<el-button type="primary" size="medium" @click="showLog = true">

src/views/set/jurisdiction.vue

@@ -153,10 +153,10 @@
 							<el-table-column label="每月B分奖分上限">
 								<template slot-scope="scope">
 									<div @click="open_integral_limit(scope.row)" v-show="scope.row.entry_limit == 0" class="cursor_pointer" style="text-decoration:underline">
-										未设置
+										不限制
 									</div>
 									<div @click="open_integral_limit(scope.row)" v-show="scope.row.entry_limit > 0" class="cursor_pointer">{{ scope.row.entry_limit }}</div>
-									<div @click="open_integral_limit(scope.row)" v-show="scope.row.entry_limit < 0">此人不限制奖分上限</div>
+									<div @click="open_integral_limit(scope.row)" v-show="scope.row.entry_limit < 0">不限制</div>
 								</template>
 							</el-table-column>
 						</el-table-column>
@@ -334,10 +334,10 @@
 							<el-table-column label="每月B分奖分上限">
 								<template slot-scope="scope">
 									<div @click="open_integral_limit(scope.row)" v-show="scope.row.entry_limit == 0" class="cursor_pointer" style="text-decoration:underline">
-										未设置
+										不限制
 									</div>
 									<div @click="open_integral_limit(scope.row)" v-show="scope.row.entry_limit > 0" class="cursor_pointer">{{ scope.row.entry_limit }}</div>
-									<div @click="open_integral_limit(scope.row)" v-show="scope.row.entry_limit < 0">此人不限制奖分上限</div>
+									<div @click="open_integral_limit(scope.row)" v-show="scope.row.entry_limit < 0">不限制</div>
 								</template>
 							</el-table-column>
 						</el-table-column>
@@ -448,6 +448,16 @@
 							</noData>
 						</template>
 					</el-table>
+					<div class="pagination" v-show="item_info.code != 'employee'">
+						<el-pagination
+							@size-change="handleSizeChange"
+							@current-change="handleCurrentChange"
+							:current-page="page"
+							:page-sizes="[10, 20, 50, 100]"
+							layout="total,sizes, prev, pager, next"
+							:total="total"
+						></el-pagination>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -470,7 +480,7 @@
 					</el-form-item>
 				</span>
 				<el-form-item label="每月B分奖分上限" prop="entry_limit">
-					<el-input v-model.number="integral_limit_form.entry_limit" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+					<el-input v-model.number="integral_limit_form.entry_limit" oninput="value=value.replace(/[^\d]/g,'')" placeholder="奖分上限不限制"></el-input>
 				</el-form-item>
 				<el-form-item style="text-align: right; margin-bottom: 0">
 					<el-button @click="integral_limit_show = false">取消</el-button>
@@ -692,6 +702,9 @@ const minimum = (rule, value, callback) => {
 export default {
 	data() {
 		return {
+			page: 1,
+			pageSize:10,
+			total: 0,
 			role_list: [],
 			table_list: [],
 			tips_show: false,
@@ -926,6 +939,7 @@ export default {
 		  		this.file = response.data;
 		  		this.$message.success({ message: response.msg });
 		  		this.close_export();
+				this.page=1;
 				this.get_table_list();
 		  	}
 		  }else{
@@ -945,6 +959,7 @@ export default {
 		},
 		//点击搜索
 		onFilterChanged: function() {
+			this.page = 1;
 			this.get_table_list();
 		},
 		// 数据查看权限弹窗
@@ -956,7 +971,7 @@ export default {
 		getDataAccess() {
 			let self = this;
 			self.dataAccessLoading = true;
-			self.$axios('get', '/api/role/range', { role_id: self.item_info.id })
+			self.$axios('get', '/api/role/range', { role_id: self.item_info.id, })
 				.then(res => {
 					if (res.data.code == 1) {
 						const resData = res.data.data;
@@ -1173,11 +1188,12 @@ export default {
 							item.point_limit[0].point = Number(item.point_limit[0].point);
 							item.point_limit[1].point = Number(item.point_limit[1].point);
 						}
-
+						if (item.entry_limit<0) {
+							item.entry_limit='';
+						}
 						this.integral_limit_form = item;
 					}
-				})
-				.finally(() => {
+				}).finally(() => {
 					this.integral_limit_loading = false;
 				});
 		},
@@ -1274,6 +1290,7 @@ export default {
 					.then(res => {
 						if (res.data.code == 1) {
 							this.$message.success(res.data.msg);
+							this.page=1;
 							this.get_table_list();
 						}
 					})
@@ -1314,6 +1331,7 @@ export default {
 					.then(res => {
 						if (res.data.code == 1) {
 							this.$message.success(res.data.msg);
+							this.page=1;
 							this.get_table_list();
 						}
 					})
@@ -1338,7 +1356,18 @@ export default {
 					this.role_loading = false;
 				});
 		},
+		handleSizeChange: function(val) {
+			this.pageSize=val;
+			this.page = 1;
+			this.get_table_list();
+		},
+		//页码变更
+		handleCurrentChange: function(val) {
+			this.page = val;
+			this.get_table_list();
+		},
 		open_right(data) {
+			this.page=1;
 			this.jurisdiction = data.code == 'employee' ? this.dataAccessListEmployee : this.dataAccessList;
 			this.item_info = data;
 			if (data.code != 'employee') {
@@ -1349,7 +1378,7 @@ export default {
 			this.table_loading = true;
 			var that = this;
 			this.table_list = [];
-			this.$axios('get', '/api/role/user', { role_id: this.item_info.id, keyword: this.keyword })
+			this.$axios('get', '/api/role/user', { role_id: this.item_info.id, keyword: this.keyword,page_size:this.pageSize,page:this.page })
 				.then(res => {
 					if (res.data.code == 1) {
 						var list = res.data.data.list;
@@ -1365,6 +1394,7 @@ export default {
 							}
 						});
 						this.table_list = list || [];
+						this.total=res.data.data.total
 					}
 				})
 				.finally(() => {

src/views/set/log.vue

@@ -4,10 +4,11 @@
 			<div style="margin-bottom: 30px;">
 				<div class="initia_title">工作日志积分</div>
 				<div class="initia_title_1">
-					1、启用后，在钉钉发布工作日志，系统自动按“日志积分规则”奖分<br />
-					2、日志名称必须与“钉钉日志模板名称”一致，否则奖分不会生效<br />
+					1、启用后，在钉钉发布工作日志，系统自动按“日志积分规则”奖分
+					<br />
+					2、日志名称必须与“钉钉日志模板名称”一致，否则奖分不会生效
+					<br />
 					3、日志支持每月、每周、每次汇报，可自行根据需要设置“日志积分规则
-					
 				</div>
 			</div>
 			<el-table ref="multipleTable" :data="list" tooltip-effect="dark" align="center" v-loading="loading">
@@ -33,9 +34,10 @@
 					<noData></noData>
 				</template>
 			</el-table>
+
 		</div>
 		<el-dialog title="设置" :visible.sync="dialogVisible" top="25vh" width="520px" class="dialog">
-			<el-alert class="el-dialog__body" title="日志名称必须与钉钉日志模板名称一致，否则设置无效，不会产生积分" type="warning"  :closable="false" show-icon></el-alert>
+			<el-alert class="el-dialog__body" title="日志名称必须与钉钉日志模板名称一致，否则设置无效，不会产生积分" type="warning" :closable="false" show-icon></el-alert>
 			<el-form label-width="110px" :model="selectItem" ref="setForm" class="form">
 				<el-form-item style="margin-bottom: 0px;" label="日志名称">
 					<div class="flex-box flex-v-ce">
@@ -44,7 +46,13 @@
 					</div>
 					<el-dialog title="设置名称" :visible.sync="isShowName" top="25vh" width="520px" append-to-body>
 						<div style="text-align: center;">
-							<el-alert class="el-dialog__body" title="日志名称必须与钉钉日志模板名称一致，否则设置无效，不会产生积分" type="warning"  :closable="false" show-icon></el-alert>
+							<el-alert
+								class="el-dialog__body"
+								title="日志名称必须与钉钉日志模板名称一致，否则设置无效，不会产生积分"
+								type="warning"
+								:closable="false"
+								show-icon
+							></el-alert>
 							<!-- <el-popover placement="top-start" title="温馨提示" width="200" trigger="hover" content="日志名称必须与钉钉预设模板名称一致,否则可能会无法同步钉钉的日志记录"> -->
 							<el-input style="width: 200px;" v-model="nameVal" slot="reference"></el-input>
 							<!-- </el-popover> -->
@@ -65,11 +73,23 @@
 						</el-select>
 					</el-form-item>
 					<el-form-item label="每次汇报奖励" :rules="[{ required: true, message: '请输入分值', trigger: 'change' }]" prop="config.point">
-						<el-input class="widthInput" placeholder="请输入(1~999)" @input="checkCountry($event,'input1')" id="input1" v-model.number="selectItem.config.point"></el-input>
+						<el-input
+							class="widthInput"
+							placeholder="请输入(1~999)"
+							@input="checkCountry($event, 'input1')"
+							id="input1"
+							v-model.number="selectItem.config.point"
+						></el-input>
 						<span style="margin-left: 5px;">B分</span>
 					</el-form-item>
 					<el-form-item label="汇报提交超过" prop="config.upper_limit" :rules="[{ required: true, message: '请输入次数' }]">
-						<el-input class="widthInput" placeholder="请输入(1~999)" @input="checkCountry($event,'input2')" id="input2" v-model.number="selectItem.config.upper_limit"></el-input>
+						<el-input
+							class="widthInput"
+							placeholder="请输入(1~999)"
+							@input="checkCountry($event, 'input2')"
+							id="input2"
+							v-model.number="selectItem.config.upper_limit"
+						></el-input>
 						<span style="margin-left: 5px;">次,不再奖励积分</span>
 					</el-form-item>
 				</template>
@@ -117,7 +137,7 @@ export default {
 				}
 			],
 			isShowName: false,
-			nameVal: ''
+			nameVal: '',
 		};
 	},
 	mounted() {
@@ -125,19 +145,19 @@ export default {
 	},
 	methods: {
 		// 最大值不能大于100
-		checkCountry(e,id){
-		    //解决v-model与oninput同时使用失效问题
-		    var dom = document.getElementById(id);
-		    var value = dom.value;
-		    //写你自己的输入规则
-		    value = value.replace(/[^\d]/g,'');
-		    if(value>999){
-			  id=='input1'?this.selectItem.config.point='':this.selectItem.config.upper_limit=''
-		      this.$message.error('不能大于999');
-		      return false
-		    }
-		    dom.value = value;//输入框赋值
-			id=='input1'?this.selectItem.config.point=dom.value:this.selectItem.config.upper_limit=dom.value
+		checkCountry(e, id) {
+			//解决v-model与oninput同时使用失效问题
+			var dom = document.getElementById(id);
+			var value = dom.value;
+			//写你自己的输入规则
+			value = value.replace(/[^\d]/g, '');
+			if (value > 999) {
+				id == 'input1' ? (this.selectItem.config.point = '') : (this.selectItem.config.upper_limit = '');
+				this.$message.error('不能大于999');
+				return false;
+			}
+			dom.value = value; //输入框赋值
+			id == 'input1' ? (this.selectItem.config.point = dom.value) : (this.selectItem.config.upper_limit = dom.value);
 		},
 		submitName() {
 			if (!this.nameVal || this.nameVal == null || this.nameVal == undefined) {
@@ -152,15 +172,15 @@ export default {
 			this.isShowName = true;
 		},
 		submit(fromName) {
-			if(this.selectItem.config.point==0){
+			if (this.selectItem.config.point == 0) {
 				this.$message.error('汇报奖励不能为0');
-				return false
+				return false;
 			}
-			if(this.selectItem.config.upper_limit==0){
+			if (this.selectItem.config.upper_limit == 0) {
 				this.$message.error('提交超过次数不能为0');
-				return false
+				return false;
 			}
-			
+
 			this.$refs[fromName].validate(valid => {
 				if (valid) {
 					this.setLoading = true;
@@ -218,10 +238,10 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-.el-dialog__body{
+.el-dialog__body {
 	position: relative;
 	top: -20px;
-}	
+}
 .widthInput {
 	width: 150px;
 }
@@ -238,7 +258,7 @@ export default {
 	font-family: PingFangSC-Regular;
 }
 .initia_title_1 {
-	color: #E6A23C;
+	color: #e6a23c;
 	font-size: 14px;
 	margin-top: 10px;
 }

src/views/set/voluntarilyPoint.vue

@@ -241,7 +241,7 @@ export default {
 			add_employee_max: 0,
 			add_employee_show: false,
 
-			task_cycle_name: 1,
+			task_cycle_name: '',
 			add_employee_form: {
 				employee_ids: []
 			},
@@ -374,7 +374,7 @@ export default {
 	methods: {
 		//获取员工列表
 		getEmployee() {
-			this.$axios('get', '/api/employee/index', { dept_id: 0, keywords: '', page: 1, page_size: 2000 })
+			this.$axios('get', '/api/employee/index', { dept_id: 0, keywords: '', page: 1, page_size: 3000,is_official:1 })
 				.then(res => {
 					let list = res.data.data.list;
 					this.employee_map = list;

src/views/task/allTask.vue

@@ -210,7 +210,7 @@ export default {
 		},
 		//获取员工列表
 		getEmployee() {
-			this.$axios('get', '/api/employee/index', { dept_id: 0, page: 1, page_size: 3000 }).then(res => {
+			this.$axios('get', '/api/employee/index', { dept_id: 0, page: 1, page_size: 3000,is_official:1 }).then(res => {
 				this.employee_map = res.data.data.list;
 			})
 		},