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 | 552 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 353 insertions(+), 199 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index d3d497f..b07e07c 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -1,46 +1,65 @@
<template>
- <basic-container>
- <div class="dispatchChildoperable">
- <avue-crud
- :option="option1"
- :data="data1"
- :page.sync="page1"
- ref="crudrec1"
- :table-loading="loading1"
- @row-save="rowSave1"
- @search-change="searchChange1"
- @search-reset="searchReset1"
- @row-update="rowUpdate1"
- @row-del="rowDel1"
- @selection-change="selectionChange1"
- @refresh-change="refreshChange1"
- >
- </avue-crud>
- </div>
+ <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>
</basic-container>
-</template>
+</template>
<script>
-import { getdata1, adddata1, update1, remove1 } from "@/api/dispatch/dispatch";
-import { getDept } from "@/api/system/dept";
+import {
+ getdata1,
+ saveDispatcher,
+ updateDispatcher,
+ remove1,
+ getDispatcherUnitByDeptId,
+ overDispatcher
+} from "@/api/dispatch/dispatch";
+import { update, getSecurityDispatcherTree } from "@/api/system/user";
+import { mapState } from "vuex";
+import { mapGetters } from "vuex";
export default {
data() {
- let baseUrl = "https://cli.avuejs.com/api/area";
return {
deptCategory: "",
deptId: "",
-
- loading1: true, //派遣记录
+ loading: true, //派遣记录
selectionList1: [],
- page1: {
+ page: {
pageSize: 10,
currentPage: 1,
total: 0,
+ ...this.$store.state.control.changePageSize
},
+ form: {},
query1: {},
- data1: [],
- option1: {
+ data: [],
+ option: {
// card: true,
tip: false,
index: true,
@@ -55,102 +74,105 @@
// menuWidth: 160,
align: "center",
selection: true,
+ ...this.$store.state.control.clearOtherBut,
column: [
- // },
{
label: "派遣单位",
prop: "dispatcherCompany",
- // addDisplay: false,
- // editDisplay: false,
- // search: true,
- // labelWidth: 120,
- // searchSpan: 4,
- width: 180,
+ // minWidth: 140,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
},
{
- label: "派遣单位",
- prop: "dispatcherUnitId",
- labelWidth: 120,
- searchLabelWidth: 80,
- dicUrl: "/api/dispatcherUnit/page-tree",
- props: {
- label: "name",
- value: "id",
- },
- hide: true,
- searchSpan: 4,
- search: true,
- overHidden: true,
- type: "tree",
- rules: [
- {
- required: true,
- message: "请输入派遣单位",
- trigger: "blur",
- },
- ],
- },
- // {
- {
- label: "保安公司",
+ label: "企业名称",
prop: "deptId",
search: true,
labelWidth: 120,
- type: "select",
+ type: "tree",
searchSpan: 4,
- cascaderItem: ["name"],
+ 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",
- },
- ],
+ message: "请输入企业名称",
+ trigger: "blur"
+ }
+ ]
},
+
{
label: "保安员",
- prop: "name",
- type: "select",
- width: 70,
+ prop: "userIds",
+ type: "tree",
labelWidth: 120,
- searchSpan: 3,
- search: true,
- // cell: true,
- // hide: true,
+ hide: true,
+ defaultExpandAll: true,
+ // props: {
+ // label: "realName",
+ // value: "id",
+ // },
+ // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
+ dicUrl: `/api/blade-user/security-dispatcher-tree?deptId={{key}}`,
+ dicData: [],
props: {
- label: "realName",
- value: "id",
+ label: "name",
+ value: "id"
},
- dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
+ //不包含父节点值
+ leafOnly: true,
+ multiple: true,
rules: [
{
required: true,
message: "请选择保安",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ },
+ {
+ label: "保安员",
+ prop: "securityName",
+ // type: "tree",
+ width: 90,
+ searchSpan: 4,
+ search: true,
+ labelWidth: 120,
+ addDisplay: false,
+ editDisplay: false
+ // hide: true,
+ // props: {
+ // label: "realName",
+ // value: "id",
+ // },
+ // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择保安",
+ // trigger: "blur",
+ // },
+ // ],
},
{
label: "身份证",
- prop: "cardid",
- labelWidth: 120,
+ prop: "idCardNo",
overHidden: true,
+ width: 160,
+ addDisplay: false,
+ editDisplay: false,
rules: [
{
required: true,
message: "请输入身份证",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -164,10 +186,11 @@
// },
{
- label: "派遣时间",
+ label: "开始时间",
prop: "dispatchertime",
type: "date",
format: "yyyy-MM-dd",
+ width: 120,
valueFormat: "yyyy-MM-dd",
labelWidth: 120,
searchSpan: 5,
@@ -177,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,
@@ -194,9 +218,9 @@
{
required: true,
message: "请输入结束时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -204,12 +228,12 @@
{
label: "派遣时间",
prop: "releaseTimeRange",
- type: "datetime",
+ type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
searchValue: [this.getStartTime(), this.getEndTime()],
searchRange: true,
- searchSpan: 4,
+ searchSpan: 5,
hide: true,
addDisplay: false,
editDisplay: false,
@@ -219,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: "派遣地址",
@@ -231,121 +278,194 @@
{
required: true,
message: "请输入派遣地址",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
- },
- ],
+ }
+ ]
},
+ 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;
+ // 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;
+ 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 {
+ //查询保安单位信息（包含子级）
+ 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
+ }),
+ deps() {
+ return this.form.deptId;
+ }
},
+
methods: {
handleChangeTABS(column) {
this.typeTABS = column;
if (column.prop == "tab1") {
- this.loading1 = false;
+ this.loading = false;
// this.onLoad(this.page);
} else if (column.prop == "tab2") {
// this.loading = false;
- console.log(document.getElementsByClassName("el-card__body")[0]);
- this.onLoad1(this.page1); //第二个表格不会自动执行
+ this.onLoad(this.page); //第二个表格不会自动执行
}
// this.$message.success(JSON.stringify(column));
},
//派遣记录
sizeChange1(val) {
- this.page1.currentPage = 1;
- this.page1.pageSize = val;
+ this.page.currentPage = 1;
+ this.page.pageSize = val;
// this.getData();
- this.onLoad1(this.page1, this.query1);
- // this.$message.success("行数" + val);
+ this.onLoad(this.page, this.query1);
},
- currentChange1(val) {
- this.page1.currentPage = val;
+ currentChange(val) {
+ this.page.currentPage = val;
// this.getData();
- this.onLoad1(this.page1, this.query1);
- // this.$message.success("页码" + val);
+ this.onLoad(this.page, this.query1);
},
- rowSave1(form, done, loading) {
- adddata1(form).then(
- (res) => {
- this.onLoad1(this.page1);
+ rowSave(form, 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) {
+ form["deptId"] = this.useifid;
+ }
+ // console.log(form, 123456);
+ (form["ids"] = form.userIds.join(",")), delete form.userIds;
+ // console.log(form, 321);
+ saveDispatcher(form).then(
+ 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();
}
);
- // }
},
- searchChange1(params, done) {
+ searchChange(params, done) {
this.query1 = params;
- this.page1.currentPage = 1;
- this.onLoad1(this.page1, params);
+ this.page.currentPage = 1;
+ this.onLoad(this.page, params);
done();
},
- searchReset1() {
- this.query = {};
- this.onLoad1(this.page1);
+ searchReset() {
+ this.query1 = {};
+ this.onLoad(this.page);
},
- rowUpdate1(row, index, done, loading) {
- update1(row).then(
+ rowUpdate(row, index, done, loading) {
+ if (this.useifid != 266) {
+ row["deptId"] = this.useifid;
+ }
+ updateDispatcher(row).then(
() => {
- this.onLoad1(this.page1);
+ this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
);
},
- rowDel1(row) {
- this.$confirm("确定将选择数据删除?", {
+ rowDel(row) {
+ this.$confirm("确定结束当前派遣?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
- return remove1(row.id);
+ return overDispatcher(row);
})
.then(() => {
- this.onLoad1(this.page1);
+ this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
- selectionChange1(list) {
+ selectionChange(list) {
this.selectionList1 = list;
- // console.log(this.selectionList1.length);
},
handleDelete1() {
- console.log(this.selectionList1);
if (this.selectionList1.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
@@ -353,23 +473,42 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove1(this.ids1);
})
.then(() => {
- this.onLoad1(this.page1);
+ this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec1.toggleSelection();
});
},
- refreshChange1() {
- // console.log(4534)
- this.onLoad1(this.page1, this.query1);
+ refreshChange() {
+ this.onLoad(this.page, this.query1);
+ },
+
+ beforeOpen(done, type, row) {
+ this.initFlag = true;
+ if (type == "edit") {
+ const userColumn = this.findObject(this.option.column, "userIds");
+ userColumn.multiple = false;
+ userColumn.dicUrl =
+ "/api/blade-user/security-dispatcher-tree?deptId=" +
+ this.userInfo.dept_id +
+ "&id=" +
+ this.form.userIds +
+ "&realName=" +
+ this.form.securityName;
+ }
+ if (type == "add") {
+ const userColumn = this.findObject(this.option.column, "userIds");
+ userColumn.multiple = true;
+ }
+ done();
},
getStartTime() {
@@ -393,79 +532,94 @@
return "";
},
//
- onLoad1(page, params = {}) {
- this.loading1 = true;
+ onLoad(page, params = {}) {
+ this.loading = true;
var values;
+ //默认查询已派遣的，派遣结束，未派遣的不显示
+ params["dispatch"] = 0;
const { releaseTimeRange } = this.query1;
if (releaseTimeRange) {
values = {
...params,
beginTime: releaseTimeRange[0],
overTime: releaseTimeRange[1],
- ...this.query,
+ ...this.query1
};
values.releaseTimeRange = null;
} else {
values = {
...params,
- ...this.query,
+ ...this.query1
};
}
- console.log(values);
+ // 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 == "公安管理员" || this.userInfo.role_name == "民警") {
+ values["jurisdiction"] = this.userInfo.jurisdiction;
+ }
getdata1(
page.currentPage,
page.pageSize,
// Object.assign(params, this.query)
values
- ).then((res) => {
- // console.log(res);
+ ).then(res => {
const data = res.data.data;
- this.page1.total = data.total;
- this.data1 = data.records;
- console.log(this.data1, 1111111111111111111111111);
- this.loading1 = false;
- this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
+ this.page.total = data.total;
+ this.data = data.records;
+ this.$store.commit("setWindowSizeHeightAdd");
+ this.loading = false;
+ // this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
});
},
- //派遣记录
+ initData(type) {
+ var that = this;
+ if (type == 1) {
+ getDispatcherUnitByDeptId(null).then(res => {
+ const dispatcherUnitIdColumn = that.findObject(
+ this.option.column,
+ "dispatcherUnitId"
+ );
+ dispatcherUnitIdColumn.dicData = res.data.data;
+ });
+ }
+ if (type == 2) {
+ 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 => {
+ const userIdsColumn = that.findObject(this.option.column, "userIds");
+ userIdsColumn.dicData = res.data.data;
+ });
+ }
+ }
},
+ // watch: {
+ // // "form.deptId"() {
+ // // this.initData();
+ // // }
+ // deps(){
+ // }
+ // },
mounted() {
- this.onLoad1(this.page1, this.query1);
- //去掉缓存
- // this.typeTABS = this.optionTABS.column[0];
- // var row = {};
- // if (this.readLock("paqiandata") != null) {
- // row = JSON.parse(this.readLock("paqiandata"));
- // this.obj0.name = row.name;
- // for (var k in row) {
- // this.obj0[k] = row[k];
- // }
- // console.log(this.obj0, 11111111);
- // this.id = row.id;
- // if (this.readLock("paqiandataS") != null) {
- // var b = JSON.parse(this.readLock("paqiandataS"));
- // var i = 0;
- // for (var k in b) {
- // if (b[k].name == row.name) {
- // i = 1;
- // }
- // }
- // if (i == 1) {
- // // console.log("存在");
- // } else {
- // // console.log("已删除");
- // this.obj0 = {};
- // this.obj0.name = row.name + " 该派遣单位已删除";
- // window.localStorage.removeItem("paqiandata");
- // this.id = 1244241;
- // }
- // }
- // } else {
- // // console.log("no");
- // this.obj0.name = " 未选择派遣单位";
- // }
- },
+ this.$store.commit("setWindowSizeHeightAdd");
+ // this.onLoad(this.page, this.query1);
+ }
};
</script>
@@ -479,4 +633,4 @@
.el-collapse-item {
padding-top: 15px !important;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3