From bd6c3ba1aad2e8c38f6334efa27b2dc3fddc4ea3 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 01 Sep 2021 11:28:51 +0800
Subject: [PATCH] 汇报类型
---
src/views/dispatch/dispatchChildoperable.vue | 126 +++++++++++++++++++++++++-----------------
1 files changed, 75 insertions(+), 51 deletions(-)
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 702bb90..751a1d4 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -23,8 +23,15 @@
</template>
<script>
-import { getdata1, adddata1, update1, remove1,getDispatcherUnitByDeptId} from "@/api/dispatch/dispatch";
-import { getListByDeptId } from "@/api/system/user";
+import {
+ getdata1,
+ adddata1,
+ update1,
+ remove1,
+ getDispatcherUnitByDeptId,
+ overDispatcher
+} from "@/api/dispatch/dispatch";
+import { update,getListByDeptId } from "@/api/system/user";
import { mapState } from "vuex";
export default {
@@ -130,6 +137,7 @@
label: "realName",
value: "id",
},
+ // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
dicData: [],
rules: [
@@ -149,11 +157,11 @@
addDisplay: false,
editDisplay: false,
// hide: true,
- props: {
- label: "realName",
- value: "id",
- },
- dicUrl: `/api/blade-user/page-security-units?deptId={{key}}`,
+ // props: {
+ // label: "realName",
+ // value: "id",
+ // },
+ // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
dicData: [],
rules: [
{
@@ -269,15 +277,14 @@
},
};
},
- created () {
-
-
- if(this.userInfo.role_name=="保安公司管理员"){
- const deptColumn = this.findObject(this.option1.column, "deptId");
-
- deptColumn.search = false;
-
- }
+ created() {
+ if (this.userInfo.role_name == "保安公司管理员") {
+ const deptColumn = this.findObject(this.option1.column, "deptId");
+ deptColumn.search = false;
+ }else{
+ const deptColumn = this.findObject(this.option1.column, "dispatcherUnitId");
+ deptColumn.search = false;
+ }
},
computed: {
// },
@@ -291,8 +298,11 @@
...mapState({
userInfo: (state) => state.user.userInfo,
}),
+ deps() {
+ return this.form.deptId;
+ },
},
-
+
methods: {
handleChangeTABS(column) {
this.typeTABS = column;
@@ -372,13 +382,13 @@
);
},
rowDel1(row) {
- this.$confirm("确定将选择数据删除?", {
+ this.$confirm("确定结束当前派遣?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
- return remove1(row.id);
+ return overDispatcher(row);
})
.then(() => {
this.onLoad1(this.page1);
@@ -420,19 +430,19 @@
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;
- })
- }
- }
- this.initFlag = true;
- done();
- },
+ // 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;
+ // });
+ // }
+ // }
+ // this.initFlag = true;
+ // done();
+ // },
getStartTime() {
if (
@@ -457,8 +467,9 @@
//
onLoad1(page, params = {}) {
this.loading1 = true;
- var that = this;
var values;
+ //默认查询已派遣的，派遣结束，未派遣的不显示
+ params['dispatch'] = 0;
const { releaseTimeRange } = this.query1;
if (releaseTimeRange) {
values = {
@@ -475,13 +486,13 @@
};
}
- 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);
}
@@ -496,29 +507,42 @@
this.data1 = data.records;
this.loading1 = false;
// this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
- console.log(this.form,111111);
+ 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"
+ );
+ console.log(res.data.data,111);
+ 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;
+ });
+ getListByDeptId(that.userInfo.dept_id).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(){
+ // console.log(this.deps,5646646)
// }
// },
mounted() {
--
Gitblit v1.9.3