From 4da370f500cbabfbeb75f8006b8a3403656c4c5f Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 01 Sep 2021 16:33:17 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises
---
src/views/dispatch/dispatchChildoperable.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 751a1d4..72bad92 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -29,9 +29,9 @@
update1,
remove1,
getDispatcherUnitByDeptId,
- overDispatcher
+ overDispatcher,
} from "@/api/dispatch/dispatch";
-import { update,getListByDeptId } from "@/api/system/user";
+import { update, getListByDeptId } from "@/api/system/user";
import { mapState } from "vuex";
export default {
@@ -279,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;
}
},
@@ -469,7 +473,7 @@
this.loading1 = true;
var values;
//默认查询已派遣的，派遣结束，未派遣的不显示
- params['dispatch'] = 0;
+ params["dispatch"] = 0;
const { releaseTimeRange } = this.query1;
if (releaseTimeRange) {
values = {
@@ -518,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