From a71912cb7ecbe4e00a588c9d0e193e70c799d502 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 04 Dec 2021 14:12:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises_ys

---
 src/views/dispatch/dispatch.vue |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/views/dispatch/dispatch.vue b/src/views/dispatch/dispatch.vue
index be8376c..8862247 100644
--- a/src/views/dispatch/dispatch.vue
+++ b/src/views/dispatch/dispatch.vue
@@ -236,7 +236,7 @@
           },
           {
             label: "保安公司",
-            prop: "deptName",
+            prop: "deptId",
             type: "tree",
             overHidden: true,
             dicUrl:
@@ -429,12 +429,24 @@
   },
   created() {
     if (this.userInfo.role_name == "保安公司管理员") {
-      const deptColumn = this.findObject(this.option.column, "deptId");
-      deptColumn.search = false;
-      deptColumn.addDisplay = false;
-      deptColumn.editDisplay = false;
-      deptColumn.viewDisplay = false;
-      deptColumn.hide = true;
+      // const deptColumn = this.findObject(this.option.column, "deptId");
+      // // deptColumn.search = false;
+      // deptColumn.addDisplay = false;
+      // deptColumn.editDisplay = false;
+      // deptColumn.viewDisplay = false;
+      // deptColumn.hide = true;
+      // this.option.column[2];
+      this.option.column[2].search = false;
+      this.option.column[2].addDisplay = false;
+      this.option.column[2].editDisplay = false;
+      this.option.column[2].viewDisplay = false;
+      this.option.column[2].hide = true;
+    } else {
+      this.option.column[2].search = true;
+      this.option.column[2].addDisplay = true;
+      this.option.column[2].editDisplay = true;
+      this.option.column[2].viewDisplay = true;
+      this.option.column[2].hide = false;
     }
   },
   computed: {
@@ -484,7 +496,7 @@
       //   this.$message.success("页码" + val);
     },
     rowSave(form, done, loading) {
-      form["deptId"] = this.userInfo.dept_id;
+      // form["deptId"] = this.userInfo.dept_id;
       adddata(form).then(
         (res) => {
           this.onLoad(this.page);

--
Gitblit v1.9.3