Skip to content

G
gdtel-gztel-school-center-ui
Commit 89d24848 by 罗承锋
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/school-center/activity/activityList.vue
#	src/views/school-center/activity/activityRecord.vue
parents 70703ce6 293b7c06
Showing with 49 additions and 14 deletions
src/api/school-center/activityRecordAPI.js
...@@ -5,7 +5,7 @@ const prefix = '/manager/ciop'; ...@@ -5,7 +5,7 @@ const prefix = '/manager/ciop';
let getList = (params) => postAction(prefix + "/activityRecord/list" , params); let getList = (params) => postAction(prefix + "/activityRecord/list" , params);
// 审核活动参与记录 // 审核活动参与记录
let audit = (params) => postAction(prefix + "/activityRecord/auditActivityRecord" , params); let audit = (params) => postAction(prefix + "/activityRecord/auditActivityRecords" , params);
export { export {
getList,audit getList,audit
......
src/views/school-center/activity/activityList.vue
...@@ -45,9 +45,6 @@ ...@@ -45,9 +45,6 @@
<!--列表--> <!--列表-->
<s-table :locale="emptyText" :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling"> <s-table :locale="emptyText" :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling">
<template slot="createTime" slot-scope="text">
{{ text | dayjs}}
</template>
<template slot="imageUrl" slot-scope="text"> <template slot="imageUrl" slot-scope="text">
<img style="width: 20%" :src="apis + text" @click="imgClick(text)"> <img style="width: 20%" :src="apis + text" @click="imgClick(text)">
</template> </template>
......
src/views/school-center/activity/activityRecord.vue
...@@ -51,7 +51,10 @@ ...@@ -51,7 +51,10 @@
<span class="table-page-search-submitButtons" style="float: left; overflow: hidden;"> <span class="table-page-search-submitButtons" style="float: left; overflow: hidden;">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-button @click="search()" type="primary">查询</a-button> <a-button @click="search()" type="primary">查询</a-button><a-divider type="vertical"/>
<a-button type="primary" :disabled="hasSelected" :loading="loading" @click="start()">
审核
</a-button>
</a-col> </a-col>
</span> </span>
</a-row> </a-row>
...@@ -59,7 +62,8 @@ ...@@ -59,7 +62,8 @@
</div> </div>
<!--列表--> <!--列表-->
<s-table :locale="emptyText" :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling"> <s-table :locale="emptyText" :columns="columns" :data="rowdata" bordered ref="table" size="small" class="flex-filling"
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
<template slot="createTime" slot-scope="text"> <template slot="createTime" slot-scope="text">
{{ text | dayjs}} {{ text | dayjs}}
...@@ -119,20 +123,21 @@ ...@@ -119,20 +123,21 @@
import STable from '@/components/table'; import STable from '@/components/table';
import {getList,audit} from "../../../api/school-center/activityRecordAPI" import {getList,audit} from "../../../api/school-center/activityRecordAPI"
import {cloneObject} from '@/utils/util'; import {cloneObject} from '@/utils/util';
import moment from "moment";
import {queryById, update} from "../../../api/school-center/uploadVerify/studentCardVerifyAPI";
export default { export default {
name: "activityRecord", name: "activityRecord",
components: { components: {
STable, STable,moment
}, },
data: function () { data: function () {
return { return {
emptyText: {emptyText: '暂无数据'}, emptyText: {emptyText: '暂无数据'},
previewVisible: false, previewVisible: false,
previewImage: '', previewImage: '',
visiblepicture: false,
fileList: [ fileList: [
], ],
apis: '',
fileid:{}, fileid:{},
// form // form
Formtable: this.$form.createForm(this, {name: 'Formtable'}), Formtable: this.$form.createForm(this, {name: 'Formtable'}),
...@@ -205,7 +210,6 @@ ...@@ -205,7 +210,6 @@
if (res.data.records.length==0){ if (res.data.records.length==0){
return data return data
} }
data = { data = {
data: res.data.records, data: res.data.records,
pageSize: parameter.pageSize, pageSize: parameter.pageSize,
...@@ -240,19 +244,30 @@ ...@@ -240,19 +244,30 @@
createfunctionOk(){ createfunctionOk(){
this.Formtable.validateFields(['status', "integral","remark"], {force: true}, (err, values)=>{ this.Formtable.validateFields(['status', "integral","remark"], {force: true}, (err, values)=>{
if (!err){ if (!err){
let params = {
ids: this.selectedRowKeys
}
//表示
this.modifyForm.status=values.status this.modifyForm.status=values.status
this.modifyForm.remark=values.remark == undefined ? '' : values.remark; this.modifyForm.remark=values.remark == undefined ? '' : values.remark;
this.modifyForm.integral=values.integral this.modifyForm.integral=values.integral
//表示
let obj = cloneObject(this.modifyForm)
//修改数据 //修改数据
audit(this.modifyForm).then(res=>{ audit(Object.assign(params, obj)).then(res=>{
if (res.state=="success") { if (res.state=="success") {
setTimeout(() => {
this.loading = false;
this.selectedRowKeys = [];
}, 1000);
this.hasSelected = true;
this.modifyvisible=false
this.$message.success(res.data ? res.data : '审核成功！', 5); this.$message.success(res.data ? res.data : '审核成功！', 5);
this.search(); this.search();
this.modifyvisible=false
return null; return null;
} }
this.$message.error(res.data ? res.data : '审核失败！', 5); this.$message.error(res.data ? res.data : '审核失败！', 5);
}) })
} }
}) })
...@@ -274,6 +289,29 @@ ...@@ -274,6 +289,29 @@
this.imgInfo='' this.imgInfo=''
this.visiblepicture = false; this.visiblepicture = false;
}, },
},
start() {
this.Formtable.setFieldsValue({
status: '',
remark: '',
integral: ''
});
if(this.selectedRowKeys.length == 0){
this.$message.error("请勾选审核项！！！", 5);
return;
}
//初始化
this.titleName="审核"
this.modifyvisible=true;
},
onSelectChange(selectedRowKeys) {
this.selectedRowKeys = selectedRowKeys;
if(this.selectedRowKeys.length > 0){
this.hasSelected = false;
}else{
this.hasSelected = true;
}
},
} }
} }
</script> </script>
......
src/views/school-center/uploadVerify/studentCardVerify.vue
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
{dataIndex: 'idCard', width: 100, title: '身份证'}, {dataIndex: 'idCard', width: 100, title: '身份证'},
{dataIndex: 'uploadDate', width: 100, title: '上传时间', scopedSlots: {customRender: "uploadDate"}}, {dataIndex: 'uploadDate', width: 100, title: '上传时间', scopedSlots: {customRender: "uploadDate"}},
{dataIndex: 'isFirstUpload', width: 100, title: '是否首次上传', ellipsis: true, scopedSlots: {customRender: "isFirstUpload"}}, {dataIndex: 'isFirstUpload', width: 100, title: '是否首次上传', ellipsis: true, scopedSlots: {customRender: "isFirstUpload"}},
{ dataIndex: 'auditState',width: 100,title: '是否通过审核',ellipsis: true,scopedSlots: {customRender: "auditState"}}, {dataIndex: 'auditState',width: 100,title: '是否通过审核',ellipsis: true,scopedSlots: {customRender: "auditState"}},
{dataIndex: 'auditName', width: 100, title: '审核人姓名'}, {dataIndex: 'auditName', width: 100, title: '审核人姓名'},
{dataIndex: 'studentCardUrl', width: 180, title: '学生证封面照片', scopedSlots: {customRender: "studentCardUrl"}}, {dataIndex: 'studentCardUrl', width: 180, title: '学生证封面照片', scopedSlots: {customRender: "studentCardUrl"}},
{dataIndex: 'otherImgUrl1', width: 180, title: '学生证内页照片', scopedSlots: {customRender: "otherImgUrl1"}}, {dataIndex: 'otherImgUrl1', width: 180, title: '学生证内页照片', scopedSlots: {customRender: "otherImgUrl1"}},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment