From 001cd68503b8dfe839f897c812404d937e6f361d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 23 Jul 2021 09:48:58 +0800
Subject: [PATCH] 保安员考试管理完善 添加成绩查询 缴费查询 报名培训查询，样式调整， 数据对接指令查询
---
src/views/qualificationExamination/signQualificationExamination.vue | 2
src/router/views/index.js | 27
src/api/commandQuery/taskDistribution.js | 53 +
src/views/commandQuery/incidentReporting.vue | 0
src/views/permit/permit.vue | 2
src/views/commandQuery/taskDistribution.vue | 319 ++++++
src/views/qualificationExamination/qualificationExamination.vue | 2
src/views/revoke/revoke.vue | 2
src/views/securityCompany/computents/service.vue | 215 +++-
src/views/qualificationExamination/paymentInquiry.vue | 379 ++++++++
src/api/securityCompany/securityCompany.js | 51 +
src/views/securityCompany/companyDetails.vue | 9
src/api/commandQuery/commandQuery.js | 14
src/views/qualificationExamination/scoreInquiry.vue | 344 +++++++
src/views/recordk/recordk.vue | 2
src/views/qualificationExamination/registrationTrainingQuery.vue | 568 ++++++++++++
src/views/securityCompany/computents/enclosure.vue | 398 ++++++++
src/views/management/computents/dispatch.vue | 2
src/views/record/record.vue | 2
src/views/management/computents/achievement.vue | 2
src/views/securityCompany/computents/punish.vue | 2
src/views/management/computents/performance.vue | 2
src/styles/element-ui.scss | 12
src/views/securityCompany/dispatch.vue | 77
src/views/management/computents/honor.vue | 2
src/api/qualificationExamination/scoreInquiry.js | 38
/dev/null | 150 ---
src/views/securityCompany/computents/equipment.vue | 2
src/views/securityCompany/computents/staff.vue | 33
src/api/commandQuery/datasignQualificationExamination.js | 74 +
src/views/management/computents/train.vue | 2
31 files changed, 2,512 insertions(+), 275 deletions(-)
diff --git a/src/api/commandQuery/commandQuery.js b/src/api/commandQuery/commandQuery.js
new file mode 100644
index 0000000..468bf90
--- /dev/null
+++ b/src/api/commandQuery/commandQuery.js
@@ -0,0 +1,14 @@
+
+import request from '@/router/axios';
+
+export const getLisperetaskDistribution = (current, size, params) => {
+ return request({
+ url: '/api/directive/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size
+ }
+ })
+}
\ No newline at end of file
diff --git a/src/api/commandQuery/datasignQualificationExamination.js b/src/api/commandQuery/datasignQualificationExamination.js
new file mode 100644
index 0000000..2a7c13c
--- /dev/null
+++ b/src/api/commandQuery/datasignQualificationExamination.js
@@ -0,0 +1,74 @@
+export var datasing = [
+ {
+ "保安姓名": "钟日健",
+ "试卷名称": "KKAISHIDHI",
+ "所属公司": "江西安泰保安服务有限公司",
+ "准考证号": "",
+ "试卷分数": 150,
+ "报名时间": "2021-07-18 15:31:06",
+ "考试时间": "2021-07-04 00:00:00"
+ },
+ {
+ "保安姓名": "唐子玉",
+ "试卷名称": "2021南昌市保安员考试 ",
+ "所属公司": "江西安泰保安服务有限公司",
+ "准考证号": "2107N0Q0000",
+ "试卷分数": 100,
+ "报名时间": "2021-07-18 15:58:43",
+ "考试时间": "2021-07-19 00:00:00"
+ },
+ {
+ "保安姓名": "曾杭",
+ "试卷名称": "2021南昌市保安员考试 ",
+ "所属公司": "江西安泰保安服务有限公司",
+ "准考证号": "2107N0Q0001",
+ "试卷分数": 100,
+ "报名时间": "2021-07-18 19:45:52",
+ "考试时间": "2021-07-19 00:00:00"
+ },
+ {
+ "保安姓名": "钟日健",
+ "试卷名称": "2021南昌市保安员考试 ",
+ "所属公司": "江西安泰保安服务有限公司",
+ "准考证号": "2107N0Q0002",
+ "试卷分数": 100,
+ "报名时间": "2021-07-18 20:52:24",
+ "考试时间": "2021-07-19 00:00:00"
+ },
+ {
+ "保安姓名": "曾杭",
+ "试卷名称": "2021南昌市保安员考试 ",
+ "所属公司": "江西安泰保安服务有限公司",
+ "准考证号": "2107N0Q0003",
+ "试卷分数": 100,
+ "报名时间": "2021-07-18 20:52:24",
+ "考试时间": "2021-07-19 00:00:00"
+ },
+ {
+ "保安姓名": "曾杭2",
+ "试卷名称": "2021南昌市保安员考试 ",
+ "所属公司": "江西安泰保安服务有限公司",
+ "准考证号": "2107N0Q0004",
+ "试卷分数": 100,
+ "报名时间": "2021-07-18 20:58:00",
+ "考试时间": "2021-07-19 00:00:00"
+ },
+ {
+ "保安姓名": "钟松",
+ "试卷名称": "2021南昌市保安员考试 ",
+ "所属公司": "江西高创保安服务技术有限公司",
+ "准考证号": "2107N0Q0005",
+ "试卷分数": 100,
+ "报名时间": "2021-07-19 15:08:07",
+ "考试时间": "2021-07-19 00:00:00"
+ },
+ {
+ "保安姓名": "钟松1",
+ "试卷名称": "2021南昌市保安员考试 ",
+ "所属公司": "江西高创保安服务技术有限公司",
+ "准考证号": "2107N0Q0006",
+ "试卷分数": 100,
+ "报名时间": "2021-07-19 15:36:11",
+ "考试时间": "2021-07-19 00:00:00"
+ }
+]
\ No newline at end of file
diff --git a/src/api/commandQuery/taskDistribution.js b/src/api/commandQuery/taskDistribution.js
new file mode 100644
index 0000000..8b34727
--- /dev/null
+++ b/src/api/commandQuery/taskDistribution.js
@@ -0,0 +1,53 @@
+import request from '@/router/axios';
+import axios from 'axios'
+
+// var newAxios = axios.create({
+// baseURL: "http://192.168.0.105:812",
+// withCredentials: false,
+// // headers: {
+// // "Content-type": "application/x-ww-form-urlencoded"
+// // }
+// })
+
+export const getList = (current, size, params) => {
+ return request({
+ // return newAxios({
+ url: '/api/apply/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
+export const adddata = (row) => {
+ return request({
+ // return newAxios({
+ url: '/api/punish/save',
+ // url: 'http://192.168.0.104:80/punish/save',
+ method: 'post',
+ data: row
+ })
+}
+
+export const update = (row) => {
+ return request({
+ // return newAxios({
+ url: '/api/punish/update',
+ method: 'post',
+ data: row
+ })
+}
+
+export const remove = (ids) => {
+ return request({
+ // return newAxios({
+ url: '/api/punish/remove',
+ method: 'post',
+ params: {
+ ids,
+ }
+ })
+}
\ No newline at end of file
diff --git a/src/api/qualificationExamination/scoreInquiry.js b/src/api/qualificationExamination/scoreInquiry.js
new file mode 100644
index 0000000..45a5f64
--- /dev/null
+++ b/src/api/qualificationExamination/scoreInquiry.js
@@ -0,0 +1,38 @@
+
+import request from '@/router/axios';
+
+export const getLisperexamScore = (current, size, params, userId) => {
+ return request({
+ url: '/api/examScore/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ userId
+ }
+ })
+}
+export const getLispereexamPayment = (current, size, params) => {
+ return request({
+ url: '/api/examPayment/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size
+ }
+ })
+}
+
+export const getLispereregistrationTrainingQuery = (current, size, params) => {
+ return request({
+ url: '/api/trainingRegistration/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
\ No newline at end of file
diff --git a/src/api/securityCompany/securityCompany.js b/src/api/securityCompany/securityCompany.js
index 58ba252..cfd68be 100644
--- a/src/api/securityCompany/securityCompany.js
+++ b/src/api/securityCompany/securityCompany.js
@@ -11,4 +11,55 @@
deptId
}
})
+}
+export const getListestaff = (current, size, params, deptId) => {
+ return request({
+ url: '/api/blade-user/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ deptId
+ }
+ })
+}
+
+// export const getListeservice = (current, size, params, deptId) => {
+// return request({
+// url: '/api/blade-user/page',
+// method: 'get',
+// params: {
+// ...params,
+// current,
+// size,
+// deptId
+// }
+// })
+// }
+
+export const getListeservice = (current, size, params, deptId) => {
+ return request({
+ url: '/api/dispatcher/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ deptId
+ }
+ })
+}
+
+export const getListeenclosure = (current, size, params, deptid) => {
+ return request({
+ url: '/api/blade-resource/attach/list',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ deptid
+ }
+ })
}
\ No newline at end of file
diff --git a/src/router/views/index.js b/src/router/views/index.js
index fc5dff2..1d9748c 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -286,6 +286,33 @@
component: () =>
import( /* webpackChunkName: "views" */ '@/views/regulatoryInformation/index')
}]
+ }, {
+ path: '/commandQuery',
+ redirect: '/commandQuery/index',
+ component: Layout,
+ children: [{
+ path: 'index',
+ name: '指令查询',
+ meta: {
+ i18n: 'index',
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/commandQuery/taskDistribution')
+ }]
+ },
+ {
+ path: '/qualificationExamination',
+ redirect: '/qualificationExamination/registrationTrainingQuery',
+ component: Layout,
+ children: [{
+ path: 'registrationTrainingQuery',
+ name: '报名培训查询',
+ meta: {
+ i18n: 'registrationTrainingQuery',
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/qualificationExamination/registrationTrainingQuery')
+ }]
},
// { //报错 到不到vue文件
// path: '/securityUnitOperation/operationTable',
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 5366f17..eafec95 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -403,7 +403,9 @@
color: $fontColor !important;
}
//所有表格 边框
-.el-card {
+.el-card,
+.el-tabs__content,
+.ol-viewport {
border: 1px solid transparent !important;
box-shadow: 3px 3px 15px -2px rgb(0, 0, 0) !important;
}
@@ -559,3 +561,11 @@
{
background-color: $black !important;
}
+
+// logo 颜色
+.login-border {
+ .el-input__inner {
+ border: 1px solid transparent !important;
+ border-bottom: 1px solid rgba($color: #000000, $alpha: 0.1) !important;
+ }
+}
diff --git a/src/views/commandQuery/incidentReporting.vue b/src/views/commandQuery/incidentReporting.vue
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/views/commandQuery/incidentReporting.vue
diff --git a/src/views/commandQuery/taskDistribution.vue b/src/views/commandQuery/taskDistribution.vue
new file mode 100644
index 0000000..a6f64a1
--- /dev/null
+++ b/src/views/commandQuery/taskDistribution.vue
@@ -0,0 +1,319 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-07-07 17:30:05
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-07-10 16:06:14
+ * menu-name 监管信息
+ */
+<template>
+ <basic-container>
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdates"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+// import {
+// getList,
+// getDetail,
+// adddata,
+// update,
+// remove,
+// } from "@/api/regulatoryInformation/regulatoryInformation";
+import { mapGetters } from "vuex";
+// import { datasing } from "./dataqualificationExamination";
+// import { getList } from "@/api/qualificationExamination/qualificationExamination";
+import { getLisperetaskDistribution } from "@/api/commandQuery/commandQuery";
+
+export default {
+ data() {
+ return {
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ selectionList: [],
+ option: {
+ // 操作栏多余按钮去除
+ delBtn: false,
+ editBtn: false,
+ addBtn: false,
+ selection: false,
+ menu: false,
+
+ searchShowBtn: false,
+
+ align: "center",
+ height: "auto",
+ calcHeight: 30,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ index: true,
+ viewBtn: true,
+ dialogClickModal: false,
+
+ column: [
+ // {
+ // label: "类型",
+ // prop: "type",
+ // overHidden: true,
+ // },
+ // {
+ // label: "deptId",
+ // prop: "deptId",
+ // overHidden: true,
+ // // labelWidth: 120,
+ // // searchLabelWidth: 120,
+ // searchSpan: 4,
+ // dicUrl:
+ // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ // props: {
+ // label: "title",
+ // value: "id",
+ // },
+ // // hide: true,
+ // search: true,
+ // // overHidden: true,
+ // type: "select",
+ // // rules: [
+ // // {
+ // // required: true,
+ // // message: "请输入保安公司",
+ // // trigger: "blur",
+ // // },
+ // // ],
+ // },
+ {
+ label: "发送指令人",
+ prop: "sendName",
+ search: true,
+ searchLabelWidth: 120,
+ searchSpan: 5,
+ // hide: true,
+ // editDisplay: false,
+ // addDisplay: false
+ },
+
+ {
+ label: "接收指令人",
+ prop: "receiveName",
+ search: true,
+ searchLabelWidth: 120,
+ },
+ {
+ label: "发送指令时间",
+ prop: "sendTime",
+ type: "date",
+ format: "yyyy-MM-dd hh:mm:ss",
+ valueFormat: "yyyy-MM-dd hh:mm:ss",
+ },
+ {
+ label: "指令内容",
+ prop: "content",
+ },
+ ],
+ },
+ data: [
+ // {
+ // deptid: "江西众泰保安公司",
+ // punishtype: 2,
+ // punishreason: "非法施工",
+ // punishresult: "没收全部非法所得财产，并罚款3W元",
+ // punishtime: "2021-01-01",
+ // punisnum: 110110110120,
+ // },
+ ],
+ };
+ },
+ computed: {
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.post_add, false),
+ viewBtn: this.vaildData(this.permission.post_view, false),
+ delBtn: this.vaildData(this.permission.post_delete, false),
+ editBtn: this.vaildData(this.permission.post_edit, false),
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ methods: {
+ rowSave(row, done, loading) {
+ adddata(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ rowUpdates(row, index, done, loading) {
+ // console.log(42342);
+ 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: "操作成功!",
+ });
+ });
+ },
+ // beforeOpen(done, type) {
+ // if (["edit", "view"].includes(type)) {
+ // getDetail(this.form.id).then((res) => {
+ // this.form = res.data.data;
+ // });
+ // }
+ // done();
+ // },
+ 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();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ // this.loading = false;
+ this.loading = true;
+ getLisperetaskDistribution(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((res) => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ console.log(this.data, "getLisperetaskDistribution");
+ this.loading = false;
+ // this.selectionClear();
+ });
+ },
+ // onLoad(page, params = {}) {
+ // // this.loading = false;
+ // this.loading = true;
+ // // getListJSON().then((res) => {
+ // // axios
+ // // .get(
+ // // "../../api/qualificationExamination/signQualificationExamination.json"
+ // // )
+ // // .then((res) => {
+ // // page.currentPage,
+ // // page.pageSize,
+ // // Object.assign(params, this.query)
+ // if (datasing) {
+ // var res = datasing;
+ // console.log(res, "signQualificationExamination");
+ // const data = res.data;
+ // // this.page.total = data.total;
+ // var d = data.records;
+ // for (var k in d) {
+ // d[k].examination_mx = "正常";
+ // d[k].examination_type = "正常";
+ // d[k]["carid"] = "370111198807051124";
+ // d[k]["certificate"] = "拥有";
+ // d[k]["reviewTime"] = "2021-02-21";
+ // d[k]["results"] = "通过";
+ // d[k]["onjob"] = "是";
+ // }
+ // this.data = d;
+ // this.loading = false;
+ // }
+ // // this.selectionClear();
+ // // });
+ // },
+
+ // 行单击
+ handleRowClick(row) {
+ // delete (row["name"]);
+ var obj = row;
+ obj["name"] = "保安公司详细资料";
+ this.$router.push({
+ path: `/securityCompany/index`,
+ query: obj,
+ });
+ },
+ },
+};
+</script>
+
+<style>
+</style>
diff --git a/src/views/management/computents/achievement.vue b/src/views/management/computents/achievement.vue
index f6e393e..3eed637 100644
--- a/src/views/management/computents/achievement.vue
+++ b/src/views/management/computents/achievement.vue
@@ -33,7 +33,7 @@
align: "center",
height: "auto",
- calcHeight: 250,
+ calcHeight: 270,
tip: false,
searchShow: false,
searchShowBtn: false,
diff --git a/src/views/management/computents/dispatch.vue b/src/views/management/computents/dispatch.vue
index 6e0085f..c3558b3 100644
--- a/src/views/management/computents/dispatch.vue
+++ b/src/views/management/computents/dispatch.vue
@@ -33,7 +33,7 @@
align: "center",
height: "auto",
- calcHeight: 250,
+ calcHeight: 270,
searchShowBtn: false,
tip: false,
// searchShow: false,
diff --git a/src/views/management/computents/honor.vue b/src/views/management/computents/honor.vue
index cb1cd73..67198b9 100644
--- a/src/views/management/computents/honor.vue
+++ b/src/views/management/computents/honor.vue
@@ -34,7 +34,7 @@
align: "center",
height: "auto",
- calcHeight: 250,
+ calcHeight: 270,
tip: false,
searchShow: false,
searchMenuSpan: 4,
diff --git a/src/views/management/computents/performance.vue b/src/views/management/computents/performance.vue
index 9999cd3..ab0acba 100644
--- a/src/views/management/computents/performance.vue
+++ b/src/views/management/computents/performance.vue
@@ -34,7 +34,7 @@
align: "center",
height: "auto",
- calcHeight: 250,
+ calcHeight: 270,
tip: false,
searchShow: false,
searchMenuSpan: 4,
diff --git a/src/views/management/computents/train.vue b/src/views/management/computents/train.vue
index 5f4573d..04edb4e 100644
--- a/src/views/management/computents/train.vue
+++ b/src/views/management/computents/train.vue
@@ -34,7 +34,7 @@
align: "center",
height: "auto",
- calcHeight: 250,
+ calcHeight: 270,
tip: false,
searchShow: false,
searchMenuSpan: 4,
diff --git a/src/views/permit/permit.vue b/src/views/permit/permit.vue
index 2c072e4..a957723 100644
--- a/src/views/permit/permit.vue
+++ b/src/views/permit/permit.vue
@@ -88,7 +88,7 @@
labelWidth: 130,
headerAlign: "center",
align: "center",
- border: true,
+ // border: true,
index: true,
viewBtn: true,
selection: true,
diff --git a/src/views/qualificationExamination/paymentInquiry.vue b/src/views/qualificationExamination/paymentInquiry.vue
new file mode 100644
index 0000000..0687023
--- /dev/null
+++ b/src/views/qualificationExamination/paymentInquiry.vue
@@ -0,0 +1,379 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-07-07 17:30:05
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-07-10 16:06:14
+ * menu-name 缴费查询
+ */
+<template>
+ <basic-container>
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdates"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+// import {
+// getList,
+// getDetail,
+// adddata,
+// update,
+// remove,
+// } from "@/api/regulatoryInformation/regulatoryInformation";
+import { mapGetters } from "vuex";
+import { datasing } from "./dataqualificationExamination";
+// import { getList } from "@/api/qualificationExamination/qualificationExamination";
+import { getLispereexamPayment } from "@/api/qualificationExamination/scoreInquiry";
+
+export default {
+ data() {
+ var dic1 = [
+ {
+ label: "公司缴费",
+ value: 1,
+ },
+ {
+ label: "个人缴费",
+ value: 2,
+ },
+ ];
+ var dic2 = [
+ {
+ label: "已缴费",
+ value: 1,
+ },
+ {
+ label: "未缴费",
+ value: 2,
+ },
+ {
+ label: "部分缴费",
+ value: 3,
+ },
+ ];
+ return {
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ selectionList: [],
+ option: {
+ // 操作栏多余按钮去除
+ delBtn: false,
+ editBtn: false,
+ addBtn: false,
+ selection: false,
+ menu: false,
+
+ searchShowBtn: false,
+
+ align: "center",
+ height: "auto",
+ calcHeight: 30,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ index: true,
+ viewBtn: true,
+ dialogClickModal: false,
+
+ column: [
+ // {
+ // label: "姓名",
+ // prop: "securityName",
+ // // slot: true,
+ // // display: false,
+ // },
+ {
+ label: "缴费类型",
+ prop: "type",
+ dicData: dic1,
+ searchSpan: 4,
+ search: true,
+ type: "select",
+ // slot: true,
+ // display: false,
+ },
+ {
+ // label: "考试开始时间",
+ label: "缴费时间",
+ prop: "paymentTime",
+ 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: "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: [
+ // {
+ // deptid: "江西众泰保安公司",
+ // punishtype: 2,
+ // punishreason: "非法施工",
+ // punishresult: "没收全部非法所得财产，并罚款3W元",
+ // punishtime: "2021-01-01",
+ // punisnum: 110110110120,
+ // },
+ ],
+ };
+ },
+ computed: {
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.post_add, false),
+ viewBtn: this.vaildData(this.permission.post_view, false),
+ delBtn: this.vaildData(this.permission.post_delete, false),
+ editBtn: this.vaildData(this.permission.post_edit, false),
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ methods: {
+ rowSave(row, done, loading) {
+ adddata(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ rowUpdates(row, index, done, loading) {
+ // console.log(42342);
+ 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: "操作成功!",
+ });
+ });
+ },
+ // beforeOpen(done, type) {
+ // if (["edit", "view"].includes(type)) {
+ // getDetail(this.form.id).then((res) => {
+ // this.form = res.data.data;
+ // });
+ // }
+ // done();
+ // },
+ 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();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ // this.loading = false;
+ this.loading = true;
+ getLispereexamPayment(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((res) => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ console.log(this.data, "getLispereexamPayment");
+ this.loading = false;
+ // this.selectionClear();
+ });
+ },
+ // onLoad(page, params = {}) {
+ // // this.loading = false;
+ // this.loading = true;
+ // // getListJSON().then((res) => {
+ // // axios
+ // // .get(
+ // // "../../api/qualificationExamination/signQualificationExamination.json"
+ // // )
+ // // .then((res) => {
+ // // page.currentPage,
+ // // page.pageSize,
+ // // Object.assign(params, this.query)
+ // if (datasing) {
+ // var res = datasing;
+ // console.log(res, "signQualificationExamination");
+ // const data = res.data;
+ // // this.page.total = data.total;
+ // var d = data.records;
+ // for (var k in d) {
+ // d[k].examination_mx = "正常";
+ // d[k].examination_type = "正常";
+ // d[k]["carid"] = "370111198807051124";
+ // d[k]["certificate"] = "拥有";
+ // d[k]["reviewTime"] = "2021-02-21";
+ // d[k]["results"] = "通过";
+ // d[k]["onjob"] = "是";
+ // }
+ // this.data = d;
+ // this.loading = false;
+ // }
+ // // this.selectionClear();
+ // // });
+ // },
+
+ // 行单击
+ // handleRowClick(row) {
+ // // delete (row["name"]);
+ // var obj = row;
+ // obj["name"] = "保安公司详细资料";
+ // this.$router.push({
+ // path: `/securityCompany/index`,
+ // query: obj,
+ // });
+ // },
+ },
+};
+</script>
+
+<style>
+</style>
diff --git a/src/views/qualificationExamination/qualificationExamination.vue b/src/views/qualificationExamination/qualificationExamination.vue
index 34f3e7c..e346643 100644
--- a/src/views/qualificationExamination/qualificationExamination.vue
+++ b/src/views/qualificationExamination/qualificationExamination.vue
@@ -63,6 +63,8 @@
selection: false,
menu: false,
+ searchShowBtn: false,
+
align: "center",
height: "auto",
calcHeight: 30,
diff --git a/src/views/qualificationExamination/registrationTrainingQuery.vue b/src/views/qualificationExamination/registrationTrainingQuery.vue
new file mode 100644
index 0000000..2054152
--- /dev/null
+++ b/src/views/qualificationExamination/registrationTrainingQuery.vue
@@ -0,0 +1,568 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-07-07 17:30:05
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-07-10 16:06:14
+ * menu-name 报名培训查询
+ */
+<template>
+ <basic-container>
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdates"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+// import {
+// getList,
+// getDetail,
+// adddata,
+// update,
+// remove,
+// } from "@/api/regulatoryInformation/regulatoryInformation";
+import { mapGetters } from "vuex";
+import { datasing } from "./dataqualificationExamination";
+// import { getList } from "@/api/qualificationExamination/qualificationExamination";
+import { getLispereregistrationTrainingQuery } from "@/api/qualificationExamination/scoreInquiry";
+
+export default {
+ data() {
+ var DIC = [
+ {
+ label: "男",
+ value: 1,
+ },
+ {
+ label: "女",
+ value: 2,
+ },
+ ];
+ var DIC1 = [
+ {
+ label: "未撤销",
+ value: 1,
+ },
+ {
+ label: "已撤销",
+ value: 2,
+ },
+ ];
+ return {
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ selectionList: [],
+ option: {
+ // 操作栏多余按钮去除
+ delBtn: false,
+ editBtn: false,
+ addBtn: false,
+ selection: false,
+ menu: false,
+
+ searchShowBtn: false,
+
+ align: "center",
+ height: "auto",
+ calcHeight: 30,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ index: true,
+ viewBtn: true,
+ dialogClickModal: false,
+
+ column: [
+ // {
+ // label: "id",
+ // prop: "id",
+ // hide: true,
+ // editDisplay: false,
+ // addDisplay: false
+ // },
+ // {
+ // label: "保安单位",
+ // prop: "tenantName",
+ // hide: true,
+ // editDisplay: false,
+ // addDisplay: false
+ // },
+ // {
+ // label: "保安id",
+ // prop: "deptId",
+ // hide: true,
+ // editDisplay: false,
+ // addDisplay: false,
+ // value: JSON.parse(window.localStorage.getItem("saber-userInfo")).content.dept_id
+ // },//上面不显示
+ {
+ label: "姓名",
+ prop: "name",
+ width: 100,
+ rules: [
+ {
+ required: true,
+ message: "请输入姓名",
+ trigger: "blur",
+ },
+ ],
+ search: true,
+ searchSpan: 5,
+ },
+ {
+ label: "性别",
+ prop: "sex",
+ rules: [
+ {
+ required: true,
+ message: "请输入性别",
+ trigger: "blur",
+ },
+ ],
+ width: 50,
+ dicData: DIC,
+ props: {
+ label: "label",
+ value: "value",
+ },
+ // width: 70,
+ // search: true,
+ },
+ {
+ label: "年龄",
+ prop: "age",
+ rules: [
+ {
+ required: true,
+ message: "请输入年龄",
+ trigger: "blur",
+ },
+ ],
+ width: 50,
+ // addDisplay: true,
+ // editDisplay: true,
+ // viewDisplay: true,
+ // filter: false,
+ // type: 'tree',
+ // dicData: DIC1,
+ // searchSpan: 5,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // search: true,
+ // type: "select",
+ },
+ {
+ label: "身高(cm)",
+ prop: "height",
+ width: 90,
+ rules: [
+ {
+ required: true,
+ message: "请输入身高",
+ trigger: "blur",
+ },
+ ],
+ // addDisplay: true,
+ // editDisplay: true,
+ // viewDisplay: true,
+ // searchSpan: 5,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // search: true,
+ // type: "select",
+ // rules: [{
+ // required: true,
+ // message: "请选择学历",
+ // trigger: "blur"
+ // }],
+ },
+ {
+ label: "体重(kg)",
+ prop: "weight",
+ width: 90,
+ rules: [
+ {
+ required: true,
+ message: "请输入体重",
+ trigger: "blur",
+ },
+ ],
+ // addDisplay: true,
+ // editDisplay: true,
+ // viewDisplay: true,
+ // searchSpan: 5,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=experienceType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // search: true,
+ // type: "select",
+ // rules: [{
+ // required: true,
+ // message: "请选择工作经验",
+ // trigger: "blur"
+ // }],
+ },
+ {
+ label: "电话",
+ prop: "phone",
+ rules: [
+ {
+ required: true,
+ message: "请输入电话",
+ trigger: "blur",
+ },
+ ],
+ width: 110,
+ // search: true,
+ // width: 110,
+ // overHidden: true
+ },
+ {
+ label: "身份证号",
+ prop: "idCardNo",
+ rules: [
+ {
+ required: true,
+ message: "请输入身份证号",
+ trigger: "blur",
+ },
+ ],
+ width: 160,
+ // search: true,
+ // searchSpan: 4,
+ // overHidden: true
+ },
+ {
+ label: "学历证书",
+ prop: "academicUrl",
+ width: 110,
+ rules: [
+ {
+ required: true,
+ message: "请输入学历证书",
+ trigger: "blur",
+ },
+ ],
+ overHidden: true,
+ // width: 70,
+ // search: true,
+ // searchSpan: 4,
+ },
+ {
+ label: "组织机构",
+ prop: "deptId",
+ // width: 70,
+ // search: true,
+ // searchSpan: 4,
+ dicUrl:
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ props: {
+ label: "title",
+ value: "id",
+ },
+ // search: true,
+ type: "select",
+ rules: [
+ {
+ required: true,
+ message: "请输入组织机构",
+ trigger: "blur",
+ },
+ ],
+ overHidden: true,
+ },
+ {
+ label: "培训公司名称",
+ prop: "trainingUnitName",
+ rules: [
+ {
+ required: true,
+ message: "请输入培训公司名称",
+ trigger: "blur",
+ },
+ ],
+ // width: 70,
+ // addDisplay: true,
+ // editDisplay: true,
+ // viewDisplay: true,
+ searchSpan: 5,
+ searchLabelWidth: 110,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=unitsNatureType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ search: true,
+ overHidden: true,
+ // type: "select",
+ // rules: [{
+ // required: false,
+ // message: "请选择单位规模",
+ // trigger: "blur"
+ // }],
+ },
+ {
+ label: "培训时间",
+ prop: "trainingTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ rules: [
+ {
+ required: true,
+ message: "请输入培训时间",
+ trigger: "blur",
+ },
+ ],
+ width: 100,
+ // addDisplay: true,
+ // editDisplay: true,
+ // viewDisplay: true,
+ // searchSpan: 4,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=unitsScaleType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // // search: true,
+ // type: "select",
+ // rules: [{
+ // required: true,
+ // message: "请选择单位规模",
+ // trigger: "blur"
+ // }],
+ },
+ {
+ label: "撤销状态",
+ prop: "cancel",
+ // search: true,
+ dicData: DIC1,
+ props: {
+ label: "label",
+ value: "value",
+ },
+ // rules: [{
+ // required: true,
+ // message: "请选",
+ // trigger: "blur"
+ // }]
+ // hide: false,
+ editDisplay: false,
+ addDisplay: false,
+ searchSpan: 5,
+ width: 70,
+ },
+ ],
+ },
+ data: [
+ // {
+ // deptid: "江西众泰保安公司",
+ // punishtype: 2,
+ // punishreason: "非法施工",
+ // punishresult: "没收全部非法所得财产，并罚款3W元",
+ // punishtime: "2021-01-01",
+ // punisnum: 110110110120,
+ // },
+ ],
+ };
+ },
+ computed: {
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.post_add, false),
+ viewBtn: this.vaildData(this.permission.post_view, false),
+ delBtn: this.vaildData(this.permission.post_delete, false),
+ editBtn: this.vaildData(this.permission.post_edit, false),
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ methods: {
+ rowSave(row, done, loading) {
+ adddata(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ rowUpdates(row, index, done, loading) {
+ // console.log(42342);
+ 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: "操作成功!",
+ });
+ });
+ },
+ // beforeOpen(done, type) {
+ // if (["edit", "view"].includes(type)) {
+ // getDetail(this.form.id).then((res) => {
+ // this.form = res.data.data;
+ // });
+ // }
+ // done();
+ // },
+ 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();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ // this.loading = false;
+ this.loading = true;
+ getLispereregistrationTrainingQuery(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((res) => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ console.log(this.data, "getLispereregistrationTrainingQuery");
+ this.loading = false;
+ // this.selectionClear();
+ });
+ },
+ // onLoad(page, params = {}) {
+ // // this.loading = false;
+ // this.loading = true;
+ // // getListJSON().then((res) => {
+ // // axios
+ // // .get(
+ // // "../../api/qualificationExamination/signQualificationExamination.json"
+ // // )
+ // // .then((res) => {
+ // // page.currentPage,
+ // // page.pageSize,
+ // // Object.assign(params, this.query)
+ // if (datasing) {
+ // var res = datasing;
+ // console.log(res, "signQualificationExamination");
+ // const data = res.data;
+ // // this.page.total = data.total;
+ // var d = data.records;
+ // for (var k in d) {
+ // d[k].examination_mx = "正常";
+ // d[k].examination_type = "正常";
+ // d[k]["carid"] = "370111198807051124";
+ // d[k]["certificate"] = "拥有";
+ // d[k]["reviewTime"] = "2021-02-21";
+ // d[k]["results"] = "通过";
+ // d[k]["onjob"] = "是";
+ // }
+ // this.data = d;
+ // this.loading = false;
+ // }
+ // // this.selectionClear();
+ // // });
+ // },
+
+ // 行单击
+ // handleRowClick(row) {
+ // // delete (row["name"]);
+ // var obj = row;
+ // obj["name"] = "保安公司详细资料";
+ // this.$router.push({
+ // path: `/securityCompany/index`,
+ // query: obj,
+ // });
+ // },
+ },
+};
+</script>
+
+<style>
+</style>
diff --git a/src/views/qualificationExamination/scoreInquiry.vue b/src/views/qualificationExamination/scoreInquiry.vue
new file mode 100644
index 0000000..8426543
--- /dev/null
+++ b/src/views/qualificationExamination/scoreInquiry.vue
@@ -0,0 +1,344 @@
+/*
+ * @Author: Morpheus
+ * @Date: 2021-07-07 17:30:05
+ * @Last Modified by: Morpheus
+ * @Last Modified time: 2021-07-10 16:06:14
+ * menu-name 监管信息
+ */
+<template>
+ <basic-container>
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdates"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ >
+ </avue-crud>
+ </basic-container>
+</template>
+
+<script>
+// import {
+// getList,
+// getDetail,
+// adddata,
+// update,
+// remove,
+// } from "@/api/regulatoryInformation/regulatoryInformation";
+import { mapGetters } from "vuex";
+import { datasing } from "./dataqualificationExamination";
+// import { getList } from "@/api/qualificationExamination/qualificationExamination";
+import { getLisperexamScore } from "@/api/qualificationExamination/scoreInquiry";
+
+export default {
+ data() {
+ return {
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ selectionList: [],
+ option: {
+ // 操作栏多余按钮去除
+ delBtn: false,
+ editBtn: false,
+ addBtn: false,
+ selection: false,
+ menu: false,
+
+ searchShowBtn: false,
+
+ align: "center",
+ height: "auto",
+ calcHeight: 30,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ index: true,
+ viewBtn: true,
+ dialogClickModal: false,
+
+ column: [
+ {
+ label: "姓名",
+ prop: "securityName",
+ // slot: true,
+ // display: false,
+ },
+ {
+ label: "考试名称",
+ prop: "examName",
+ // slot: true,
+ // display: false,
+ },
+ {
+ // label: "考试开始时间",
+ label: "考试时间",
+ prop: "examTime",
+ 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: "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: "theoryGrade",
+ // slot: true,
+ // display: false,
+ },
+ {
+ label: "实操成绩",
+ prop: "learnGrade",
+ // slot: true,
+ // display: false,
+ },
+ {
+ label: "总成绩",
+ prop: "allGrade",
+ // slot: true,
+ // display: false,
+ },
+ ],
+ },
+ data: [
+ // {
+ // deptid: "江西众泰保安公司",
+ // punishtype: 2,
+ // punishreason: "非法施工",
+ // punishresult: "没收全部非法所得财产，并罚款3W元",
+ // punishtime: "2021-01-01",
+ // punisnum: 110110110120,
+ // },
+ ],
+ };
+ },
+ computed: {
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.post_add, false),
+ viewBtn: this.vaildData(this.permission.post_view, false),
+ delBtn: this.vaildData(this.permission.post_delete, false),
+ editBtn: this.vaildData(this.permission.post_edit, false),
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ methods: {
+ rowSave(row, done, loading) {
+ adddata(row).then(
+ () => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ done();
+ },
+ (error) => {
+ window.console.log(error);
+ loading();
+ }
+ );
+ },
+ rowUpdates(row, index, done, loading) {
+ // console.log(42342);
+ 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: "操作成功!",
+ });
+ });
+ },
+ // beforeOpen(done, type) {
+ // if (["edit", "view"].includes(type)) {
+ // getDetail(this.form.id).then((res) => {
+ // this.form = res.data.data;
+ // });
+ // }
+ // done();
+ // },
+ 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();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ // this.loading = false;
+ this.loading = true;
+ getLisperexamScore(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query)
+ ).then((res) => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ console.log(this.data);
+ this.loading = false;
+ // this.selectionClear();
+ });
+ },
+ // onLoad(page, params = {}) {
+ // // this.loading = false;
+ // this.loading = true;
+ // // getListJSON().then((res) => {
+ // // axios
+ // // .get(
+ // // "../../api/qualificationExamination/signQualificationExamination.json"
+ // // )
+ // // .then((res) => {
+ // // page.currentPage,
+ // // page.pageSize,
+ // // Object.assign(params, this.query)
+ // if (datasing) {
+ // var res = datasing;
+ // console.log(res, "signQualificationExamination");
+ // const data = res.data;
+ // // this.page.total = data.total;
+ // var d = data.records;
+ // for (var k in d) {
+ // d[k].examination_mx = "正常";
+ // d[k].examination_type = "正常";
+ // d[k]["carid"] = "370111198807051124";
+ // d[k]["certificate"] = "拥有";
+ // d[k]["reviewTime"] = "2021-02-21";
+ // d[k]["results"] = "通过";
+ // d[k]["onjob"] = "是";
+ // }
+ // this.data = d;
+ // this.loading = false;
+ // }
+ // // this.selectionClear();
+ // // });
+ // },
+
+ // 行单击
+ // handleRowClick(row) {
+ // // delete (row["name"]);
+ // var obj = row;
+ // obj["name"] = "保安公司详细资料";
+ // this.$router.push({
+ // path: `/securityCompany/index`,
+ // query: obj,
+ // });
+ // },
+ },
+};
+</script>
+
+<style>
+</style>
diff --git a/src/views/qualificationExamination/signQualificationExamination.vue b/src/views/qualificationExamination/signQualificationExamination.vue
index 3df1672..65fea96 100644
--- a/src/views/qualificationExamination/signQualificationExamination.vue
+++ b/src/views/qualificationExamination/signQualificationExamination.vue
@@ -113,6 +113,8 @@
label: "保安公司",
prop: "deptName",
overHidden: true,
+ search: true,
+ searchSpan: 4,
// display: false,
// labelWidth: 120,
// width: 200,
diff --git a/src/views/record/record.vue b/src/views/record/record.vue
index c8a37b5..18ebabe 100644
--- a/src/views/record/record.vue
+++ b/src/views/record/record.vue
@@ -84,7 +84,7 @@
searchMenuSpan: 6,
labelWidth: 130,
menuWidth: 280,
- border: true,
+ // border: true,
index: true,
viewBtn: true,
selection: true,
diff --git a/src/views/recordk/recordk.vue b/src/views/recordk/recordk.vue
index d0c4057..e2c347f 100644
--- a/src/views/recordk/recordk.vue
+++ b/src/views/recordk/recordk.vue
@@ -83,7 +83,7 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
- border: true,
+ // border: true,
index: true,
viewBtn: true,
menuWidth: 280,
diff --git a/src/views/revoke/revoke.vue b/src/views/revoke/revoke.vue
index cd2cf2f..91de32b 100644
--- a/src/views/revoke/revoke.vue
+++ b/src/views/revoke/revoke.vue
@@ -84,7 +84,7 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
- border: true,
+ // border: true,
menuWidth: 280,
index: true,
viewBtn: true,
diff --git a/src/views/securityCompany/companyDetails.vue b/src/views/securityCompany/companyDetails.vue
index 4f122a2..b676aa4 100644
--- a/src/views/securityCompany/companyDetails.vue
+++ b/src/views/securityCompany/companyDetails.vue
@@ -210,7 +210,7 @@
<service :form="form"></service>
</el-tab-pane>
<el-tab-pane label="其他附件" name="eighth">
- <!-- <equipment></equipment> -->
+ <enclosure :form="form"></enclosure>
</el-tab-pane>
</el-tabs>
</div>
@@ -233,13 +233,14 @@
import staff from "./computents/staff.vue"; //保安员信息
import punish from "./computents/punish.vue"; //处罚信息
import service from "./computents/service.vue"; //服务对象
-// import manage from "./computents/manage.vue"; //其他附件
+import enclosure from "./computents/enclosure.vue"; //其他附件
export default {
components: {
equipment: equipment,
staff: staff,
punish: punish,
service: service,
+ enclosure: enclosure,
},
data() {
return {
@@ -261,7 +262,7 @@
align: "center",
height: "auto",
- calcHeight: 250,
+ calcHeight: 270,
tip: false,
searchShow: false,
searchShowBtn: false,
@@ -340,7 +341,7 @@
align: "center",
height: "auto",
- calcHeight: 250,
+ calcHeight: 270,
tip: false,
searchShow: false,
searchMenuSpan: 4,
diff --git a/src/views/securityCompany/computents/enclosure.vue b/src/views/securityCompany/computents/enclosure.vue
new file mode 100644
index 0000000..d0dd27d
--- /dev/null
+++ b/src/views/securityCompany/computents/enclosure.vue
@@ -0,0 +1,398 @@
+<template>
+ <div>
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-click="rowClick"
+ @row-del="rowDel"
+ @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="primary"-->
+ <!-- size="small"-->
+ <!-- plain-->
+ <!-- icon="el-icon-upload2"-->
+ <!-- @click="handleUpload">上 传-->
+ <!-- </el-button>-->
+ <!-- <el-button type="danger"-->
+ <!-- size="small"-->
+ <!-- icon="el-icon-delete"-->
+ <!-- plain-->
+ <!-- @click="handleDelete">删 除-->
+ <!-- </el-button>-->
+ </template>
+ <template slot-scope="scope" slot="menu">
+ <el-button
+ type="text"
+ icon="el-icon-download"
+ size="small"
+ @click="handleDownload(scope.row)"
+ >下载
+ </el-button>
+ </template>
+ <template slot-scope="{ row }" slot="attachSize">
+ <el-tag>{{ `${row.attachSize} KB` }}</el-tag>
+ </template>
+ </avue-crud>
+ <el-dialog
+ title="附件管理"
+ append-to-body
+ :visible.sync="attachBox"
+ width="555px"
+ >
+ <avue-form
+ ref="form"
+ :option="attachOption"
+ v-model="attachForm"
+ :upload-after="uploadAfter"
+ >
+ </avue-form>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+// import { getList, getDetail, remove } from "@/api/resource/attach";
+import { getListeenclosure } from "@/api/securityCompany/securityCompany";
+import { mapGetters } from "vuex";
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+
+export default {
+ components: { ElImageViewer },
+ props: ["form"],
+ data() {
+ return {
+ form: {},
+ query: {},
+ loading: true,
+ imgUrl: "",
+ showViewer: false, // 显示查看器
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0,
+ },
+ attachBox: false,
+ selectionList: [],
+ option: {
+ height: "auto",
+ calcHeight: 270,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ searchShowBtn: false,
+ headerAlign: "center",
+ border: true,
+
+ menuWidth: 130,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ column: [
+ {
+ label: "附件地址",
+ prop: "link",
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入附件地址",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件域名",
+ prop: "domain",
+ search: true,
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入附件域名",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件名称",
+ prop: "name",
+ overHidden: true,
+ width: 110,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入附件名称",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件原名",
+ prop: "originalName",
+ search: true,
+ overHidden: true,
+ width: 110,
+ rules: [
+ {
+ required: true,
+ message: "请输入附件原名",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件拓展名",
+ prop: "extension",
+ overHidden: true,
+ width: 110,
+ rules: [
+ {
+ required: true,
+ message: "请输入附件拓展名",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "附件大小",
+ prop: "attachSize",
+ overHidden: true,
+ width: 110,
+ slot: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入附件大小",
+ trigger: "blur",
+ },
+ ],
+ },
+ {
+ label: "所属机构",
+ prop: "deptid",
+ overHidden: true,
+ type: "select",
+ dicUrl: "/api/blade-system/dept/selectIn",
+ props: {
+ label: "deptname",
+ value: "deptid",
+ },
+ },
+ {
+ label: "类型",
+ prop: "type",
+ overHidden: true,
+ addDisplay: false,
+ width: 80,
+ type: "select",
+ dicData: [
+ {
+ label: "许可审批",
+ value: "0",
+ },
+ {
+ label: "备案",
+ value: "1",
+ },
+ {
+ label: "撤销",
+ value: "2",
+ },
+ {
+ label: "跨区备案",
+ value: "3",
+ },
+ ],
+ },
+ ],
+ },
+ data: [],
+ attachForm: {},
+ attachOption: {
+ submitBtn: false,
+ emptyBtn: false,
+ column: [
+ {
+ label: "附件上传",
+ prop: "attachFile",
+ type: "upload",
+ drag: true,
+ loadText: "模板上传中，请稍等",
+ span: 24,
+ propsHttp: {
+ res: "data",
+ },
+ action: "/api/blade-resource/oss/endpoint/put-file-attach?deptid=",
+ },
+ ],
+ },
+ };
+ },
+ created() {
+ var flag = false,
+ i = 0,
+ ind = null;
+ this.$store.state.tags.tagList.forEach((item, index) => {
+ if (item.label == "附件上传") {
+ if (flag == false) {
+ ind = index;
+ flag = true;
+ }
+ i++;
+ }
+ });
+ if (i > 1) {
+ this.$store.state.tags.tagList.splice(ind, 1);
+ }
+ var deptid = this.$route.query.deptid;
+ var type = this.$route.query.type;
+ this.attachOption.column[0].action += deptid + "&type=" + type;
+ },
+ computed: {
+ ...mapGetters(["permission"]),
+ permissionList() {
+ return {
+ addBtn: false,
+ editBtn: false,
+ viewBtn: false,
+ delBtn: this.vaildData(this.permission.attach_delete, false),
+ };
+ },
+ ids() {
+ let ids = [];
+ this.selectionList.forEach((ele) => {
+ ids.push(ele.id);
+ });
+ return ids.join(",");
+ },
+ },
+ methods: {
+ rowClick(row) {
+ var that = this;
+ that.imgUrl = row.link;
+ this.showViewer = true;
+ },
+ handleUpload() {
+ this.attachBox = true;
+ },
+ uploadAfter(res, done, loading, column) {
+ window.console.log(column);
+ this.attachBox = false;
+ this.refreshChange();
+ done();
+ },
+ handleDownload(row) {
+ window.open(`${row.link}`);
+ },
+ rowDel(row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
+ .then(() => {
+ return remove(row.id);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!",
+ });
+ });
+ },
+ 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)) {
+ getDetail(this.form.id).then((res) => {
+ this.form = res.data.data;
+ });
+ }
+ done();
+ },
+ 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();
+ },
+ currentChange(currentPage) {
+ this.page.currentPage = currentPage;
+ },
+ sizeChange(pageSize) {
+ this.page.pageSize = pageSize;
+ },
+ refreshChange() {
+ this.onLoad(this.page, this.query);
+ },
+ onLoad(page, params = {}) {
+ this.loading = true;
+ getListeenclosure(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.query),
+ this.form.departmentid
+ // this.$route.query.deptid,
+ // this.$route.query.type
+ ).then((res) => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ console.log(this.data, getListeenclosure);
+ this.loading = false;
+ this.selectionClear();
+ });
+ },
+ },
+};
+</script>
+
+<style>
+</style>
diff --git a/src/views/securityCompany/computents/equipment copy 4.vue b/src/views/securityCompany/computents/equipment copy 4.vue
deleted file mode 100644
index ff0ec95..0000000
--- a/src/views/securityCompany/computents/equipment copy 4.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<template>
- <avue-crud
- class="company-box"
- :option="equipmentOption"
- :search.sync="equipmentSearch"
- :table-loading="equipmentLoading"
- :data="equipmentData"
- ref="equipmentCrud"
- :page.sync="equipmentPage"
- @on-load="equipmentOnLoad"
- @selection-change="equipmentSelectionChange"
- @search-change="equipmentSearchChange"
- @search-reset="equipmentSearchReset"
- @current-change="equipmentCurrentChange"
- @size-change="equipmentSizeChange"
- >
- </avue-crud>
-</template>
-
-<script>
-export default {
- data() {
- return {
- equipmentOption: {
- // 操作栏多余按钮去除
- delBtn: false,
- editBtn: false,
- addBtn: false,
- selection: false,
- menu: false,
-
- align: "center",
- height: "auto",
- calcHeight: 250,
- tip: false,
- searchShow: false,
- searchMenuSpan: 4,
- index: false,
- viewBtn: true,
- //dialogType: 'drawer',
- dialogClickModal: false,
- // 操作栏宽度
- menuWidth: 156,
-
- column: [
- {
- label: "投资人姓名",
- prop: "shareholder",
- slot: true,
- display: false,
- },
- {
- label: "投资比例",
- prop: "shareholdingratio",
- slot: true,
- display: false,
- formatter: function (row, value) {
- return (value = value + "%");
- },
- },
- {
- label: "出资金额",
- prop: "capital",
- slot: true,
- display: false,
- formatter: function (row, value) {
- return (value = value + "万元");
- },
- },
- {
- label: "投资时间",
- prop: "capitaltime",
- slot: true,
- display: false,
- },
- {
- label: "身份证号",
- prop: "cardid",
- slot: true,
- display: false,
- },
- {
- label: "联系电话",
- prop: "cell",
- slot: true,
- display: false,
- },
- ],
- },
- equipmentSearch: {},
- equipmentLoading: true,
- equipmentData: [],
- equipmentPage: {
- pageSize: 10,
- currentPage: 1,
- total: 0,
- },
- equipmentQuery: {},
- equipmentSelectionList: [],
- };
- },
- methods: {
- equipmentOnLoad(page, params = {}) {
- this.equipmentLoading = true;
- console.log("success");
- // getequipmentList(
- // page.currentPage,
- // page.pageSize,
- // Object.assign(params, this.equipmentQuery),
- // this.form.creditcode
- // ).then((res) => {
- // const data = res.data.data;
-
- // this.equipmentPage.total = data.total;
- // this.equipmentData = data.records;
- this.equipmentLoading = false;
- // this.$refs.equipmentCrud.refreshTable();
- // this.$refs.equipmentCrud.doLayout();
- // this.equipmentSelectionClear();
- // });
- },
- equipmentSelectionClear() {
- this.equipmentSelectionList = [];
- this.$refs.equipmentCrud.toggleSelection();
- },
- equipmentSelectionChange(list) {
- this.equipmentSelectionList = list;
- },
- equipmentSearchChange(params, done) {
- this.equipmentQuery = params;
- this.equipmentPage.currentPage = 1;
- this.equipmentOnLoad(this.equipmentPage, params);
- done();
- },
- equipmentSearchReset() {
- this.equipmentQuery = {};
- this.equipmentOnLoad(this.equipmentPage);
- },
- equipmentCurrentChange(currentPage) {
- this.equipmentPage.currentPage = currentPage;
- },
- equipmentSizeChange(pageSize) {
- this.equipmentPage.pageSize = pageSize;
- },
- },
-};
-</script>
-
-<style>
-</style>
\ No newline at end of file
diff --git a/src/views/securityCompany/computents/equipment.vue b/src/views/securityCompany/computents/equipment.vue
index 4af735b..1926560 100644
--- a/src/views/securityCompany/computents/equipment.vue
+++ b/src/views/securityCompany/computents/equipment.vue
@@ -34,7 +34,7 @@
align: "center",
height: "auto",
- calcHeight: 250,
+ calcHeight: 270,
tip: false,
searchShow: false,
searchMenuSpan: 4,
diff --git a/src/views/securityCompany/computents/punish.vue b/src/views/securityCompany/computents/punish.vue
index 969f32e..8df748f 100644
--- a/src/views/securityCompany/computents/punish.vue
+++ b/src/views/securityCompany/computents/punish.vue
@@ -34,7 +34,7 @@
align: "center",
height: "auto",
- calcHeight: 250,
+ calcHeight: 270,
tip: false,
searchShow: false,
searchMenuSpan: 4,
diff --git a/src/views/securityCompany/computents/service.vue b/src/views/securityCompany/computents/service.vue
index 878c382..af8833c 100644
--- a/src/views/securityCompany/computents/service.vue
+++ b/src/views/securityCompany/computents/service.vue
@@ -18,7 +18,9 @@
</template>
<script>
+import { getListeservice } from "@/api/securityCompany/securityCompany";
export default {
+ props: ["form"],
data() {
return {
serviceOption: {
@@ -32,7 +34,7 @@
align: "center",
height: "auto",
- calcHeight: 250,
+ calcHeight: 270,
tip: false,
searchShow: false,
searchMenuSpan: 4,
@@ -44,47 +46,157 @@
menuWidth: 156,
column: [
+ // {
+ // label: "id",
+ // prop: "id",
+ // hide: true,
+ // editDisplay: false,
+ // addDisplay: false,
+ // },
{
- label: "投资人姓名",
- prop: "shareholder",
- slot: true,
- display: false,
+ label: "姓名",
+ prop: "name",
+ // search: true,
+ searchSpan: 3,
+ rules: [
+ {
+ required: true,
+ message: "请输入姓名",
+ trigger: "blur",
+ },
+ ],
+ },
+ // {
+ // label: "身份证号",
+ // prop: "cardid",
+ // // rules: [
+ // // {
+ // // required: true,
+ // // message: "请输入编号",
+ // // trigger: "blur",
+ // // },
+ // // ],
+ // // search: true,
+ // }, //上面不显示
+ {
+ label: "派遣单位",
+ prop: "dispatcherCompany",
+ search: true,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入规格",
+ // trigger: "blur",
+ // },
+ // ],
+ // search: true,
+ },
+ // {
+ // label: "保安公司",
+ // prop: "deptName",
+ // // rules: [
+ // // {
+ // // required: true,
+ // // message: "请输入规格",
+ // // trigger: "blur",
+ // // },
+ // // ],
+ // // search: true,
+ // },
+ // {
+ // label: "派遣人",
+ // prop: "dispatcher",
+ // // rules: [
+ // // {
+ // // required: true,
+ // // message: "请输入规格",
+ // // trigger: "blur",
+ // // },
+ // // ],
+ // // search: true,
+ // },
+ {
+ label: "派遣时间",
+ prop: "dispatchertime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ labelWidth: 120,
+ searchSpan: 4,
+ // search: true,
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入时间",
+ trigger: "click",
+ },
+ ],
+ // width: 70,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入型号",
+ // trigger: "blur",
+ // },
+ // ],
+ // search: true,
},
{
- label: "投资比例",
- prop: "shareholdingratio",
- slot: true,
- display: false,
- formatter: function (row, value) {
- return (value = value + "%");
- },
+ label: "结束时间",
+ prop: "endTime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ labelWidth: 120,
+ searchSpan: 4,
+ // search: true,
+ overHidden: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入时间",
+ trigger: "click",
+ },
+ ],
+ // width: 70,
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入型号",
+ // trigger: "blur",
+ // },
+ // ],
+ // search: true,
},
{
- label: "出资金额",
- prop: "capital",
- slot: true,
- display: false,
- formatter: function (row, value) {
- return (value = value + "万元");
- },
- },
- {
- label: "投资时间",
- prop: "capitaltime",
- slot: true,
- display: false,
- },
- {
- label: "身份证号",
- prop: "cardid",
- slot: true,
- display: false,
- },
- {
- label: "联系电话",
- prop: "cell",
- slot: true,
- display: false,
+ label: "派遣地址",
+ prop: "dispatcheraddress",
+ // rules: [
+ // {
+ // required: true,
+ // message: "请输入组织机构",
+ // trigger: "blur",
+ // },
+ // ],
+ // overHidden: true,
+ // // addDisplay: true,
+ // // editDisplay: true,
+ // // viewDisplay: true,
+ // // searchSpan: 5,
+ // dicUrl:
+ // "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ // props: {
+ // label: "title",
+ // value: "id",
+ // },
+ // // search: true,
+ // type: "select",
+ // // rules: [{
+ // // required: true,
+ // // message: "请选择学历",
+ // // trigger: "blur"
+ // // }],
},
],
},
@@ -103,21 +215,22 @@
methods: {
serviceOnLoad(page, params = {}) {
this.serviceLoading = true;
- // getserviceList(
- // page.currentPage,
- // page.pageSize,
- // Object.assign(params, this.serviceQuery),
- // this.form.creditcode
- // ).then((res) => {
- // const data = res.data.data;
+ getListeservice(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.serviceQuery),
+ this.form.departmentid
+ ).then((res) => {
+ const data = res.data.data;
- // this.servicePage.total = data.total;
- // this.serviceData = data.records;
- this.serviceLoading = false;
- // this.$refs.serviceCrud.refreshTable();
- // this.$refs.serviceCrud.doLayout();
- // this.serviceSelectionClear();
- // });
+ this.servicePage.total = data.total;
+ this.serviceData = data.records;
+ console.log(this.serviceData, "this.serviceData");
+ this.serviceLoading = false;
+ this.$refs.serviceCrud.refreshTable();
+ this.$refs.serviceCrud.doLayout();
+ this.serviceSelectionClear();
+ });
},
serviceSelectionClear() {
this.serviceSelectionList = [];
diff --git a/src/views/securityCompany/computents/staff.vue b/src/views/securityCompany/computents/staff.vue
index 3f58e95..90eb620 100644
--- a/src/views/securityCompany/computents/staff.vue
+++ b/src/views/securityCompany/computents/staff.vue
@@ -18,7 +18,9 @@
</template>
<script>
+import { getListestaff } from "@/api/securityCompany/securityCompany";
export default {
+ props: ["form"],
data() {
return {
staffOption: {
@@ -32,7 +34,7 @@
align: "center",
height: "auto",
- calcHeight: 250,
+ calcHeight: 270,
tip: false,
searchShow: false,
searchMenuSpan: 4,
@@ -254,21 +256,22 @@
methods: {
staffOnLoad(page, params = {}) {
this.staffLoading = true;
- // getstaffList(
- // page.currentPage,
- // page.pageSize,
- // Object.assign(params, this.staffQuery),
- // this.form.creditcode
- // ).then((res) => {
- // const data = res.data.data;
+ getListestaff(
+ page.currentPage,
+ page.pageSize,
+ Object.assign(params, this.staffQuery),
+ this.form.departmentid
+ ).then((res) => {
+ const data = res.data.data;
- // this.staffPage.total = data.total;
- // this.staffData = data.records;
- this.staffLoading = false;
- // this.$refs.staffCrud.refreshTable();
- // this.$refs.staffCrud.doLayout();
- // this.staffSelectionClear();
- // });
+ this.staffPage.total = data.total;
+ this.staffData = data.records;
+ console.log(this.staffData, "staffData");
+ this.staffLoading = false;
+ this.$refs.staffCrud.refreshTable();
+ this.$refs.staffCrud.doLayout();
+ this.staffSelectionClear();
+ });
},
staffSelectionClear() {
this.staffSelectionList = [];
diff --git a/src/views/securityCompany/dispatch.vue b/src/views/securityCompany/dispatch.vue
index 4385098..d90fdcd 100644
--- a/src/views/securityCompany/dispatch.vue
+++ b/src/views/securityCompany/dispatch.vue
@@ -33,13 +33,14 @@
</template>
<script>
-import {
- getList,
- getDetail,
- add,
- update,
- remove,
-} from "@/api/securityCompany/dispatch";
+// import {
+// getList,
+// getDetail,
+// add,
+// update,
+// remove,
+// } from "@/api/securityCompany/dispatch";
+import { getdata } from "@/api/dispatch/dispatch";
import { mapGetters } from "vuex";
export default {
@@ -75,21 +76,28 @@
column: [
{
- label: "公司名称",
- prop: "enterprisename",
+ label: "派遣单位",
+ prop: "name",
search: true,
searchSpan: 4,
display: false,
},
{
- label: "法定代表人",
- prop: "representative",
+ label: "联系人",
+ prop: "linkman",
display: false,
width: 120,
},
+
{
- label: "成立日期",
- prop: "establishtime",
+ label: "联系电话",
+ prop: "phone",
+ display: false,
+ width: 200,
+ },
+ {
+ label: "创建时间",
+ prop: "createTime",
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
@@ -103,24 +111,7 @@
width: 180,
},
{
- label: "注册资金",
- prop: "registeredcapital",
- display: false,
- width: 200,
- },
- {
- label: "实缴资金",
- prop: "capital",
- display: false,
- width: 200,
- },
- {
- label: "公司类型",
- prop: "enterprises",
- display: false,
- },
- {
- label: "注册地址",
+ label: "派遣地址",
prop: "address",
display: false,
width: 200,
@@ -260,30 +251,30 @@
},
onLoad(page, params = {}) {
this.loading = true;
- getList(
+ getdata(
page.currentPage,
page.pageSize,
- Object.assign(params, this.query),
- 4
+ Object.assign(params, this.query)
).then((res) => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ console.log(this.data, "dis");
this.loading = false;
this.selectionClear();
});
},
// 行单击
- handleRowClick(row) {
- // delete (row["name"]);
- var obj = row;
- obj["name"] = "保安公司详细资料";
- this.$router.push({
- path: `/securityCompany/index`,
- query: obj,
- });
- },
+ // handleRowClick(row) {
+ // // delete (row["name"]);
+ // var obj = row;
+ // obj["name"] = "保安公司详细资料";
+ // this.$router.push({
+ // path: `/securityCompany/index`,
+ // query: obj,
+ // });
+ // },
},
};
</script>
--
Gitblit v1.9.3