Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulator...

zhengpz

2021-09-17 6135c5fa2cce201feb2f62695d5a22680775756a

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory_ys

 src/api/apply/apply.js

New file
@@ -0,0 +1,9 @@
import request from '@/router/axios';

export const update = (row) => {
    return request({
        url: '/api/apply/update',
        method: 'post',
        data: row
    })
}

 src/styles/element-ui.scss

@@ -44,6 +44,10 @@
  padding: 0 !important;
}

.el-upload__tip {
    color: #fff;
}

.el-dropdown-menu__item--divided:before,
.el-menu,
.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
@@ -80,12 +84,15 @@
  border-color: $mainB !important;
  background-color: $mainB !important;
}

.el-form-item__label {
  color: $fontColor !important;
}

.avue-crud__menu {
  background-color: $mainB !important;
}

.el-table {
  background-color: $mainB !important;
  color: $fontColor !important;
@@ -96,72 +103,90 @@
  background-color: $mainB !important;
  color: $fontColor !important;
}

.el-table__body tr.hover-row > td {
  background-color: $mainBhover !important;
}

.el-button--text {
  color: $fontColor !important;
}

.el-card {
  background-color: $mainB !important;
}

.el-tabs__item {
  color: $fontColor !important;
}

//标签栏活动按钮
.el-tabs__item.is-active {
  color: $fontColorActive1 !important;
}

.el-input.is-disabled .el-input__inner {
  color: $fontColor !important;
}

.el-textarea.is-disabled .el-textarea__inner {
  color: $fontColor !important;
}

.el-textarea.is-disabled .el-textarea__inner {
  background-color: $mainB !important;
}

.el-pagination__jump,
.el-pagination__total {
  color: $fontColor !important;
}

.avue-sidebar .el-menu-item i,
.avue-sidebar .el-menu-item span,
.avue-sidebar .el-submenu__title i,
.avue-sidebar .el-submenu__title span {
  color: $fontColor !important;
}

.el-menu-item:hover {
  background-color: $mainBhover !important;
  // color: red !important;
}

.el-input__inner {
  background-color: $inputqiu !important;
  color: $fontColor !important;
  border: 1px solid $inputBorder !important;
}

.el-tree-node__content {
  background-color: $mainB !important;
  color: $fontColor !important;
}

.el-tree-node__content:hover {
  background-color: $mainBhover !important;
}

//el按钮
.el-button {
  background-color: $mainBhover !important;
  color: $fontColor !important;
}

.el-pagination.is-background .btn-next,
.el-pagination.is-background .btn-prev,
.el-pagination.is-background .el-pager li {
  background-color: $inputB !important;
  color: $fontColor !important;
}

.el-tree {
  background-color: $mainB !important;
  color: $fontColor !important;
}

.el-table th {
  background-color: $inputB1 !important;
}
@@ -170,24 +195,29 @@
.el-dialog__header {
  background-color: $mainB !important;
}

.avue-dialog .el-dialog__title,
.avue-dialog .el-drawer__header,
.el-dialog__title {
  color: $fontColor !important;
}

.el-dialog__body {
  background-color: $mainB !important;
  color: $fontColor !important;
}

.w-e-toolbar {
  // background-color: $inputB !important;
  background-color: #fff !important;
  color: $fontColor !important;
  // border: 1px solid $inputBorder !important;
}

.w-e-text-container {
  border: 1px solid $inputBorder !important;
}

.el-collapse-item__content {
  color: $fontColor !important;
}
@@ -201,10 +231,12 @@
.el-upload-dragger {
  background-color: $inputB1 !important;
}

.el-upload-dragger .el-upload__text,
.el-upload-dragger .el-icon-upload {
  color: $fontColor !important;
}

//单选
.el-radio {
  color: $fontColor !important;
@@ -221,24 +253,27 @@
.el-input-number__increase {
  background-color: $inputB1 !important;
}

//菜单图标
.el-input-group__append,
.el-input-group__prepend {
  background-color: $inputB1 !important;
  color: $fontColor !important;
}

//登入表单 恢复按钮
.login-border .el-input__inner {
  background-color: #fff !important;
  color: #606266 !important;
}

//菜单编辑删除按钮
.el-button + .el-button {
  padding-left: 8px;
  padding-right: 8px;
}
//菜单自定义按钮

//菜单自定义按钮
.el-button--text,
.el-button--text.is-disabled,
.el-button--text.is-disabled:focus,
@@ -247,6 +282,7 @@
  padding-left: 8px !important;
  padding-right: 8px !important;
}

//菜单按钮
.login-border .el-button {
  background-color: $buttonB !important;
@@ -267,6 +303,7 @@
.el-autocomplete-suggestion li {
  color: $fontColor !important;
}

.el-autocomplete-suggestion li:hover {
  background-color: $inputB1 !important;
}
@@ -275,13 +312,16 @@
.el-dropdown-menu {
  background-color: $mainB !important;
}

.el-dropdown-menu__item {
  color: $fontColor !important;
}

.el-dropdown-menu__item:hover {
  background-color: $inputB1 !important;
  color: $fontColor !important;
}

//总标签栏
.avue-tags {
  background-color: $mainBx1 !important;
@@ -302,6 +342,7 @@
.avue-logo {
  background-color: $mainB !important;
}

.avue-sidebar {
  background-color: $mainB !important;
}
@@ -311,9 +352,11 @@
.el-select-dropdown__list {
  background-color: $mainB !important;
}

.el-select-dropdown__item {
  color: $fontColor !important;
}

// .el-select-dropdown__item:hover {
//   background-color: $inputB1 !important;
//   color: $fontColor !important;
@@ -323,17 +366,21 @@
  background-color: $inputB1 !important;
  color: $fontColor !important;
}

//弹框消息
.el-message-box {
  background-color: $mainB !important;
}

.el-message-box__content {
  color: $fontColor !important;
}

//用户头像边上的下拉 字体颜色
.el-dropdown-menu__item a {
  color: $fontColor !important;
}

// a
//top导航颜色
.avue-header {
@@ -358,6 +405,7 @@
  background-color: $mainB !important;
  color: $fontColor !important;
}

.el-date-table th {
  color: $fontColor !important;
}
@@ -365,6 +413,7 @@
.el-range-editor--small .el-range-input {
  background-color: transparent !important;
}

.el-picker-panel__icon-btn {
  color: $fontColor !important;
}
@@ -378,6 +427,7 @@
.el-textarea__inner {
  color: $fontColor !important;
}

//通知公告 白色bug
.el-table--striped .el-table__body tr.el-table__row--striped td {
  background-color: transparent !important;
@@ -387,6 +437,7 @@
.el-collapse-item__header {
  background-color: $mainB !important;
}

.avue-group__icon,
.avue-group__title {
  color: $fontColor !important;
@@ -402,8 +453,8 @@
.el-table__expand-icon {
  color: $fontColor !important;
}
// 左侧树形 阴影

// 左侧树形 阴影
// .el-card.is-always-shadow {
//   box-shadow: 3px 3px 15px -2px rgb(0, 0, 0);
// }
@@ -417,6 +468,7 @@
.el-table th.is-leaf {
  border: 1px solid rgba($color: #ffffff, $alpha: 0.2);
}

// //顶部搜索栏
// .el-card.is-never-shadow.avue-crud__search {
//   position: absolute;
@@ -508,7 +560,6 @@
//   position: relative;
//   top: 15px;
// }

// 搜索栏按钮左移
// .avue-form__group:nth-last-child() .el-form-item__content {
//   margin-left: 30px !important;
@@ -517,6 +568,7 @@
.avue-form__menu--center .el-button {
  float: left;
}

.avue-form__menu--center .el-button:nth-child(1) {
  margin-left: 30px;
}
@@ -536,7 +588,6 @@
// .el-tabs--border-card {
//   background-color: $mainB !important;
// }

.el-tabs--border-card {
  background-color: $mainB !important;
}
@@ -544,10 +595,12 @@
.el-tabs--border-card > .el-tabs__header {
  background-color: $mainB !important;
}

.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
  background-color: transparent !important;
  border-bottom: 1px solid $mainB !important;
}

// 系统字典新增
.el-switch__label {
  color: $fontColor;
@@ -569,8 +622,7 @@
}

//覆盖左侧主菜单 监管 样式
.el-menu-item:focus
// .el-menu-item:hover
.el-menu-item:focus // .el-menu-item:hover
{
  background-color: $black !important;
}
@@ -599,7 +651,6 @@
//   display: flex;
//   flex-direction: row-reverse;
// }

.rowClickSelf {
  // border: 1px solid #2593ee !important;
  &:hover {
@@ -612,7 +663,6 @@
//   border: 1px solid #fff;
//   box-sizing: border-box;
// }

.avue-empty__desc {
  color: #fff !important;
}

 src/views/qualificationExamination/paymentInquiry.vue

@@ -25,6 +25,7 @@
                   @refresh-change="refreshChange"
                   @on-load="onLoad">


            <template slot-scope="{ type, size, row }"
                      slot="menu">

@@ -33,7 +34,27 @@
                           :type="type"
                           @click.stop="payTheFees(row)">缴费确认
                </el-button>
                <el-button
            type="text"
            icon="el-icon-download"
            size="small"
            @click="handleDownload(row)"
            >下载
            </el-button>
            <el-button
            type="text"
            icon="el-icon-picture-outline-round"
            size="small"
            @click="seeImages(row)"
            >预览
            </el-button>

            </template>


            <template slot-scope="{ row }"
                      slot="sex">
                {{row.sex==1?'男':row.sex==2?'女':''}}
            </template>

            <template class="tdtype"
@@ -50,7 +71,40 @@
                </el-tag>
            </template>

            <!-- 自定义按钮 -->
            <template slot="menuLeft">
              <el-button
                type="success"
                size="small"
                plain
                icon="el-icon-upload2"
                @click="handleImport"
                >缴费凭证批量上传
              </el-button>
            </template>

        </avue-crud>
        <el-dialog
            title="预览"
            append-to-body
            :visible.sync="imgSee"
            class="see-img-box"
            >
            <div class="img" :style="{ background: imgUrl }"></div>
        </el-dialog>
        <el-dialog
              title="缴费凭证批量上传"
              append-to-body
              :visible.sync="excelBox"
              width="555px"
            >
            <avue-form
              :option="excelOption"
              v-model="excelForm"
              :upload-after="uploadAfter"
            >
            </avue-form>
        </el-dialog>
    </basic-container>
</template>

@@ -97,6 +151,28 @@
            form: {},
            query: {},
            loading: true,
            imgSee: false,
            excelBox: false,
            excelForm: {},
            excelOption: {
                submitBtn: false,
                emptyBtn: false,
                column: [
                {
                    label: "模板上传",
                    prop: "excelFile",
                    type: "upload",
                    drag: true,
                    loadText: "模板上传中，请稍等",
                    span: 24,
                    propsHttp: {
                    res: "data",
                    },
                    tip: "请上传 zip 压缩文件",
                    action: "/api/blade-resource/oss/endpoint/put-file-exam-payment-zip",
                }
                ],
            },
            page: {
                pageSize: 10,
                currentPage: 1,
@@ -110,7 +186,7 @@
                addBtn: false,
                selection: true,
                menu: true,

                menuWidth:260,
                searchShowBtn: false,

                align: "center",
@@ -124,24 +200,86 @@
                dialogClickModal: false,

                column: [
                    // {
                    //   label: "姓名",
                    //   prop: "securityName",
                    //   // slot: true,
                    //   // display: false,
                    // },
                    {
                        label: "缴费类型",
                        prop: "type",
                        dicData: dic1,
                        searchSpan: 4,
                        label: "缴费人",
                        prop: "realName",
                        search: true,
                        type: "select",
                        // slot: true,
                        // display: false,
                        searchSpan:4,
                    },
                    {
                        // label: "考试开始时间",
                        label: "身份证号",
                        prop: "idCardNo",
                        search:true,
                        searchSpan:4,
                        width:150
                    },
                    {
                        label: "性别",
                        prop: "sex",
                        slot:true,
                        dicData: [
                            {
                            label:"男",
                            value:1
                            },
                            {
                            label:"女",
                            value:2
                            }
                        ],
                    },
                    {
                        label: "联系方式",
                        prop: "phone",
                    },
                    {
                        label: "所在单位",
                        prop: "deptName",
                        search:true,
                        searchSpan:6,
                        width:200
                    },
                    {
                        label: "报考证件类型",
                        prop: "paperType"
                    },
                    {
                        label: "报名时间",
                        prop: "applyTime",
                        type: "datetime",
                        format: "yyyy-MM-dd HH:mm:ss",
                        valueFormat: "yyyy-MM-dd HH:mm:ss",
                        width:150
                    },
                    {
                        label: "缴费状态",
                        prop: "paymentStatus",
                        searchSpan: 4,
                        search: true,
                        dicData: [
                          {
                            label:"已缴费",
                            value:1
                          },
                          {
                            label:"未缴费",
                            value:2
                          },
                          {
                            label:"部分缴费",
                            value:3
                          },
                        ],
                        type: "select",
                    },
                    {
                        label: "缴费凭证",
                        prop: "certificateUrl",
                        overHidden: true,
                        type: "upload",
                        listType: "picture-img",
                    },
                    {
                        label: "缴费时间",
                        prop: "paymentTime",
                        type: "date",
@@ -158,66 +296,8 @@
                                trigger: "click",
                            },
                        ],
                        // slot: true,
                        // display: false,
                        // formatter: function (row, value) {
                        //   return (value = value + "%");
                        // },
                    },
                    // {
                    //   label: "考试结束时间",
                    //   prop: "examEndTime",
                    //   type: "date",
                    //   format: "yyyy-MM-dd",
                    //   valueFormat: "yyyy-MM-dd",
                    //   labelWidth: 120,
                    //   searchSpan: 4,
                    //   search: true,
                    //   overHidden: true,
                    //   rules: [
                    //     {
                    //       required: true,
                    //       message: "请输入时间",
                    //       trigger: "click",
                    //     },
                    //   ],
                    //   // slot: true,
                    //   // display: false,
                    //   // formatter: function (row, value) {
                    //   //   return (value = value + "万元");
                    //   // },
                    // },
                    // {
                    //   label: "考试类型",
                    //   prop: "examinationaddress",
                    //   // slot: true,
                    //   // display: false,
                    // },
                    {
                        label: "缴费人",
                        prop: "deptName",
                        // searchSpan: 4,
                        // search: true,
                        // slot: true,
                        // display: false,
                    },
                    {
                        label: "缴费状态",
                        prop: "paymentStatus",
                        searchSpan: 4,
                        search: true,
                        dicData: dic2,
                        type: "select",
                        // slot: true,
                        // display: false,
                    },
                    {
                        label: "报名编号",
                        prop: "applyCode",
                        overHidden: true,
                        // slot: true,
                        // display: false,
                    },
                    
                ],
            },
            data: [
@@ -383,6 +463,24 @@
                // this.selectionClear();
            });
        },
        handleDownload(row) {
            window.open(`${row.certificateUrl}`);
        },
        seeImages(row) {
            this.imgUrl = "";
            this.imgUrl = "url(" + row.certificateUrl + ") center center / contain no-repeat";

            this.imgSee = true;
        },
        handleImport() {
            this.excelBox = true;
        },
        uploadAfter(res, done, loading, column) {
            window.console.log(column);
            this.excelBox = false;
            this.refreshChange();
            done();
        },
        // onLoad(page, params = {}) {
        //   // this.loading = false;
        //   this.loading = true;

 src/views/qualificationExamination/signQualificationExamination.vue

@@ -26,6 +26,24 @@
      @refresh-change="refreshChange"
      @on-load="onLoad"
    >

      <template slot-scope="{ type, size, row }"
                      slot="menu">

                <el-button icon="el-icon-edit"
                           :size="size"
                           :type="type"
                           @click.stop="payTheFees(row)">审核
                </el-button>
      </template>
      <template slot-scope="{ row }"
                      slot="examinationType">
          {{row.examinationType=="1"?"正常":row.examinationType=="2"?"异常":"正常"}}
      </template>
      <template slot-scope="{ row }"
                      slot="auditStatus">
          {{row.auditStatus==1?"审核通过":row.auditStatus==2?"审核不通过":"待审核"}}
      </template>
    </avue-crud>
  </basic-container>
</template>
@@ -35,6 +53,9 @@
  getList,
  getListJSON,
} from "@/api/qualificationExamination/signQualificationExamination";
import {
  update
} from "@/api/apply/apply";
import { mapGetters } from "vuex";

export default {
@@ -55,7 +76,7 @@
        editBtn: false,
        addBtn: false,
        selection: true,
        menu: false,
        menu: true,

        align: "center",
        height: "auto",
@@ -135,6 +156,7 @@
          {
            label: "审查状态",
            prop: "examinationType",
            slot:true,
            // // display: false,
            // width: 200,
            // labelWidth: 120,
@@ -148,14 +170,15 @@
            // labelWidth: 120,
            // overHidden: true,
          },
          // {
          //   label: "审查结果",
          //   prop: "results",
          //   // // display: false,
          //   // width: 200,
          //   // labelWidth: 120,
          //   // overHidden: true,
          // },
          {
            label: "审核状态",
            prop: "auditStatus",
            slot:true,
            // // display: false,
            // width: 200,
            // labelWidth: 120,
            // overHidden: true,
          },
        ],
        // group: [
        //   {
@@ -231,6 +254,40 @@
        }
      );
    },
    payTheFees (row) {
            console.log(row)
            this.$confirm("请确认是否审核通过？", {
                confirmButtonText: "审核通过",
                cancelButtonText: "审核不通过",
                type: "warning",
            })
                .then(() => {
                    var  data  ={
                      id:row.id,
                      auditStatus:1
                    }
                    return update(data).then(() => {
                        this.onLoad(this.page);
                        this.$message({
                            type: "success",
                            message: "操作成功!",
                        });
                    });
                })
                .catch(() => {
                    var  data  ={
                      id:row.id,
                      auditStatus:2
                    }
                    return update(data).then(() => {
                        this.onLoad(this.page);
                        this.$message({
                            type: "success",
                            message: "操作成功!",
                        });
                    });
                });
        },
    rowUpdates(row, index, done, loading) {
      // console.log(42342);
      update(row).then(

 src/views/securityCompany/regulatoryInformation.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-07 17:30:05
 * @Last Modified by: liu
 * @Last Modified time: 2021-09-15 11:22:23
 * @Last Modified time: 2021-09-15 19:56:58
 * menu-name 监管信息
 */
<template>
@@ -131,7 +131,7 @@
            ],
          },
          {
            label: "处罚类型",
            label: "监管类型",
            prop: "punishtype",
            type: "select",
            labelWidth: 120,
@@ -146,14 +146,14 @@
            width: 120,
          },
          {
            label: "处罚原因",
            label: "原因",
            prop: "punishreason",
            // display: false,
            labelWidth: 120,
            width: 200,
          },
          {
            label: "处罚结果",
            label: "结果",
            prop: "punishresult",
            // display: false,
            width: 200,
@@ -161,7 +161,7 @@
            overHidden: true,
          },
          {
            label: "处罚日期",
            label: "日期",
            prop: "punishtime",
            type: "date",
            format: "yyyy-MM-dd",
@@ -178,7 +178,7 @@
          },

          {
            label: "处罚批准文号",
            label: "批准文号",
            prop: "punisnum",
            labelWidth: 120,
            // display: false,