0.0

src/components/EmployeeSelector.vue

@@ -29,8 +29,10 @@
 										v-if="can_select_employee && item.name.indexOf(keyword) >= 0"
 										@click.prevent.stop="select_employee(item)"
 									>
+										<img :src="item.img_url" width="30" height="30" class="imgUrl" v-if="item.img_url">
+										<div class="imgUrl" v-else style="background: #238DFA;color: #fff;">{{item.name.substring(item.name.length-2)}}</div>
 										<div class="employee_checkbox"><el-checkbox v-model="item.checked"></el-checkbox></div>
-										<userImage :user_name="item.name" :img_url="item.img_url" width="30px" height="30px"></userImage>
+										<!-- <userImage :user_name="item.name" :img_url="item.img_url" width="30px" height="30px"></userImage> -->
 										<div class="employee_name">{{ item.name }}</div>
 										<div class="employee_cell_clear"></div>
 									</div>
@@ -54,7 +56,10 @@
 								<div class="employee_cell_clear"></div>
 							</div>
 							<div class="employee_cell" v-for="(item, index) in employee_selected_list" :key="index">
-								<userImage :user_name="item.name" :img_url="item.img_url" width="30px" height="30px"></userImage>
+								
+								<img :src="item.img_url" width="30" height="30" class="imgUrl" v-if="item.img_url">
+								<div class="imgUrl" v-else style="background: #238DFA;color: #fff;">{{item.name.substring(item.name.length-2)}}</div>
+								<!-- <userImage :user_name="item.name" :img_url="item.img_url" width="30px" height="30px"></userImage> -->
 								<div class="employee_name">{{ item.name }}</div>
 								<div class="employee_delete">
 									<el-button type="default" size="mini" @click="employee_cancel(item, true)" icon="el-icon-close" circle></el-button>
@@ -704,4 +709,13 @@ a {
 .dept_path:hover::-webkit-scrollbar-thumb {
 	background-color: rgba(144, 147, 153, 0.3);
 }
+.imgUrl{
+	border-radius: 50%;
+	height: 30px;
+	width: 30px;
+	box-sizing: border-box;
+	text-align: center;
+	line-height: 30px;
+	font-size: 0.6rem;
+}
 </style>

src/home.vue

@@ -1458,7 +1458,7 @@ export default {
 .right-all-style {
 	background: #fff;
 	border-radius: 5px;
-	margin: 0 0 10px 20px;
+	margin: 0 0 10px 10px;
 	.title {
 		padding-left: 10px;
 		font-size: 16px;

src/views/ranking/integral_event.vue

@@ -456,6 +456,8 @@ export default {
 					this.keyWordSelect();
 					this.close_import();
 				}
+			}else{
+				this.$message.error({ message: response.msg });
 			}
 		},
 		beforeFilesUpload(file) {

src/views/set/jurisdiction.vue

@@ -1122,11 +1122,12 @@ export default {
 			this.list_info = item;
 			this.my_no_select = item.id;
 			this.management_scope_arr.employee = [];
+			this.role_loading = true;
 			this.$axios('get', '/api/employee/info', { id: this.list_info.id })
 				.then(res => {
 					if (res.data.code == 1) {
-						this.management_scope_arr.employee = res.data.data.employee_detail.manage_scope || []; //获取当前数据的管理范围
 						this.management_scope_show = true;
+						this.management_scope_arr.employee = res.data.data.employee_detail.manage_scope || []; //获取当前数据的管理范围
 					}
 				})
 				.finally(() => {

src/views/set/rule.vue

@@ -81,7 +81,7 @@
 			width="500px"
 		>
 			<el-form :model="dept_formdata" ref="dept_formdata" :rules="dept_formdata_rules" label-width="80px">
-				<el-form-item label="规则分类" prop="name"><el-input v-model="dept_formdata.name"></el-input></el-form-item>
+				<el-form-item label="规则分类" prop="name"><el-input v-model="dept_formdata.name" maxlength="10" show-word-limit></el-input></el-form-item>
 				<el-form-item label="上级分类">
 					<el-cascader
 						ref="dept"
@@ -456,6 +456,8 @@ export default {
 					this.getData();
 					this.close_import();
 				}
+			}else{
+				this.$message.error({ message: response.msg });
 			}
 		},
 		handleRemove(file, fileList) {

src/views/workbench/approval_list.vue

@@ -6,11 +6,19 @@
 			</el-tabs>
 
 			<el-form ref="formData" :inline="true" :model="formData" label-width="50px">
-				<el-form-item label="类型">
+				<el-form-item label="工作类型">
+				  <el-select v-model="formData.source_type" placeholder="请选择排序">
+				    <el-option v-for="item in sourceList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+				  </el-select>
+				</el-form-item>
+				<el-form-item label="积分类型">
 					<el-select v-model="formData.pt_id" placeholder="请选择排序">
 						<el-option v-for="item in point_types" :key="item.id" :label="item.name" :value="item.id"></el-option>
 					</el-select>
 				</el-form-item>
+				<el-select v-model="formData.target_id" filterable clearable placeholder="请输入或选择人员">
+				  <el-option v-for="item in employee_map" :key="item.id" :label="item.name" :value="item.id"></el-option>
+				</el-select>
 			</el-form>
 
 			<div v-if="formData.type == 'waiting'">
@@ -122,6 +130,7 @@ export default {
 			formData: {
 				type: 'waiting',
 				source_type: '0',
+				target_id:null,
 				pt_id: 0,
 				page_size: 10,
 				page: 1
@@ -132,19 +141,30 @@ export default {
 			point_types: null,
 			tabsOption: [{ label: '待我审批', name: 'waiting' }, { label: '我已审批', name: 'reviewed' }],
 			detailShow: false,
-			detail_id: null
+			detail_id: null,
+			employee_map: JSON.parse(localStorage.getItem("userList")),
+			sourceList: [{ name: '全部', id: '0' }, { name: '积分任务', id: '1' }, { name: '积分申请', id: '2' }, { name: '积分录入', id: '3' }]
 		};
 	},
 	watch: {
 		'formData.type'() {
 			this.formData.page = 1;
-			this.list = [];
 			this.getSpList();
 		},
 		'formData.pt_id'() {
-			this.list = [];
 			this.formData.page = 1;
 			this.getSpList();
+		},
+		'formData.source_type'() {
+		  this.formData.page = 1;
+		  this.getSpList();
+		},
+		'formData.target_id'(val) {
+		  if(!val){
+		    this.formData.target_id = null;
+		  }
+		  this.formData.page = 1;
+		  this.getSpList();
 		}
 	},
 	components: { examinePopup },