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

src/main.js

@@ -23,9 +23,9 @@ Vue.component("downloadExcel", JsonExcel);
 import userImage from '@/components/UserImage'
 Vue.component('userImage', userImage)
 Vue.use(ElementUI);
-// if (process.env.NODE_ENV === 'development') {
-//   new VConsole()
-// }
+if (process.env.NODE_ENV === 'development') {
+  new VConsole()
+}
 
 Vue.prototype.$echarts = echarts
 Vue.prototype.$dd=dd;

src/views/ranking/balanceA.vue

@@ -6,7 +6,6 @@
       <p>每次清零将清空指定月份之前的余额（不含指定月份），不可清空未结束月份的余额：</p>
       <p>例如当前是2020年7月8号，指定选择2020年7月份，可清空2020年7月1号之前所有余额，不清除7月1-8号的余额。</p>
     </el-alert>
-
     <div class="box boxMinHeight">
       <el-tabs v-model="active">
         <el-tab-pane label="A分余额" name="balanceA"></el-tab-pane>

src/views/set/framework.vue

@@ -271,13 +271,13 @@ export default {
 	methods: {
 		handleSuccess(response) {
 			if (response.code == 1) {
-				if (response.data.length > 0) {
-					var htmls = response.data;
+				if (response.data.list.length > 0) {
+					var htmls = response.data.list;
 					var str = "<div class='red'></div>";
 					htmls.forEach(item => {
-						str += `<div>${item.errors}</div>`;
+						str += `<div>${item.姓名}:${item.line_err}</div>`;
 					});
-					this.close_import();
+					console.log(str);
 					this.$notify.error({
 						title: '导入错误',
 						dangerouslyUseHTMLString: true,
@@ -286,8 +286,9 @@ export default {
 						offset: 50,
 						customClass: 'notifyBox'
 					});
+					this.close_import();
 				} else {
-					this.file = response.data;
+					this.file = response.data.list;
 					this.$message.success({ message: response.msg });
 					this.getEmployee();
 					this.close_import();

src/views/set/rule.vue

@@ -552,8 +552,6 @@ export default {
 						this.$message.error('积分不能为空或为0');
 						return;
 					}
-					// self.rules_detail_form.min_point=self.rules_detail_form.min_point2;
-					// self.rules_detail_form.max_point=self.rules_detail_form.max_point2;
 					if (self.integral_select_name1 != '1' && self.rules_detail_form.min_point >= 0) {
 						self.rules_detail_form.min_point = '-' + self.rules_detail_form.min_point;
 					}
@@ -722,7 +720,7 @@ export default {
 		del_rule() {
 			let self = this;
 			let data = {
-				item_id: [this.rules_detail_form.id]
+				item_ids:JSON.stringify([this.rules_detail_form.id])
 			};
 			this.delRule_loading = true;
 			self.$confirm('此操作将永久删除该选项, 是否继续?', '提示').then(
@@ -790,7 +788,7 @@ export default {
 				type: 'warning'
 			}).then(() => {
 				let data = {
-					item_id: this.del_item_id
+					item_ids: JSON.stringify(this.del_item_id)
 				};
 				this.$axios('post', '/api/integral/rule/items/destroy', data).then(res => {
 					if (res.data.code == 1) {

src/views/workbench/approval_list.vue

@@ -5,7 +5,7 @@
 				<el-tab-pane v-for="(item, index) in tabsOption" :key="index" :label="item.label" :name="item.name"></el-tab-pane>
 			</el-tabs>
 
-			<el-form ref="formData" :inline="true" :model="formData" label-width="50px">
+			<el-form ref="formData" :inline="true" :model="formData" label-width="80px">
 				<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>