|
|
@@ -226,13 +226,23 @@
|
|
|
style="float:left"
|
|
|
:disabled="disabled"
|
|
|
>删除</el-button>
|
|
|
+
|
|
|
<el-button
|
|
|
+ v-if="rules_detail_title"
|
|
|
class="fr"
|
|
|
type="primary"
|
|
|
- @click="next('rules_detail_form') "
|
|
|
+ @click="editRule('rules_detail_form') "
|
|
|
style="float:right"
|
|
|
:disabled="disabled"
|
|
|
>确 定</el-button>
|
|
|
+ <el-button
|
|
|
+ v-else
|
|
|
+ class="fr"
|
|
|
+ type="primary"
|
|
|
+ @click="next('rules_detail_form') "
|
|
|
+ style="float:right"
|
|
|
+ :disabled="disabled"
|
|
|
+ >确 定 1</el-button>
|
|
|
<el-button
|
|
|
class="fr"
|
|
|
@click="rules_detail_close('rules_detail_form')"
|
|
|
@@ -262,7 +272,8 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <div>
|
|
|
+ <div
|
|
|
+ v-loading="staff_loading">
|
|
|
<EmployeeSelector1
|
|
|
:max="add_employee_max"
|
|
|
:can_select_dept="false"
|
|
|
@@ -314,6 +325,7 @@ export default {
|
|
|
total: 0,//返回的总数据
|
|
|
pagesize: 10,//每页显示的数据
|
|
|
table_loading: false,
|
|
|
+ staff_loading: false,
|
|
|
|
|
|
dialogFormVisible: false,
|
|
|
form: {
|
|
|
@@ -431,6 +443,7 @@ export default {
|
|
|
// 添加成员点击完成
|
|
|
sub_add_employee(form) {
|
|
|
let self = this;
|
|
|
+ self.staff_loading = true;
|
|
|
if (!self.task_cycle_name) {
|
|
|
self.$message.error("请选择加分周期");
|
|
|
return false;
|
|
|
@@ -460,6 +473,8 @@ export default {
|
|
|
})
|
|
|
.then((res) => {
|
|
|
this.disabled = false;
|
|
|
+ self.table_loading = false;
|
|
|
+ self.staff_loading = false;
|
|
|
if (res.data.code == 1) {
|
|
|
self.add_employee_show = false;
|
|
|
self.$message.success(
|
|
|
@@ -471,13 +486,18 @@ export default {
|
|
|
res.data.data.exist +
|
|
|
"条"
|
|
|
);
|
|
|
- self.open_right();
|
|
|
+ // self.err_open_right();
|
|
|
+
|
|
|
+ // self.open_right();
|
|
|
+
|
|
|
+
|
|
|
+ self.get_role_lists()
|
|
|
} else {
|
|
|
self.$message.error(res.data.msg);
|
|
|
}
|
|
|
})
|
|
|
.catch((e) => {
|
|
|
- self.$message.error(e.data.msg);
|
|
|
+ // self.$message.error(e.data.msg);
|
|
|
})
|
|
|
.finally(() => {
|
|
|
self.loading = false;
|
|
|
@@ -488,6 +508,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+
|
|
|
|
|
|
editDetails() {},
|
|
|
handleSelectionChange(val) {
|
|
|
@@ -523,7 +544,7 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
.catch((e) => {
|
|
|
- self.$message.error(e.data.msg);
|
|
|
+ // self.$message.error(e.data.msg);
|
|
|
})
|
|
|
.finally(() => {
|
|
|
self.loading = false;
|
|
|
@@ -547,6 +568,68 @@ export default {
|
|
|
this.rules_detail_title = false;
|
|
|
},
|
|
|
|
|
|
+
|
|
|
+ editRule(form) {
|
|
|
+ let self = this;
|
|
|
+ let data = null;
|
|
|
+ self.rules_detail_form.max_point = self.rules_detail_form.min_point;
|
|
|
+ if (this.rules_detail_title == false) {
|
|
|
+ data = {
|
|
|
+ items: [self.rules_detail_form],
|
|
|
+ };
|
|
|
+ } else {
|
|
|
+ self.rules_detail_form.item_id = self.rules_detail_form.id;
|
|
|
+ data = self.rules_detail_form;
|
|
|
+ }
|
|
|
+ self.$refs[form].validate((valid) => {
|
|
|
+ if (valid) {
|
|
|
+ this.disabled = true;
|
|
|
+ if (this.is_attendance) {
|
|
|
+ self.rules_detail_form.is_attendance = 1;
|
|
|
+ } else {
|
|
|
+ self.rules_detail_form.is_attendance = 0;
|
|
|
+ }
|
|
|
+ self
|
|
|
+ .$axios({
|
|
|
+ url: this.rules_detail_title
|
|
|
+ ? "api/integral/rule/items/edit"
|
|
|
+ : "/api/integral/rule/items",
|
|
|
+ method: "post",
|
|
|
+ data: data,
|
|
|
+ })
|
|
|
+ .then((res) => {
|
|
|
+ this.disabled = false;
|
|
|
+ this.dialogFormVisible = false;
|
|
|
+ setTimeout(() => {
|
|
|
+ this.is_attendance = false;
|
|
|
+ }, 300);
|
|
|
+ if (res.data.code == 1) {
|
|
|
+ self.$message.success(res.data.msg);
|
|
|
+ self.rules_detail_show = false;
|
|
|
+ self.jieguoId = res.data.data.item_id;
|
|
|
+ // self.add_employee_id = res.data.data.item_id;
|
|
|
+ self.add_rulse_id = self.rules_detail_form.rule_id;
|
|
|
+ self.get_role_lists()
|
|
|
+ if (this.rules_detail_title == false) {
|
|
|
+ setTimeout(() => {
|
|
|
+ self.add_employee_show = true;
|
|
|
+ }, 600);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ self.$message.error(res.data.msg);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .catch((e) => {
|
|
|
+ self.$message.error(e.data.msg);
|
|
|
+ })
|
|
|
+ .finally(() => {
|
|
|
+ self.loading = false;
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ },
|
|
|
// 点击确定提交积分规则
|
|
|
next(form) {
|
|
|
let self = this;
|
|
|
@@ -585,12 +668,9 @@ export default {
|
|
|
if (res.data.code == 1) {
|
|
|
self.$message.success(res.data.msg);
|
|
|
self.rules_detail_show = false;
|
|
|
-
|
|
|
- self.jieguoId = res.data.data.item_id;
|
|
|
-
|
|
|
+ // self.jieguoId = res.data.data.item_id;
|
|
|
self.add_employee_id = res.data.data.item_id;
|
|
|
self.add_rulse_id = self.rules_detail_form.rule_id;
|
|
|
- self.get_role_lists();
|
|
|
if (this.rules_detail_title == false) {
|
|
|
setTimeout(() => {
|
|
|
self.add_employee_show = true;
|
|
|
@@ -617,22 +697,61 @@ export default {
|
|
|
this.rules_detail_show = false;
|
|
|
this.$refs[form].resetFields();
|
|
|
},
|
|
|
-
|
|
|
+ //第一次添加
|
|
|
+ // err_open_right() {
|
|
|
+ // let self = this;
|
|
|
+ // self.table_loading = true;
|
|
|
+ // self.item_id = self.jieguoId
|
|
|
+ // self.add_rulse_id = data.rule_id;
|
|
|
+ // self.right_rules_detail = data;
|
|
|
+ // // if (data || self.add_employee_id!="") {
|
|
|
+ // // self.add_employee_id = data.id;
|
|
|
+ // // self.add_rulse_id = data.rule_id;
|
|
|
+ // // self.right_rules_detail = data;
|
|
|
+ // // }
|
|
|
+ // // else{
|
|
|
+ // // self.add_employee_id = self.jieguoId
|
|
|
+ // // }
|
|
|
+ // var params = {
|
|
|
+ // params: {
|
|
|
+ // item_id: self.item_id,
|
|
|
+ // employee_id: self.employee_id || "",
|
|
|
+ // page: self.page,
|
|
|
+ // page_size:Number(this.pagesize)
|
|
|
+ // },
|
|
|
+ // };
|
|
|
+ // self.$axios
|
|
|
+ // .get("/api/integral/auto/list", params)
|
|
|
+ // .then((res) => {
|
|
|
+ // self.table_loading = false;
|
|
|
+ // if (res.data.code == 1) {
|
|
|
+ // self.table_list = res.data.data.list || [];
|
|
|
+ // self.total = res.data.data.total;
|
|
|
+ // } else {
|
|
|
+ // self.$message.error(res.data.msg);
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // .finally(() => {
|
|
|
+ // self.table_loading = false;
|
|
|
+ // });
|
|
|
+ // },
|
|
|
open_right(data) {
|
|
|
let self = this;
|
|
|
- self.rule_list_load = true;
|
|
|
self.table_loading = true;
|
|
|
+
|
|
|
if (data) {
|
|
|
self.add_employee_id = data.id;
|
|
|
self.add_rulse_id = data.rule_id;
|
|
|
self.right_rules_detail = data;
|
|
|
- console.log('6666')
|
|
|
- console.log(self.jieguoId )
|
|
|
- }else{
|
|
|
- self.add_employee_id = self.jieguoId
|
|
|
- console.log('11111')
|
|
|
- console.log(self.add_employee_id)
|
|
|
}
|
|
|
+ // if (data || self.add_employee_id!="") {
|
|
|
+ // self.add_employee_id = data.id;
|
|
|
+ // self.add_rulse_id = data.rule_id;
|
|
|
+ // self.right_rules_detail = data;
|
|
|
+ // }
|
|
|
+ // else{
|
|
|
+ // self.add_employee_id = self.jieguoId
|
|
|
+ // }
|
|
|
var params = {
|
|
|
params: {
|
|
|
item_id: self.add_employee_id || "",
|
|
|
@@ -644,6 +763,7 @@ export default {
|
|
|
self.$axios
|
|
|
.get("/api/integral/auto/list", params)
|
|
|
.then((res) => {
|
|
|
+ self.table_loading = false;
|
|
|
if (res.data.code == 1) {
|
|
|
self.table_list = res.data.data.list || [];
|
|
|
self.total = res.data.data.total;
|
|
|
@@ -810,7 +930,8 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- });
|
|
|
+ this.table_loading = false;
|
|
|
+ })
|
|
|
},
|
|
|
},
|
|
|
};
|
Summer