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

liuyg

2021-08-22 7363584e96318fcab937adcc101523fc09638380

 src/views/securityGuard/securityGuard.vue

@@ -25,6 +25,7 @@
          :permission="permissionList"
          @row-del="rowDel"
          @row-update="rowUpdate"
          :row-style="rowStyle"
          @row-save="rowSave"
          :before-open="beforeOpen"
          :page.sync="page"
@@ -122,6 +123,14 @@
              v-if="permission.securityGuard_delete"
              @click.stop="rowDel(row)"
              >离职登记
            </el-button>
            <el-button
              icon="el-icon-edit"
              :size="size"
              :type="type"
              v-if="permission.securityGuard_check"
              @click.stop="rowCheck(row)"
              >审查异常标记
            </el-button>
          </template>

@@ -856,32 +865,32 @@
            tip: "请上传 .xls,.xlsx 标准格式文件",
            action: "/api/blade-user/import-user",
          },
          {
            label: "数据覆盖",
            prop: "isCovered",
            type: "switch",
            align: "center",
            width: 80,
            dicData: [
              {
                label: "否",
                value: 0,
              },
              {
                label: "是",
                value: 1,
              },
            ],
            value: 0,
            slot: true,
            rules: [
              {
                required: true,
                message: "请选择是否覆盖",
                trigger: "blur",
              },
            ],
          },
          // {
          //   label: "数据覆盖",
          //   prop: "isCovered",
          //   type: "switch",
          //   align: "center",
          //   width: 80,
          //   dicData: [
          //     {
          //       label: "否",
          //       value: 0,
          //     },
          //     {
          //       label: "是",
          //       value: 1,
          //     },
          //   ],
          //   value: 0,
          //   slot: true,
          //   rules: [
          //     {
          //       required: true,
          //       message: "请选择是否覆盖",
          //       trigger: "blur",
          //     },
          //   ],
          // },
          {
            label: "模板下载",
            prop: "excelTemplate",
@@ -957,7 +966,7 @@
      done();
    },
    handleTemplate1() {
      window.open(`/api/examSubjectChoices/export-template`);
      window.open(`/api/blade-user/export-template-security`);
    },

    //行点击事件
@@ -1144,6 +1153,24 @@
          });
        });
    },
    rowCheck(row) {
      this.$confirm("确定审查异常标记?", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
          row.examinationType = "1";
          return update(row);
        })
        .then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!",
          });
        });
    },
    searchReset() {
      this.query = {};
      this.treeDeptId = "";
@@ -1288,6 +1315,14 @@
    currentChange(currentPage) {
      this.page.currentPage = currentPage;
    },
    //行样式调整
    rowStyle({ row, column, rowIndex }) {
      if (row.examinationType == "1") {
        return {
          color: "#ff2727",
        };
      }
    },
    sizeChange(pageSize) {
      this.page.pageSize = pageSize;
    },