Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

Administrator

2021-11-05 6ce99cb40ee88271fa0d0d8daea99ba0eaec122f

 src/views/dispatch/dispatchChildoperable.vue

@@ -20,7 +20,7 @@
      </avue-crud>
    </div>
  </basic-container>
</template> 
</template>

<script>
import {
@@ -279,8 +279,8 @@
    };
  },
  created() {
    var that = this;
    if (this.userInfo.role_name == "保安公司管理员") {
      console.log("保安公司管理员登入");
      const deptColumn = this.findObject(this.option1.column, "deptId");
      deptColumn.search = false;
      deptColumn.hide = true;
@@ -291,6 +291,16 @@
        "dispatcherUnitId"
      );
      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: {
@@ -318,7 +328,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));
@@ -412,10 +421,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;
@@ -438,7 +445,6 @@
        });
    },
    refreshChange1() {
      // console.log(4534)
      this.onLoad1(this.page1, this.query1);
    },

@@ -501,7 +507,10 @@
      if (this.useifid != 266) {
        values["deptId"] = this.useifid;
      }

      //公安局进入
      if (this.userInfo.role_name == "公安管理员") {
        values["jurisdiction"] = this.userInfo.jurisdiction;
      }
      getdata1(
        page.currentPage,
        page.pageSize,
@@ -513,7 +522,6 @@
        this.data1 = data.records;
        this.loading1 = false;
        // this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
        console.log(this.form, 111111);
      });
    },
    initData(type) {
@@ -524,7 +532,6 @@
            this.option1.column,
            "dispatcherUnitId"
          );
          // console.log(res.data.data, 111);
          dispatcherUnitIdColumn.dicData = res.data.data;
        });
      }
@@ -548,7 +555,6 @@
  //   //   this.initData();
  //   // }
  //   deps(){
  //     console.log(this.deps,5646646)
  //   }
  // },
  mounted() {
@@ -567,4 +573,4 @@
.el-collapse-item {
  padding-top: 15px !important;
}
</style>
</style>