bug优化
This commit is contained in:
@@ -858,6 +858,9 @@ layout("/mobile/platform.html"){
|
||||
|
||||
|
||||
let msg = '您选择了【' + this.choose.courseName + (flag ? this.formData.courseTimeName : '') + '】\n的报名,是否确认?'
|
||||
if (this.choose.id === "76619f05ae904324930747087c408b5e") {
|
||||
msg = "本人已认真阅读本次活动《安全告知书》,并确认自身身体状况可以参与活动方案提示的相关内容"
|
||||
}
|
||||
vant.Dialog.confirm({
|
||||
title: '温馨提示',
|
||||
message: msg,
|
||||
|
||||
@@ -701,6 +701,7 @@
|
||||
signUpMethod: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
address: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
plannedDate: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
cover: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
},
|
||||
userColumns: [
|
||||
{prop: 'userName', label: '姓名'},
|
||||
|
||||
@@ -699,7 +699,10 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
this.$refs['form'].validate(valid => {
|
||||
if (valid) {
|
||||
const msg = '您确认要提交' + this.choose.courseName + '的报名吗?'
|
||||
let msg = '您确认要提交' + this.choose.courseName + '的报名吗?'
|
||||
if (this.choose.id === "76619f05ae904324930747087c408b5e") {
|
||||
msg = "本人已认真阅读本次活动《安全告知书》,并确认自身身体状况可以参与活动方案提示的相关内容"
|
||||
}
|
||||
this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
|
||||
@@ -267,13 +267,13 @@ layout("/layouts/platform.html"){
|
||||
v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('H05')}">
|
||||
批量领取
|
||||
</el-button>-->
|
||||
<el-button :disabled="pageFormProjectType!==3"
|
||||
<!--<el-button :disabled="pageFormProjectType!==3"
|
||||
@click="doExcelByOptionId"
|
||||
icon="el-icon-printer" size="small"
|
||||
type="primary"
|
||||
v-if="judgmentAuthority">
|
||||
导出报销表
|
||||
</el-button>
|
||||
</el-button>-->
|
||||
<!--<el-button :disabled="pageFormProjectType!==3"
|
||||
@click="reimbursementDialog=true"
|
||||
icon="el-icon-printer" size="small"
|
||||
@@ -313,6 +313,9 @@ layout("/layouts/platform.html"){
|
||||
type="primary"
|
||||
v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('H05')}">添加
|
||||
</el-button>-->
|
||||
<el-button :disabled="!pageForm.projectId" type="primary" size="small"
|
||||
@click="doExportWelfareBySearch">导出名单
|
||||
</el-button>
|
||||
</template>
|
||||
</table-tool>
|
||||
|
||||
@@ -827,6 +830,15 @@ layout("/layouts/platform.html"){
|
||||
'courier-number-info': httpVueLoader('/components/welfare/CourierNumberInfo.vue?v=' + new Date().getTime())
|
||||
},
|
||||
methods: {
|
||||
doExportWelfareBySearch(){
|
||||
window.open(loc() + '/doExportWelfareBySearch?searchName=' + this.pageForm.searchName +
|
||||
'&searchKeyWord=' + this.pageForm.searchKeyword +
|
||||
'&projectId=' + this.pageForm.projectId +
|
||||
'&unionId=' + this.pageForm.welfareUnit +
|
||||
'&threeUnitId=' + this.pageForm.threeUnitId +
|
||||
'&units=' + (this.pageForm.units ? JSON.stringify(this.pageForm.units) : null) +
|
||||
"&isChoose=" + this.pageForm.isChoose)
|
||||
},
|
||||
async sendMsg(){
|
||||
if (!this.pageForm.projectId) {
|
||||
this.$message.warning('请选择福利项目')
|
||||
|
||||
Reference in New Issue
Block a user