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

Administrator

2021-08-20 9f0421ca359101cfc56786b80cc5111932796da3

 src/views/securityGuard/securityGuard.vue

@@ -107,7 +107,7 @@
              >导出
            </el-button>
          </template>
 

          <template slot-scope="{ type, size, row }" slot="menu">
            <!-- <el-button
                style="display:none"
@@ -126,12 +126,12 @@
              >离职登记
            </el-button>
          </template>
 

          <template slot-scope="{ row }" slot="sex">
            <el-tag v-if="row.sex == 1">男</el-tag>
            <el-tag v-if="row.sex == 2">女</el-tag>
          </template>
 

          <template slot-scope="{ row }" slot="tenantName">
            <el-tag>{{ row.tenantName }}</el-tag>
          </template>
@@ -162,7 +162,7 @@
            :props="props"
          >
          </el-tree>
 

          <span slot="footer" class="dialog-footer">
            <el-button @click="roleBox = false">取 消</el-button>
            <el-button type="primary" @click="submitRole">确 定</el-button>
@@ -263,7 +263,7 @@
import { getToken } from "@/util/auth";
import { securityFormPageColumn } from "./data";
import { mapState } from "vuex";
 

export default {
  data() {
    const validatePass = (rule, value, callback) => {
@@ -312,7 +312,7 @@
          },
        ],
      },
 

      form: {},
      search: {},
      roleBox: false,
@@ -378,9 +378,12 @@
        calcHeight: 80,
        tip: false,
        searchShow: true,

        indexWidth: 55,
        searchMenuSpan: 6,
        border: false,
        stripe: true,
        border: true,

        align: "center",
        index: true,
        delBtnText: "注销",
@@ -402,7 +405,7 @@
                prop: "deptId",
                type: "tree",
                // dicUrl:
                  // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
                // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
                // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
                props: {
                  label: "title",
@@ -487,12 +490,12 @@
                row: true,
                prop: "myPicture",
              },
 

              // {
              //   label: "编号",
              //   prop: "code",
              // },
 

              {
                label: "所属辖区",
                prop: "jurisdiction",
@@ -625,6 +628,10 @@
              {
                label: "政治面貌",
                prop: "politicaloutlook",
              },
              {
                label: "健康状态",
                prop: "healstats",
              },
              {
                label: "身高",
@@ -927,18 +934,14 @@
      userInfo: (state) => state.user.userInfo,
    }),
  },
  beforeCreate() {
    
  },
  created() {
 
  },
  beforeCreate() {},
  created() {},
  mounted() {
    // this.option.column[0].hide = true
    // 非保安单位模式默认加载管理组数据
    if (!website.tenantMode) {
          this.initData(website.tenantId);
        }
      this.initData(website.tenantId);
    }
  },
  methods: {
    handleImport1() {
@@ -953,7 +956,7 @@
    handleTemplate1() {
      window.open(`/api/examSubjectChoices/export-template`);
    },
 

    //行点击事件
    rowClick(row) {
      this.$router.push({
@@ -1296,28 +1299,36 @@
            const column = that.findObject(that.option.column, "deptId");
            column.search = false;
            const deptColumn = that.findObject(that.option.group, "deptId");
            deptColumn.dicUrl = "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            deptColumn.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            //禁止编辑
            deptColumn.disabled = true;
            deptColumn.value = that.userInfo.dept_id;
            that.isSecurity = true;
            //如果是保安公司管理员
            params["deptId"] = that.userInfo.dept_id;
          }else if (roleAlias == "公安管理员") {
          } else if (roleAlias == "公安管理员") {
            params["jurisdiction"] = that.userInfo.jurisdiction;
            var columnDept = that.findObject(that.option.column, "deptId");
            columnDept.dicUrl = 
                "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction="+that.userInfo.jurisdiction
            columnDept.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
              that.userInfo.jurisdiction;
            var ColumnDeptUpdate = that.findObject(that.option.group, "deptId");
            ColumnDeptUpdate.dicUrl = 
                "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction="+that.userInfo.jurisdiction
          }else{
            ColumnDeptUpdate.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
              that.userInfo.jurisdiction;
          } else {
            var columnDept1 = that.findObject(that.option.column, "deptId");
            columnDept1.dicUrl = "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            var ColumnDeptUpdate1 = that.findObject(that.option.group, "deptId");
            ColumnDeptUpdate1.dicUrl = "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            columnDept1.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            var ColumnDeptUpdate1 = that.findObject(
              that.option.group,
              "deptId"
            );
            ColumnDeptUpdate1.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
          }
 

          let values = {
            ...params,
          };
@@ -1326,20 +1337,25 @@
            roleAlias: "111",
            ...that.query,
          };
 

          that.loading = true;
          getList(page.currentPage, page.pageSize, values).then((res) => {
            const data = res.data.data;
            that.page.total = data.total;
            var d = data.records;
            var date = new Date();
            var datayear = date.getFullYear();
            for (const key in d) {
              var year = d[key].cardid.slice(6, 10);
              d[key]["age"] = +datayear - +year;
              // d[key].securitynumber = "赣洪202100009";
            }
            that.data = data.records;
            that.loading = false;
            that.selectionClear();
          });
        });
      });
      
 
      
    },
    platformRowUpdate(row, index, done, loading) {
      updatePlatform(row.id, row.userType, row.userExt).then(
@@ -1414,11 +1430,11 @@
.box {
  height: 800px;
}
 

.el-scrollbar {
  height: 100%;
}
 

.box .el-scrollbar__wrap {
  overflow: scroll;
}