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

shuishen

2021-08-13 991eb36cef84ee585540977217915d9d4b534637

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

 public/papers.html

@@ -121,8 +121,8 @@
            var examType = JSON.parse(getData("data")).examType;
            // console.log(JSON.parse(getData("data")), 111);

            // axios.get('http://223.82.109.183:2080/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
            axios.get('http://localhost:81/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
            axios.get('http://223.82.109.183:2080/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
                // axios.get('http://localhost:81/apply/getApplyInfo?id=' + id + "&applyExamType=" + examType).then(function(res) {
                var data = res.data.data;
                var str = `<span class="title">${data.examName}</span>
                    <span class="title">准考证信息</span>

 public/papersApply.html

@@ -77,8 +77,8 @@
            var name = JSON.parse(getData("data")).name;
            // console.log(JSON.parse(getData("data")), 111);

            // axios.get('http://223.82.109.183:2080/apply/getApplyDetailList?examId=' + id).then(function(res) {
            axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
            axios.get('http://223.82.109.183:2080/apply/getApplyDetailList?examId=' + id).then(function(res) {
                // axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
                var data = res.data;
                var list = data.applyList;
                console.log(data, 123);

 src/api/owner/owner.js

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

export const getList = (current, size, params) => {
    return request({
        url: '/api/owner/list',
        method: 'get',
        params: {
            ...params,
            current,
            size,
        }
    })
}

export const getListPage = (current, size, params) => {
    return request({
        url: '/api/owner/page',
        method: 'get',
        params: {
            ...params,
            current,
            size,
        }
    })
}

export const remove = (ids) => {
    return request({
        url: '/api/owner/remove',
        method: 'post',
        params: {
            ids,
        }
    })
}

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

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

export const getNotice = (id) => {
    return request({
        url: '/api/owner/detail',
        method: 'get',
        params: {
            id
        }
    })
}

 src/views/exam/performance.vue

@@ -158,6 +158,7 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
          },
          {
            label: "保安姓名",
@@ -279,7 +280,7 @@
              label: "总成绩",
              prop: "allGrade",
              slot: true,
              hide:true,
              // hide:true,
              // 表单新增时是否禁止
              addDisabled: false,
              viewDisplay:false,

 src/views/exam/singleperformance.vue

@@ -149,6 +149,7 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
          },
          {
            label: "保安姓名",

 src/views/ownerFeedback/owner.vue

New file
@@ -0,0 +1,261 @@
<template>
  <basic-container>
    <avue-crud :option="option"
               :table-loading="loading"
               :data="data"
               :page.sync="page"
               ref="crud"
               @row-del="rowDel"
               v-model="form"
               :permission="permissionList"
               @row-update="rowUpdate"
               @row-save="rowSave"
               :before-open="beforeOpen"
               @search-change="searchChange"
               @search-reset="searchReset"
               @selection-change="selectionChange"
               @current-change="currentChange"
               @size-change="sizeChange"
               @refresh-change="refreshChange"
               @on-load="onLoad">
      <template slot="menuLeft">
        <el-button type="danger"
                   size="small"
                   icon="el-icon-delete"
                   plain
                   v-if="permission.owner_delete"
                   @click="handleDelete">删 除
        </el-button>
      </template>
      <template slot-scope="{row}"
                slot="category">
        <el-tag>{{row.categoryName}}</el-tag>
      </template>
    </avue-crud>
  </basic-container>
</template>

<script>
  import {getList, remove, update, add, getNotice} from "@/api/owner/owner";
  import {mapGetters} from "vuex";

  export default {
    data() {
      return {
        form: {},
        query: {},
        loading: true,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        },
        selectionList: [],
        option: {
          height: 'auto',
          calcHeight: 54,
          dialogWidth: 950,
          tip: false,
          searchShow: true,
          labelWidth: 120,
          searchMenuSpan: 6,
          border: true,
          index: true,
          viewBtn: true,
          selection: true,
          excelBtn: true,
          dialogClickModal: false,
          column: [
            {
              label: "服务单位",
              prop: "company",
              search: true,
              rules: [{
                required: true,
                message: "请输入服务单位",
                trigger: "blur"
              }]
            },
            {
              label: "服务单位",
              prop: "companyContact",
            },
            {
              label: "反馈时间",
              prop: "feedbackTime",
              type: "date",
              format: "yyyy-MM-dd hh:mm:ss",
              valueFormat: "yyyy-MM-dd hh:mm:ss",
              rules: [{
                required: true,
                message: "请输入反馈时间",
                trigger: "click"
              }]
            }, {
              label: "反馈意见",
              prop: "opinion",
            }, {
              label: "业主",
              prop: "owner",
            }, {
              label: "业主联系方式",
              prop: "ownerContact",
            }, {
              label: "备注",
              prop: "remarks",
            }, {
              label: "处置结果",
              prop: "result",
            }
          ]
        },
        data: []
      };
    },
    computed: {
      ...mapGetters(["permission"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.owner_add, false),
          viewBtn: this.vaildData(this.permission.owner_view, false),
          delBtn: this.vaildData(this.permission.owner_delete, false),
          editBtn: this.vaildData(this.permission.owner_edit, false)
        };
      },
      ids() {
        let ids = [];
        this.selectionList.forEach(ele => {
          ids.push(ele.id);
        });
        return ids.join(",");
      }
    },
    methods: {
      rowSave(row, done, loading) {
        add(row).then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
        }, error => {
          window.console.log(error);
          loading();
        });
      },
      rowUpdate(row, index, done, loading) {
        update(row).then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
        }, error => {
          window.console.log(error);
          loading();
        });
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            return remove(row.id);
          })
          .then(() => {
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            });
          });
      },
      searchReset() {
        this.query = {};
        this.onLoad(this.page);
      },
      searchChange(params, done) {
        this.query = params;
        this.page.currentPage = 1;
        this.onLoad(this.page, params);
        done();
      },
      selectionChange(list) {
        this.selectionList = list;
      },
      selectionClear() {
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
      },
      handleDelete() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
          return;
        }
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            return remove(this.ids);
          })
          .then(() => {
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            });
            this.$refs.crud.toggleSelection();
          });
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getNotice(this.form.id).then(res => {
            this.form = res.data.data;
          });
        }
        done();
      },
      currentChange(currentPage) {
        this.page.currentPage = currentPage;
      },
      sizeChange(pageSize) {
        this.page.pageSize = pageSize;
      },
      refreshChange() {
        this.onLoad(this.page, this.query);
      },
      onLoad(page, params = {}) {
        const {releaseTimeRange} = this.query;
        let values = {
          ...params,
        };
        if (releaseTimeRange) {
          values = {
            ...params,
            releaseTime_datege: releaseTimeRange[0],
            releaseTime_datelt: releaseTimeRange[1],
            ...this.query
          };
          values.releaseTimeRange = null;
        }
        this.loading = true;
        getList(page.currentPage, page.pageSize, values).then(res => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
          this.loading = false;
          this.selectionClear();
        });
      }
    }
  };
</script>

<style>
</style>

 src/views/trainExam/performance.vue

@@ -158,6 +158,7 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
          },
          {
            label: "保安姓名",
@@ -279,7 +280,7 @@
              label: "总成绩",
              prop: "allGrade",
              slot: true,
              hide:true,
              // hide:true,
              // 表单新增时是否禁止
              addDisabled: false,
              viewDisplay:false,

 src/views/trainExam/singleperformance.vue

@@ -149,6 +149,7 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
          },
          {
            label: "保安姓名",

 src/views/traincompany/index.vue

@@ -3,7 +3,7 @@
 * @Date: 2021-07-07 17:30:05
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-07-10 16:06:14
 * menu-name 保安培训单位
 * menu-name 保安培训报名
 */
<template>
  <basic-container>
@@ -286,6 +286,7 @@
    submit(){
        batchTrain({
          userIds: this.formTrainApply.userId.join(","),
          trainingUnitId: this.formTrainApply.trainingUnitId
        }).then(
          (res) => {
            this.onLoad(this.page);