冲突

liuyg

2022-02-16 af0aaf0fe19dc69369ee2f7e5ca001c24353a22e

 src/views/securityGuardManagement/registerOnce.vue

@@ -28,14 +28,14 @@
            @refresh-change="refreshChange"
            @on-load="onLoad"
          >
            <template slot-scope="{ row }" slot="deptId">
            <!-- <template slot-scope="{ row }" slot="deptId">
              <el-tag
                class="rowClickSelf"
                title="点击查看所属公司情况"
                @click="rowClickSelf(row.deptId)"
                >{{ row.$deptId }}</el-tag
              >
            </template>
            </template> -->
            <template slot-scope="{ type, size, row }" slot="menu">
              <el-button
                :size="size"
@@ -300,7 +300,7 @@
            display: false,
          },
          {
            label: "所属保安公司",
            label: "企业名称",
            searchLabelWidth: "110",
            // prop: "deptName",
            prop: "deptId",
@@ -616,6 +616,9 @@
      return ids.join(",");
    },
  },
  created(){
    this.departmentid = this.$route.query.departmentid;
  },
  mounted() {
    //重复菜单

@@ -643,7 +646,7 @@
    // 判断是否从保安公司人数点击跳转
    if (this.$route.query.departmentid) {
      this.departmentid = this.$route.query.departmentid;
      // console.log(this.departmentid, "ddddddddddddd");
      console.log(this.departmentid, "ddddddddddddd");
      this.spanRight = 24;
      this.spanLeft = 0;
      var d = this.option.column;
@@ -809,12 +812,14 @@
    refreshChange() {
      this.onLoad(this.page, this.query);
    },
    onLoad(page, params = {}, deptId) {
    onLoad(page, params = {}) {
      this.loading = true;
      params["jurisdiction"] = this.jurisdiction;
      if (this.departmentid) {
        params["deptId"] = this.departmentid;
      }
      console.log(params,123456)
      console.log(this.query,123456)
      getListSecurity(
        page.currentPage,
        page.pageSize,