+解决和冲突合并，加上适应1366*768分辨率

liuyg

2022-02-16 19e0b728e8cd41f9ddcd62eea6c15ebf769d9977

 src/views/qualificationExamination/signQualificationExamination.vue

@@ -1,5 +1,5 @@
/* * @Author: Morpheus * @Date: 2021-07-07 17:30:05 * @Last Modified by:
Morpheus * @Last Modified time: 2021-07-10 16:06:14 * menu-name 监管信息 */
Morpheus * @Last Modified time: 2021-07-10 16:06:14 * menu-name 考试监管信息 */
<template>
  <basic-container
    :class="[
@@ -13,6 +13,7 @@
      :table-loading="loading"
      :data="data"
      :page.sync="page"
      :search.sync="search"
      :permission="permissionList"
      v-model="form"
      ref="crud"
@@ -32,10 +33,7 @@
</template>

<script>
import {
  getList,
  getListJSON,
} from "@/api/qualificationExamination/signQualificationExamination";
import { getTrainList } from "@/api/qualificationExamination/signQualificationExamination";
import { mapGetters } from "vuex";

export default {
@@ -43,6 +41,7 @@
    return {
      form: {},
      query: {},
      search: {},
      loading: true,
      page: {
        pageSize: 10,
@@ -69,32 +68,48 @@
        viewBtn: true,
        dialogClickModal: false,
        ...this.$store.state.control.clearOtherBut,
        searchIndex: 5, //收缩展示数量

        column: [
          {
            label: "保安姓名",
            prop: "realName",
            width: 85,
            search: true,
            searchSpan: 3,
            width: 90,
          },
          {
            label: "保安公司",
            label: "性别",
            prop: "sex",
            width: 60,
            dicData: [
              {
                label: "男",
                value: 1,
              },
              {
                label: "女",
                value: 2,
              },
            ],
          },
          {
            label: "身份证号",
            prop: "idCardNo",
            search: true,
            searchSpan: 4,
            width: 140,
          },
          {
            label: "企业名称",
            prop: "deptName",
            overHidden: true,
            search: true,
            searchSpan: 4,
            // display: false,
            // labelWidth: 120,
            // width: 200,
          },
          // {
          //   label: "准考证号",
          //   prop: "userId",
          //   overHidden: true,
          // },

          {
            label: "报名时间",
            prop: "applyTime",
            prop: "trainingTime",
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
@@ -106,43 +121,108 @@
            // search: true,
            searchSpan: 4,
            // display: false,·
            width: 120,
            width: 110,
          },
          // {
          //   label: "考试时间",
          //   prop: "applyTime",
          //   type: "date",
          //   format: "yyyy-MM-dd",
          //   valueFormat: "yyyy-MM-dd",
          //   mock: {
          //     type: "datetime",
          //     labelWidth: 120,
          //     format: "yyyy-MM-dd",
          //   },
          //   // search: true,
          //   searchSpan: 4,
          //   // display: false,
          //   width: 180,
          // },
          // {
          //   label: "证件类型",
          //   prop: "certificatetype",
          //   // labelWidth: 120,
          //   // display: false,
          // },
          //   {
          //     label: "保安员证",
          //     prop: "certificate",
          //     // labelWidth: 120,
          //     // display: false,
          //   },
          {
            label: "考试名称",
            prop: "trainExamName",
            searchSpan: 5,
            overHidden: true,
            search: true,
          },
          {
            label: "培训学校名称",
            searchLabelWidth: 110,
            searchSpan: 5,
            prop: "trainUnitName",
            overHidden: true,
            search: true,
          },
          {
            label: "考试时间",
            prop: "trainExamTime",
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            // mock: {
            //   type: "datetime",
            //   labelWidth: 120,
            //   format: "yyyy-MM-dd",
            // },
            // search: true,
            // searchSpan: 4,
            // display: false,
            width: 110,
          },
          {
            label: "考试时间",
            prop: "examTime",
            type: "date",
            hide: true,
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            // mock: {
            //   type: "datetime",
            //   labelWidth: 120,
            //   format: "yyyy-MM-dd",
            // },
            search: true,
            searchSpan: 4,
            // display: false,
            width: 150,
          },
          {
            label: "考试申请审核状态",
            prop: "auditStatus",
            searchLabelWidth: 140,
            type: "select",
            width: 100,
            search: true,
            searchSpan: 4,
            dicData: [
              {
                label: "全部",
                value: 0,
              },
              {
                label: "待审核",
                value: 3,
              },
              {
                label: "审核通过",
                value: 1,
              },
              {
                label: "审核不通过",
                value: 2,
              },
              {
                label: "未提交审核",
                value: 4,
              },
            ],
          },
          {
            label: "审查状态",
            prop: "examinationType",
            // // display: false,
            // width: 200,
            // labelWidth: 120,
            // overHidden: true,
            type: "select",
            width: 80,
            search: true,
            searchSpan: 3,
            dicData: [
              {
                label: "全部",
                value: "2",
              },
              {
                label: "正常",
                value: "0",
              },
              {
                label: "异常",
                value: "1",
              },
            ],
          },
          {
            label: "审查明细",
@@ -151,6 +231,13 @@
            // width: 200,
            // labelWidth: 120,
            // overHidden: true,
          },
          {
            label: "审查时间",
            prop: "auditTime",
            type: "date",
            format: "yyyy-MM-dd HH:mm:ss",
            valueFormat: "yyyy-MM-dd HH:mm:ss",
          },
          // {
          //   label: "审查结果",
@@ -217,6 +304,9 @@
      });
      return ids.join(",");
    },
  },
  created() {
    this.search["auditStatus"] = 3;
  },
  mounted() {
    this.$store.commit("setWindowSizeHeightAdd");
@@ -308,8 +398,11 @@
    },
    onLoad(page, params = {}) {
      // this.loading = false;
      params = this.search;
      this.loading = true;
      getList(
      //已提交考试审核
      // params['auditStatus'] = 3;
      getTrainList(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.query)
@@ -318,14 +411,24 @@
        this.page.total = data.total;
        var d = data.records;
        for (var k in d) {
          if (d[k].examinationType == 1) {
          if (
            d[k].examinationType == "0" ||
            d[k].examinationType == "" ||
            d[k].examinationType == null
          ) {
            d[k].examinationType = "正常";
          } else if (d[k].examinationType == 2) {
          } else if (d[k].examinationType == "1") {
            d[k].examinationType = "异常";
          }
          if (d[k].sex == -1) {
            d[k].sex = "";
          }
          if (d[k].auditStatus == -1) {
            d[k].auditStatus = "";
          }
        }
        this.data = data.records;
        this.$store.commit("setWindowSizeHeightAdd");
        this.data = data.records;
        this.loading = false;
        // this.selectionClear();
      });