From c4e67a8942e514b65ab41bb19781d50576c15725 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 24 Sep 2021 19:56:52 +0800
Subject: [PATCH] 用户
---
src/views/dispatch/dispatchChildoperable.vue | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index d858ed2..ab2717c 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -29,8 +29,9 @@
update1,
remove1,
getDispatcherUnitByDeptId,
+ overDispatcher,
} from "@/api/dispatch/dispatch";
-import { getListByDeptId } from "@/api/system/user";
+import { update, getListByDeptId } from "@/api/system/user";
import { mapState } from "vuex";
export default {
@@ -136,7 +137,8 @@
label: "realName",
value: "id",
},
- dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
+ // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
+ dicUrl: `/api/blade-user/page-security-units?status=1&deptId={{key}}`,
dicData: [],
rules: [
{
@@ -155,11 +157,11 @@
addDisplay: false,
editDisplay: false,
// hide: true,
- props: {
- label: "realName",
- value: "id",
- },
- dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
+ // props: {
+ // label: "realName",
+ // value: "id",
+ // },
+ // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
dicData: [],
rules: [
{
@@ -277,10 +279,14 @@
},
created() {
if (this.userInfo.role_name == "保安公司管理员") {
+ console.log("保安公司管理员登入");
const deptColumn = this.findObject(this.option1.column, "deptId");
deptColumn.search = false;
- }else{
- const deptColumn = this.findObject(this.option1.column, "dispatcherUnitId");
+ } else {
+ const deptColumn = this.findObject(
+ this.option1.column,
+ "dispatcherUnitId"
+ );
deptColumn.search = false;
}
},
@@ -380,13 +386,13 @@
);
},
rowDel1(row) {
- this.$confirm("确定将选择数据删除?", {
+ this.$confirm("确定结束当前派遣?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
- return remove1(row.id);
+ return overDispatcher(row);
})
.then(() => {
this.onLoad1(this.page1);
@@ -429,15 +435,6 @@
},
beforeOpen(done, type) {
- var that = this;
- if (["add", "edit", "view"].includes(type)) {
- if (this.userInfo.role_name == "保安公司管理员") {
- getListByDeptId(that.userInfo.dept_id).then((res) => {
- const userColumn = that.findObject(this.option1.column, "userIds");
- userColumn.dicData = res.data.data;
- });
- }
- }
this.initFlag = true;
done();
},
@@ -465,8 +462,9 @@
//
onLoad1(page, params = {}) {
this.loading1 = true;
- var that = this;
var values;
+ //默认查询已派遣的，派遣结束，未派遣的不显示
+ params["dispatch"] = 0;
const { releaseTimeRange } = this.query1;
if (releaseTimeRange) {
values = {
@@ -515,7 +513,7 @@
this.option1.column,
"dispatcherUnitId"
);
- console.log(res.data.data,111);
+ // console.log(res.data.data, 111);
dispatcherUnitIdColumn.dicData = res.data.data;
});
}
@@ -527,7 +525,7 @@
);
dispatcherUnitIdColumn.dicData = res.data.data;
});
- getListByDeptId(that.userInfo.dept_id).then((res) => {
+ getListByDeptId(that.userInfo.dept_id, 1).then((res) => {
const userIdsColumn = that.findObject(this.option1.column, "userIds");
userIdsColumn.dicData = res.data.data;
});
--
Gitblit v1.9.3