From 404136b0310181bd10ab488d7dae2b8a6d37d7fd Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 19:13:41 +0800
Subject: [PATCH] 报名列表,报名清册新增缴费确认
---
src/views/trainingRegistration/data.js | 34 ++++++++++
src/api/trainingRegistration/trainingRegistration.js | 9 +++
src/views/trainApply/index.vue | 91 +++++++++++++++++++++++++++---
src/views/trainingRegistration/index.vue | 35 +++++++++++
4 files changed, 156 insertions(+), 13 deletions(-)
diff --git a/src/api/trainingRegistration/trainingRegistration.js b/src/api/trainingRegistration/trainingRegistration.js
index 6c00b00..b003c76 100644
--- a/src/api/trainingRegistration/trainingRegistration.js
+++ b/src/api/trainingRegistration/trainingRegistration.js
@@ -80,4 +80,13 @@
method: 'post',
data: params
})
+}
+
+
+export const vipSign = (row) => {
+ return request({
+ url: '/api/trainingRegistration/vipSign',
+ method: 'post',
+ data: row
+ })
}
\ No newline at end of file
diff --git a/src/views/trainApply/index.vue b/src/views/trainApply/index.vue
index 7230bf3..b283ffb 100644
--- a/src/views/trainApply/index.vue
+++ b/src/views/trainApply/index.vue
@@ -10,9 +10,9 @@
<el-col
:span="24"
:class="[
- 'hasButOne',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<el-card>
<div class="exam-card-body">
@@ -105,6 +105,14 @@
@click="auditSucess(row)"
>审核通过
</el-button>
+ <el-button
+ v-if="row.vipStatus!=1 && permission.exam_vip"
+ icon="el-icon-folder-checked"
+ @click="usesVipConfirm(row)"
+ :size="size"
+ :type="type"
+ >缴费确认</el-button
+ >
</template>
</avue-crud>
@@ -138,12 +146,15 @@
getdata,
adddata,
cancelTrainAudit,
+ cancelTrain,
auditSucess,
remove,
+ vipSign
} from "@/api/trainingRegistration/trainingRegistration";
import Qs from "qs";
import { getToken } from "@/util/auth";
import { mapState } from "vuex";
+import { mapGetters } from "vuex";
var DIC = {
cancel: [
@@ -187,7 +198,7 @@
//dialogType: 'drawer',
dialogClickModal: false,
// 操作栏宽度
- menuWidth: 200,
+ menuWidth: 280,
...this.$store.state.control.clearOtherBut,
column: [
{
@@ -230,6 +241,7 @@
// 表单新增时是否可见
addDisplay: false,
search: true,
+ searchSpan:3,
// 表单新增时是否为查看模式
addDetail: false,
// 表单编辑时是否禁止
@@ -281,12 +293,14 @@
trigger: "blur",
},
],
- width: 220,
+ width: 180,
+ overHidden:true
},
{
label: "所属企业",
prop: "deptName",
search: true,
+ searchSpan:5,
slot: true,
// 表单新增时是否禁止
addDisabled: false,
@@ -307,7 +321,8 @@
trigger: "blur",
},
],
- width: 220,
+ width: 200,
+ overHidden:true
},
{
label: "报名状态",
@@ -379,7 +394,7 @@
trigger: "blur",
},
],
- width: 200,
+ width: 150,
},
{
label: "报考证件",
@@ -560,6 +575,34 @@
addDisplay: false,
width: 100,
},
+ // {
+ // label: "缴费状态",
+ // search: true,
+ // type: "select",
+ // searchSpan: 4,
+ // prop: "vipStatus",
+ // dicData: [
+ // {
+ // label: '全部',
+ // value: 0,
+ // },
+ // {
+ // label: '已缴费',
+ // value: 1,
+ // },
+ // {
+ // label: '未缴费',
+ // value: 2,
+ // }
+ // ],
+ // props: {
+ // label: "label",
+ // value: "value"
+ // },
+ // editDisplay: false,
+ // addDisplay: false,
+ // width: 100,
+ // },
],
},
questionBankSearch: {},
@@ -671,6 +714,15 @@
});
return ids.join(",");
},
+ ...mapGetters(["userInfo", "permission"]),
+ permissionList() {
+ return {
+ addBtn: this.vaildData(this.permission.notice_add, false),
+ viewBtn: this.vaildData(this.permission.notice_view, false),
+ delBtn: this.vaildData(this.permission.notice_delete, false),
+ editBtn: this.vaildData(this.permission.notice_edit, false)
+ };
+ }
},
methods: {
//报名信息导出
@@ -769,7 +821,7 @@
type: "warning",
}).then(() => {
row.cancel = 2;
- cancelTrainAudit(row).then(
+ cancelTrain(row).then(
() => {
this.onLoad(this.page);
this.$message({
@@ -809,7 +861,28 @@
);
});
},
-
+ usesVipConfirm(row){
+ this.$confirm("确定将选择当前人员确认已缴费?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ var data = {
+ id : row.id,
+ userId:row.userId,
+ vipStatus :1
+ }
+ return vipSign(data);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ });
+ },
// 新增
questionBankRowSave(row, done, loading) {
adddata({
diff --git a/src/views/trainingRegistration/data.js b/src/views/trainingRegistration/data.js
index 15554f3..8e5d689 100644
--- a/src/views/trainingRegistration/data.js
+++ b/src/views/trainingRegistration/data.js
@@ -35,7 +35,7 @@
}],
searchSpan: 4,
searchLabelWidth: 110,
- width: 200,
+ width: 180,
}, {
label: "姓名",
prop: "userId",
@@ -60,6 +60,7 @@
editDisplay: false,
addDisplay: false,
searchSpan: 3,
+ width:90
}, {
label: "身份证号",
prop: "idCardNo",
@@ -138,7 +139,8 @@
},
{
label: "考试证件",
- prop: "applyCard"
+ prop: "applyCard",
+ width:70
},
{
label: "审核状态",
@@ -241,6 +243,34 @@
addDisplay: false,
width: 100,
},
+ // {
+ // label: "缴费状态",
+ // search: true,
+ // type: "select",
+ // searchSpan: 4,
+ // prop: "vipStatus",
+ // dicData: [
+ // {
+ // label: '全部',
+ // value: 0,
+ // },
+ // {
+ // label: '已缴费',
+ // value: 1,
+ // },
+ // {
+ // label: '未缴费',
+ // value: 2,
+ // }
+ // ],
+ // props: {
+ // label: "label",
+ // value: "value"
+ // },
+ // editDisplay: false,
+ // addDisplay: false,
+ // width: 100,
+ // },
// {
// label: "确认截止时间",
// prop: "remainingTime",
diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index 9c7c4f8..50f5ee5 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -93,6 +93,14 @@
:type="type"
>确认报名</el-button
>
+ <el-button
+ v-if="row.vipStatus!=1 && permission.trainingRegistration_vip"
+ icon="el-icon-folder-checked"
+ @click="usesVipConfirm(row)"
+ :size="size"
+ :type="type"
+ >缴费确认</el-button
+ >
</template>
</avue-crud>
@@ -141,7 +149,8 @@
update,
remove,
cancelTrain,
- addExam
+ addExam,
+ vipSign
} from "@/api/trainingRegistration/trainingRegistration";
import { mapGetters } from "vuex";
import { getRoleDetail } from "@/api/system/role";
@@ -339,7 +348,7 @@
}
},
labelWidth: "120",
- menuWidth: 200,
+ menuWidth: 280,
align: "center",
reserveSelection: true,
selection: true,
@@ -565,6 +574,28 @@
});
});
},
+ usesVipConfirm(row){
+ this.$confirm("确定将选择当前人员确认已缴费?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ var data = {
+ id : row.id,
+ userId:row.userId,
+ vipStatus :1
+ }
+ return vipSign(data);
+ })
+ .then(() => {
+ this.onLoad(this.page);
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ });
+ });
+ },
selectionChange(list) {
// this.selectionList = list;
this.choiceName = [];
--
Gitblit v1.9.3