From 79d9fc857559982b00b68b2d709807bdc4cd286f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 11 Apr 2022 10:58:17 +0800
Subject: [PATCH] minio 地址修改
---
src/views/dispatch/dispatchChildoperable.vue | 326 +++++++++++++++++++++++++++++-------------------------
1 files changed, 175 insertions(+), 151 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 1f0bee9..b07e07c 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -1,30 +1,32 @@
<template>
- <basic-container>
- <div
- :class="[
- 'dispatchChildoperable',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'dispatchChildoperable',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :data="data"
+ :page.sync="page"
+ ref="crudrec1"
+ :permission="permissionList"
+ v-model="form"
+ :table-loading="loading"
+ :before-open="beforeOpen"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ @selection-change="selectionChange"
+ @refresh-change="refreshChange"
+ @current-change="currentChange"
+ @on-load="onLoad"
>
- <avue-crud
- :option="option"
- :data="data"
- :page.sync="page"
- ref="crudrec1"
- v-model="form"
- :table-loading="loading"
- :before-open="beforeOpen"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @row-update="rowUpdate"
- @row-del="rowDel"
- @selection-change="selectionChange"
- @refresh-change="refreshChange"
- @current-change="currentChange"
- >
- </avue-crud>
- </div>
+ </avue-crud>
</basic-container>
</template>
@@ -35,10 +37,11 @@
updateDispatcher,
remove1,
getDispatcherUnitByDeptId,
- overDispatcher,
+ overDispatcher
} from "@/api/dispatch/dispatch";
import { update, getSecurityDispatcherTree } from "@/api/system/user";
import { mapState } from "vuex";
+import { mapGetters } from "vuex";
export default {
data() {
@@ -51,7 +54,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
form: {},
query1: {},
@@ -73,18 +76,12 @@
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,
+ editDisplay: false
},
{
label: "企业名称",
@@ -96,46 +93,22 @@
cascaderItem: ["userIds"],
props: {
label: "title",
- value: "id",
+ 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,
message: "请输入企业名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
- {
- 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,
@@ -148,7 +121,7 @@
dicData: [],
props: {
label: "name",
- value: "id",
+ value: "id"
},
//不包含父节点值
leafOnly: true,
@@ -157,20 +130,20 @@
{
required: true,
message: "请选择保安",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "保安员",
prop: "securityName",
// type: "tree",
- width: 70,
+ width: 90,
searchSpan: 4,
search: true,
labelWidth: 120,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
// props: {
// label: "realName",
@@ -189,17 +162,17 @@
{
label: "身份证",
prop: "idCardNo",
- labelWidth: 120,
overHidden: true,
+ width: 160,
addDisplay: false,
editDisplay: false,
rules: [
{
required: true,
message: "请输入身份证",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -217,6 +190,7 @@
prop: "dispatchertime",
type: "date",
format: "yyyy-MM-dd",
+ width: 120,
valueFormat: "yyyy-MM-dd",
labelWidth: 120,
searchSpan: 5,
@@ -226,15 +200,16 @@
{
required: true,
message: "请输入派遣时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// overHidden: true
},
{
label: "结束时间",
prop: "endTime",
type: "date",
+ width: 120,
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
labelWidth: 120,
@@ -243,9 +218,9 @@
{
required: true,
message: "请输入结束时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -268,9 +243,32 @@
{
required: true,
message: "请输入时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ },
+ {
+ 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: "派遣地址",
@@ -280,58 +278,88 @@
{
required: true,
message: "请输入派遣地址",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
- },
- ],
+ }
+ ]
},
- useifid: 266,
+ useifid: 266
};
},
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" || roleName == "民警") {
+ 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: {
- // },
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.dispatchChildoperable_add, false),
+ viewBtn: this.vaildData(this.permission.dispatchChildoperable_view, true),
+ delBtn: this.vaildData(this.permission.dispatchChildoperable_delete, false),
+ editBtn: this.vaildData(this.permission.dispatchChildoperable_edit, false)
+ };
+ },
ids1() {
let ids1 = [];
- this.selectionList1.forEach((ele) => {
+ this.selectionList1.forEach(ele => {
ids1.push(ele.id);
});
return ids1.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
+ userInfo: state => state.user.userInfo
}),
deps() {
return this.form.deptId;
- },
+ }
},
methods: {
@@ -367,24 +395,26 @@
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) => {
+ res => {
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
+ this.onLoad(this.page, this.query1);
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
+ this.onLoad(this.page, this.query1);
+ done();
}
);
- // }
},
searchChange(params, done) {
this.query1 = params;
@@ -397,10 +427,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;
}
@@ -409,11 +435,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -423,7 +449,7 @@
this.$confirm("确定结束当前派遣?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return overDispatcher(row);
@@ -432,7 +458,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -447,7 +473,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove1(this.ids1);
@@ -456,7 +482,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec1.toggleSelection();
});
@@ -468,7 +494,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 +507,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();
},
@@ -521,30 +543,30 @@
...params,
beginTime: releaseTimeRange[0],
overTime: releaseTimeRange[1],
- ...this.query1,
+ ...this.query1
};
values.releaseTimeRange = null;
} else {
values = {
...params,
- ...this.query1,
+ ...this.query1
};
}
- 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;
}
//公安局进入
- if (this.userInfo.role_name == "公安管理员") {
+ if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "民警") {
values["jurisdiction"] = this.userInfo.jurisdiction;
}
getdata1(
@@ -552,10 +574,11 @@
page.pageSize,
// Object.assign(params, this.query)
values
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading = false;
// this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
});
@@ -563,7 +586,7 @@
initData(type) {
var that = this;
if (type == 1) {
- getDispatcherUnitByDeptId(null).then((res) => {
+ getDispatcherUnitByDeptId(null).then(res => {
const dispatcherUnitIdColumn = that.findObject(
this.option.column,
"dispatcherUnitId"
@@ -572,19 +595,19 @@
});
}
if (type == 2) {
- getDispatcherUnitByDeptId(that.userInfo.dept_id).then((res) => {
+ getDispatcherUnitByDeptId(that.userInfo.dept_id).then(res => {
const dispatcherUnitIdColumn = that.findObject(
this.option.column,
"dispatcherUnitId"
);
dispatcherUnitIdColumn.dicData = res.data.data;
});
- getSecurityDispatcherTree(that.userInfo.dept_id, 1).then((res) => {
+ getSecurityDispatcherTree(that.userInfo.dept_id, 1).then(res => {
const userIdsColumn = that.findObject(this.option.column, "userIds");
userIdsColumn.dicData = res.data.data;
});
}
- },
+ }
},
// watch: {
// // "form.deptId"() {
@@ -594,8 +617,9 @@
// }
// },
mounted() {
- this.onLoad(this.page, this.query1);
- },
+ this.$store.commit("setWindowSizeHeightAdd");
+ // this.onLoad(this.page, this.query1);
+ }
};
</script>
--
Gitblit v1.9.3