Merge branch 'dev' of http://git.pro.g107.net/guojy/dd_pc into dev

src/views/ranking/dept_rank.vue

@@ -134,6 +134,7 @@
 					background
 					@size-change="handleSizeChange"
 					@current-change="handleCurrentChange"
+					:current-page="formData.page"
 					:page-sizes="[10, 20, 50, 100]"
 					layout="total, sizes, prev, pager, next"
 					:page-size="formData.page_size"
@@ -284,7 +285,7 @@ export default {
 			point_types: [],
 			point_type: [],
 			sort: false,
-			time_types: [{ label: '月份', value: '1' }, { label: '年份', value: '2' }, { label: '季度', value: '3' }, { label: '自定义', value: '4' }],
+			time_types: [{ label: '月份', value: '1' }, { label: '季度', value: '3' }, { label: '年份', value: '2' }, { label: '自定义', value: '4' }],
 			props: { value: 'id', label: 'name', children: 'child', multiple: true },
 			props2: { value: 'id', label: 'name', children: 'child', checkStrictly: true},
 			time_type: '月份',
@@ -519,11 +520,14 @@ export default {
 					break;
 			}
 
+			// let data = JSON.parse(JSON.stringify(this.formData));
 			let data = JSON.parse(JSON.stringify(this.formData));
 			var employee_ids = data.exclusion.join(',');
 			data.exclusion = employee_ids;
 			data.page = 1;
 			data.page_size = 10;
+			this.formData.page = 1;
+			this.formData.page_size = 10;
 			this.$nextTick(() => {
 				this.get_list(data);
 			});

src/views/set/framework.vue

@@ -269,6 +269,7 @@
 				v-if="dirSupScope_show"
 				:max="1"
 				ref="Employee3"
+				:multi="false"
 				:employee_list="dirSupList"
 				isCreatorSelect
 				:selected="selected_dirSup"