From d6da030bf9df3b26b2a7df90b3100b06ba18b42b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 21 Dec 2021 16:48:19 +0800
Subject: [PATCH] 车辆装备修改
---
src/views/dispatch/dispatchChildoperable.vue | 145 +++++++++++++++++++++++++++---------------------
1 files changed, 81 insertions(+), 64 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 1f0bee9..8e4ae58 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -73,15 +73,9 @@
selection: true,
...this.$store.state.control.clearOtherBut,
column: [
- // },
{
label: "派遣单位",
prop: "dispatcherCompany",
- // addDisplay: false,
- // editDisplay: false,
- // search: true,
- // labelWidth: 120,
- // searchSpan: 4,
minWidth: 210,
addDisplay: false,
editDisplay: false,
@@ -99,7 +93,7 @@
value: "id",
},
width: 180,
- dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
+ // dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
rules: [
{
required: true,
@@ -108,29 +102,7 @@
},
],
},
- {
- label: "派遣单位",
- prop: "dispatcherUnitId",
- labelWidth: 120,
- searchLabelWidth: 80,
- // dicUrl: "/api/dispatcherUnit/page-tree?deptId={{key}}",
- props: {
- label: "name",
- value: "id",
- },
- hide: true,
- searchSpan: 4,
- search: true,
- overHidden: true,
- type: "tree",
- rules: [
- {
- required: true,
- message: "请输入派遣单位",
- trigger: "blur",
- },
- ],
- },
+
{
label: "保安员",
prop: "userIds",
@@ -273,6 +245,29 @@
],
},
{
+ label: "派遣单位",
+ prop: "dispatcherUnitId",
+ labelWidth: 120,
+ searchLabelWidth: 80,
+ // dicUrl: "/api/dispatcherUnit/page-tree?deptId={{key}}",
+ props: {
+ label: "name",
+ value: "id",
+ },
+ hide: true,
+ searchSpan: 4,
+ search: true,
+ overHidden: true,
+ type: "tree",
+ rules: [
+ {
+ required: true,
+ message: "请输入派遣单位",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
label: "派遣地址",
prop: "dispatcheraddress",
labelWidth: 120,
@@ -294,27 +289,49 @@
},
created() {
var that = this;
- if (this.userInfo.role_name == "保安公司管理员") {
- const deptColumn = this.findObject(this.option.column, "deptId");
- deptColumn.search = false;
- deptColumn.hide = true;
+ // if (this.userInfo.role_name == "保安公司管理员") {
+ // const deptColumn = this.findObject(this.option.column, "deptId");
+ // deptColumn.search = false;
+ // deptColumn.hide = true;
+ // this.useifid = this.userInfo.dept_id;
+ // } else {
+ // const deptColumn = this.findObject(
+ // this.option.column,
+ // "dispatcherUnitId"
+ // );
+ // deptColumn.search = false;
+ // }
+ var roleName = this.userInfo.role_name;
+ if (
+ roleName == "保安公司管理员" ||
+ roleName == "保安" ||
+ roleName == "分公司管理员"
+ ) {
+ //查询保安单位信息（包含子级）
+ const column = this.findObject(this.option.column, "deptId");
+ // column.search = false;
+ //默认全部展开
+ column.defaultExpandAll = true;
+ column.dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?deptId=" +
+ this.userInfo.dept_id;
+ //赋值
+ column.value = that.userInfo.dept_id;
this.useifid = this.userInfo.dept_id;
- } else {
- const deptColumn = this.findObject(
- this.option.column,
- "dispatcherUnitId"
- );
- deptColumn.search = false;
- }
-
- //公安局进入
- if (this.userInfo.role_name == "公安管理员") {
- that.option.column[1].dicUrl =
- "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
+ this.initData(2);
+ } else if (roleName == "公安管理员" || roleName == "administrator") {
+ var columnDept = that.findObject(that.option.column, "deptId");
+ columnDept.dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?jurisdiction=" +
that.userInfo.jurisdiction;
+ this.initData(1);
} else {
- that.option.column[1].dicUrl =
- "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
+ //查询保安单位信息（包含子级）
+ const column = this.findObject(this.option.column, "deptId");
+ // column.search = false;
+ //默认全部展开
+ column.dicUrl = "/api/blade-system/dept/security_lazy-tree";
+ this.initData(1);
}
},
computed: {
@@ -479,13 +496,13 @@
"&realName=" +
this.form.securityName;
}
- if (type == "add") {
- const userColumn = this.findObject(this.option.column, "userIds");
- userColumn.multiple = true;
- userColumn.dicUrl =
- "/api/blade-user/security-dispatcher-tree?deptId=" +
- this.userInfo.dept_id;
- }
+ // if (type == "add") {
+ // const userColumn = this.findObject(this.option.column, "userIds");
+ // userColumn.multiple = true;
+ // userColumn.dicUrl =
+ // "/api/blade-user/security-dispatcher-tree?deptId=" +
+ // this.userInfo.dept_id;
+ // }
done();
},
@@ -531,15 +548,15 @@
};
}
- if (this.userInfo.role_name == "保安公司管理员") {
- const deptColumn = this.findObject(this.option.column, "deptId");
- deptColumn.disabled = true;
- // deptColumn.search = false; //会报错
- deptColumn.value = this.userInfo.dept_id;
- this.initData(2);
- } else {
- this.initData(1);
- }
+ // if (this.userInfo.role_name == "保安公司管理员") {
+ // const deptColumn = this.findObject(this.option.column, "deptId");
+ // deptColumn.disabled = true;
+ // // deptColumn.search = false; //会报错
+ // deptColumn.value = this.userInfo.dept_id;
+ // this.initData(2);
+ // } else {
+ // this.initData(1);
+ // }
if (this.useifid != 266) {
values["deptId"] = this.useifid;
}
--
Gitblit v1.9.3