From 8e68b3cefdf22c2eb37e02e2bafa06013bab5053 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 03 Sep 2021 17:56:39 +0800
Subject: [PATCH] 注册
---
src/views/dispatch/dispatchChildoperable.vue | 57 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index d858ed2..72bad92 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,6 +137,7 @@
label: "realName",
value: "id",
},
+ // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
dicUrl: `/api/blade-user/page-security-units?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);
@@ -428,19 +434,19 @@
this.onLoad1(this.page1, this.query1);
},
- 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();
- },
+ // 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();
+ // },
getStartTime() {
if (
@@ -465,8 +471,9 @@
//
onLoad1(page, params = {}) {
this.loading1 = true;
- var that = this;
var values;
+ //默认查询已派遣的，派遣结束，未派遣的不显示
+ params["dispatch"] = 0;
const { releaseTimeRange } = this.query1;
if (releaseTimeRange) {
values = {
@@ -515,7 +522,7 @@
this.option1.column,
"dispatcherUnitId"
);
- console.log(res.data.data,111);
+ console.log(res.data.data, 111);
dispatcherUnitIdColumn.dicData = res.data.data;
});
}
--
Gitblit v1.9.3