From 2c461eb9efb980d55dfd7407ee70088fc90a4a7a Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 08 Feb 2022 14:24:31 +0800
Subject: [PATCH] 保安员详情修改
---
src/views/dispatch/dispatchChildoperable.vue | 157 ++++++++++++++++++++++++++++------------------------
1 files changed, 84 insertions(+), 73 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 1f0bee9..aa94c14 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -73,16 +73,10 @@
selection: true,
...this.$store.state.control.clearOtherBut,
column: [
- // },
{
label: "派遣单位",
prop: "dispatcherCompany",
- // addDisplay: false,
- // editDisplay: false,
- // search: true,
- // labelWidth: 120,
- // searchSpan: 4,
- minWidth: 210,
+ // minWidth: 140,
addDisplay: false,
editDisplay: false,
},
@@ -98,8 +92,7 @@
label: "title",
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,34 +101,11 @@
},
],
},
- {
- 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",
type: "tree",
- width: 70,
labelWidth: 120,
hide: true,
defaultExpandAll: true,
@@ -165,7 +135,7 @@
label: "保安员",
prop: "securityName",
// type: "tree",
- width: 70,
+ width:90,
searchSpan: 4,
search: true,
labelWidth: 120,
@@ -189,8 +159,8 @@
{
label: "身份证",
prop: "idCardNo",
- labelWidth: 120,
overHidden: true,
+ width:160,
addDisplay: false,
editDisplay: false,
rules: [
@@ -217,6 +187,7 @@
prop: "dispatchertime",
type: "date",
format: "yyyy-MM-dd",
+ width:120,
valueFormat: "yyyy-MM-dd",
labelWidth: 120,
searchSpan: 5,
@@ -235,6 +206,7 @@
label: "结束时间",
prop: "endTime",
type: "date",
+ width:120,
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
labelWidth: 120,
@@ -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: {
@@ -367,9 +384,9 @@
if (this.useifid != 266) {
form["deptId"] = this.useifid;
}
- console.log(form, 123456);
+ // console.log(form, 123456);
(form["ids"] = form.userIds.join(",")), delete form.userIds;
- console.log(form, 321);
+ // console.log(form, 321);
saveDispatcher(form).then(
(res) => {
this.onLoad(this.page);
@@ -377,14 +394,16 @@
type: "success",
message: "操作成功!",
});
+ this.onLoad(this.page, this.query1);
done();
},
(error) => {
window.console.log(error);
loading();
+ this.onLoad(this.page, this.query1);
+ done();
}
);
- // }
},
searchChange(params, done) {
this.query1 = params;
@@ -397,10 +416,6 @@
this.onLoad(this.page);
},
rowUpdate(row, index, done, loading) {
- // if(this.userInfo.role_name=="保安公司管理员"){
- // const userColumn = this.findObject(this.option.column, "userIds");
- // userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
- // }
if (this.useifid != 266) {
row["deptId"] = this.useifid;
}
@@ -468,7 +483,6 @@
beforeOpen(done, type, row) {
this.initFlag = true;
if (type == "edit") {
- console.log(row, 123);
const userColumn = this.findObject(this.option.column, "userIds");
userColumn.multiple = false;
userColumn.dicUrl =
@@ -482,9 +496,6 @@
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 +542,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