【update】-工作组相关功能开发

This commit is contained in:
fengchenchen
2024-07-03 18:05:55 +08:00
parent e98ff8ddae
commit 622e384104
4 changed files with 132 additions and 10 deletions
@@ -487,7 +487,7 @@ import StatusSlot from '@comp/tools/StatusSlot'
import PreviewFile from '@comp/jero/PreviewFile'
import JImageUpload from '@comp/jero/JImageUpload'
import SetGuessUploadFlagModal from './modules/SetGuessUploadFlagModal'
import { downloadFile } from '../../../api/manage'
import { downloadFile, postAction } from '../../../api/manage'
import WasicTopicData from './modules/wasicStaticData'
import { formatMoney } from '@/utils/formatMoney'
import {getPayConfirmList} from '@api/incomePaymentsApi'
@@ -836,7 +836,9 @@ export default {
delete: '/meeting/workGroupMeetingSituation/delete',
deleteBatch: '/meeting/workGroupMeetingSituation/deleteBatch',
exportXlsUrl: '/meeting/workGroupMeetingSituation/exportXls',
importExcelUrl: '/meeting/workGroupMeetingSituation/importExcel'
importExcelUrl: '/meeting/workGroupMeetingSituation/importExcel',
// 批量审核报名信息
checkSignUpBatch: '/meeting/workGroupMeetingSituation/checkRegister',
},
// 理事会的url
councilMeetingUrl: {
@@ -852,7 +854,9 @@ export default {
delete: '/meeting/draftGroupMeetingSituation/delete',
deleteBatch: '/meeting/draftGroupMeetingSituation/deleteBatch',
exportXlsUrl: '/meeting/draftGroupMeetingSituation/exportXls',
importExcelUrl: '/meeting/draftGroupMeetingSituation/importExcel'
importExcelUrl: '/meeting/draftGroupMeetingSituation/importExcel',
// 批量审核报名信息
checkSignUpBatch: '/meeting/workGroupMeetingSituation/checkRegisterBatch',
},
// 海外会议的url
overseasMeetingUrl: {
@@ -1330,6 +1334,34 @@ export default {
return
}
console.log(2, flag)
const that = this
let ids = ''
for (let a = 0; a < this.selectedRowKeys.length; a++) {
ids += this.selectedRowKeys[a] + ','
}
this.$confirm({
title: '确认审核',
content: '是否确定批量审核报名信息?',
onOk: function () {
that.loading = true
if(!that.url.checkSignUpBatch) return
postAction(that.url.checkSignUpBatch, {ids: ids}).then((res) => {
if (res.success) {
that.$message.success(res.message)
that.loadData()
that.onClearSelected()
} else {
if (res.message.indexOf('<br/>') > -1) {
that.messageLineFeed('审核失败', res.message)
} else {
that.$message.warning(res.message)
}
}
}).finally(() => {
that.loading = false
})
}
})
// this.$refs.setGuessUploadFlagModal.showBatch(this.selectedRowKeys)
},
}
@@ -83,6 +83,22 @@
/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="是否审核" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag v-model="queryParam.checkPaymentStatus"
placeholder="请选择是否审核"
dictCode="yn"
/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="是否确认凭证" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag v-model="queryParam.confirmVoucher"
placeholder="请选择是否确认凭证"
dictCode="yn"
/>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span class="table-page-search-submitButtons">
@@ -198,6 +214,7 @@
<a @click="handleEditAccount(record)" :disabled="isAllowEditAccount(record)" v-has="'workingGroupMember:editAccount'">调账</a>
<a @click="handleEdit(record)" v-has="'workingGroupMember:edit'">编辑</a>
<a @click="handleDelete(record.id)" v-has="'workingGroupMember:delete'">删除</a>
<a @click="confirmVoucher(record.id)" v-has="'workingGroupMember:confirmVoucher'">确认凭证</a>
</span>
</a-table>
</div>
@@ -231,6 +248,7 @@ import WorkGroupSetLabel from './modules/WorkGroupSetLabel'
import { formatMoney } from '../../utils/formatMoney'
import {YesOrNoEnums} from '@/enums/commonEnums'
import { MonthRangeMixin } from '../../mixins/MonthRangeMixins'
import { getAction } from "../../api/manage";
// eslint-disable-next-line no-undef,no-unused-vars
const Base64 = require('js-base64').Base64
@@ -310,7 +328,9 @@ export default {
deleteBatch: '/project/payWorkingGroupSubitem/deleteBatch',
exportXlsUrl: '/project/payWorkingGroupSubitem/exportXls',
importExcelUrl: '/project/payWorkingGroupSubitem/importExcel',
downTemplateUrl: '/project/payWorkingGroupSubitem/downloadExcelModel'
downTemplateUrl: '/project/payWorkingGroupSubitem/downloadExcelModel',
// todo 需要进行修改
confirmVoucher: '/project/payWorkingGroupSubitem/confirmVoucher'
},
columns: [
{
@@ -378,7 +398,24 @@ export default {
width: 80,
dataIndex: 'pack',
scopedSlots: { customRender: 'status-pack' }
}, {
},
{
title: '确认凭证',
align: 'center',
fixed: 'right',
dataIndex: 'pack2',
width: 100,
scopedSlots: { customRender: 'status-pack' }
},
{
title: '审核',
align: 'center',
fixed: 'right',
dataIndex: 'registerCheckResult',
width: 100,
scopedSlots: { customRender: 'status-pack' }
},
{
title: '需要发票',
align: 'center',
fixed: 'right',
@@ -411,7 +448,7 @@ export default {
dataIndex: 'action',
align: 'center',
fixed: 'right',
width: 180,
width: 220,
scopedSlots: { customRender: 'action' }
}
],
@@ -631,6 +668,32 @@ export default {
onDateChange: function (value, dateString) {
this.queryParam.estimatedArrivalStartDate = dateString[0]
this.queryParam.estimatedArrivalEndDate = dateString[1]
},
// 确认凭证
confirmVoucher(id) {
var that = this
this.$confirm({
title: '确认',
content: '确定要确认此条数据凭证吗?',
onOk: function () {
getAction(that.url.confirmVoucher, {id: id}).then((res) => {
if (res.success) {
that.$message.success(res.message)
// 判断当前删除的数据是否是最后一页的最后一条数据,如果是的话页码减一
if (that.ipagination.current > 1 && ((that.ipagination.current - 1) * that.ipagination.pageSize) + 1 === that.ipagination.total) {
that.ipagination.current -= 1
}
that.loadData()
} else {
if (res.message.indexOf('<br/>') > -1) {
that.messageLineFeed('删除失败', res.message)
} else {
that.$message.warning(res.message)
}
}
})
}
})
}
// 2021 10 11 沟通后去掉了这个功能
// searchReset() {
@@ -48,6 +48,7 @@
<a-button type="primary" icon="plus" @click="handleAdd" v-has="'workingGroupProject:add'">新增</a-button>
<a-button type="danger" icon="delete" @click="batchDel" v-has="'workingGroupProject:batchDel'">批量删除</a-button>
<a-button type="primary" icon="plus" @click="handleBatchAddMemberUnit" v-has="'workingGroupMember:batchAdd'">批量新增成员单位</a-button>
<a-button type="primary" icon="plus" @click="handleExportAllFile" v-has="'workingGroupMember:exportAllFile'">全部文件导出</a-button>
<!-- 进度条tooltip-->
<div class="tooltip">
@@ -133,7 +134,7 @@ import ProgressBar from '@comp/ProgressBar'
import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
import IconWorkingGruop from '@/assets/imgs/icon/icon_working_group.png'
import { copyWorkingGroup } from '../../api/incomePaymentsApi'
import { getAction } from '../../api/manage'
import { downloadFile, getAction } from "../../api/manage";
import WorkingGroupMemberUnitModule from '@views/projectManagement/modules/WorkingGroupMemberUnitModule'
export default {
@@ -154,7 +155,8 @@ export default {
url: {
list: '/project/payWorkingGroup/list',
delete: '/project/payWorkingGroup/delete',
deleteBatch: '/project/payWorkingGroup/deleteBatch'
deleteBatch: '/project/payWorkingGroup/deleteBatch',
exportAllFileUrl: '/project/payWorkingGroup/exportAllFile',
},
columns: [
{
@@ -197,6 +199,11 @@ export default {
lastQueryParam: {
year: new Date().getFullYear().toString()
},
/* 排序参数 */
isorter: {
column: 'sortNo', // 排序顺序自定义 正序
order: 'asc',
},
operateData: [] // 进行操作权限校验时使用的数据
}
},
@@ -207,6 +214,16 @@ export default {
this.$refs.workingGroupMemberUnitModule.title = '批量新增成员单位'
this.$refs.workingGroupMemberUnitModule.disableSubmit = false
},
// 导出全部文件
handleExportAllFile () {
const fileName = '导出工作组全部文件'
let param = this.getQueryParams()
if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
param['selections'] = this.selectedRowKeys.join(',')
}
console.log('导出参数', param)
downloadFile(this.url.exportAllFileUrl, fileName + '.zip', param)
},
loadData(arg) {
if (!this.url.list) {
this.$message.error('请设置url.list属性!')
@@ -15,14 +15,20 @@
</span>
<a-form :form="form">
<a-row>
<a-col :span="24">
<a-form-item label="工作组项目" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
<a-col :span="12">
<a-form-item label="工作组项目" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="请输入工作组项目"
v-decorator="['workingGroupProject',validatorRules.workingGroupProject]"
:maxLength='50'
@change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
</a-form-item>
</a-col>
<!--排序顺序自定义-->
<a-col :span="12" >
<a-form-item label="排序" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input-number placeholder="请输入排序" :min="1" :max="99999" style="width: 200px" v-decorator="[ 'sortNo',validatorRules.sortNo]" />
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span="12">
@@ -217,6 +223,10 @@ export default {
rules: [{ required: true, message: '请输入项目名称' }],
validateTrigger: 'blur'
},
sortNo: {
rules: [{ required: true, message: '请输入排序' }],
validateTrigger: 'blur'
},
year: {
rules: [{ required: true, message: '请选择运行年份' }],
validateTrigger: 'change'