347617796@qq.com před 4 roky
rodič
revize
9540095396

+ 1 - 1
.env.development

@@ -1,2 +1,2 @@
 NODE_ENV="development"
-VUE_APP_BASE_API="https://ding.insys.g107.com/"
+VUE_APP_BASE_API="https://test-ding.g107.com/"

+ 4 - 4
src/api/axios.js

@@ -19,10 +19,10 @@ const service = axios.create({
 
 service.interceptors.request.use(
 	config => {
-		if (getToken()) {
-			config.headers['A-Token'] = getToken()
-			// config.headers['A-Token'] = ' eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTYwMDA2MzkyNywiZXhwIjoxNjAwNjYzOTI3LCJuYmYiOjE2MDAwNjM5MjcsImp0aSI6InNFYVc0eDlmaXJGdDlJU0EiLCJzdWIiOjIsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.7o1wC4OOI4MX5WdP4AK5S5k8WoU_30Zjj6CfPU5bhBc'
-		}
+		// if (getToken()) {
+		// 	config.headers['A-Token'] = getToken()
+			config.headers['A-Token'] = ' eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTYwMDA2MzkyNywiZXhwIjoxNjAwNjYzOTI3LCJuYmYiOjE2MDAwNjM5MjcsImp0aSI6InNFYVc0eDlmaXJGdDlJU0EiLCJzdWIiOjIsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.7o1wC4OOI4MX5WdP4AK5S5k8WoU_30Zjj6CfPU5bhBc'
+		// }
 		return config
 	},
 	error => {

+ 3 - 1
src/components/EmployeeSelector.vue

@@ -436,7 +436,6 @@
           this.dept_list = res.data.data.list
           this.owner_id = res.data.data.owner_id
           this.company_info = res.data.data.company_info
-		  console.log(res.data.data.company_info);
           if (res.data.data.dept_info == null) {
             this.dept_name = JSON.parse(JSON.stringify(res.data.data.company_info.name))
             this.dept_id = 0
@@ -511,6 +510,9 @@
           if (userAll.length == employee_selected_list.length) {
             this.checked = true
           }
+		  if(userAll.length==0){
+				this.$message("暂无可选人员,请确保在'组织架构'中的人员开启了参与积分管理!");
+		  }
           _this.list = userAll
         })
       }

+ 6 - 6
src/index.vue

@@ -45,13 +45,13 @@ export default {
 		this.routers = this.$router.options.routes[0].children;
 	},
 	mounted() {
-		var url = window.location.href;
-		var str = this.GetRequest(url).corpId || '123';
-		var corpId = str.split('#')[0];
-		if (corpId) {
-			this.login(corpId);
+		// var url = window.location.href;
+		// var str = this.GetRequest(url).corpId || '123';
+		// var corpId = str.split('#')[0];
+		// if (corpId) {
+		// 	this.login(corpId);
 			this.getTypes();
-		}
+		// }
 	},
 	methods: {
 		tz(){},

+ 1 - 0
src/views/framework.vue

@@ -194,6 +194,7 @@ export default {
 			this.enable_loading=true;
 			this.$axios.post('api/employee/enable', { employee_id: this.selectIds }).then(res => {
 				if (res) {
+					this.$message.success({ message: '开启成功,可在"角色权限设置对应管理范围"' });
 					this.getEmployee();
 				}
 			}).finally(err=>{

+ 2 - 2
src/views/rule.vue

@@ -201,7 +201,7 @@ export default {
 				children: 'child',
 				label: 'name'
 			},
-			selectItem: { name: '积分分类' }, //选择的分类
+			selectItem: { name: '积分规则' }, //选择的分类
 			//添加分类
 			class_show: false,
 			delRule_loading:false,
@@ -702,7 +702,7 @@ export default {
 				if (is) {
 					that.handleNodeClick(that.selectItem);
 				} else {
-					this.selectItem = { name: '积分分类' }; //选择的分类
+					this.selectItem = { name: '积分规则' }; //选择的分类
 				}
 			}).finally(() => {
 				this.rule_loading = false;