From 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 12 Nov 2021 09:29:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/dispatch/dispatchChildoperable.vue | 207 +++++++++++++++++++++++++++++++++------------------
1 files changed, 132 insertions(+), 75 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 702bb90..8e368a6 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -20,11 +20,18 @@
</avue-crud>
</div>
</basic-container>
-</template>
+</template>
<script>
-import { getdata1, adddata1, update1, remove1,getDispatcherUnitByDeptId} from "@/api/dispatch/dispatch";
-import { getListByDeptId } from "@/api/system/user";
+import {
+ getdata1,
+ saveDispatcher,
+ updateDispatcher,
+ remove1,
+ getDispatcherUnitByDeptId,
+ overDispatcher,
+} from "@/api/dispatch/dispatch";
+import { update, getSecurityDispatcherTree } from "@/api/system/user";
import { mapState } from "vuex";
export default {
@@ -32,7 +39,6 @@
return {
deptCategory: "",
deptId: "",
-
loading1: true, //派遣记录
selectionList1: [],
page1: {
@@ -123,15 +129,22 @@
type: "tree",
width: 70,
labelWidth: 120,
- searchSpan: 3,
- search: 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",
+ label: "name",
value: "id",
},
- dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
- dicData: [],
+ //不包含父节点值
+ leafOnly:true,
+ multiple: true,
rules: [
{
required: true,
@@ -143,25 +156,26 @@
{
label: "保安员",
prop: "securityName",
- type: "tree",
+ // type: "tree",
width: 70,
+ searchSpan: 4,
+ search: true,
labelWidth: 120,
addDisplay: false,
editDisplay: false,
// hide: true,
- props: {
- label: "realName",
- value: "id",
- },
- dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
- dicData: [],
- rules: [
- {
- required: true,
- message: "请选择保安",
- trigger: "blur",
- },
- ],
+ // props: {
+ // label: "realName",
+ // value: "id",
+ // },
+ // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请选择保安",
+ // trigger: "blur",
+ // },
+ // ],
},
{
@@ -267,17 +281,33 @@
},
],
},
+ useifid: 266,
};
},
- created () {
+ created() {
+ var that = this;
+ if (this.userInfo.role_name == "保安公司管理员") {
+ const deptColumn = this.findObject(this.option1.column, "deptId");
+ deptColumn.search = false;
+ deptColumn.hide = true;
+ this.useifid = this.userInfo.dept_id;
+ } else {
+ const deptColumn = this.findObject(
+ this.option1.column,
+ "dispatcherUnitId"
+ );
+ deptColumn.search = false;
+ }
-
- if(this.userInfo.role_name=="保安公司管理员"){
- const deptColumn = this.findObject(this.option1.column, "deptId");
-
- deptColumn.search = false;
-
- }
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ that.option1.column[1].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
+ that.userInfo.jurisdiction;
+ } else {
+ that.option1.column[1].dicUrl =
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
+ }
},
computed: {
// },
@@ -291,8 +321,11 @@
...mapState({
userInfo: (state) => state.user.userInfo,
}),
+ deps() {
+ return this.form.deptId;
+ },
},
-
+
methods: {
handleChangeTABS(column) {
this.typeTABS = column;
@@ -301,7 +334,6 @@
// 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.$message.success(JSON.stringify(column));
@@ -324,8 +356,14 @@
// const userColumn = this.findObject(this.option1.column, "userIds");
// userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
// }
-
- adddata1(form).then(
+ 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.onLoad1(this.page1);
this.$message({
@@ -348,7 +386,7 @@
done();
},
searchReset1() {
- this.query = {};
+ this.query1 = {};
this.onLoad1(this.page1);
},
rowUpdate1(row, index, done, loading) {
@@ -356,7 +394,10 @@
// const userColumn = this.findObject(this.option1.column, "userIds");
// userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
// }
- update1(row).then(
+ if (this.useifid != 266) {
+ row["deptId"] = this.useifid;
+ }
+ updateDispatcher(row).then(
() => {
this.onLoad1(this.page1);
this.$message({
@@ -372,13 +413,13 @@
);
},
rowDel1(row) {
- this.$confirm("确定将选择数据删除?", {
+ this.$confirm("确定结束当前派遣?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
- return remove1(row.id);
+ return overDispatcher(row);
})
.then(() => {
this.onLoad1(this.page1);
@@ -390,10 +431,8 @@
},
selectionChange1(list) {
this.selectionList1 = list;
- // console.log(this.selectionList1.length);
},
handleDelete1() {
- console.log(this.selectionList1);
if (this.selectionList1.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
@@ -416,21 +455,22 @@
});
},
refreshChange1() {
- // console.log(4534)
this.onLoad1(this.page1, this.query1);
},
- beforeOpen(done, type) {
- var that = this;
- if (["add","edit", "view"].includes(type)) {
- if(this.userInfo.role_name=="保安公司管理员"){
- getListByDeptId(that.userInfo.dept_id).then((res)=>{
- const userColumn = that.findObject(this.option1.column, "userIds");
- userColumn.dicData = res.data.data;
- })
- }
- }
+ beforeOpen(done, type,row) {
this.initFlag = true;
+ if(type=="edit"){
+ console.log(row,123);
+ const userColumn = this.findObject(this.option1.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.option1.column, "userIds");
+ userColumn.multiple = true;
+ userColumn.dicUrl = "/api/blade-user/security-dispatcher-tree?deptId="+this.userInfo.dept_id;
+ }
done();
},
@@ -457,34 +497,41 @@
//
onLoad1(page, params = {}) {
this.loading1 = true;
- var that = this;
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,
};
}
- if(this.userInfo.role_name=="保安公司管理员"){
+ if (this.userInfo.role_name == "保安公司管理员") {
const deptColumn = this.findObject(this.option1.column, "deptId");
deptColumn.disabled = true;
// deptColumn.search = false; //会报错
deptColumn.value = this.userInfo.dept_id;
this.initData(2);
- }else{
+ } else {
this.initData(1);
}
-
+ if (this.useifid != 266) {
+ values["deptId"] = this.useifid;
+ }
+ //公安局进入
+ if (this.userInfo.role_name == "公安管理员") {
+ values["jurisdiction"] = this.userInfo.jurisdiction;
+ }
getdata1(
page.currentPage,
page.pageSize,
@@ -496,29 +543,39 @@
this.data1 = data.records;
this.loading1 = false;
// this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
- console.log(this.form,111111);
});
},
- initData(type){
+ initData(type) {
var that = this;
- if(type==1){
- getDispatcherUnitByDeptId(null).then((res)=>{
- const dispatcherUnitIdColumn = that.findObject(this.option1.column, "dispatcherUnitId");
- dispatcherUnitIdColumn.dicData = res.data.data;
-
- })
+ if (type == 1) {
+ getDispatcherUnitByDeptId(null).then((res) => {
+ const dispatcherUnitIdColumn = that.findObject(
+ this.option1.column,
+ "dispatcherUnitId"
+ );
+ dispatcherUnitIdColumn.dicData = res.data.data;
+ });
}
- if(type==2){
- getDispatcherUnitByDeptId(that.userInfo.dept_id).then((res)=>{
- const dispatcherUnitIdColumn = that.findObject(this.option1.column, "dispatcherUnitId");
- dispatcherUnitIdColumn.dicData = res.data.data;
- })
+ if (type == 2) {
+ getDispatcherUnitByDeptId(that.userInfo.dept_id).then((res) => {
+ const dispatcherUnitIdColumn = that.findObject(
+ this.option1.column,
+ "dispatcherUnitId"
+ );
+ dispatcherUnitIdColumn.dicData = res.data.data;
+ });
+ getSecurityDispatcherTree(that.userInfo.dept_id, 1).then((res) => {
+ const userIdsColumn = that.findObject(this.option1.column, "userIds");
+ userIdsColumn.dicData = res.data.data;
+ });
}
- }
+ },
},
// watch: {
- // "form.deptId"() {
- // this.initData();
+ // // "form.deptId"() {
+ // // this.initData();
+ // // }
+ // deps(){
// }
// },
mounted() {
@@ -537,4 +594,4 @@
.el-collapse-item {
padding-top: 15px !important;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3