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

liuyg

2021-09-26 07f1c1c536b439fd006a46b52ed3ec538492431b

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

 src/views/securityGuard/securityGuard.vue

@@ -131,7 +131,7 @@
              :size="size"
              :type="type"
              v-if="permission.securityGuard_delete && row.status != 2"
              @click.stop="rowDel(row)"
              @click.stop="rowStatus(row)"
              >离职登记
            </el-button>
            <el-button
@@ -473,8 +473,7 @@
        searchMenuSpan: 6,
        stripe: true,
        border: true,
        delBtn: false,

        delBtn: true,
        align: "center",
        index: true,
        delBtnText: "注销",
@@ -766,6 +765,11 @@
                  //   value: 3,
                  // },
                ],
                rules: [{
                    required: true,
                    message: "请选择性别",
                    trigger: "blur"
                }]
              },
              // {
              //   label: "生日",
@@ -1120,7 +1124,7 @@
        }
      );
    },
    rowDel(row) {
    rowStatus(row) {
      this.$prompt("离职原因", "提示", {
        confirmButtonText: "确定离职",
        cancelButtonText: "取消",
@@ -1142,6 +1146,23 @@
        })
        .catch(() => {});
    },
    rowDel(row) {
      this.$confirm("确定注销当前用户?", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
          return remove(row.id);
        })
        .then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!",
          });
        });
    },
    rowCheck(row) {
      this.$confirm("确定审查异常标记?", {
        confirmButtonText: "确定",

 src/views/traincompany/index.vue

@@ -111,7 +111,7 @@
        dialogClickModal: false,
        column: [
          {
            label: "公司名称",
            label: "学校",
            prop: "deptName",
            search: true,
            searchSpan: 4,
@@ -158,7 +158,7 @@
        labelWidth:110,
        column: [
          {
              label: "培训公司名称",
              label: "学校",
              prop: "trainingUnitId",
              dicUrl: "/api/blade-system/dept/lazy-tree-type?parentId=1418458374477549569",
              cascaderItem: ["trainExamId"],
@@ -170,7 +170,7 @@
              disabled:true,
              rules: [{
                  required: true,
                  message: "请输入培训公司名称",
                  message: "请输入学校",
                  trigger: "blur"
              }],
              hide:true,