bug整改
This commit is contained in:
=
@@ -34,11 +34,11 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column label="操作" width="220">
|
||||
<template slot-scope="{row}">
|
||||
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button v-if="row.applyStateId === 10010"
|
||||
<el-button v-if="[10010,10030].includes(row.applyStateId)"
|
||||
@click="sublime.jumpPagePjax('/platform/member/change/apply?id=' + row.id)"
|
||||
size="mini" type="primary">编辑</el-button>
|
||||
<!-- <el-button v-if="row.applyStateId === 20" @click="doRevoke(row)" size="mini" type="warning">撤销</el-button>-->
|
||||
<el-button v-if="row.applyStateId === 10010" @click="doDelete(row)" size="mini" type="danger">删除</el-button>
|
||||
<el-button v-if="[10010,10030].includes(row.applyStateId)" @click="doDelete(row)" size="mini" type="danger">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
@@ -60,6 +60,11 @@ layout("/layouts/platform.html"){
|
||||
background-color: rgba(0, 0, 0, 0.2);
|
||||
border-radius: 10px;
|
||||
}
|
||||
|
||||
.el-transfer-panel__list.is-filterable {
|
||||
height: 300px;
|
||||
padding-top: 0;
|
||||
}
|
||||
</style>
|
||||
<div id="app" v-cloak>
|
||||
<guava>
|
||||
@@ -115,11 +120,12 @@ layout("/layouts/platform.html"){
|
||||
@click="doSearch"></el-button>
|
||||
</div>
|
||||
|
||||
<div class="pull-right offscreen-right">
|
||||
<el-button v-if="tabActive==='groupInfo' && ${@shiro.hasAnyRoles('ltbzr,ltbfzr,ltbms,sysadmin')}" type="primary" icon="el-icon-plus"
|
||||
<div class="pull-right offscreen-right"
|
||||
v-if="${@shiro.hasRole('ltbzr') || @shiro.hasRole('sysadmin')}">
|
||||
<el-button v-if="tabActive==='groupInfo'" type="primary" icon="el-icon-plus"
|
||||
@click="openAddGroup">新增小组
|
||||
</el-button>
|
||||
<el-button v-if="tabActive==='componentUnit' && ${@shiro.hasAnyRoles('ltbzr,ltbfzr,ltbms,sysadmin')}" type="primary" icon="el-icon-plus"
|
||||
<el-button v-if="tabActive==='componentUnit'" type="primary" icon="el-icon-plus"
|
||||
@click="openAddComponentUnit">新增组成单位
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -131,9 +137,9 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column type="index" label="序号"></el-table-column>
|
||||
<el-table-column prop="groupName" label="小组名称"></el-table-column>
|
||||
<el-table-column prop="groupCode" label="小组代码"></el-table-column>
|
||||
<el-table-column label="操作" width="200px" v-if="${@shiro.hasAnyRoles('ltbzr,ltbfzr,ltbms,sysadmin')}">
|
||||
<el-table-column label="操作" width="200px">
|
||||
<template scope="{row}">
|
||||
<el-button size="mini"
|
||||
<el-button size="mini" type="primary"
|
||||
@click="groupDialogVisible=true;groupFormData={...row}">
|
||||
编辑
|
||||
</el-button>
|
||||
@@ -160,7 +166,7 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column prop="unionname" label="所属工会"
|
||||
show-overflow-tooltip></el-table-column>
|
||||
<el-table-column prop="roleName" label="身份"></el-table-column>
|
||||
<el-table-column label="操作" width="100px" v-if="${@shiro.hasAnyRoles('ltbzr,ltbfzr,ltbms,sysadmin')}">
|
||||
<el-table-column label="操作" width="100px">
|
||||
<template scope="{row}">
|
||||
<el-dropdown @command="dropdownCommand">
|
||||
<el-button size="mini">
|
||||
@@ -201,15 +207,15 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
</guava>
|
||||
|
||||
<el-dialog :visible.sync="groupDialogVisible" title="小组">
|
||||
<el-form :model="groupFormData" label-width="120px" ref="form">
|
||||
<el-dialog :visible.sync="groupDialogVisible" title="新增离退休小组" width="40%">
|
||||
<el-form :model="groupFormData" label-width="80px" ref="form">
|
||||
<el-form-item label="小组名称" prop="groupName"
|
||||
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<el-input v-model="groupFormData.groupName" maxlength="20"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="小组代码" prop="groupCode"
|
||||
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<el-input-number v-model="groupFormData.groupCode"></el-input-number>
|
||||
<el-input-number v-model="groupFormData.groupCode" style="width: 100%;"></el-input-number>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
@@ -219,13 +225,17 @@ layout("/layouts/platform.html"){
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :visible.sync="componentUnitDialogVisible" title="组成单位">
|
||||
<el-transfer v-model="groupComponentUnit" :data="groupComponentUnitLeft"
|
||||
ref="componentUnitTransfer"
|
||||
:props="{
|
||||
<div style="width: 100%;">
|
||||
<el-transfer v-model="groupComponentUnit" :data="groupComponentUnitLeft"
|
||||
filterable
|
||||
ref="componentUnitTransfer"
|
||||
:props="{
|
||||
key: 'id',
|
||||
label: 'name'
|
||||
}"
|
||||
></el-transfer>
|
||||
:titles="['可选单位', '当前成员单位']"
|
||||
></el-transfer>
|
||||
</div>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="componentUnitDialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" @click="doSetComponentUnit">确定</el-button>
|
||||
@@ -476,7 +486,6 @@ layout("/layouts/platform.html"){
|
||||
created() {
|
||||
this.getTree()
|
||||
this.groupPageData()
|
||||
console.log(${@shiro.hasAnyRoles('ltbzr,ltbfzr,ltbms,sysadmin')})
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -136,7 +136,7 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column prop="partyBranchCode" label="党支部代码"></el-table-column>
|
||||
<el-table-column label="操作" width="200px">
|
||||
<template scope="{row}">
|
||||
<el-button size="mini"
|
||||
<el-button size="mini" type="primary"
|
||||
@click="partyBranchDialogVisible=true;partyBranchFormData={...row}">
|
||||
编辑
|
||||
</el-button>
|
||||
@@ -200,15 +200,15 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
</guava>
|
||||
|
||||
<el-dialog :visible.sync="partyBranchDialogVisible" title="党支部">
|
||||
<el-form :model="partyBranchFormData" label-width="120px" ref="form">
|
||||
<el-dialog :visible.sync="partyBranchDialogVisible" title="新增离退休党支部" width="40%">
|
||||
<el-form :model="partyBranchFormData" label-width="100px" ref="form">
|
||||
<el-form-item label="党支部名称" prop="partyBranchName"
|
||||
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<el-input v-model="partyBranchFormData.partyBranchName" maxlength="20"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="党支部代码" prop="partyBranchCode"
|
||||
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<el-input-number v-model="partyBranchFormData.partyBranchCode"></el-input-number>
|
||||
<el-input-number v-model="partyBranchFormData.partyBranchCode" style="width: 100%"></el-input-number>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
@@ -217,8 +217,8 @@ layout("/layouts/platform.html"){
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :visible.sync="userDialogVisible" title="人员">
|
||||
<el-form :model="partyBranchUserFormData" label-width="120px" ref="partyBranchUserForm">
|
||||
<el-dialog :visible.sync="userDialogVisible" title="新增党支部人员" width="40%">
|
||||
<el-form :model="partyBranchUserFormData" label-width="80px" ref="partyBranchUserForm">
|
||||
<el-form-item label="人员" prop="userIds"
|
||||
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<el-select v-model="partyBranchUserFormData.userIds"
|
||||
@@ -244,8 +244,8 @@ layout("/layouts/platform.html"){
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :visible.sync="committeeDialogVisible" title="支部委员会">
|
||||
<el-form :model="partyBranchCommitteeFormData" label-width="120px" ref="partyBranchCommitteeForm">
|
||||
<el-dialog :visible.sync="committeeDialogVisible" title="新增党支部委员" width="40%">
|
||||
<el-form :model="partyBranchCommitteeFormData" label-width="80px" ref="partyBranchCommitteeForm">
|
||||
<el-form-item label="人员" prop="userId"
|
||||
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<el-select v-model="partyBranchCommitteeFormData.userId"
|
||||
@@ -264,7 +264,7 @@ layout("/layouts/platform.html"){
|
||||
</el-form-item>
|
||||
<el-form-item label="身份" prop="roleCode"
|
||||
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<el-select v-model="partyBranchCommitteeFormData.roleCode">
|
||||
<el-select v-model="partyBranchCommitteeFormData.roleCode" style="width: 100%;">
|
||||
<el-option v-for="item in retiredPartyBranchCommitteeRoleOptions"
|
||||
:label="item.name"
|
||||
:value="item.code"
|
||||
|
||||
@@ -10,7 +10,9 @@ layout("/layouts/platform.html"){
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">年度：</div>
|
||||
<div class="search-item-option">
|
||||
<el-date-picker v-model="pageForm.year" value-format="yyyy" format="yyyy" type="year" :clearable="false"></el-date-picker>
|
||||
<el-date-picker v-model="pageForm.year" value-format="yyyy"
|
||||
style="width: 100%"
|
||||
format="yyyy" type="year" :clearable="false"></el-date-picker>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -193,4 +195,4 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<!--#
|
||||
}
|
||||
#-->
|
||||
#-->
|
||||
|
||||
@@ -70,7 +70,9 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never" class="mt10">
|
||||
<table-tool label="退休人员" :app="this">
|
||||
<template #func>
|
||||
<el-button size="small" type="primary" @click="openAdd">新增退休人员</el-button>
|
||||
<el-button size="small" type="primary" @click="openImport">导入离退休人员</el-button>
|
||||
<el-button size="small" type="primary" @click="openAdd">新增退休人员(系统中不存在)</el-button>
|
||||
<el-button size="small" type="primary" @click="openSet">设置退休人员(系统中存在)</el-button>
|
||||
<el-button size="small" type="primary" @click="backUp">备份为历史数据</el-button>
|
||||
</template>
|
||||
</table-tool>
|
||||
@@ -111,15 +113,15 @@ layout("/layouts/platform.html"){
|
||||
<el-dropdown-item :command="{action:openView,value:row}">
|
||||
查看
|
||||
</el-dropdown-item>
|
||||
<!-- <el-dropdown-item>-->
|
||||
<!-- 编辑-->
|
||||
<!-- </el-dropdown-item>-->
|
||||
<el-dropdown-item :command="{action:openChange,value:row}">
|
||||
变更
|
||||
<el-dropdown-item :command="{action:openEdit,value:row}">
|
||||
编辑
|
||||
</el-dropdown-item>
|
||||
<!-- <el-dropdown-item :command="{action:openChange,value:row}">-->
|
||||
<!-- 变更-->
|
||||
<!-- </el-dropdown-item>-->
|
||||
<el-dropdown-item :command="{action:doDelete,value:row}">
|
||||
删除
|
||||
</el-dropdown-item>
|
||||
<!-- <el-dropdown-item>-->
|
||||
<!-- 删除-->
|
||||
<!-- </el-dropdown-item>-->
|
||||
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
@@ -137,7 +139,11 @@ layout("/layouts/platform.html"){
|
||||
<user-info :id="userId"></user-info>
|
||||
</template>
|
||||
|
||||
<el-drawer title="新增退休人员" :visible.sync="retireUserAddDialogVisible" size="70%">
|
||||
<template #edit>
|
||||
<user-edit ref="userEdit" @finish="$refs.guava.index();pageData()"></user-edit>
|
||||
</template>
|
||||
|
||||
<el-drawer title="设置退休人员(系统中存在)" :visible.sync="retireUserAddDialogVisible" size="70%">
|
||||
<el-timeline>
|
||||
<el-timeline-item timestamp="" placement="top">
|
||||
<el-input placeholder="请输入内容" clearable v-model="nonRetiredUserPageForm.searchKeyword"
|
||||
@@ -185,36 +191,80 @@ layout("/layouts/platform.html"){
|
||||
</span>
|
||||
</el-drawer>
|
||||
|
||||
<el-dialog title="设置去世信息" :visible.sync="deadDialogVisible" width="50%">
|
||||
<el-form :model="deathFormData" ref="deathForm" label-width="120px">
|
||||
<el-form-item label="姓名">
|
||||
<el-input v-model="deathFormData.username" readonly></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="工号">
|
||||
<el-input v-model="deathFormData.loginname" readonly></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="单位">
|
||||
<el-input v-model="deathFormData.unitname" readonly></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="去世日期" prop="deathDate"
|
||||
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
|
||||
<el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd"
|
||||
v-model="deathFormData.deathDate"></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-dialog
|
||||
title="导入离退休人员"
|
||||
:visible.sync="importVisible"
|
||||
:close-on-click-modal="false"
|
||||
width="50%">
|
||||
<el-timeline>
|
||||
<el-timeline-item timestamp="下载模板" placement="top">
|
||||
<el-card>
|
||||
<el-button size="medium" type=""
|
||||
@click="location.href='/platform/retiredUser/list/downloadImport'"
|
||||
icon="el-icon-download">下载模板
|
||||
</el-button>
|
||||
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item timestamp="上传文件" placement="top">
|
||||
<el-card>
|
||||
<el-form>
|
||||
<el-upload
|
||||
name="file"
|
||||
ref="upload"
|
||||
:on-remove="(file, fileList) => {
|
||||
importData.fileList = fileHandleRemove(file, fileList);
|
||||
importResult={
|
||||
errorCount:0,
|
||||
successCount:0,
|
||||
totalCount:0,
|
||||
errorList:[]
|
||||
}
|
||||
}"
|
||||
:on-change="(file, fileList) => {
|
||||
importData.fileList = fileHandleChange(file, fileList,{type:['xls','xlsx']})
|
||||
}"
|
||||
:auto-upload="false"
|
||||
:limit="1"
|
||||
:file-list="importData.fileList">
|
||||
<el-button size="medium" type="" icon="el-icon-upload"
|
||||
style="width: 200px">选择文件
|
||||
</el-button>
|
||||
<div class="el-upload__tip" slot="tip" style="color: #F56C6C">
|
||||
只能上传 xls/xlsx 文件
|
||||
</div>
|
||||
</el-upload>
|
||||
</el-form>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item placement="top" timestamp="导入结果">
|
||||
<el-card shadow="never">
|
||||
<p>总记录数：{{errorInfoData.totalCount}}</p>
|
||||
<p>成功数：<span class="text-success">{{errorInfoData.successCount}}</span></p>
|
||||
<p>错误数：<span class="text-danger">{{errorInfoData.errorCount}}</span></p>
|
||||
<el-link @click="exportErrors" type="primary" v-if="errorInfoData.errorCount>0">下载错误记录
|
||||
</el-link>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
</el-timeline>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="deadDialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" @click="setUserDeathInfo">确定</el-button>
|
||||
</span>
|
||||
<el-button @click="importVisible = false" :disabled="importLoading">取 消</el-button>
|
||||
<el-button type="primary" @click="doImport" :loading="importLoading">确定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</guava>
|
||||
</div>
|
||||
|
||||
<script src="${base!}/assets/platform/plugins/xlsx/xlsx.full.min.js"></script>
|
||||
|
||||
<script>
|
||||
const vue = new Vue({
|
||||
el: '#app',
|
||||
mixins: [initTableMixins],
|
||||
components: {
|
||||
'user-info': httpVueLoader('/components/retiredUser/userInfo.vue'),
|
||||
'user-info': httpVueLoader('/components/retiredUser/userInfo.vue?v=1.0.1'),
|
||||
'user-edit': httpVueLoader('/components/retiredUser/userEdit.vue?v=1.0.1'),
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@@ -233,7 +283,7 @@ layout("/layouts/platform.html"){
|
||||
{prop: 'personType', label: '人员类型', sortable: true, checked: 0},
|
||||
{prop: 'userState', label: '在职状态', sortable: true, checked: 0},
|
||||
{prop: 'political', label: '政治面貌'},
|
||||
{prop: 'unionname', label: '所属工会', sortable: true},
|
||||
// {prop: 'unionname', label: '所属工会', sortable: true},
|
||||
{prop: 'unitname', label: '所属单位', sortable: true},
|
||||
{prop: 'threeUnitName', label: '所在科室', sortable: true, checked: 0},
|
||||
{prop: 'unionGroupName', label: '工会小组', sortable: true, checked: 0},
|
||||
@@ -256,8 +306,19 @@ layout("/layouts/platform.html"){
|
||||
retiredGroupOption: [],
|
||||
retiredPartyBranchOption: [],
|
||||
|
||||
userId: null
|
||||
userId: null,
|
||||
|
||||
importVisible: false,
|
||||
importLoading: false,
|
||||
importData: {
|
||||
fileList: [],
|
||||
},
|
||||
errorInfoData: {
|
||||
totalCount: 0,
|
||||
successCount: 0,
|
||||
errorCount: 0,
|
||||
errorList: 0,
|
||||
},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
@@ -277,6 +338,11 @@ layout("/layouts/platform.html"){
|
||||
},
|
||||
|
||||
openAdd() {
|
||||
this.userId = null
|
||||
this.$refs.guava.edit()
|
||||
this.$refs.userEdit.reset()
|
||||
},
|
||||
openSet() {
|
||||
this.retireUserAddDialogVisible = true
|
||||
this.nonRetiredUserPageForm.pageNumber = 1
|
||||
this.nonRetiredUserPageData()
|
||||
@@ -284,6 +350,12 @@ layout("/layouts/platform.html"){
|
||||
this.$refs.nonRetiredUserTable.clearSelection()
|
||||
}
|
||||
},
|
||||
|
||||
openEdit(row) {
|
||||
this.$refs.guava.edit()
|
||||
this.$refs.userEdit.getInfo(row.id)
|
||||
},
|
||||
|
||||
async nonRetiredUserPageData() {
|
||||
const resp = await $.post(loc() + '/nonRetiredUserPageData', this.nonRetiredUserPageForm)
|
||||
if (resp.code === 0) {
|
||||
@@ -351,8 +423,101 @@ layout("/layouts/platform.html"){
|
||||
async openView(row) {
|
||||
this.userId = row.id
|
||||
this.$refs.guava.view()
|
||||
}
|
||||
},
|
||||
async doDelete(row) {
|
||||
const confirm = await this.$confirm('您确定要删除吗?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
})
|
||||
if ('confirm' !== confirm) return
|
||||
const resp = await $.post(loc() + "/doDelete", {id: row.id})
|
||||
if (resp.code == 0) {
|
||||
this.$message.success(resp.msg)
|
||||
this.doSearch()
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
},
|
||||
|
||||
openImport(){
|
||||
this.importData = {
|
||||
fileList: [],
|
||||
}
|
||||
this.errorInfoData = {
|
||||
totalCount: 0,
|
||||
successCount: 0,
|
||||
errorCount: 0,
|
||||
errorList: 0,
|
||||
}
|
||||
this.importVisible = true;
|
||||
},
|
||||
doImport(){
|
||||
if (this.importData.fileList.length === 0) {
|
||||
this.notifyWarning("请选择文件！")
|
||||
return
|
||||
}
|
||||
const data = new FormData();
|
||||
data.append("isFlag", this.importData.isFlag)
|
||||
this.importData.fileList.forEach((val) => {
|
||||
data.append("file", val.raw, val.raw.name);
|
||||
});
|
||||
this.importLoading = true
|
||||
$.ajax({
|
||||
url: loc() + "/doImport",
|
||||
type: "post",
|
||||
data: data,
|
||||
processData: false,
|
||||
contentType: false,
|
||||
success: (data) => {
|
||||
this.importLoading = false
|
||||
if (data.code === 0 && data.data === null) {
|
||||
this.pageData();
|
||||
this.notifySuccess("导入成功")
|
||||
this.importVisible = false
|
||||
} else {
|
||||
this.notifyWarning("导入失败")
|
||||
this.errorInfoData = data.data
|
||||
}
|
||||
},
|
||||
error: (data) => {
|
||||
this.notifyWarning("导入失败")
|
||||
this.importLoading = false
|
||||
}
|
||||
});
|
||||
},
|
||||
exportErrors() {
|
||||
const data = this.errorInfoData.errorList
|
||||
|
||||
// 创建工作簿
|
||||
const workbook = XLSX.utils.book_new();
|
||||
|
||||
// 创建工作表
|
||||
const worksheet = XLSX.utils.json_to_sheet(data);
|
||||
|
||||
// 将工作表添加到工作簿
|
||||
XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
|
||||
|
||||
// 将工作簿转换为二进制对象
|
||||
const excelBuffer = XLSX.write(workbook, {bookType: 'xlsx', type: 'array'});
|
||||
|
||||
// 将二进制对象转换为Blob对象
|
||||
const blob = new Blob([excelBuffer], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
|
||||
|
||||
// 创建下载链接并设置相关属性
|
||||
const url = window.URL.createObjectURL(blob);
|
||||
const link = document.createElement('a');
|
||||
link.href = url;
|
||||
link.download = '错误记录.xlsx';
|
||||
|
||||
// 模拟点击下载链接
|
||||
document.body.appendChild(link);
|
||||
link.click();
|
||||
// 清理下载链接
|
||||
document.body.removeChild(link);
|
||||
window.URL.revokeObjectURL(url);
|
||||
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
this.pageData()
|
||||
@@ -366,4 +531,4 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<!--#
|
||||
}
|
||||
#-->
|
||||
#-->
|
||||
|
||||
@@ -427,7 +427,9 @@ layout("/layouts/platform.html"){
|
||||
if (!keyWord) {
|
||||
return
|
||||
}
|
||||
$.post("/platform/staff/special/manage/queryUser", { keyWord }).then((res) => {
|
||||
|
||||
const con = this.formData.userId
|
||||
$.post("/platform/staff/special/manage/queryUser", { keyWord:keyWord,con:con }).then((res) => {
|
||||
this.users = res.data
|
||||
})
|
||||
},
|
||||
|
||||
@@ -54,7 +54,7 @@ layout("/layouts/platform.html"){
|
||||
placeholder="查询类型"
|
||||
style="width: 110px;">
|
||||
<el-option label="姓名" value="userName"></el-option>
|
||||
<el-option label="工号" value="loginName"></el-option>
|
||||
<el-option label="一卡通号" value="loginName"></el-option>
|
||||
</el-select>
|
||||
<el-button slot="append" @click="doSearch">搜索</el-button>
|
||||
</el-input>
|
||||
@@ -140,7 +140,8 @@ layout("/layouts/platform.html"){
|
||||
<span>选择路线：</span>
|
||||
<el-select v-model="pageForm.takePartInLineId" filterable clearable
|
||||
placeholder="请选择线路"
|
||||
style="width: 80%" @change="doSearch()">
|
||||
style="width: 80%"
|
||||
@change="lineChange(pageForm.takePartInLineId);doSearch()">
|
||||
<el-option v-for="item in takePartInLines"
|
||||
:key="item.id"
|
||||
:label="item.lineName"
|
||||
@@ -169,6 +170,20 @@ layout("/layouts/platform.html"){
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12">
|
||||
<span>出行时间：</span>
|
||||
<el-select v-model="pageForm.selectId" filterable clearable
|
||||
placeholder="请选择出行时间"
|
||||
style="width: 80%" @change="doSearch()">
|
||||
<el-option v-for="item in linePlayTimes"
|
||||
:key="item.times"
|
||||
:label="item.times"
|
||||
:value="item.selectId">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -192,7 +207,7 @@ layout("/layouts/platform.html"){
|
||||
v-for="item in options">
|
||||
{{ item.label }}
|
||||
</el-tag>
|
||||
<el-link :underline="false" @click="pageForm.state='';doSearch()" class="mr10"
|
||||
<el-link :underline="false" @click="clearState" class="mr10"
|
||||
style="color: red" v-if="options.length&&pageForm.state">清空
|
||||
</el-link>
|
||||
<template
|
||||
@@ -244,7 +259,12 @@ layout("/layouts/platform.html"){
|
||||
</el-link>
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop=='isFamily'">
|
||||
{{row.isFamily?'携带':'未携带'}}（{{row.num}}）
|
||||
<el-link v-if="!row.familyNumber" type="primary" @click="openView(row)">
|
||||
{{row.isFamily?'携带':'未携带'}}（{{row.isFamily}}）
|
||||
</el-link>
|
||||
<el-link v-else type="primary">
|
||||
{{row.familyNumber?'携带':'未携带'}}（{{row.familyNumber}}）
|
||||
</el-link>
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop=='num'">
|
||||
{{1+row.num}}
|
||||
@@ -256,9 +276,39 @@ layout("/layouts/platform.html"){
|
||||
<sapn v-else style="color: #67C23A">暂无</sapn>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="操作" width="300px">
|
||||
<el-table-column align="center" header-align="center" label="操作" width="180px">
|
||||
<template scope="{row}">
|
||||
<el-button @click="openView(row)" size="mini" type="primary">查看
|
||||
<el-dropdown @command="dropdownCommand">
|
||||
<el-button plain size="mini">
|
||||
<i class="ti-settings"></i>
|
||||
<span class="ti-angle-down"></span>
|
||||
</el-button>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item :command="{type:'view',data:row}">
|
||||
查看
|
||||
</el-dropdown-item>
|
||||
<template v-if="!pageForm.regionalNature
|
||||
||(pageForm.regionalNature==='省内'&&modifyConfig.isSnLine)
|
||||
||(pageForm.regionalNature==='省外'&&modifyConfig.isSwLine)">
|
||||
<el-dropdown-item v-if="ifRecall(row)" :command="{type:'recall',data:row}">
|
||||
撤回
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item v-if="ifEdit(row)" :command="{type:'handle',data:row}">
|
||||
审核
|
||||
</el-dropdown-item>
|
||||
|
||||
<template v-if="[2750].includes(row.stateId)">
|
||||
<el-dropdown-item :command="{type:'modify',data:row}">
|
||||
编辑
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item :command="{type:'delete',data:row}">
|
||||
删除
|
||||
</el-dropdown-item>
|
||||
</template>
|
||||
</template>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
<!--<el-button @click="openView(row)" size="mini" type="primary">查看
|
||||
</el-button>
|
||||
<template v-if="!pageForm.regionalNature||
|
||||
(pageForm.regionalNature==='省内'&&modifyConfig.isSnLine)||
|
||||
@@ -270,8 +320,7 @@ layout("/layouts/platform.html"){
|
||||
type="primary">
|
||||
审核
|
||||
</el-button>
|
||||
</template>
|
||||
|
||||
</template>-->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -303,17 +352,24 @@ layout("/layouts/platform.html"){
|
||||
<el-input disabled v-model="formData.auditTime"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-form-item label="审核意见" prop="auditOpinion">
|
||||
<el-input maxlength="500" placeholder="请填写您的审核意见" rows="4"
|
||||
type="textarea"
|
||||
v-model="formData.auditOpinion"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="审核意见" prop="auditOpinion">
|
||||
<el-input maxlength="500" placeholder="请填写您的审核意见" rows="4"
|
||||
type="textarea"
|
||||
v-model="formData.auditOpinion"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row style="margin: 40px 0;text-align: right">
|
||||
<el-button @click="doAudit(false)" type="danger">退回
|
||||
<el-button @click="$refs.guava.index()">返回
|
||||
</el-button>
|
||||
<el-button @click="doAudit(true)" type="primary">通过
|
||||
<el-button @click="doAudit(false,true)" type="warning">调整
|
||||
</el-button>
|
||||
<el-button @click="doAudit(false,false)" type="danger">拒绝
|
||||
</el-button>
|
||||
<el-button @click="doAudit(true,false)" type="primary">通过
|
||||
</el-button>
|
||||
</el-row>
|
||||
</el-form>
|
||||
@@ -330,7 +386,7 @@ layout("/layouts/platform.html"){
|
||||
width="50%">
|
||||
|
||||
<el-form :model="formData" label-width="130px">
|
||||
<el-row gutter="20">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="审核人" prop="username">
|
||||
<el-input disabled v-model="formData.username"></el-input>
|
||||
@@ -341,20 +397,150 @@ layout("/layouts/platform.html"){
|
||||
<el-input disabled v-model="formData.auditTime"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-form-item label="审核意见" prop="auditOpinion">
|
||||
<el-input maxlength="500" placeholder="请填写您的审核意见" rows="4" type="textarea"
|
||||
v-model="formData.auditOpinion"></el-input>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="审核意见" prop="auditOpinion">
|
||||
<el-input maxlength="500" placeholder="请填写您的审核意见" rows="4" type="textarea"
|
||||
v-model="formData.auditOpinion"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="doOnekeyAudit(false)">取 消</el-button>
|
||||
<el-button type="primary" @click="doOnekeyAudit(true)">确 定</el-button>
|
||||
</span>
|
||||
<el-button @click="dialogVisible = false">返 回</el-button>
|
||||
<el-button @click="doOnekeyAudit(false,true)" type="warning">调 整</el-button>
|
||||
<el-button @click="doOnekeyAudit(false,false)" type="danger">拒 绝</el-button>
|
||||
<el-button type="primary" @click="doOnekeyAudit(true,false)">通 过</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog
|
||||
title="修改信息"
|
||||
:visible.sync="editVisible"
|
||||
:close-on-click-modal="false"
|
||||
width="50%">
|
||||
<el-form :model="editFormData" label-width="120px" :rules="rules" ref="editForm" style="margin-right: 40px">
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="loginName" label="工号">
|
||||
<el-input v-model="editFormData.loginName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="姓名">
|
||||
<el-input v-model="editFormData.userName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="手机号">
|
||||
<el-input v-model="editFormData.mobile" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="身份证号">
|
||||
<el-input v-model="editFormData.idCard" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="unionName" label="工会">
|
||||
<el-input v-model="editFormData.unionName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="unitName" label="单位">
|
||||
<el-input v-model="editFormData.unitName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
<el-form-item prop="prop" :label="labelName">
|
||||
<template v-if="modifyConfig.familyInfo == 2">
|
||||
<el-collapse v-model="activeNames">
|
||||
<el-collapse-item title="点击可展开详细信息" name="1">
|
||||
<el-card shadow="never">
|
||||
<el-table :data="editFormData.companionList">
|
||||
<el-table-column label="姓名" prop="userName"></el-table-column>
|
||||
<el-table-column label="性别" prop="sex"></el-table-column>
|
||||
<el-table-column label="身份证号" prop="idCard" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="年龄" prop="age"></el-table-column>
|
||||
<el-table-column label="床型" prop="bedType">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo?.bedType }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="床位" prop="bedNum">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo?.bedNum }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="意向拼床人" prop="otherSleepUser">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo?.otherSleepUser ?
|
||||
row.bedInfo?.otherSleepUser : '暂无' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="关系" prop="relation"></el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-input v-model="editFormData.bedType" readonly></el-input>
|
||||
</template>
|
||||
</el-form-item>
|
||||
|
||||
<!--<el-form-item prop="travelName" label="旅行社">
|
||||
<el-select v-model="editFormData.agencyId" filterable clearable
|
||||
placeholder="请选择旅行社"
|
||||
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in agencyLists"
|
||||
:key="item.id"
|
||||
:label="item.travelAgencyName"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>-->
|
||||
<el-form-item prop="travelLine" :label="lineLabelName">
|
||||
<el-select v-model="editFormData.takePartInLineId" filterable clearable
|
||||
placeholder="请选择线路"
|
||||
@change="validateLine"
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in unionSelectLines"
|
||||
:key="item.id"
|
||||
:label="item.lineName + '-' + item.regionalNature + '【' + item.lotName + '】' + '（' + item.playStartTime + '至' + item.playEndTime + '）' + '（' + item.signUpMode + '）'"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item prop="specificTime" label="出行时间" v-if="pageForm.state==='3'">
|
||||
<el-select v-model="editFormData.specificTime" filterable clearable
|
||||
placeholder="请选择出行时间"
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in editSpecificTimes"
|
||||
:key="item"
|
||||
:label="item"
|
||||
:value="item">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="editVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="doEdit">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -378,8 +564,9 @@ layout("/layouts/platform.html"){
|
||||
isTransferIn: false,
|
||||
},
|
||||
options: [
|
||||
{label: "总人数", value: "0"},
|
||||
{label: "本工会人员（自己线路）", value: "1"},
|
||||
{label: "本工会人员（其他路线）", value: "2"},
|
||||
// {label: "本工会人员（其他路线）", value: "2"},
|
||||
{label: "其他工会人员（选我线路）", value: "3"}
|
||||
],
|
||||
unionOptions: [],
|
||||
@@ -394,7 +581,7 @@ layout("/layouts/platform.html"){
|
||||
searchName: "userName",
|
||||
},
|
||||
tableColumns: [
|
||||
{prop: 'loginName', label: '工号'},
|
||||
{prop: 'loginName', label: '一卡通号'},
|
||||
{prop: 'userName', label: '姓名'},
|
||||
{prop: 'unitName', label: '单位', sortable: true},
|
||||
{prop: 'unionName', label: '工会', sortable: true},
|
||||
@@ -403,20 +590,152 @@ layout("/layouts/platform.html"){
|
||||
// {prop: 'userNature', label: '人员性质'},
|
||||
{prop: 'isFamily', label: '是否携带家属'},
|
||||
// {prop: 'num', label: '人数'},
|
||||
{prop: 'isTransferIn', label: '是否转入转出', sortable: true},
|
||||
// {prop: 'isTransferIn', label: '是否转入转出', sortable: true},
|
||||
{prop: 'linePlayTime', label: '出行时间', sortable: true},
|
||||
{prop: 'stateId', label: '审核状态', sortable: true},
|
||||
],
|
||||
modifyConfig: {}
|
||||
modifyConfig: {},
|
||||
|
||||
linePlayTimes: [],
|
||||
|
||||
editVisible: false,
|
||||
editFormData: {
|
||||
companionList: []
|
||||
},
|
||||
rules: {
|
||||
loginName: [{required: true, message: '请填写工号', trigger: ['blur', 'change']}],
|
||||
userName: [{required: true, message: '请填写姓名', trigger: ['blur', 'change']}],
|
||||
unionName: [{required: true, message: '请选择工会', trigger: ['blur', 'change']}],
|
||||
unitName: [{required: true, message: '请选择单位', trigger: ['blur', 'change']}],
|
||||
// travelName: [{required: true, message: '请选择旅行社', trigger: ['blur', 'change']}],
|
||||
specificTime: [{required: true, message: '请选择出行时间', trigger: ['blur', 'change']}],
|
||||
// travelLine: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
},
|
||||
editSpecificTimes: [],
|
||||
labelName: '',
|
||||
unionSelectLines: [],
|
||||
lineLabelName: '',
|
||||
|
||||
activeNames:[],
|
||||
}
|
||||
},
|
||||
components: {
|
||||
'enroll-info': httpVueLoader('/components/theRapyRecuperation/Enrollinfo.vue'),
|
||||
'enroll-info': httpVueLoader('/components/theRapyRecuperation/Enrollinfo.vue?v=1.0.1'),
|
||||
'line-info': httpVueLoader('/components/theRapyRecuperation/LineInfo.vue')
|
||||
|
||||
},
|
||||
methods: {
|
||||
async doOnekeyAudit(flag) {
|
||||
const confirm = await this.$confirm('您确定要一键审核您所勾选的信息吗, 是否继续?', '提示', {
|
||||
async validateLine() {
|
||||
const resp = await $.post('/platform/theRapyRecuperation/line/enroll/validSignUpInfo'
|
||||
, {enroll: JSON.stringify(this.editFormData)})
|
||||
if (resp.code !== 0) {
|
||||
this.$message.warning(resp.msg)
|
||||
this.editFormData.takePartInLineId = ''
|
||||
}
|
||||
},
|
||||
dropdownCommand(command) {
|
||||
const {type, data} = command
|
||||
if (type === 'view') {
|
||||
this.openView(data)
|
||||
} else if (type === 'recall') {
|
||||
this.doRecall(data)
|
||||
} else if (type === 'handle') {
|
||||
this.openEdit(data)
|
||||
} else if (type === 'modify') {
|
||||
this.openModify(data)
|
||||
} else if (type === 'delete') {
|
||||
this.doDelete(data)
|
||||
}
|
||||
},
|
||||
async doDelete(row) {
|
||||
this.$confirm("您确定要删除【<span style='color: red'>" + row.userName + "</span>】的此条报名信息吗？", '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
dangerouslyUseHTMLString: true,
|
||||
type: 'warning',
|
||||
callback: async (a, b) => {
|
||||
if ("confirm" === a) {//确认后再执行
|
||||
const resp = await $.post('/platform/theRapyRecuperation/line/enroll/doDeleteMyEnrollInfoById/' + row.id)
|
||||
if (resp.code === 0) {
|
||||
await this.doSearch()
|
||||
this.$message.success('删除成功')
|
||||
await this.getApplyNumAudit();
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
async openModify(row) {
|
||||
this.getUnionSelectLine(row.takePartInLineId)
|
||||
this.editFormData = {};
|
||||
const resp = await $.get("/platform/theRapyRecuperation/TheRapyAudit/findOne", {id: row.id})
|
||||
if (resp.code === 0) {
|
||||
this.editFormData = {...resp.data.viewData}
|
||||
if (this.modifyConfig.familyInfo == 2) {
|
||||
this.editFormData.companionList = resp.data.viewData.companionList
|
||||
this.labelName = "家属信息"
|
||||
} else {
|
||||
this.editFormData.bedType = resp.data.viewData.familyNumber
|
||||
this.labelName = "家属数量"
|
||||
}
|
||||
}
|
||||
if (row.takePartInBaseManagementId) {
|
||||
this.editSpecificTime(row.takePartInBaseManagementId);
|
||||
this.lineLabelName = "酒店"
|
||||
} else if (row.takePartInLineId) {
|
||||
this.lineLabelName = '线路'
|
||||
}
|
||||
this.editVisible = true
|
||||
},
|
||||
async doEdit() {
|
||||
this.$refs['editForm'].validate().then(async () => {
|
||||
const confirm = await this.$confirm('您确定要修改这位老师的报名信息吗？', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
if (!this.editFormData.takePartInLineId && !this.editFormData.takePartInBaseManagementId) {
|
||||
this.$message.warning('请选择线路')
|
||||
return
|
||||
}
|
||||
const resp = await $.post('/platform/theRapyRecuperation/user/query/doEdit', this.editFormData)
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success(resp.msg)
|
||||
this.editVisible = false
|
||||
await this.doSearch();
|
||||
} else {
|
||||
this.$notify.error(resp.msg)
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
async lineChange(val) {
|
||||
this.pageForm.selectId = '';
|
||||
const data = this.takePartInLines.find(v => v.id === val)
|
||||
if (!data) {
|
||||
return
|
||||
}
|
||||
const resp = await $.get('/platform/theRapyRecuperation/TheRapyXghAudit/getLinePlayTimeByLineId', {
|
||||
lineId: data.id,
|
||||
year: this.pageForm.year,
|
||||
signUpMode: 1,
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.linePlayTimes = resp.data
|
||||
}
|
||||
},
|
||||
async doOnekeyAudit(flag, adjustment) {
|
||||
let msg = '';
|
||||
if (adjustment && !flag) {
|
||||
msg = '您确定要一键【调整】您所勾选的报名信息吗，调整后该报名信息将不会在审核列表中展示, 是否继续?'
|
||||
} else if (!adjustment && !flag) {
|
||||
msg = '您确定要一键【拒绝】您所勾选的报名信息吗，是否继续?'
|
||||
} else if (!adjustment && flag) {
|
||||
msg = '您确定要一键【通过】您所勾选的报名信息吗，是否继续?'
|
||||
}
|
||||
const confirm = await this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
@@ -425,13 +744,14 @@ layout("/layouts/platform.html"){
|
||||
const resp = await $.post(loc() + "/doOnekeyAudit", {
|
||||
ids: JSON.stringify(this.tableSelection),
|
||||
flag: flag,
|
||||
adjustment: adjustment,
|
||||
auditOpinion: this.formData.auditOpinion
|
||||
})
|
||||
if (resp.data===0){
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success({title: '成功', message: resp.msg});
|
||||
await this.doSearch()
|
||||
this.dialogVisible = false
|
||||
}else {
|
||||
} else {
|
||||
this.$notify.warning({title: '失败', message: resp.msg});
|
||||
this.dialogVisible = false
|
||||
}
|
||||
@@ -468,7 +788,8 @@ layout("/layouts/platform.html"){
|
||||
selfUnionId,
|
||||
takePartInUnionId
|
||||
} = row
|
||||
if ((stateId === 2715 || stateId === 2720 || stateId === 2750) && selfUnionId === "${@shiro.getPrincipalProperty('unit').getUnionid()}") {
|
||||
// if ((stateId === 2715 || stateId === 2720 || stateId === 2750) && selfUnionId === "${@shiro.getPrincipalProperty('unit').getUnionid()}") {
|
||||
if ((stateId === 2715 || stateId === 2750) && selfUnionId === "${@shiro.getPrincipalProperty('unit').getUnionid()}") {
|
||||
return true
|
||||
} else if ((stateId === 2725 || stateId === 2750) && takePartInUnionId === "${@shiro.getPrincipalProperty('unit').getUnionid()}") {
|
||||
return true
|
||||
@@ -484,16 +805,24 @@ layout("/layouts/platform.html"){
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
const resp = await $.post(loc() + "/doRecall", {id: row.id})
|
||||
if (resp.code === 0){
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success({title: '成功', message: resp.msg});
|
||||
await this.doSearch()
|
||||
}else {
|
||||
} else {
|
||||
this.$notify.warning({title: '失败', message: resp.msg});
|
||||
}
|
||||
}
|
||||
},
|
||||
async doAudit(flag) {
|
||||
const confirm = await this.$confirm('您确定要' + (flag ? '通过' : '退回') + '吗, 是否继续?', '提示', {
|
||||
async doAudit(flag, adjustment) {
|
||||
let msg = '';
|
||||
if (adjustment && !flag) {
|
||||
msg = '您确定要【调整】该报名信息吗，调整后该报名信息将不会在审核列表中展示, 是否继续?'
|
||||
} else if (!adjustment && !flag) {
|
||||
msg = '您确定要【拒绝】该报名信息吗，是否继续?'
|
||||
} else if (!adjustment && flag) {
|
||||
msg = '您确定要【通过】该报名信息吗，是否继续?'
|
||||
}
|
||||
const confirm = await this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
@@ -501,15 +830,16 @@ layout("/layouts/platform.html"){
|
||||
if (confirm === "confirm") {
|
||||
const resp = await $.post(loc() + "/doAudit", {
|
||||
flag: flag,
|
||||
adjustment: adjustment,
|
||||
id: this.formData.id,
|
||||
isTransferIn: this.formData.isTransferIn,
|
||||
auditOpinion: this.formData.auditOpinion
|
||||
})
|
||||
if (resp.code === 0){
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success({title: '成功', message: resp.msg});
|
||||
this.doSearch()
|
||||
this.$refs.guava.index()
|
||||
}else {
|
||||
} else {
|
||||
this.$notify.warning({title: '失败', message: resp.msg});
|
||||
}
|
||||
}
|
||||
@@ -568,7 +898,7 @@ layout("/layouts/platform.html"){
|
||||
this.unionOptions = data
|
||||
},
|
||||
async getXlByUnion() {
|
||||
const {data} = await $.post(loc() + "/getXlByUnion", {
|
||||
const {data} = await $.post(loc() + "/getXlByUnionAudit", {
|
||||
unionId: this.pageForm.unionId,
|
||||
year: this.pageForm.year,
|
||||
regionalNature: this.pageForm.regionalNature,
|
||||
@@ -597,12 +927,18 @@ layout("/layouts/platform.html"){
|
||||
async getApplyNumAudit() {
|
||||
const {data} = await $.post(loc() + "/getApplyNumAudit", this.pageForm)
|
||||
this.options = [
|
||||
{label: "总人数" + (data.count1 + data.count3) + "人", value: "0"},
|
||||
{label: "本工会人员（自己线路）" + data.count1 + "人", value: "1"},
|
||||
{label: "本工会人员（其他路线）" + data.count2 + "人", value: "2"},
|
||||
// {label: "本工会人员（其他路线）" + data.count2 + "人", value: "2"},
|
||||
{label: "其他工会人员（选我线路）" + data.count3 + "人", value: "3"}
|
||||
]
|
||||
|
||||
},
|
||||
async clearState() {
|
||||
this.pageForm.state = ''
|
||||
this.pageForm.unionId = ''
|
||||
await this.doSearch()
|
||||
},
|
||||
async doSearch() {
|
||||
this.pageForm.pageNumber = 1;
|
||||
this.pageData();
|
||||
@@ -615,12 +951,23 @@ layout("/layouts/platform.html"){
|
||||
this.modifyConfig = res.data
|
||||
}
|
||||
},
|
||||
async getUnionSelectLine(disPlayUnionSelectId = null) {
|
||||
const resp = await $.post('/platform/theRapyRecuperation/user/query/getUnionSelectLine', {
|
||||
startYear: this.pageForm.year,
|
||||
signUpMode: 1,
|
||||
disPlayUnionSelectId: disPlayUnionSelectId
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.unionSelectLines = resp.data
|
||||
}
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
await this.getBmUserUnion()
|
||||
await this.getModifyConfig()
|
||||
this.takePartInLines = await this.getXlByUnion()
|
||||
await this.doSearch()
|
||||
await this.getUnionSelectLine()
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -0,0 +1,806 @@
|
||||
<!--#
|
||||
layout("/layouts/platform.html"){
|
||||
#-->
|
||||
|
||||
<style xmlns="">
|
||||
.query-row {
|
||||
height: 70px;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.query-row .el-col {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.query-row:not(:last-child) {
|
||||
border-bottom: 1px dashed rgb(230, 230, 230);
|
||||
}
|
||||
|
||||
.query-row-title {
|
||||
width: 120px;
|
||||
}
|
||||
|
||||
.el-table-container {
|
||||
padding-top: 0;
|
||||
}
|
||||
</style>
|
||||
<div id="app" v-cloak>
|
||||
<guava ref="guava">
|
||||
<template>
|
||||
<el-card shadow="never">
|
||||
<el-row align="middle" class="query-row" type="flex">
|
||||
<el-col class="query-row-title"></el-col>
|
||||
<el-col class="query-row-content">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<span>年  度：</span>
|
||||
<el-date-picker
|
||||
v-model="pageForm.year"
|
||||
type="year"
|
||||
value-format="yyyy"
|
||||
placeholder="选择年"
|
||||
style="width: 80%" @change="doSearch">
|
||||
</el-date-picker>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<span>查询类型：</span>
|
||||
<el-input placeholder="请输入内容" clearable
|
||||
v-model="pageForm.searchKeyword"
|
||||
style="width: 80%" @keyup.enter.native="doSearch">
|
||||
<el-select v-model="pageForm.searchName" slot="prepend"
|
||||
placeholder="查询类型"
|
||||
style="width: 110px;">
|
||||
<el-option label="姓名" value="userName"></el-option>
|
||||
<el-option label="一卡通号" value="loginName"></el-option>
|
||||
</el-select>
|
||||
<el-button slot="append" @click="doSearch">搜索</el-button>
|
||||
</el-input>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row align="middle" class="query-row" type="flex">
|
||||
<el-col class="query-row-title"></el-col>
|
||||
<el-col class="query-row-content">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<span>所属工会：</span>
|
||||
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会"
|
||||
@change="unionChange"
|
||||
filterable clearable style="width: 80%"
|
||||
:disabled="unionDisabled">
|
||||
<el-option
|
||||
v-for="item in unionOptions"
|
||||
:key="item.id"
|
||||
:label="item.unionname"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<span>所属单位：</span>
|
||||
<el-select v-model="pageForm.unitId" placeholder="请选择所属单位"
|
||||
@change="doSearch"
|
||||
filterable clearable style="width: 80%"
|
||||
:disabled="unitDisabled">
|
||||
<el-option
|
||||
v-for="item in unitOptions"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row align="middle" class="query-row" type="flex">
|
||||
<el-col class="query-row-title"></el-col>
|
||||
<el-col class="query-row-content">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<span>旅 行 社：</span>
|
||||
<el-select v-model="pageForm.agencyId" filterable clearable
|
||||
placeholder="请选择旅行社"
|
||||
|
||||
style="width: 80%">
|
||||
<el-option v-for="item in agencyLists"
|
||||
:key="item.id"
|
||||
:label="item.travelAgencyName"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
</el-card>
|
||||
|
||||
<el-card shadow="never" class="mt10">
|
||||
<table-tool label="审核列表" :app="this">
|
||||
<template #label_end>
|
||||
|
||||
</template>
|
||||
|
||||
<template #func>
|
||||
<el-tag :effect="pageForm.state===item.value?'dark':'plain'"
|
||||
:key="item.value"
|
||||
:type="item.label"
|
||||
@click="checkState(item.value)"
|
||||
style="margin-right: 10px;cursor: pointer;font-size: 15px"
|
||||
v-for="item in options">
|
||||
{{ item.label }}
|
||||
</el-tag>
|
||||
<el-link :underline="false" @click="clearState" class="mr10"
|
||||
style="color: red" v-if="options.length&&pageForm.state">清空
|
||||
</el-link>
|
||||
<template v-if="modifyConfig.travelAudit">
|
||||
<el-button type="primary" size="small" class="mr10"
|
||||
@click="openOnekeyAudit">一键审核
|
||||
</el-button>
|
||||
<el-radio-group @change="doSearch()" size="small"
|
||||
v-model="pageForm.isAudit">
|
||||
<el-radio-button label="">全部</el-radio-button>
|
||||
<el-radio-button label="true">已审核</el-radio-button>
|
||||
<el-radio-button label="false">未审核</el-radio-button>
|
||||
</el-radio-group>
|
||||
</template>
|
||||
|
||||
</template>
|
||||
</table-tool>
|
||||
<el-table :data="tableData" style="width: 100%"
|
||||
row-key="id" @sort-change="pageOrder"
|
||||
v-loading="tableLoading"
|
||||
@selection-change="handleSelectionChange">
|
||||
<el-table-column
|
||||
:selectable="ifEdit"
|
||||
type="selection"
|
||||
width="55">
|
||||
</el-table-column>
|
||||
<el-table-column align="center" header-align="center" type="index"
|
||||
:index="indexMethod" label="序号"
|
||||
width="80px"></el-table-column>
|
||||
|
||||
<el-table-column
|
||||
align="center"
|
||||
header-align="center"
|
||||
v-for="column in tableColumns"
|
||||
show-overflow-tooltip
|
||||
:label="column.label"
|
||||
:prop="column.prop"
|
||||
:sortable="column.sortable"
|
||||
>
|
||||
<template scope="{row}" v-if="column.prop=='isTransferIn'">
|
||||
<sapn v-if="row.takePartInUnionId!=unionId">转出</sapn>
|
||||
<sapn v-else-if="row.selfUnionId!=unionId">转入</sapn>
|
||||
<sapn v-else>否</sapn>
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop=='isFamily'">
|
||||
<el-link v-if="!row.familyNumber" type="primary" @click="openUser(row)">
|
||||
{{row.isFamily?'携带':'未携带'}}（{{row.isFamily}}）
|
||||
</el-link>
|
||||
<el-link v-else type="primary">
|
||||
{{row.familyNumber?'携带':'未携带'}}（{{row.familyNumber}}）
|
||||
</el-link>
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop=='num'">
|
||||
{{1+row.num}}
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop=='stateId'">
|
||||
<span v-if="row.stateId">
|
||||
<vi-table-state :state="row"></vi-table-state>
|
||||
</span>
|
||||
<sapn v-else style="color: #67C23A">暂无</sapn>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="操作" width="180px">
|
||||
<template scope="{row}">
|
||||
<el-dropdown @command="dropdownCommand">
|
||||
<el-button plain size="mini">
|
||||
<i class="ti-settings"></i>
|
||||
<span class="ti-angle-down"></span>
|
||||
</el-button>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item :command="{type:'view',data:row}">
|
||||
查看
|
||||
</el-dropdown-item>
|
||||
<template v-if="modifyConfig.travelAudit">
|
||||
<el-dropdown-item v-if="ifRecall(row)" :command="{type:'recall',data:row}">
|
||||
撤回
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item v-if="ifEdit(row)" :command="{type:'handle',data:row}">
|
||||
审核
|
||||
</el-dropdown-item>
|
||||
|
||||
<template v-if="[2750].includes(row.stateId)">
|
||||
<el-dropdown-item :command="{type:'modify',data:row}">
|
||||
编辑
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item :command="{type:'delete',data:row}">
|
||||
删除
|
||||
</el-dropdown-item>
|
||||
</template>
|
||||
</template>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--#include("/layouts/pagination.html"){}#-->
|
||||
</el-card>
|
||||
</template>
|
||||
|
||||
<template #view>
|
||||
<enroll-info ref="viewEnrollInfo" :union_id="unionId"></enroll-info>
|
||||
</template>
|
||||
|
||||
<template #public>
|
||||
<line-info ref="viewLineInfo"></line-info>
|
||||
</template>
|
||||
|
||||
<template #edit>
|
||||
<enroll-info ref="editEnrollInfo">
|
||||
<template #handle>
|
||||
<el-tab-pane label="审核" name="audit">
|
||||
<el-form :model="formData" label-width="130px">
|
||||
<el-row gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="审核人" prop="username">
|
||||
<el-input disabled v-model="formData.username"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="审核时间" prop="auditTime">
|
||||
<el-input disabled v-model="formData.auditTime"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="审核意见" prop="auditOpinion">
|
||||
<el-input maxlength="500" placeholder="请填写您的审核意见" rows="4"
|
||||
type="textarea"
|
||||
v-model="formData.auditOpinion"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row style="margin: 40px 0;text-align: right">
|
||||
<el-button @click="$refs.guava.index()">返回
|
||||
</el-button>
|
||||
<el-button @click="doAudit(false,true)" type="warning">调整
|
||||
</el-button>
|
||||
<el-button @click="doAudit(false,false)" type="danger">拒绝
|
||||
</el-button>
|
||||
<el-button @click="doAudit(true,false)" type="primary">通过
|
||||
</el-button>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-tab-pane>
|
||||
</template>
|
||||
</enroll-info>
|
||||
</template>
|
||||
</guava>
|
||||
|
||||
|
||||
<el-dialog
|
||||
title="提示"
|
||||
:visible.sync="dialogVisible"
|
||||
width="50%">
|
||||
|
||||
<el-form :model="formData" label-width="130px">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="审核人" prop="username">
|
||||
<el-input disabled v-model="formData.username"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="审核时间" prop="auditTime">
|
||||
<el-input disabled v-model="formData.auditTime"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="审核意见" prop="auditOpinion">
|
||||
<el-input maxlength="500" placeholder="请填写您的审核意见" rows="4" type="textarea"
|
||||
v-model="formData.auditOpinion"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">返 回</el-button>
|
||||
<el-button @click="doOnekeyAudit(false,true)" type="warning">调 整</el-button>
|
||||
<el-button @click="doOnekeyAudit(false,false)" type="danger">拒 绝</el-button>
|
||||
<el-button type="primary" @click="doOnekeyAudit(true,false)">通 过</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog
|
||||
title="修改信息"
|
||||
:visible.sync="editVisible"
|
||||
:close-on-click-modal="false"
|
||||
width="50%">
|
||||
<el-form :model="editFormData" label-width="120px" :rules="rules" ref="editForm" style="margin-right: 40px">
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="loginName" label="工号">
|
||||
<el-input v-model="editFormData.loginName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="姓名">
|
||||
<el-input v-model="editFormData.userName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="手机号">
|
||||
<el-input v-model="editFormData.mobile" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="身份证号">
|
||||
<el-input v-model="editFormData.idCard" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="unionName" label="工会">
|
||||
<el-input v-model="editFormData.unionName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="unitName" label="单位">
|
||||
<el-input v-model="editFormData.unitName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
<el-form-item prop="prop" :label="labelName">
|
||||
<template v-if="modifyConfig.familyInfo == 2">
|
||||
<el-collapse v-model="activeNames">
|
||||
<el-collapse-item title="点击可展开详细信息" name="1">
|
||||
<el-card shadow="never">
|
||||
<el-table :data="editFormData.companionList">
|
||||
<el-table-column label="姓名" prop="userName"></el-table-column>
|
||||
<el-table-column label="性别" prop="sex"></el-table-column>
|
||||
<el-table-column label="身份证号" prop="idCard" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="年龄" prop="age"></el-table-column>
|
||||
<el-table-column label="床型" prop="bedType">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo.bedType }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="床位" prop="bedNum">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo.bedNum }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="意向拼床人" prop="otherSleepUser">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo.otherSleepUser ?
|
||||
row.bedInfo.otherSleepUser : '暂无' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="关系" prop="relation"></el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-input v-model="editFormData.bedType" readonly></el-input>
|
||||
</template>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="travelName" label="旅行社">
|
||||
<el-select v-model="editFormData.agencyId" filterable clearable
|
||||
placeholder="请选择旅行社"
|
||||
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in agencyLists"
|
||||
:key="item.id"
|
||||
:label="item.travelAgencyName"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="editVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="doEdit">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
|
||||
<script>
|
||||
const vue = new Vue({
|
||||
el: '#app',
|
||||
mixins: [initTableMixins],
|
||||
data() {
|
||||
return {
|
||||
unionDisabled: false,
|
||||
unitDisabled: false,
|
||||
unionId: "${@shiro.getPrincipalProperty('unit').getUnionid()}",
|
||||
dialogVisible: false,
|
||||
tableSelection: [],
|
||||
formData: {
|
||||
id: "",
|
||||
username: "${@shiro.getPrincipalProperty('username')}",
|
||||
loginName: "${@shiro.getPrincipalProperty('loginname')}",
|
||||
auditTime: moment().format('YYYY-MM-DD HH:mm:ss'),
|
||||
auditOpinion: "",
|
||||
isTransferIn: false,
|
||||
},
|
||||
options: [
|
||||
{label: "总人数", value: "0"},
|
||||
],
|
||||
unionOptions: [],
|
||||
unitOptions: [],
|
||||
takePartInLines: [],
|
||||
pageForm: {
|
||||
lotId: '',
|
||||
regionalNature: '',
|
||||
isAudit: "",
|
||||
state: "",
|
||||
year: moment().format('YYYY'),
|
||||
searchName: "userName",
|
||||
},
|
||||
tableColumns: [
|
||||
{prop: 'loginName', label: '一卡通号'},
|
||||
{prop: 'userName', label: '姓名'},
|
||||
{prop: 'unitName', label: '单位', sortable: true},
|
||||
{prop: 'unionName', label: '工会', sortable: true},
|
||||
{prop: 'travelAgencyName', label: '旅行社', sortable: true},
|
||||
{prop: 'isFamily', label: '是否携带家属'},
|
||||
{prop: 'stateId', label: '审核状态', sortable: true},
|
||||
],
|
||||
modifyConfig: {},
|
||||
editVisible: false,
|
||||
editFormData: {
|
||||
companionList: []
|
||||
},
|
||||
rules: {
|
||||
loginName: [{required: true, message: '请填写工号', trigger: ['blur', 'change']}],
|
||||
userName: [{required: true, message: '请填写姓名', trigger: ['blur', 'change']}],
|
||||
unionName: [{required: true, message: '请选择工会', trigger: ['blur', 'change']}],
|
||||
unitName: [{required: true, message: '请选择单位', trigger: ['blur', 'change']}],
|
||||
travelName: [{required: true, message: '请选择旅行社', trigger: ['blur', 'change']}],
|
||||
specificTime: [{required: true, message: '请选择出行时间', trigger: ['blur', 'change']}],
|
||||
},
|
||||
editSpecificTimes: [],
|
||||
labelName: '',
|
||||
unionSelectLines: [],
|
||||
lineLabelName: '',
|
||||
activeNames:[],
|
||||
agencyLists: [],
|
||||
}
|
||||
},
|
||||
components: {
|
||||
'enroll-info': httpVueLoader('/components/theRapyRecuperation/Enrollinfo.vue?v=1.0.1'),
|
||||
'line-info': httpVueLoader('/components/theRapyRecuperation/LineInfo.vue')
|
||||
},
|
||||
methods: {
|
||||
async getAgencyList() {
|
||||
const {data} = await $.post("/platform/theRapyRecuperation/travelAgency/selectTravelAgencyByYears", {
|
||||
startYear: this.pageForm.startYear,
|
||||
endYear: this.pageForm.endYear
|
||||
})
|
||||
this.agencyLists = data
|
||||
},
|
||||
dropdownCommand(command) {
|
||||
const {type, data} = command
|
||||
if (type === 'view') {
|
||||
this.openView(data)
|
||||
} else if (type === 'recall') {
|
||||
this.doRecall(data)
|
||||
} else if (type === 'handle') {
|
||||
this.openEdit(data)
|
||||
} else if (type === 'modify') {
|
||||
this.openModify(data)
|
||||
} else if (type === 'delete') {
|
||||
this.doDelete(data)
|
||||
}
|
||||
},
|
||||
async doDelete(row) {
|
||||
this.$confirm("您确定要删除【<span style='color: red'>" + row.userName + "</span>】的此条报名信息吗？", '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
dangerouslyUseHTMLString: true,
|
||||
type: 'warning',
|
||||
callback: async (a, b) => {
|
||||
if ("confirm" === a) {//确认后再执行
|
||||
const resp = await $.post('/platform/theRapyRecuperation/line/enroll/doDeleteMyEnrollInfoById/' + row.id)
|
||||
if (resp.code === 0) {
|
||||
await this.doSearch()
|
||||
this.$message.success('删除成功')
|
||||
await this.getApplyNumAudit();
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
async openModify(row) {
|
||||
this.editFormData = {};
|
||||
const resp = await $.get("/platform/theRapyRecuperation/TheRapyAudit/findOne", {id: row.id})
|
||||
if (resp.code === 0) {
|
||||
this.editFormData = {...resp.data.viewData}
|
||||
if (this.modifyConfig.familyInfo == 2) {
|
||||
this.editFormData.companionList = resp.data.viewData.companionList
|
||||
this.labelName = "家属信息"
|
||||
} else {
|
||||
this.editFormData.bedType = resp.data.viewData.familyNumber
|
||||
this.labelName = "家属数量"
|
||||
}
|
||||
}
|
||||
if (row.takePartInBaseManagementId) {
|
||||
this.editSpecificTime(row.takePartInBaseManagementId);
|
||||
this.lineLabelName = "酒店"
|
||||
} else if (row.takePartInLineId) {
|
||||
this.lineLabelName = '线路'
|
||||
}
|
||||
this.editVisible = true
|
||||
},
|
||||
async doEdit() {
|
||||
this.$refs['editForm'].validate().then(async () => {
|
||||
const confirm = await this.$confirm('您确定要修改这位老师的报名信息吗？', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
if (!this.editFormData.takePartInLineId && !this.editFormData.takePartInBaseManagementId) {
|
||||
this.$message.warning('请选择线路')
|
||||
return
|
||||
}
|
||||
const resp = await $.post('/platform/theRapyRecuperation/user/query/doEdit', this.editFormData)
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success(resp.msg)
|
||||
this.editVisible = false
|
||||
await this.doSearch();
|
||||
} else {
|
||||
this.$notify.error(resp.msg)
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
async doOnekeyAudit(flag, adjustment) {
|
||||
let msg = '';
|
||||
if (adjustment && !flag) {
|
||||
msg = '您确定要一键【调整】您所勾选的报名信息吗，调整后该报名信息将不会在审核列表中展示, 是否继续?'
|
||||
} else if (!adjustment && !flag) {
|
||||
msg = '您确定要一键【拒绝】您所勾选的报名信息吗，是否继续?'
|
||||
} else if (!adjustment && flag) {
|
||||
msg = '您确定要一键【通过】您所勾选的报名信息吗，是否继续?'
|
||||
}
|
||||
const confirm = await this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
const resp = await $.post(loc() + "/doOnekeyAudit", {
|
||||
ids: JSON.stringify(this.tableSelection),
|
||||
flag: flag,
|
||||
adjustment: adjustment,
|
||||
auditOpinion: this.formData.auditOpinion
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success({title: '成功', message: resp.msg});
|
||||
await this.doSearch()
|
||||
this.dialogVisible = false
|
||||
} else {
|
||||
this.$notify.warning({title: '失败', message: resp.msg});
|
||||
this.dialogVisible = false
|
||||
}
|
||||
}
|
||||
},
|
||||
async openOnekeyAudit() {
|
||||
if (this.tableSelection.length === 0) {
|
||||
this.$notify.warning({title: '警告', message: "请您先在左侧勾选在审核"});
|
||||
return
|
||||
}
|
||||
|
||||
this.dialogVisible = true
|
||||
},
|
||||
handleSelectionChange(val) {
|
||||
this.tableSelection = val.map(v => v.id);
|
||||
},
|
||||
ifEdit(row) {
|
||||
const {
|
||||
stateId,
|
||||
selfUnionId,
|
||||
takePartInUnionId
|
||||
} = row
|
||||
if (stateId === 2710 && selfUnionId === "${@shiro.getPrincipalProperty('unit').getUnionid()}") {
|
||||
return true
|
||||
} else if (stateId === 2720 && takePartInUnionId === "${@shiro.getPrincipalProperty('unit').getUnionid()}") {
|
||||
return true
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
},
|
||||
ifRecall(row) {
|
||||
const {
|
||||
stateId,
|
||||
selfUnionId,
|
||||
takePartInUnionId
|
||||
} = row
|
||||
// if ((stateId === 2715 || stateId === 2720 || stateId === 2750) && selfUnionId === "${@shiro.getPrincipalProperty('unit').getUnionid()}") {
|
||||
if ((stateId === 2715 || stateId === 2750) && selfUnionId === "${@shiro.getPrincipalProperty('unit').getUnionid()}") {
|
||||
return true
|
||||
} else if ((stateId === 2725 || stateId === 2750) && takePartInUnionId === "${@shiro.getPrincipalProperty('unit').getUnionid()}") {
|
||||
return true
|
||||
} else {
|
||||
return false
|
||||
}
|
||||
},
|
||||
async doRecall(row) {
|
||||
const confirm = await this.$confirm('您确定要撤回吗, 是否继续?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
const resp = await $.post(loc() + "/doRecall", {id: row.id})
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success({title: '成功', message: resp.msg});
|
||||
await this.doSearch()
|
||||
} else {
|
||||
this.$notify.warning({title: '失败', message: resp.msg});
|
||||
}
|
||||
}
|
||||
},
|
||||
async doAudit(flag, adjustment) {
|
||||
let msg = '';
|
||||
if (adjustment && !flag) {
|
||||
msg = '您确定要【调整】该报名信息吗，调整后该报名信息将不会在审核列表中展示, 是否继续?'
|
||||
} else if (!adjustment && !flag) {
|
||||
msg = '您确定要【拒绝】该报名信息吗，是否继续?'
|
||||
} else if (!adjustment && flag) {
|
||||
msg = '您确定要【通过】该报名信息吗，是否继续?'
|
||||
}
|
||||
const confirm = await this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
const resp = await $.post(loc() + "/doAudit", {
|
||||
flag: flag,
|
||||
adjustment: adjustment,
|
||||
id: this.formData.id,
|
||||
isTransferIn: this.formData.isTransferIn,
|
||||
auditOpinion: this.formData.auditOpinion
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success({title: '成功', message: resp.msg});
|
||||
this.doSearch()
|
||||
this.$refs.guava.index()
|
||||
} else {
|
||||
this.$notify.warning({title: '失败', message: resp.msg});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
openEdit(row) {
|
||||
this.$set(this.formData, "isTransferIn", row.isTransferIn)
|
||||
this.$set(this.formData, "id", row.id)
|
||||
this.$refs.guava.edit()
|
||||
this.$refs.editEnrollInfo.openAudit(row.id, 'audit')
|
||||
},
|
||||
openView(row) {
|
||||
this.$refs.guava.view()
|
||||
this.$refs.viewEnrollInfo.openView(row.id)
|
||||
},
|
||||
async checkState(type) {
|
||||
this.pageForm.state = type
|
||||
this.$set(this.pageForm, "unionIds", [])
|
||||
this.$set(this.pageForm, "unionId", null)
|
||||
await this.getBmUserUnion()
|
||||
if (type === "1") {
|
||||
this.$set(this.pageForm, "unionId", this.unionId)
|
||||
this.unionDisabled = true
|
||||
} else if (type === "2") {
|
||||
this.unionDisabled = true
|
||||
this.unitDisabled = true
|
||||
} else if (type === "3") {
|
||||
this.unionDisabled = false
|
||||
this.unitDisabled = false
|
||||
|
||||
this.unionOptions = this.unionOptions.filter(v => v.id !== this.unionId)
|
||||
} else {
|
||||
this.unionDisabled = false
|
||||
this.unitDisabled = false
|
||||
}
|
||||
await this.unionChange()
|
||||
await this.doSearch()
|
||||
},
|
||||
async unionChange() {
|
||||
this.pageForm.unitId = null
|
||||
this.unitOptions = await getUnits(this.pageForm.unionId)
|
||||
await this.doSearch()
|
||||
},
|
||||
/**
|
||||
* 查询所有报名人员的工会
|
||||
* @returns {Promise<void>}
|
||||
*/
|
||||
async getBmUserUnion() {
|
||||
const {data} = await $.post(loc() + "/getBmUserUnion")
|
||||
this.unionOptions = data
|
||||
},
|
||||
pageData() {
|
||||
sublime.showLoadingbar();
|
||||
this.tableLoading = true
|
||||
|
||||
const pageForm = clone(this.pageForm)
|
||||
pageForm.states = JSON.stringify(pageForm.states)
|
||||
|
||||
$.post(loc() + "/pageData", pageForm, (data) => {
|
||||
sublime.closeLoadingbar();
|
||||
this.tableLoading = false
|
||||
if (data.code === 0) {
|
||||
this.tableData = data.data.list;
|
||||
this.pageForm.totalCount = data.data.totalCount;
|
||||
} else {
|
||||
this.$message.error(data.msg);
|
||||
}
|
||||
}, "json");
|
||||
},
|
||||
async getApplyNumAudit() {
|
||||
const {data} = await $.post(loc() + "/getApplyNumAudit", this.pageForm)
|
||||
this.options = [
|
||||
{label: "总人数" + (data.count1) + "人", value: "0"},
|
||||
]
|
||||
|
||||
},
|
||||
async clearState() {
|
||||
this.pageForm.state = ''
|
||||
this.pageForm.unionId = ''
|
||||
await this.doSearch()
|
||||
},
|
||||
async doSearch() {
|
||||
this.pageForm.pageNumber = 1;
|
||||
this.pageData();
|
||||
await this.getApplyNumAudit()
|
||||
},
|
||||
async getModifyConfig() {
|
||||
const res = await $.post('/platform/theRapyRecuperation/TheRapyConfig/findOne')
|
||||
if (res.code === 0) {
|
||||
this.modifyConfig = res.data
|
||||
}
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
await this.getBmUserUnion()
|
||||
await this.getAgencyList()
|
||||
await this.getModifyConfig()
|
||||
await this.doSearch()
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
|
||||
<!--#
|
||||
}
|
||||
#-->
|
||||
@@ -42,7 +42,7 @@ layout("/layouts/platform.html"){
|
||||
type="year"
|
||||
value-format="yyyy"
|
||||
placeholder="选择年"
|
||||
style="width: 80%" @change="doSearch">
|
||||
style="width: 80%" @change="getLineSignNumber(); doSearch()">
|
||||
</el-date-picker>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
@@ -54,7 +54,7 @@ layout("/layouts/platform.html"){
|
||||
placeholder="查询类型"
|
||||
style="width: 110px;">
|
||||
<el-option label="姓名" value="userName"></el-option>
|
||||
<el-option label="工号" value="loginName"></el-option>
|
||||
<el-option label="一卡通号" value="loginName"></el-option>
|
||||
</el-select>
|
||||
<el-button slot="append" @click="doSearch">搜索</el-button>
|
||||
</el-input>
|
||||
@@ -63,24 +63,24 @@ layout("/layouts/platform.html"){
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- <el-row align="middle" class="query-row" type="flex">-->
|
||||
<!-- <el-col class="query-row-title"></el-col>-->
|
||||
<!-- <el-col class="query-row-content">-->
|
||||
<!-- <span>报名路线：</span>-->
|
||||
<!-- <el-tag :effect="pageForm.state===item.value?'dark':'plain'"-->
|
||||
<!-- :key="item.value"-->
|
||||
<!-- :type="item.label"-->
|
||||
<!-- @click="checkState(item.value)"-->
|
||||
<!-- style="margin-right: 10px;cursor: pointer;margin-bottom: 5px;font-size: 15px"-->
|
||||
<!-- v-for="item in options">-->
|
||||
<!-- {{ item.label }}-->
|
||||
<!-- </el-tag>-->
|
||||
<!-- <el-link :underline="false" @click="pageForm.state='';doSearch()"-->
|
||||
<!-- style="color: red" v-if="options.length&&pageForm.state">清空-->
|
||||
<!-- </el-link>-->
|
||||
<!-- <span style="color: red;font-size: 12px;margin-left: 10px">温馨提示：其他工会选我线路，所在工会审核过后，才显示数量</span>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
<!-- <el-row align="middle" class="query-row" type="flex">-->
|
||||
<!-- <el-col class="query-row-title"></el-col>-->
|
||||
<!-- <el-col class="query-row-content">-->
|
||||
<!-- <span>报名路线：</span>-->
|
||||
<!-- <el-tag :effect="pageForm.state===item.value?'dark':'plain'"-->
|
||||
<!-- :key="item.value"-->
|
||||
<!-- :type="item.label"-->
|
||||
<!-- @click="checkState(item.value)"-->
|
||||
<!-- style="margin-right: 10px;cursor: pointer;margin-bottom: 5px;font-size: 15px"-->
|
||||
<!-- v-for="item in options">-->
|
||||
<!-- {{ item.label }}-->
|
||||
<!-- </el-tag>-->
|
||||
<!-- <el-link :underline="false" @click="pageForm.state='';doSearch()"-->
|
||||
<!-- style="color: red" v-if="options.length&&pageForm.state">清空-->
|
||||
<!-- </el-link>-->
|
||||
<!-- <span style="color: red;font-size: 12px;margin-left: 10px">温馨提示：其他工会选我线路，所在工会审核过后，才显示数量</span>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
|
||||
<el-row align="middle" class="query-row" type="flex">
|
||||
<el-col class="query-row-title"></el-col>
|
||||
@@ -140,7 +140,7 @@ layout("/layouts/platform.html"){
|
||||
<span>选择路线：</span>
|
||||
<el-select v-model="pageForm.takePartInLineId" filterable clearable
|
||||
placeholder="请选择线路"
|
||||
style="width: 80%" @change="doSearch()">
|
||||
style="width: 80%" @change="lineChange">
|
||||
<el-option v-for="item in takePartInLines"
|
||||
:key="item.id"
|
||||
:label="item.lineName"
|
||||
@@ -169,6 +169,20 @@ layout("/layouts/platform.html"){
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="12">
|
||||
<span>出行时间：</span>
|
||||
<el-select v-model="pageForm.selectId" filterable clearable
|
||||
placeholder="请选择出行时间"
|
||||
style="width: 80%" @change="playChange">
|
||||
<el-option v-for="item in linePlayTimes"
|
||||
:key="item.times"
|
||||
:label="item.times"
|
||||
:value="item.selectId">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -179,13 +193,23 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never" class="mt10">
|
||||
<table-tool label="审核列表" :app="this">
|
||||
<template #label_end>
|
||||
<!-- <span style="color: red;margin-left: 10px">温馨提示：省内线路不需要审核</span>-->
|
||||
|
||||
</template>
|
||||
|
||||
<template #func
|
||||
v-if="!pageForm.regionalNature||
|
||||
(pageForm.regionalNature==='省内'&&modifyConfig.isSnLine)||
|
||||
(pageForm.regionalNature==='省外'&&modifyConfig.isSwLine)">
|
||||
|
||||
<el-button size="small"
|
||||
style="background-color: #fff;border-color: #b3d8ff;color: #1867b0;font-size: 15px"
|
||||
>{{selectLine.lineName?selectLine.lineName:'全部'}}线路的人数：{{lineSignNumber}}人
|
||||
</el-button>
|
||||
|
||||
<!-- <span v-if="pageForm.takePartInLineId" style="margin-left: 10px">-->
|
||||
<!-- {{selectLine.lineName}}线路的报名人数：{{lineSignNumber}}-->
|
||||
<!-- </span>-->
|
||||
|
||||
<el-button type="primary" size="small" class="mr10"
|
||||
@click="openOnekeyAudit">一键审核
|
||||
</el-button>
|
||||
@@ -229,7 +253,12 @@ layout("/layouts/platform.html"){
|
||||
</el-link>
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop=='isFamily'">
|
||||
{{row.isFamily?'携带':'未携带'}}（{{row.num}}）
|
||||
<el-link v-if="!row.familyNumber" type="primary" @click="openView(row)">
|
||||
{{row.isFamily?'携带':'未携带'}}（{{row.isFamily}}）
|
||||
</el-link>
|
||||
<el-link v-else type="primary">
|
||||
{{row.familyNumber?'携带':'未携带'}}（{{row.familyNumber}}）
|
||||
</el-link>
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop=='num'">
|
||||
{{1+row.num}}
|
||||
@@ -241,9 +270,40 @@ layout("/layouts/platform.html"){
|
||||
<sapn v-else style="color: #67C23A">暂无</sapn>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" header-align="center" label="操作" width="300px">
|
||||
<el-table-column align="center" header-align="center" label="操作" width="180px">
|
||||
<template scope="{row}">
|
||||
<el-button @click="openView(row)" size="mini" type="primary">查看
|
||||
<el-dropdown @command="dropdownCommand">
|
||||
<el-button plain size="mini">
|
||||
<i class="ti-settings"></i>
|
||||
<span class="ti-angle-down"></span>
|
||||
</el-button>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item :command="{type:'view',data:row}">
|
||||
查看
|
||||
</el-dropdown-item>
|
||||
<template v-if="!pageForm.regionalNature
|
||||
||(pageForm.regionalNature==='省内'&&modifyConfig.isSnLine)
|
||||
||(pageForm.regionalNature==='省外'&&modifyConfig.isSwLine)">
|
||||
<el-dropdown-item v-if="ifRecall(row)" :command="{type:'recall',data:row}">
|
||||
撤回
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item v-if="ifEdit(row)" :command="{type:'handle',data:row}">
|
||||
审核
|
||||
</el-dropdown-item>
|
||||
|
||||
<template v-if="[2750].includes(row.stateId)">
|
||||
<el-dropdown-item :command="{type:'modify',data:row}">
|
||||
编辑
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item :command="{type:'delete',data:row}">
|
||||
删除
|
||||
</el-dropdown-item>
|
||||
</template>
|
||||
</template>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
|
||||
<!--<el-button @click="openView(row)" size="mini" type="primary">查看
|
||||
</el-button>
|
||||
<template v-if="!pageForm.regionalNature||
|
||||
(pageForm.regionalNature==='省内'&&modifyConfig.isSnLine)||
|
||||
@@ -255,7 +315,7 @@ layout("/layouts/platform.html"){
|
||||
type="primary">
|
||||
审核
|
||||
</el-button>
|
||||
</template>
|
||||
</template>-->
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -288,17 +348,24 @@ layout("/layouts/platform.html"){
|
||||
<el-input disabled v-model="formData.auditTime"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-form-item label="审核意见" prop="auditOpinion">
|
||||
<el-input maxlength="500" placeholder="请填写您的审核意见" rows="4"
|
||||
type="textarea"
|
||||
v-model="formData.auditOpinion"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
</el-row>
|
||||
<el-row gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="审核意见" prop="auditOpinion">
|
||||
<el-input maxlength="500" placeholder="请填写您的审核意见" rows="4"
|
||||
type="textarea"
|
||||
v-model="formData.auditOpinion"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row style="margin: 40px 0;text-align: right">
|
||||
<el-button @click="doAudit(false)" type="danger">退回
|
||||
<el-button @click="$refs.guava.index()">返回
|
||||
</el-button>
|
||||
<el-button @click="doAudit(true)" type="primary">通过
|
||||
<!--<el-button @click="doAudit(false,true)" type="warning">调整
|
||||
</el-button>-->
|
||||
<el-button @click="doAudit(false,false)" type="danger">拒绝
|
||||
</el-button>
|
||||
<el-button @click="doAudit(true,false)" type="primary">通过
|
||||
</el-button>
|
||||
</el-row>
|
||||
</el-form>
|
||||
@@ -308,7 +375,6 @@ layout("/layouts/platform.html"){
|
||||
</template>
|
||||
</guava>
|
||||
|
||||
|
||||
<el-dialog
|
||||
title="提示"
|
||||
:visible.sync="dialogVisible"
|
||||
@@ -326,20 +392,148 @@ layout("/layouts/platform.html"){
|
||||
<el-input disabled v-model="formData.auditTime"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-form-item label="审核意见" prop="auditOpinion">
|
||||
<el-input maxlength="500" placeholder="请填写您的审核意见" rows="4" type="textarea"
|
||||
v-model="formData.auditOpinion"></el-input>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
|
||||
<el-row gutter="20">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="审核意见" prop="auditOpinion">
|
||||
<el-input maxlength="500" placeholder="请填写您的审核意见" rows="4" type="textarea"
|
||||
v-model="formData.auditOpinion"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="doOnekeyAudit(false)">取 消</el-button>
|
||||
<el-button type="primary" @click="doOnekeyAudit(true)">确 定</el-button>
|
||||
</span>
|
||||
<el-button @click="dialogVisible = false">返 回</el-button>
|
||||
<el-button @click="doOnekeyAudit(false,true)" type="warning">调 整</el-button>
|
||||
<el-button @click="doOnekeyAudit(false,false)" type="danger">拒 绝</el-button>
|
||||
<el-button type="primary" @click="doOnekeyAudit(true,false)">通 过</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog
|
||||
title="修改信息"
|
||||
:visible.sync="editVisible"
|
||||
:close-on-click-modal="false"
|
||||
width="50%">
|
||||
<el-form :model="editFormData" label-width="120px" :rules="rules" ref="editForm" style="margin-right: 40px">
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="loginName" label="工号">
|
||||
<el-input v-model="editFormData.loginName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="姓名">
|
||||
<el-input v-model="editFormData.userName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="手机号">
|
||||
<el-input v-model="editFormData.mobile" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="身份证号">
|
||||
<el-input v-model="editFormData.idCard" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="unionName" label="工会">
|
||||
<el-input v-model="editFormData.unionName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="unitName" label="单位">
|
||||
<el-input v-model="editFormData.unitName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-form-item prop="prop" :label="labelName">
|
||||
<template v-if="modifyConfig.familyInfo == 2">
|
||||
<el-collapse v-model="activeNames">
|
||||
<el-collapse-item title="点击可展开详细信息" name="1">
|
||||
<el-card shadow="never">
|
||||
<el-table :data="editFormData.companionList">
|
||||
<el-table-column label="姓名" prop="userName"></el-table-column>
|
||||
<el-table-column label="性别" prop="sex"></el-table-column>
|
||||
<el-table-column label="身份证号" prop="idCard" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="年龄" prop="age"></el-table-column>
|
||||
<el-table-column label="床型" prop="bedType">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo?.bedType }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="床位" prop="bedNum">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo?.bedNum }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="意向拼床人" prop="otherSleepUser">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo?.otherSleepUser ?
|
||||
row.bedInfo?.otherSleepUser : '暂无' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="关系" prop="relation"></el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-input v-model="editFormData.bedType" readonly></el-input>
|
||||
</template>
|
||||
</el-form-item>
|
||||
<!--<el-form-item prop="travelName" label="旅行社">
|
||||
<el-select v-model="editFormData.agencyId" filterable clearable
|
||||
placeholder="请选择旅行社"
|
||||
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in agencyLists"
|
||||
:key="item.id"
|
||||
:label="item.travelAgencyName"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>-->
|
||||
<el-form-item prop="travelLine" :label="lineLabelName">
|
||||
<el-select v-model="editFormData.takePartInLineId" filterable clearable
|
||||
placeholder="请选择线路"
|
||||
@change="validateLine"
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in unionSelectLines"
|
||||
:key="item.id"
|
||||
:label="item.lineName + '-' + item.regionalNature + '【' + item.lotName + '】' + '（' + item.playStartTime + '至' + item.playEndTime + '）' + '（' + item.signUpMode + '）'"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item prop="specificTime" label="出行时间" v-if="pageForm.state==='3'">
|
||||
<el-select v-model="editFormData.specificTime" filterable clearable
|
||||
placeholder="请选择出行时间"
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in editSpecificTimes"
|
||||
:key="item"
|
||||
:label="item"
|
||||
:value="item">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="editVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="doEdit">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -379,7 +573,7 @@ layout("/layouts/platform.html"){
|
||||
searchName: "userName",
|
||||
},
|
||||
tableColumns: [
|
||||
{prop: 'loginName', label: '工号'},
|
||||
{prop: 'loginName', label: '一卡通号'},
|
||||
{prop: 'userName', label: '姓名'},
|
||||
{prop: 'unitName', label: '单位', sortable: true},
|
||||
{prop: 'unionName', label: '工会', sortable: true},
|
||||
@@ -388,10 +582,35 @@ layout("/layouts/platform.html"){
|
||||
// {prop: 'userNature', label: '人员性质'},
|
||||
{prop: 'isFamily', label: '是否携带家属'},
|
||||
// {prop: 'num', label: '人数'},
|
||||
{prop: 'isTransferIn', label: '是否转入转出', sortable: true},
|
||||
// {prop: 'isTransferIn', label: '是否转入转出', sortable: true},
|
||||
{prop: 'linePlayTime', label: '出行时间', sortable: true},
|
||||
{prop: 'stateId', label: '审核状态', sortable: true},
|
||||
],
|
||||
modifyConfig: {}
|
||||
modifyConfig: {},
|
||||
selectLine: {
|
||||
lineName: '全部'
|
||||
},
|
||||
lineSignNumber: 0,
|
||||
|
||||
times: null,
|
||||
linePlayTimes: [],
|
||||
|
||||
editVisible: false,
|
||||
editFormData: {},
|
||||
rules: {
|
||||
loginName: [{required: true, message: '请填写工号', trigger: ['blur', 'change']}],
|
||||
userName: [{required: true, message: '请填写姓名', trigger: ['blur', 'change']}],
|
||||
unionName: [{required: true, message: '请选择工会', trigger: ['blur', 'change']}],
|
||||
unitName: [{required: true, message: '请选择单位', trigger: ['blur', 'change']}],
|
||||
// travelName: [{required: true, message: '请选择旅行社', trigger: ['blur', 'change']}],
|
||||
specificTime: [{required: true, message: '请选择出行时间', trigger: ['blur', 'change']}],
|
||||
// travelLine: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
},
|
||||
editSpecificTimes: [],
|
||||
labelName: '',
|
||||
unionSelectLines: [],
|
||||
lineLabelName: '',
|
||||
activeNames:[]
|
||||
}
|
||||
},
|
||||
components: {
|
||||
@@ -400,8 +619,134 @@ layout("/layouts/platform.html"){
|
||||
|
||||
},
|
||||
methods: {
|
||||
async doOnekeyAudit(flag) {
|
||||
const confirm = await this.$confirm('您确定要一键审核您所勾选的信息吗, 是否继续?', '提示', {
|
||||
async validateLine() {
|
||||
const resp = await $.post('/platform/theRapyRecuperation/line/enroll/validSignUpInfo'
|
||||
, {enroll: JSON.stringify(this.editFormData)})
|
||||
if (resp.code !== 0) {
|
||||
this.$message.warning(resp.msg)
|
||||
this.editFormData.takePartInLineId = ''
|
||||
}
|
||||
},
|
||||
dropdownCommand(command) {
|
||||
const {type, data} = command
|
||||
if (type === 'view') {
|
||||
this.openView(data)
|
||||
} else if (type === 'recall') {
|
||||
this.doRecall(data)
|
||||
} else if (type === 'handle') {
|
||||
this.openEdit(data)
|
||||
} else if (type === 'modify') {
|
||||
this.openModify(data)
|
||||
} else if (type === 'delete') {
|
||||
this.doDelete(data)
|
||||
}
|
||||
},
|
||||
async doDelete(row){
|
||||
this.$confirm("您确定要删除【<span style='color: red'>" + row.userName + "</span>】的此条报名信息吗？", '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
dangerouslyUseHTMLString: true,
|
||||
type: 'warning',
|
||||
callback: async (a, b) => {
|
||||
if ("confirm" === a) {//确认后再执行
|
||||
const resp = await $.post('/platform/theRapyRecuperation/line/enroll/doDeleteMyEnrollInfoById/' + row.id)
|
||||
if (resp.code === 0) {
|
||||
await this.doSearch()
|
||||
this.$message.success('删除成功')
|
||||
await this.getLineSignNumber();
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
async openModify(row) {
|
||||
this.getUnionSelectLine(row.takePartInLineId)
|
||||
this.editFormData = {};
|
||||
const resp = await $.get("/platform/theRapyRecuperation/TheRapyAudit/findOne", {id: row.id})
|
||||
if (resp.code === 0) {
|
||||
this.editFormData = {...resp.data.viewData}
|
||||
if (this.modifyConfig.familyInfo == 2) {
|
||||
this.editFormData.companionList = resp.data.viewData.companionList
|
||||
this.labelName = "家属信息"
|
||||
} else {
|
||||
this.editFormData.bedType = resp.data.viewData.familyNumber
|
||||
this.labelName = "家属数量"
|
||||
}
|
||||
}
|
||||
if (row.takePartInBaseManagementId) {
|
||||
this.editSpecificTime(row.takePartInBaseManagementId);
|
||||
this.lineLabelName = "酒店"
|
||||
} else if (row.takePartInLineId) {
|
||||
this.lineLabelName = '线路'
|
||||
}
|
||||
this.editVisible = true
|
||||
},
|
||||
async doEdit() {
|
||||
this.$refs['editForm'].validate().then(async () => {
|
||||
const confirm = await this.$confirm('您确定要修改这位老师的报名信息吗？', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
if (!this.editFormData.takePartInLineId && !this.editFormData.takePartInBaseManagementId){
|
||||
this.$message.warning('请选择线路')
|
||||
return
|
||||
}
|
||||
const resp = await $.post('/platform/theRapyRecuperation/user/query/doEdit', this.editFormData)
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success(resp.msg)
|
||||
this.editVisible = false
|
||||
await this.doSearch();
|
||||
await this.getLineSignNumber();
|
||||
} else {
|
||||
this.$notify.error(resp.msg)
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
async lineChange(val) {
|
||||
console.log(val)
|
||||
this.pageForm.selectId = ''
|
||||
if (val) {
|
||||
this.selectLine = this.takePartInLines.find(o => o.id === val)
|
||||
await this.getLinePlayTimeByLineId(val);
|
||||
} else {
|
||||
this.selectLine.lineName = ''
|
||||
}
|
||||
await this.getLineSignNumber()
|
||||
await this.doSearch()
|
||||
},
|
||||
async playChange() {
|
||||
await this.getLineSignNumber()
|
||||
await this.doSearch()
|
||||
},
|
||||
async getLinePlayTimeByLineId(id) {
|
||||
const resp = await $.get(loc() + '/getLinePlayTimeByLineId', {
|
||||
lineId: id,
|
||||
year: this.pageForm.year,
|
||||
signUpMode: 2,
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.linePlayTimes = resp.data
|
||||
}
|
||||
},
|
||||
async getLineSignNumber() {
|
||||
const resp = await $.get('/platform/theRapyRecuperation/TheRapyXghAudit/getLineNumber', this.pageForm)
|
||||
this.lineSignNumber = resp.data
|
||||
},
|
||||
async doOnekeyAudit(flag, adjustment) {
|
||||
let msg = '';
|
||||
if (adjustment && !flag) {
|
||||
msg = '您确定要一键【调整】您所勾选的报名信息吗，调整后该报名信息将不会在审核列表中展示, 是否继续?'
|
||||
} else if (!adjustment && !flag) {
|
||||
msg = '您确定要一键【拒绝】您所勾选的报名信息吗，是否继续?'
|
||||
} else if (!adjustment && flag) {
|
||||
msg = '您确定要一键【通过】您所勾选的报名信息吗，是否继续?'
|
||||
}
|
||||
const confirm = await this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
@@ -410,13 +755,14 @@ layout("/layouts/platform.html"){
|
||||
const resp = await $.post(loc() + "/doOnekeyAudit", {
|
||||
ids: JSON.stringify(this.tableSelection),
|
||||
flag: flag,
|
||||
adjustment: adjustment,
|
||||
auditOpinion: this.formData.auditOpinion
|
||||
})
|
||||
if (resp.code === 0){
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success({title: '成功', message: resp.msg});
|
||||
await this.doSearch()
|
||||
this.dialogVisible = false
|
||||
}else {
|
||||
} else {
|
||||
this.$notify.warning({title: '失败', message: resp.msg});
|
||||
this.dialogVisible = false
|
||||
}
|
||||
@@ -461,17 +807,25 @@ layout("/layouts/platform.html"){
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
const resp = await $.post(loc() + "/doRecall", {id: row.id})
|
||||
if (resp.code === 0){
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success({title: '成功', message: resp.msg});
|
||||
await this.doSearch()
|
||||
}else {
|
||||
} else {
|
||||
this.$notify.warning({title: '失败', message: resp.msg});
|
||||
|
||||
}
|
||||
}
|
||||
},
|
||||
async doAudit(flag) {
|
||||
const confirm = await this.$confirm('您确定要' + (flag ? '通过' : '退回') + '吗, 是否继续?', '提示', {
|
||||
async doAudit(flag, adjustment) {
|
||||
let msg = '';
|
||||
if (adjustment && !flag) {
|
||||
msg = '您确定要【调整】该报名信息吗，调整后该报名信息将不会在审核列表中展示, 是否继续?'
|
||||
} else if (!adjustment && !flag) {
|
||||
msg = '您确定要【拒绝】该报名信息吗，是否继续?'
|
||||
} else if (!adjustment && flag) {
|
||||
msg = '您确定要【通过】该报名信息吗，是否继续?'
|
||||
}
|
||||
const confirm = await this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
@@ -479,15 +833,16 @@ layout("/layouts/platform.html"){
|
||||
if (confirm === "confirm") {
|
||||
const resp = await $.post(loc() + "/doAudit", {
|
||||
flag: flag,
|
||||
adjustment: adjustment,
|
||||
id: this.formData.id,
|
||||
isTransferIn: this.formData.isTransferIn,
|
||||
auditOpinion: this.formData.auditOpinion
|
||||
})
|
||||
if (resp.code === 0){
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success({title: '成功', message: resp.msg});
|
||||
await this.doSearch()
|
||||
this.$refs.guava.index()
|
||||
}else {
|
||||
} else {
|
||||
this.$notify.warning({title: '失败', message: resp.msg});
|
||||
|
||||
}
|
||||
@@ -591,12 +946,24 @@ layout("/layouts/platform.html"){
|
||||
this.modifyConfig = res.data
|
||||
}
|
||||
},
|
||||
async getUnionSelectLine(disPlayUnionSelectId = null) {
|
||||
const resp = await $.post('/platform/theRapyRecuperation/user/query/getUnionSelectLine', {
|
||||
startYear: this.pageForm.year,
|
||||
//signUpMode: 1,
|
||||
disPlayUnionSelectId: disPlayUnionSelectId
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.unionSelectLines = resp.data
|
||||
}
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
await this.getBmUserUnion()
|
||||
await this.getModifyConfig()
|
||||
this.takePartInLines = await this.getXlByUnion()
|
||||
await this.doSearch()
|
||||
await this.getLineSignNumber()
|
||||
await this.getUnionSelectLine()
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
+63
-206
@@ -28,47 +28,45 @@ layout("/layouts/platform.html"){
|
||||
</el-input>
|
||||
</div>
|
||||
</div>
|
||||
<template v-if="!isLxyGys">
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">旅行社：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select clearable filterable style="width: 100%"
|
||||
v-model="pageForm.travelAgencyId"
|
||||
@change="doSearch">
|
||||
<el-option :key="item.id"
|
||||
:label="item.travelAgencyName"
|
||||
:value="item.id"
|
||||
v-for="item in travelAgencyList"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">旅行社：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select clearable filterable style="width: 100%"
|
||||
v-model="pageForm.travelAgencyId"
|
||||
@change="doSearch">
|
||||
<el-option :key="item.id"
|
||||
:label="item.travelAgencyName"
|
||||
:value="item.id"
|
||||
v-for="item in travelAgencyList"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">活动范围：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select clearable filterable style="width: 100%"
|
||||
v-model="pageForm.regionalNature"
|
||||
@change="doSearch">
|
||||
<el-option key="1" label="省内" value="省内"></el-option>
|
||||
<el-option key="1" label="省外" value="省外"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">活动范围：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select clearable filterable style="width: 100%"
|
||||
v-model="pageForm.regionalNature"
|
||||
@change="doSearch">
|
||||
<el-option key="1" label="省内" value="省内"></el-option>
|
||||
<el-option key="1" label="省外" value="省外"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">标段时间：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select clearable filterable style="width: 100%"
|
||||
v-model="pageForm.lotId"
|
||||
@change="doSearch">
|
||||
<el-option :key="item.id"
|
||||
:label="item.lotName"
|
||||
:value="item.id"
|
||||
v-for="item in modifyBdList"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">标段时间：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select clearable filterable style="width: 100%"
|
||||
v-model="pageForm.lotId"
|
||||
@change="doSearch">
|
||||
<el-option :key="item.id"
|
||||
:label="item.lotName"
|
||||
:value="item.id"
|
||||
v-for="item in modifyBdList"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div class="search-query">
|
||||
<el-button @click="doSearch" icon="el-icon-search" type="primary">搜索</el-button>
|
||||
</div>
|
||||
@@ -78,19 +76,14 @@ layout("/layouts/platform.html"){
|
||||
<el-card class="mt10" shadow="never">
|
||||
<table-tool :app="this" label="目的地列表">
|
||||
<template #func>
|
||||
<template v-if="!isLxyGys">
|
||||
<el-button @click="openImport" size="medium" type="primary"
|
||||
style="margin-right: 10px">导入目的地
|
||||
</el-button>
|
||||
<el-button @click="openAdd" size="medium" type="primary">新建目的地</el-button>
|
||||
</template>
|
||||
<el-button @click="openImport" size="medium" type="primary" style="margin-right: 10px">导入目的地</el-button>
|
||||
<el-button @click="openAdd" size="medium" type="primary">新建目的地</el-button>
|
||||
</template>
|
||||
</table-tool>
|
||||
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
|
||||
align="center"
|
||||
header-align="center">
|
||||
<el-table-column :index="indexMethod" align="center" header-align="center"
|
||||
label="序号" type="index"
|
||||
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
|
||||
width="80px"></el-table-column>
|
||||
<el-table-column
|
||||
:label="column.label"
|
||||
@@ -103,7 +96,6 @@ layout("/layouts/platform.html"){
|
||||
>
|
||||
<template scope="{row}" v-if="column.prop==='isDisabled'">
|
||||
<el-switch
|
||||
:disabled="isLxyGys"
|
||||
:active-value="false"
|
||||
:inactive-value="true"
|
||||
@change="(val)=>{baseStatusChange(row.id)}"
|
||||
@@ -126,13 +118,9 @@ layout("/layouts/platform.html"){
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="250px">
|
||||
<template scope="{row}">
|
||||
<el-button @click="openView(row.id)" size="mini" type="primary">查看
|
||||
</el-button>
|
||||
<el-button @click="openEdit(row.id)" size="mini" type="primary">编辑
|
||||
</el-button>
|
||||
<el-button @click="doDelete(row.id)" size="mini" type="danger"
|
||||
v-if="!isLxyGys">删除
|
||||
</el-button>
|
||||
<el-button @click="openView(row.id)" size="mini" type="primary">查看</el-button>
|
||||
<el-button @click="openEdit(row.id)" size="mini" type="primary">编辑</el-button>
|
||||
<el-button @click="doDelete(row.id)" size="mini" type="danger">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -147,7 +135,6 @@ layout("/layouts/platform.html"){
|
||||
<el-date-picker style="width: 100%"
|
||||
@change="yearChange"
|
||||
type="year"
|
||||
:disabled="isLxyGys"
|
||||
v-model="formData.year"
|
||||
value-format="yyyy"></el-date-picker>
|
||||
</el-form-item>
|
||||
@@ -166,8 +153,7 @@ layout("/layouts/platform.html"){
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="旅行社名称" prop="travelAgencyId">
|
||||
<el-select clearable filterable style="width: 100%"
|
||||
v-model="formData.travelAgencyId" :disabled="isLxyGys">
|
||||
<el-select clearable filterable style="width: 100%" v-model="formData.travelAgencyId">
|
||||
<el-option :key="item.id"
|
||||
:label="item.travelAgencyName+'('+ item.year +'年)'"
|
||||
:value="item.id"
|
||||
@@ -180,8 +166,7 @@ layout("/layouts/platform.html"){
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="组织形式" prop="createMode">
|
||||
<el-radio-group size="small" v-model="formData.createMode"
|
||||
:disabled="isLxyGys">
|
||||
<el-radio-group size="small" v-model="formData.createMode">
|
||||
<el-radio :label="1" border>校工会组织</el-radio>
|
||||
<el-radio :label="2" border>分工会组织</el-radio>
|
||||
</el-radio-group>
|
||||
@@ -193,8 +178,7 @@ layout("/layouts/platform.html"){
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="活动范围" prop="regionalNature">
|
||||
<el-radio-group size="small" v-model="formData.regionalNature"
|
||||
:disabled="isLxyGys">
|
||||
<el-radio-group size="small" v-model="formData.regionalNature">
|
||||
<el-radio label="省内" border>省内</el-radio>
|
||||
<el-radio label="省外" border>省外</el-radio>
|
||||
</el-radio-group>
|
||||
@@ -206,9 +190,7 @@ layout("/layouts/platform.html"){
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="标段时间" prop="lotId">
|
||||
<!--<el-input clearable maxlength="50" v-model="formData.lotId"></el-input>-->
|
||||
<el-select clearable filterable style="width: 100%"
|
||||
v-model="formData.lotId"
|
||||
:disabled="isLxyGys"
|
||||
<el-select clearable filterable style="width: 100%" v-model="formData.lotId"
|
||||
@change="doBdModify">
|
||||
<el-option :key="item"
|
||||
:label="item.lotName"
|
||||
@@ -220,8 +202,7 @@ layout("/layouts/platform.html"){
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="预计费用（元/人次）" prop="estimatedCost">
|
||||
<el-select clearable filterable style="width: 100%"
|
||||
v-model="formData.estimatedCost" :disabled="isLxyGys">
|
||||
<el-select clearable filterable style="width: 100%" v-model="formData.estimatedCost">
|
||||
<el-option :key="item.id"
|
||||
:label="item.activityCost"
|
||||
:value="item.activityCost"
|
||||
@@ -235,14 +216,12 @@ layout("/layouts/platform.html"){
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="目的地联系人" prop="baseContactPerson">
|
||||
<el-input clearable maxlength="20"
|
||||
v-model="formData.baseContactPerson"></el-input>
|
||||
<el-input clearable maxlength="20" v-model="formData.baseContactPerson"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="联系人电话" prop="baseContactNumber">
|
||||
<el-input clearable maxlength="20"
|
||||
v-model="formData.baseContactNumber"></el-input>
|
||||
<el-input clearable maxlength="20" v-model="formData.baseContactNumber"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -252,7 +231,6 @@ layout("/layouts/platform.html"){
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="报名开始时间" prop="signUpStartTime">
|
||||
<el-date-picker style="width: 100%"
|
||||
:disabled="isLxyGys"
|
||||
type="datetime"
|
||||
v-model="formData.signUpStartTime"
|
||||
format="yyyy-MM-dd HH:mm"
|
||||
@@ -263,7 +241,6 @@ layout("/layouts/platform.html"){
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="报名截至时间" prop="signUpEndTime">
|
||||
<el-date-picker style="width: 100%"
|
||||
:disabled="isLxyGys"
|
||||
type="datetime"
|
||||
v-model="formData.signUpEndTime"
|
||||
format="yyyy-MM-dd HH:mm"
|
||||
@@ -277,7 +254,6 @@ layout("/layouts/platform.html"){
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="变更截至时间" prop="changeEndTime">
|
||||
<el-date-picker style="width: 100%"
|
||||
:disabled="isLxyGys"
|
||||
type="datetime"
|
||||
v-model="formData.changeEndTime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
@@ -303,7 +279,6 @@ layout("/layouts/platform.html"){
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="活动开始时间" prop="activityStartTime">
|
||||
<el-date-picker
|
||||
:disabled="isLxyGys"
|
||||
placeholder="活动开始时间"
|
||||
style="width: 100%"
|
||||
type="date"
|
||||
@@ -315,7 +290,6 @@ layout("/layouts/platform.html"){
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="活动结束时间" prop="activityEndTime">
|
||||
<el-date-picker
|
||||
:disabled="isLxyGys"
|
||||
placeholder="活动结束时间"
|
||||
style="width: 100%"
|
||||
type="date"
|
||||
@@ -330,21 +304,7 @@ layout("/layouts/platform.html"){
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="24" :sm="24" :xs="24">
|
||||
<el-form-item label="详细信息" prop="content">
|
||||
|
||||
<div id="lineContent"></div>
|
||||
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="24" :sm="24" :xs="24">
|
||||
<el-form-item label="上传详细信息图片">
|
||||
<el-button type="primary" @click="scFilesDrawer = true" size="small">
|
||||
上传详细信息图片
|
||||
</el-button>
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -352,7 +312,6 @@ layout("/layouts/platform.html"){
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="是否启用" prop="isDisabled">
|
||||
<el-switch
|
||||
:disabled="isLxyGys"
|
||||
:active-value="false"
|
||||
:inactive-value="true"
|
||||
active-color="#13ce66"
|
||||
@@ -366,8 +325,7 @@ layout("/layouts/platform.html"){
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="24" :sm="24" :xs="24">
|
||||
<el-form-item label="图片上传" prop="files">
|
||||
<file-upload :files.sync="formData.files" :max="1"
|
||||
:type="['jpg', 'jpeg', 'png']">
|
||||
<file-upload :files.sync="formData.files" :max="1" :type="['jpg', 'jpeg', 'png']">
|
||||
<template #el-upload__tip>
|
||||
<div class="el-upload__tip" slot="tip">
|
||||
图片类请上传jpg/png/jpeg格式,上传数量为1个
|
||||
@@ -433,59 +391,10 @@ layout("/layouts/platform.html"){
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
|
||||
</guava>
|
||||
|
||||
|
||||
<el-drawer
|
||||
size="50%"
|
||||
:visible.sync="scFilesDrawer"
|
||||
direction="rtl">
|
||||
<el-card shadow="never">
|
||||
<template #header>
|
||||
<div style="display:flex;justify-content: space-between;align-items: center">
|
||||
<h3 style="color: #1867b0">上传文件</h3>
|
||||
<file-upload :files.sync="files" ref="fileUpload"
|
||||
:source="1"
|
||||
:max="20"></file-upload>
|
||||
</div>
|
||||
</template>
|
||||
<el-table :data="files" border class="mt10" stripe
|
||||
style="width: 100%">
|
||||
<el-table-column label="文件名"
|
||||
show-overflow-tooltip
|
||||
prop="filename"></el-table-column>
|
||||
<el-table-column label="文件路径" prop="url" show-overflow-tooltip>
|
||||
<template scope="{row}">
|
||||
{{ APP_DOMAIN + FILE_STREAM_PREVIEW_ADDRESS +
|
||||
"?id=" + row.id }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
header-align="center"
|
||||
label="操作"
|
||||
width="100px"
|
||||
>
|
||||
<template slot-scope="{row,$index}">
|
||||
<el-button
|
||||
icon="el-icon-folder-checked"
|
||||
size="mini" type="primary"
|
||||
@click="doCopy(row)">复制
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
</el-card>
|
||||
|
||||
<el-row class="mt20 mr20" justify="end" type="flex">
|
||||
<el-button @click="scFilesDrawer=false" type="primary">关闭</el-button>
|
||||
</el-row>
|
||||
</el-drawer>
|
||||
</div>
|
||||
<script>
|
||||
const vue = new Vue({
|
||||
new Vue({
|
||||
el: '#app',
|
||||
mixins: [initTableMixins],
|
||||
components: {
|
||||
@@ -542,8 +451,6 @@ layout("/layouts/platform.html"){
|
||||
callback()
|
||||
}
|
||||
return {
|
||||
scFilesDrawer: false,
|
||||
files: [],
|
||||
pageForm: {
|
||||
year: new Date().getFullYear().toString(),
|
||||
unionId: '',
|
||||
@@ -560,7 +467,7 @@ layout("/layouts/platform.html"){
|
||||
id: '',
|
||||
sortNumber: '',
|
||||
baseName: '',
|
||||
travelAgencyId: null,
|
||||
travelAgencyId: '',
|
||||
regionalNature: '省内',
|
||||
year: new Date().getFullYear().toString(),
|
||||
isDisabled: false,
|
||||
@@ -593,71 +500,29 @@ layout("/layouts/platform.html"){
|
||||
{label: '是否启用', prop: 'isDisabled', sortable: true}
|
||||
],
|
||||
rules: {
|
||||
sortNumber: [{
|
||||
required: false,
|
||||
message: '请输入排序编号',
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
sortNumber: [{required: false, message: '请输入排序编号', trigger: ['change', 'blur']}],
|
||||
baseName: [{required: true, message: '请输入目的地名称', trigger: ['change', 'blur']}],
|
||||
// travelAgencyId: [{required: true, message: '请选择旅行社', trigger: ['change', 'blur']}],
|
||||
regionalNature: [{
|
||||
required: true,
|
||||
message: '请选择区域性质',
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
travelAgencyId: [{required: true, message: '请选择旅行社', trigger: ['change', 'blur']}],
|
||||
regionalNature: [{required: true, message: '请选择区域性质', trigger: ['change', 'blur']}],
|
||||
year: [{required: true, message: '请选择年度', trigger: ['change', 'blur']}],
|
||||
lotId: [{required: true, message: '请选择出行天数', trigger: ['change', 'blur']}],
|
||||
content: [{required: false, message: '请输入详细内容', trigger: ['change', 'blur']}],
|
||||
signUpStartTime: [{
|
||||
required: true,
|
||||
message: '请选择报名开始时间',
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
signUpEndTime: [{
|
||||
required: true,
|
||||
validator: validateSignUpEndTime,
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
changeEndTime: [{
|
||||
required: true,
|
||||
validator: validateChangeEndTime,
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
signUpStartTime: [{required: true, message: '请选择报名开始时间', trigger: ['change', 'blur']}],
|
||||
signUpEndTime: [{required: true, validator: validateSignUpEndTime, trigger: ['change', 'blur']}],
|
||||
changeEndTime: [{required: true, validator: validateChangeEndTime, trigger: ['change', 'blur']}],
|
||||
files: [{required: true, message: '请上传图片', trigger: ['change', 'blur']}],
|
||||
createMode: [{required: true, message: '请选择组织方式', trigger: ['change', 'blur']}],
|
||||
activityStartTime: [{
|
||||
required: true,
|
||||
validator: validateActivityStartTime,
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
activityEndTime: [{
|
||||
required: true,
|
||||
validator: validateActivityEndTime,
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
estimatedCost: [{
|
||||
required: true,
|
||||
message: '请输入预计费用',
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
activityStartTime: [{ required: true, validator: validateActivityStartTime, trigger: ['change', 'blur'] }],
|
||||
activityEndTime: [{ required: true, validator: validateActivityEndTime, trigger: ['change', 'blur'] }],
|
||||
estimatedCost: [{required: true, message: '请输入预计费用', trigger: ['change', 'blur']}],
|
||||
},
|
||||
//目的地导入
|
||||
importVisible: false,
|
||||
importLoading: false,
|
||||
importData: {},
|
||||
isLxyGys: false,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
doCopy(row) {
|
||||
const input = document.createElement('input')
|
||||
input.value = APP_DOMAIN + FILE_STREAM_PREVIEW_ADDRESS + "?id=" + row.id // 设置复制内容
|
||||
document.body.appendChild(input) // 添加临时实例
|
||||
input.select() // 选择实例内容
|
||||
document.execCommand('Copy') // 执行复制
|
||||
document.body.removeChild(input) // 删除临时实例
|
||||
this.$message.success('复制成功！')
|
||||
},
|
||||
async doSearch() {
|
||||
this.formData.year = this.pageForm.year;
|
||||
await this.yearChange();
|
||||
@@ -668,7 +533,6 @@ layout("/layouts/platform.html"){
|
||||
this.travelAgencyList = resp.data
|
||||
},
|
||||
async openAdd() {
|
||||
this.files = []
|
||||
this.$refs.guava.edit()
|
||||
this.$nextTick(() => {
|
||||
if (this.$refs['form']) {
|
||||
@@ -679,7 +543,6 @@ layout("/layouts/platform.html"){
|
||||
})
|
||||
},
|
||||
async openEdit(id) {
|
||||
this.files = []
|
||||
const resp = await $.post(loc() + '/selectBaseManageById/' + id)
|
||||
if (resp.code === 0) {
|
||||
this.$refs.guava.edit()
|
||||
@@ -803,10 +666,10 @@ layout("/layouts/platform.html"){
|
||||
processData: false,
|
||||
contentType: false,
|
||||
success: (data) => {
|
||||
if (data.code === 0) {
|
||||
if (data.code === 0){
|
||||
this.pageData();
|
||||
this.importVisible = false
|
||||
} else {
|
||||
}else {
|
||||
this.importVisible = false
|
||||
}
|
||||
},
|
||||
@@ -818,19 +681,13 @@ layout("/layouts/platform.html"){
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
//如果不是超级管理员，校工会，分工会，就是供应商
|
||||
if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}" === 'false') {
|
||||
this.isLxyGys = true
|
||||
}
|
||||
await this.initPageData();
|
||||
this.pageData();
|
||||
|
||||
},
|
||||
computed: {
|
||||
editDialogTitle() {
|
||||
return this.formData.id ? '编辑目的地' : '新增目的地'
|
||||
}
|
||||
|
||||
},
|
||||
})
|
||||
</script>
|
||||
|
||||
@@ -3,12 +3,16 @@ layout("/layouts/platform.html"){
|
||||
#-->
|
||||
|
||||
<style>
|
||||
.mr0-radio {
|
||||
display: flex;
|
||||
}
|
||||
/*.mr0-radio {*/
|
||||
/* display: flex;*/
|
||||
/*}*/
|
||||
|
||||
.mr0-radio label {
|
||||
margin-right: 0 !important;
|
||||
/*.mr0-radio label {*/
|
||||
/* margin-right: 0 !important;*/
|
||||
/*}*/
|
||||
|
||||
.el-radio {
|
||||
margin-right: 0;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -17,19 +21,55 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<div class="search">
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">年度：</div>
|
||||
<div class="search-item-label">年度范围：</div>
|
||||
<div class="search-item-option">
|
||||
<el-date-picker
|
||||
v-model="pageForm.startYear"
|
||||
type="year"
|
||||
class="picker-year"
|
||||
format="yyyy"
|
||||
style="width: 46%"
|
||||
value-format="yyyy"
|
||||
@change="handleChangeYear"
|
||||
>
|
||||
</el-date-picker>
|
||||
<span>至</span>
|
||||
<el-date-picker
|
||||
v-model="pageForm.endYear"
|
||||
type="year"
|
||||
class="picker-year"
|
||||
format="yyyy"
|
||||
style="width: 46%"
|
||||
value-format="yyyy"
|
||||
@change="handleChangeYear"
|
||||
>
|
||||
</el-date-picker>
|
||||
|
||||
<!--<el-date-picker
|
||||
style="width: 100%"
|
||||
@change="doSearch"
|
||||
placeholder="选择年度"
|
||||
type="year"
|
||||
v-model="pageForm.year"
|
||||
value-format="yyyy">
|
||||
</el-date-picker>
|
||||
</el-date-picker>-->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!--<div class="search-item">
|
||||
<div class="search-item-label">旅行社：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select @change="doSearch"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 100%"
|
||||
v-model="pageForm.travelAgencyId">
|
||||
<el-option :key="item.id"
|
||||
:label="item.travelAgencyName"
|
||||
:value="item.id"
|
||||
v-for="item in travelAgencyOptions"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</div>-->
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">线路名称：</div>
|
||||
<div class="search-item-option">
|
||||
@@ -40,41 +80,22 @@ layout("/layouts/platform.html"){
|
||||
</el-input>
|
||||
</div>
|
||||
</div>
|
||||
<template v-if="!isLxyGys">
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">旅行社：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select @change="doSearch"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 100%"
|
||||
v-model="pageForm.travelAgencyId">
|
||||
<el-option :key="item.id"
|
||||
:label="item.travelAgencyName"
|
||||
:value="item.id"
|
||||
v-for="item in travelAgencyOptions"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">时间标段：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select @change="doSearch" clearable filterable
|
||||
style="width: 100%"
|
||||
v-model="pageForm.lotId">
|
||||
<el-option :key="item.id"
|
||||
:label="item.lotName"
|
||||
:value="item.id"
|
||||
v-for="item in lotList"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">时间标段：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select @change="doSearch" clearable filterable
|
||||
style="width: 100%"
|
||||
v-model="pageForm.lotId">
|
||||
<el-option :key="item.id"
|
||||
:label="item.lotName"
|
||||
:value="item.id"
|
||||
v-for="item in lotList"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="search-item"
|
||||
v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}">
|
||||
<div class="search-item" v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}">
|
||||
<div class="search-item-label">分工会：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select @change="doSearch"
|
||||
@@ -99,17 +120,14 @@ layout("/layouts/platform.html"){
|
||||
<el-card class="mt10" shadow="never">
|
||||
<table-tool :app="this" label="线路列表">
|
||||
<template #func>
|
||||
<template v-if="!isLxyGys">
|
||||
<el-button @click="openImport" size="medium" type="primary">导入线路</el-button>
|
||||
<el-button @click="openAdd" size="medium" type="primary">新建线路</el-button>
|
||||
</template>
|
||||
<el-button @click="openImport" size="medium" type="primary">导入线路</el-button>
|
||||
<el-button @click="openAdd" size="medium" type="primary">新建线路</el-button>
|
||||
</template>
|
||||
</table-tool>
|
||||
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
|
||||
align="center"
|
||||
header-align="center">
|
||||
<el-table-column :index="indexMethod" align="center" header-align="center"
|
||||
label="序号" type="index"
|
||||
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
|
||||
width="80px"></el-table-column>
|
||||
<el-table-column
|
||||
:label="column.label"
|
||||
@@ -123,7 +141,6 @@ layout("/layouts/platform.html"){
|
||||
>
|
||||
<template scope="{row}" v-if="column.prop==='isDisabled'">
|
||||
<el-switch
|
||||
:disabled="isLxyGys"
|
||||
:active-value="false"
|
||||
:inactive-value="true"
|
||||
@change="(val)=>{lineStatusChange(row.id)}"
|
||||
@@ -138,12 +155,15 @@ layout("/layouts/platform.html"){
|
||||
<template scope="{row:{createMode}}" v-else-if="column.prop==='createMode'">
|
||||
{{createModeName(createMode)}}
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop==='createUserName'">
|
||||
{{row.createUserName + '（' + row.createUnionName + '）'}}
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop==='playTime'">
|
||||
<el-button @click="viewUnionSelectTimeInfo(row.id)"
|
||||
type="text">
|
||||
查看详情
|
||||
</el-button>
|
||||
<!-- v-if="row.createMode===2 && row.signUpMode===1"-->
|
||||
<!-- v-if="row.createMode===2 && row.signUpMode===1"-->
|
||||
<!--<span v-else>
|
||||
{{row.playStartTime + '至' + row.playEndTime}}
|
||||
</span>-->
|
||||
@@ -151,13 +171,9 @@ layout("/layouts/platform.html"){
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="250px">
|
||||
<template scope="{row}">
|
||||
<el-button @click="openView(row.id)" size="mini" type="primary">查看
|
||||
</el-button>
|
||||
<el-button @click="openEdit(row.id)" size="mini" type="primary">编辑
|
||||
</el-button>
|
||||
<el-button @click="doDelete(row.id)" size="mini" type="danger"
|
||||
v-if="!isLxyGys">删除
|
||||
</el-button>
|
||||
<el-button @click="openView(row.id)" size="mini" type="primary">查看</el-button>
|
||||
<el-button @click="openEdit(row.id)" size="mini" type="primary">编辑</el-button>
|
||||
<el-button @click="doDelete(row.id)" size="mini" type="danger">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -181,7 +197,6 @@ layout("/layouts/platform.html"){
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="年度" prop="year">
|
||||
<el-date-picker style="width: 100%"
|
||||
:disabled="isLxyGys"
|
||||
@change="yearChange"
|
||||
type="year"
|
||||
v-model="formData.year"
|
||||
@@ -190,21 +205,31 @@ layout("/layouts/platform.html"){
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="排序号" prop="serialNumber">
|
||||
<el-input maxlength="50" v-model="formData.serialNumber"></el-input>
|
||||
<el-input type="number" maxlength="50" v-model="formData.serialNumber"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="线路名称" prop="lineName">
|
||||
<el-input maxlength="50" v-model="formData.lineName"
|
||||
:disabled="isLxyGys"></el-input>
|
||||
<el-input maxlength="50" v-model="formData.lineName"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="旅行社名称" prop="travelAgencyId">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="时间标段" prop="lotId">
|
||||
<el-select clearable filterable style="width: 100%"
|
||||
v-model="formData.travelAgencyId" :disabled="isLxyGys">
|
||||
v-model="formData.lotId">
|
||||
<el-option :key="item.id"
|
||||
:label="item.lotName"
|
||||
:value="item.id"
|
||||
v-for="item in lotList"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!--<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="旅行社名称" prop="travelAgencyId">
|
||||
<el-select clearable filterable style="width: 100%" v-model="formData.travelAgencyId">
|
||||
<el-option :key="item.id"
|
||||
:label="item.travelAgencyName+'('+ item.year +'年)'"
|
||||
:value="item.id"
|
||||
@@ -212,9 +237,9 @@ layout("/layouts/platform.html"){
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-col>-->
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<!--<el-row :gutter="20">
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="旅行社联系人">
|
||||
<el-input
|
||||
@@ -229,16 +254,14 @@ layout("/layouts/platform.html"){
|
||||
readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-row>-->
|
||||
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="线路类型" prop="regionalNature">
|
||||
<el-radio-group class="mr0-radio" size="small"
|
||||
:disabled="isLxyGys"
|
||||
v-model="formData.regionalNature">
|
||||
<el-radio-group class="mr0-radio" size="small" v-model="formData.regionalNature">
|
||||
<el-radio :label="item.value"
|
||||
border v-for="item in regionalNatureList">
|
||||
{{item.label}}
|
||||
@@ -246,24 +269,11 @@ layout("/layouts/platform.html"){
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="时间标段" prop="lotId">
|
||||
<el-select clearable filterable style="width: 100%"
|
||||
v-model="formData.lotId" :disabled="isLxyGys">
|
||||
<el-option :key="item.id"
|
||||
:label="item.lotName"
|
||||
:value="item.id"
|
||||
v-for="item in lotList"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="交通工具" prop="trafficTools">
|
||||
<el-input clearable maxlength="50"
|
||||
v-model="formData.trafficTools"></el-input>
|
||||
<el-input clearable maxlength="50" v-model="formData.trafficTools"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -271,23 +281,21 @@ layout("/layouts/platform.html"){
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="最少成团人数" prop="minimumGroupSize">
|
||||
<!--<el-col :span="12">
|
||||
<el-form-item label="最少参与教工" prop="minimumGroupSize">
|
||||
<el-input-number :max="1000"
|
||||
:min="config.groupNumber"
|
||||
:precision="0"
|
||||
style="width: 100%"
|
||||
:disabled="isLxyGys"
|
||||
v-model="formData.minimumGroupSize"></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="预计人数（含家属）" prop="estimatedFamilyNumbers">
|
||||
</el-col>-->
|
||||
<el-col :span="24">
|
||||
<el-form-item label="最少成团人数包括家属" prop="estimatedFamilyNumbers">
|
||||
<el-input-number :max="1000"
|
||||
:min="1"
|
||||
:precision="0"
|
||||
style="width: 100%"
|
||||
:disabled="isLxyGys"
|
||||
v-model="formData.estimatedFamilyNumbers"></el-input-number>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@@ -295,8 +303,7 @@ layout("/layouts/platform.html"){
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="预计费用（元/人次）" prop="estimatedCost">
|
||||
<el-input clearable maxlength="50" :disabled="isLxyGys"
|
||||
v-model="formData.estimatedCost"></el-input>
|
||||
<el-input clearable maxlength="50" v-model="formData.estimatedCost"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -304,8 +311,7 @@ layout("/layouts/platform.html"){
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="组织形式" prop="signUpMode">
|
||||
<el-radio-group class="mr0-radio" size="small" :disabled="isLxyGys"
|
||||
v-model="formData.signUpMode">
|
||||
<el-radio-group class="mr0-radio" size="small" v-model="formData.signUpMode">
|
||||
<el-radio :label="item.value" v-if="isShow(item.roles)"
|
||||
size="small"
|
||||
border v-for="item in signUpModeList">
|
||||
@@ -322,8 +328,7 @@ layout("/layouts/platform.html"){
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="联系人" prop="lineContact">
|
||||
<el-input clearable max="50" :disabled="isLxyGys"
|
||||
v-model="formData.lineContact"></el-input>
|
||||
<el-input clearable max="50" v-model="formData.lineContact"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
@@ -331,104 +336,93 @@ layout("/layouts/platform.html"){
|
||||
{ required: false, message: '手机号码不能为空', trigger: 'blur' },
|
||||
{ pattern: /^1[34578]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
|
||||
]" label="联系方式" prop="lineContactPhone">
|
||||
<el-input clearable :disabled="isLxyGys"
|
||||
v-model="formData.lineContactPhone"></el-input>
|
||||
<el-input clearable v-model="formData.lineContactPhone"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<!-- <template v-if="formData.signUpMode===2 || formData.createMode===1">-->
|
||||
<!-- <el-row :gutter="20">-->
|
||||
<!-- <el-col :md="12" :sm="24" :xs="24">-->
|
||||
<!-- <el-form-item label="报名开始时间" prop="signUpStartTime">-->
|
||||
<!-- <el-date-picker style="width: 100%"-->
|
||||
<!-- type="datetime"-->
|
||||
<!-- v-model="formData.signUpStartTime"-->
|
||||
<!-- format="yyyy-MM-dd HH:mm"-->
|
||||
<!-- value-format="yyyy-MM-dd HH:mm:ss">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :md="12" :sm="24" :xs="24">-->
|
||||
<!-- <el-form-item label="报名截至时间" prop="signUpEndTime">-->
|
||||
<!-- <el-date-picker style="width: 100%"-->
|
||||
<!-- type="datetime"-->
|
||||
<!-- v-model="formData.signUpEndTime"-->
|
||||
<!-- format="yyyy-MM-dd HH:mm"-->
|
||||
<!-- value-format="yyyy-MM-dd HH:mm:ss">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
<!-- <template v-if="formData.signUpMode===2 || formData.createMode===1">-->
|
||||
<!-- <el-row :gutter="20">-->
|
||||
<!-- <el-col :md="12" :sm="24" :xs="24">-->
|
||||
<!-- <el-form-item label="报名开始时间" prop="signUpStartTime">-->
|
||||
<!-- <el-date-picker style="width: 100%"-->
|
||||
<!-- type="datetime"-->
|
||||
<!-- v-model="formData.signUpStartTime"-->
|
||||
<!-- format="yyyy-MM-dd HH:mm"-->
|
||||
<!-- value-format="yyyy-MM-dd HH:mm:ss">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :md="12" :sm="24" :xs="24">-->
|
||||
<!-- <el-form-item label="报名截至时间" prop="signUpEndTime">-->
|
||||
<!-- <el-date-picker style="width: 100%"-->
|
||||
<!-- type="datetime"-->
|
||||
<!-- v-model="formData.signUpEndTime"-->
|
||||
<!-- format="yyyy-MM-dd HH:mm"-->
|
||||
<!-- value-format="yyyy-MM-dd HH:mm:ss">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
|
||||
<!-- <el-row :gutter="20">-->
|
||||
<!-- <el-col :md="12" :sm="24" :xs="24">-->
|
||||
<!-- <el-form-item label="变更截至时间" prop="changeEndTime">-->
|
||||
<!-- <el-date-picker style="width: 100%"-->
|
||||
<!-- type="datetime"-->
|
||||
<!-- v-model="formData.changeEndTime"-->
|
||||
<!-- value-format="yyyy-MM-dd HH:mm:ss">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :md="12" :sm="24" :xs="24">-->
|
||||
<!-- <el-form-item>-->
|
||||
<!-- <template #label>-->
|
||||
<!-- <span class="text-primary">-->
|
||||
<!-- <i class="el-icon-warning"></i>-->
|
||||
<!-- 温馨提醒:-->
|
||||
<!-- </span>-->
|
||||
<!-- </template>-->
|
||||
<!-- <span class="text-primary">-->
|
||||
<!-- 变更时间应该大于报名截至时间，小于出行时间。-->
|
||||
<!-- </span>-->
|
||||
<!-- <el-row :gutter="20">-->
|
||||
<!-- <el-col :md="12" :sm="24" :xs="24">-->
|
||||
<!-- <el-form-item label="变更截至时间" prop="changeEndTime">-->
|
||||
<!-- <el-date-picker style="width: 100%"-->
|
||||
<!-- type="datetime"-->
|
||||
<!-- v-model="formData.changeEndTime"-->
|
||||
<!-- value-format="yyyy-MM-dd HH:mm:ss">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :md="12" :sm="24" :xs="24">-->
|
||||
<!-- <el-form-item>-->
|
||||
<!-- <template #label>-->
|
||||
<!-- <span class="text-primary">-->
|
||||
<!-- <i class="el-icon-warning"></i>-->
|
||||
<!-- 温馨提醒:-->
|
||||
<!-- </span>-->
|
||||
<!-- </template>-->
|
||||
<!-- <span class="text-primary">-->
|
||||
<!-- 变更时间应该大于报名截至时间，小于出行时间。-->
|
||||
<!-- </span>-->
|
||||
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
|
||||
<!-- <el-row :gutter="20">-->
|
||||
<!-- <el-col :md="12" :sm="24" :xs="24">-->
|
||||
<!-- <el-form-item label="出行开始时间" prop="playStartTime">-->
|
||||
<!-- <el-date-picker-->
|
||||
<!-- placeholder="出行开始时间"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- type="date"-->
|
||||
<!-- v-model="formData.playStartTime"-->
|
||||
<!-- value-format="yyyy-MM-dd">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :md="12" :sm="24" :xs="24">-->
|
||||
<!-- <el-form-item label="出行结束时间" prop="playEndTime">-->
|
||||
<!-- <el-date-picker-->
|
||||
<!-- placeholder="出行结束时间"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- type="date"-->
|
||||
<!-- v-model="formData.playEndTime"-->
|
||||
<!-- value-format="yyyy-MM-dd">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
<!-- </template>-->
|
||||
<!-- <el-row :gutter="20">-->
|
||||
<!-- <el-col :md="12" :sm="24" :xs="24">-->
|
||||
<!-- <el-form-item label="出行开始时间" prop="playStartTime">-->
|
||||
<!-- <el-date-picker-->
|
||||
<!-- placeholder="出行开始时间"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- type="date"-->
|
||||
<!-- v-model="formData.playStartTime"-->
|
||||
<!-- value-format="yyyy-MM-dd">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :md="12" :sm="24" :xs="24">-->
|
||||
<!-- <el-form-item label="出行结束时间" prop="playEndTime">-->
|
||||
<!-- <el-date-picker-->
|
||||
<!-- placeholder="出行结束时间"-->
|
||||
<!-- style="width: 100%"-->
|
||||
<!-- type="date"-->
|
||||
<!-- v-model="formData.playEndTime"-->
|
||||
<!-- value-format="yyyy-MM-dd">-->
|
||||
<!-- </el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- </el-row>-->
|
||||
<!-- </template>-->
|
||||
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="24" :sm="24" :xs="24">
|
||||
<el-form-item label="线路内容" prop="content">
|
||||
<div id="lineContent"></div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="24" :sm="24" :xs="24">
|
||||
<el-form-item label="上传详细信息图片">
|
||||
<el-button type="primary" @click="scFilesDrawer = true" size="small">
|
||||
上传线路内容图片
|
||||
</el-button>
|
||||
|
||||
<text-editor v-model="formData.content"></text-editor>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -436,7 +430,6 @@ layout("/layouts/platform.html"){
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
<el-form-item label="是否启用" prop="isDisabled">
|
||||
<el-switch
|
||||
:disabled="isLxyGys"
|
||||
:active-value="false"
|
||||
:inactive-value="true"
|
||||
active-color="#13ce66"
|
||||
@@ -450,11 +443,8 @@ layout("/layouts/platform.html"){
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="24" :sm="24" :xs="24">
|
||||
<el-form-item label="移动端缩略图" prop="files">
|
||||
<file-upload :files.sync="formData.files"
|
||||
picture_card
|
||||
:max="1"
|
||||
:type="['jpg', 'jpeg', 'png']"
|
||||
></file-upload>
|
||||
<image-Upload :height="100" :width="100" :limit="1" :file-type="['png', 'jpg']" :file-size="1"
|
||||
v-model="formData.files"></image-Upload>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -536,54 +526,6 @@ layout("/layouts/platform.html"){
|
||||
</el-dialog>
|
||||
|
||||
</guava>
|
||||
|
||||
<el-drawer
|
||||
size="50%"
|
||||
:visible.sync="scFilesDrawer"
|
||||
direction="rtl">
|
||||
<el-card shadow="never">
|
||||
<template #header>
|
||||
<div style="display:flex;justify-content: space-between;align-items: center">
|
||||
<h3 style="color: #1867b0">上传文件</h3>
|
||||
<file-upload :files.sync="files" ref="fileUpload"
|
||||
:source="1"
|
||||
:max="20"></file-upload>
|
||||
</div>
|
||||
</template>
|
||||
<el-table :data="files" border class="mt10" stripe
|
||||
style="width: 100%">
|
||||
<el-table-column label="文件名"
|
||||
show-overflow-tooltip
|
||||
prop="filename"></el-table-column>
|
||||
<el-table-column label="文件路径" prop="url" show-overflow-tooltip>
|
||||
<template scope="{row}">
|
||||
{{ APP_DOMAIN + FILE_STREAM_PREVIEW_ADDRESS +
|
||||
"?id=" + row.id }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
header-align="center"
|
||||
label="操作"
|
||||
width="100px"
|
||||
>
|
||||
<template slot-scope="{row,$index}">
|
||||
<el-button
|
||||
icon="el-icon-folder-checked"
|
||||
size="mini" type="primary"
|
||||
@click="doCopy(row)">复制
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
</el-card>
|
||||
|
||||
<el-row class="mt20 mr20" justify="end" type="flex">
|
||||
<el-button @click="scFilesDrawer=false" type="primary">关闭</el-button>
|
||||
</el-row>
|
||||
</el-drawer>
|
||||
|
||||
</div>
|
||||
|
||||
<script>
|
||||
@@ -647,7 +589,7 @@ layout("/layouts/platform.html"){
|
||||
{label: '年度', prop: 'year', sortable: true},
|
||||
{label: '线路名称', prop: 'lineName', sortable: true, width: '200'},
|
||||
{label: '时间标段', prop: 'lotName', sortable: true, sortProp: 'lotValue'},
|
||||
{label: '承担旅行社', prop: 'travelAgencyName', sortable: true},
|
||||
/*{label: '承担旅行社', prop: 'travelAgencyName', sortable: true},*/
|
||||
// {label: '出行时间', prop: 'playTime', sortable: true},
|
||||
{label: '线路类型', prop: 'regionalNature', sortable: true},
|
||||
{label: '组织形式', prop: 'signUpMode', sortable: true},
|
||||
@@ -659,71 +601,31 @@ layout("/layouts/platform.html"){
|
||||
],
|
||||
editDialogVisible: false,
|
||||
rules: {
|
||||
serialNumber: [{
|
||||
required: true,
|
||||
message: '请输入排序号',
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
serialNumber: [{required: true, message: '请输入排序号', trigger: ['change', 'blur']}],
|
||||
lineName: [{required: true, message: '请输入线路名称', trigger: ['change', 'blur']}],
|
||||
// travelAgencyId: [{required: true, message: '请选择旅行社', trigger: ['change', 'blur']}],
|
||||
regionalNature: [{
|
||||
required: true,
|
||||
message: '请选择区域性质',
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
minimumGroupSize: [{
|
||||
required: true,
|
||||
message: '请输入最少成团人数',
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
travelAgencyId: [{required: true, message: '请选择旅行社', trigger: ['change', 'blur']}],
|
||||
regionalNature: [{required: true, message: '请选择区域性质', trigger: ['change', 'blur']}],
|
||||
minimumGroupSize: [{required: true, message: '请输入最少参与教工', trigger: ['change', 'blur']}],
|
||||
year: [{required: true, message: '请选择年度', trigger: ['change', 'blur']}],
|
||||
playNumberOfDays: [{
|
||||
required: true,
|
||||
message: '请输入游玩天数',
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
playNumberOfDays: [{required: true, message: '请输入游玩天数', trigger: ['change', 'blur']}],
|
||||
//content: [{required: true, message: '请输入线路内容', trigger: ['change', 'blur']}],
|
||||
signUpStartTime: [{
|
||||
required: true,
|
||||
message: '请选择报名开始时间',
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
signUpEndTime: [{
|
||||
required: true,
|
||||
validator: validateSignUpEndTime,
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
changeEndTime: [{
|
||||
required: true,
|
||||
validator: validateChangeEndTime,
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
signUpEndTime: [{required: true, validator: validateSignUpEndTime, trigger: ['change', 'blur']}],
|
||||
changeEndTime: [{required: true, validator: validateChangeEndTime, trigger: ['change', 'blur']}],
|
||||
//files: [{required: true, message: '请上传移动端缩略图', trigger: ['change', 'blur']}],
|
||||
signUpMode: [{required: true, message: '请选择报名模式', trigger: ['change', 'blur']}],
|
||||
|
||||
playStartTime: [{
|
||||
required: true,
|
||||
message: '请选择出行开始时间',
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
playEndTime: [{
|
||||
required: true,
|
||||
validator: validatePlayEndTime,
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
trafficTools: [{
|
||||
required: false,
|
||||
message: '请输入交通工具',
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
estimatedCost: [{
|
||||
required: false,
|
||||
message: '请输入预计费用',
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
playStartTime: [{required: true, message: '请选择出行开始时间', trigger: ['change', 'blur']}],
|
||||
playEndTime: [{required: true, validator: validatePlayEndTime, trigger: ['change', 'blur']}],
|
||||
trafficTools: [{required: false, message: '请输入交通工具', trigger: ['change', 'blur']}],
|
||||
estimatedCost: [{required: false, message: '请输入预计费用', trigger: ['change', 'blur']}],
|
||||
estimatedFamilyNumbers: [{
|
||||
required: false,
|
||||
message: '请输入预计人数（含家属）',
|
||||
message: '请输入成团人数包括家属',
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
lotId: [{required: true, message: '请选择标段时间', trigger: ['change', 'blur']}]
|
||||
@@ -755,14 +657,15 @@ layout("/layouts/platform.html"){
|
||||
playEndTime: null,
|
||||
trafficTools: null,
|
||||
estimatedCost: null,
|
||||
estimatedFamilyNumbers: 1,
|
||||
estimatedFamilyNumbers: null,
|
||||
lotId: null,
|
||||
lineContact: null,
|
||||
lineContactPhone: null
|
||||
},
|
||||
pageForm: {
|
||||
keywords: null,
|
||||
year: new Date().getFullYear().toString(),
|
||||
startYear: '',
|
||||
endYear: moment().format('YYYY'),
|
||||
unionId: null,
|
||||
lineName: null,
|
||||
travelAgencyId: null
|
||||
@@ -777,21 +680,11 @@ layout("/layouts/platform.html"){
|
||||
importVisible: false,
|
||||
importLoading: false,
|
||||
importData: {},
|
||||
isLxyGys: false,
|
||||
scFilesDrawer: false,
|
||||
files: [],
|
||||
|
||||
modifyConfig:{}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
doCopy(row) {
|
||||
const input = document.createElement('input')
|
||||
input.value = APP_DOMAIN + FILE_STREAM_PREVIEW_ADDRESS + "?id=" + row.id // 设置复制内容
|
||||
document.body.appendChild(input) // 添加临时实例
|
||||
input.select() // 选择实例内容
|
||||
document.execCommand('Copy') // 执行复制
|
||||
document.body.removeChild(input) // 删除临时实例
|
||||
this.$message.success('复制成功！')
|
||||
},
|
||||
isShow(roles) {
|
||||
if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === 'true') {
|
||||
return true
|
||||
@@ -807,7 +700,6 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
},
|
||||
async openAdd() {
|
||||
this.files = []
|
||||
this.$refs.guava.edit()
|
||||
this.$nextTick(() => {
|
||||
if (this.$refs['form']) {
|
||||
@@ -824,9 +716,10 @@ layout("/layouts/platform.html"){
|
||||
if (this.config) {
|
||||
this.formData.minimumGroupSize = this.config.groupNumber
|
||||
}
|
||||
await this.getNumber()
|
||||
this.formData.estimatedFamilyNumbers = this.modifyConfig.outsideQuota
|
||||
},
|
||||
async openEdit(id) {
|
||||
this.files = []
|
||||
const resp = await $.post(loc() + '/selectLineInfoById/' + id)
|
||||
if (resp.code === 0) {
|
||||
this.$refs.guava.edit()
|
||||
@@ -849,15 +742,27 @@ layout("/layouts/platform.html"){
|
||||
spinner: 'el-icon-loading',
|
||||
background: 'rgba(0, 0, 0, 0.7)'
|
||||
});
|
||||
|
||||
const resp = await $.post(loc() + '/doSubmit', {line: JSON.stringify(this.formData)})
|
||||
delete this.formData.travelAgency
|
||||
const resp = await $.post(loc() + '/doSubmit', this.formData)
|
||||
loading.close()
|
||||
if (resp.code === 0) {
|
||||
this.$refs.guava.index()
|
||||
this.notifySuccess(resp.msg)
|
||||
this.pageData()
|
||||
this.$message.success(resp.msg)
|
||||
this.$confirm('需要将该线路设置为出行线路吗?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(async () => {
|
||||
if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" === 'true') {
|
||||
sublime.jumpPagePjax('/platform/theRapyRecuperation/lineXghSelect?mode=2')
|
||||
} else {
|
||||
sublime.jumpPagePjax('/platform/theRapyRecuperation/lineFghSelect?mode=1')
|
||||
}
|
||||
}).catch(() => {
|
||||
this.$refs.guava.index()
|
||||
this.pageData()
|
||||
})
|
||||
} else {
|
||||
this.notifyWarning(resp.msg)
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
},
|
||||
async lineStatusChange(id) {
|
||||
@@ -918,6 +823,9 @@ layout("/layouts/platform.html"){
|
||||
},
|
||||
async initPageData() {
|
||||
this.regionalNatureList = await getEnumOptions('TheRapyRecuperationProvinceType')
|
||||
if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}" !== 'true') {
|
||||
this.regionalNatureList = this.regionalNatureList.filter(o => o.name === 'provinceIn')
|
||||
}
|
||||
this.signUpModeList = await getEnumOptions('TheRapyRecuperationSignUpMode')
|
||||
this.createModeList = await getEnumOptions('TheRapyRecuperationLineCreateMode')
|
||||
this.unionOptions = await getUnions(null)
|
||||
@@ -968,21 +876,37 @@ layout("/layouts/platform.html"){
|
||||
data.append("file", val.raw, val.raw.name);
|
||||
});
|
||||
this.importLoading = true
|
||||
const resp = await $.post(loc() + "/travelLineImport", data)
|
||||
if (resp.code === 0) {
|
||||
const resp = await $.post(loc() + "/travelLineImport",data)
|
||||
if (resp.code === 0){
|
||||
this.pageData();
|
||||
this.importVisible = false
|
||||
} else {
|
||||
}else {
|
||||
this.notifyWarning("导入失败")
|
||||
this.importLoading = false
|
||||
}
|
||||
},
|
||||
handleChangeYear(){
|
||||
if (this.pageForm.startYear && this.pageForm.endYear){
|
||||
if (this.pageForm.startYear > this.pageForm.endYear){
|
||||
this.pageForm.endYear = '';
|
||||
this.$message.error('起始年份需小于结束年份！');
|
||||
}
|
||||
}
|
||||
},
|
||||
async getModifyConfig() {
|
||||
const res = await $.post('/platform/theRapyRecuperation/TheRapyConfig/findOne')
|
||||
if (res.code === 0) {
|
||||
this.modifyConfig = res.data
|
||||
}
|
||||
},
|
||||
async getNumber() {
|
||||
const resp = await $.post(loc() + '/getNo')
|
||||
this.formData.serialNumber = resp.data
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
//如果不是超级管理员，校工会，分工会，就是供应商
|
||||
if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('H03')}" === 'false') {
|
||||
this.isLxyGys = true
|
||||
}
|
||||
await this.getModifyConfig()
|
||||
this.pageForm.startYear = this.modifyConfig.provinceStartYear+''
|
||||
await this.initPageData()
|
||||
this.pageData()
|
||||
}
|
||||
|
||||
+38
-17
@@ -111,11 +111,19 @@ layout("/layouts/platform.html"){
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="24" :sm="24" :xs="24">
|
||||
<el-col :md="12" :sm="12" :xs="12">
|
||||
<el-form-item label="旅行社名称" prop="travelAgencyName">
|
||||
<el-input maxlength="50" v-model="formData.travelAgencyName"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :md="12" :sm="12" :xs="12">
|
||||
<el-form-item label="是否自由组团" prop="signUpTravelAgency">
|
||||
<el-radio-group v-model="formData.signUpTravelAgency">
|
||||
<el-radio-button :label="true">是</el-radio-button>
|
||||
<el-radio-button :label="false">否</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="12" :sm="24" :xs="24">
|
||||
@@ -170,11 +178,8 @@ layout("/layouts/platform.html"){
|
||||
<el-row :gutter="20">
|
||||
<el-col :md="24" :sm="24" :xs="24">
|
||||
<el-form-item label="移动端缩略图" prop="files">
|
||||
<file-upload :files.sync="formData.files"
|
||||
picture_card
|
||||
:max="1"
|
||||
:type="['jpg', 'jpeg', 'png']"
|
||||
></file-upload>
|
||||
<image-Upload :height="100" :width="100" :limit="1" :file-type="['png', 'jpg']" :file-size="1"
|
||||
v-model="formData.files"></image-Upload>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -295,6 +300,7 @@ layout("/layouts/platform.html"){
|
||||
{type: 'url', message: '请输入正确的官网地址', trigger: ['blur', 'change']}],
|
||||
note: [{required: false, message: '请输入备注', trigger: ['change', 'blur']}],
|
||||
year: [{required: true, message: '请选择年度', trigger: ['change', 'blur']}],
|
||||
signUpTravelAgency: [{required: true, message: '请选择是否自由组团', trigger: ['change', 'blur']}],
|
||||
//files: [{required: true, message: '请上传移动端缩略图', trigger: ['change', 'blur']}],
|
||||
},
|
||||
viewData: {},
|
||||
@@ -308,7 +314,8 @@ layout("/layouts/platform.html"){
|
||||
officialWebsite: null,
|
||||
note: null,
|
||||
year: null,
|
||||
isDisabled: false
|
||||
isDisabled: false,
|
||||
signUpTravelAgency: false
|
||||
},
|
||||
pageForm: {
|
||||
keywords: null,
|
||||
@@ -342,7 +349,8 @@ layout("/layouts/platform.html"){
|
||||
officialWebsite: null,
|
||||
note: null,
|
||||
year: null,
|
||||
isDisabled: false
|
||||
isDisabled: false,
|
||||
signUpTravelAgency: false,
|
||||
}
|
||||
})
|
||||
},
|
||||
@@ -413,15 +421,28 @@ layout("/layouts/platform.html"){
|
||||
});
|
||||
this.importLoading = true
|
||||
|
||||
const resp = await $.post(loc() + '/travelAgencyImport',data)
|
||||
if (resp.code===0){
|
||||
this.pageData();
|
||||
this.importVisible = false
|
||||
this.importLoading = false
|
||||
}else {
|
||||
this.notifyWarning("导入失败")
|
||||
this.importLoading = false
|
||||
}
|
||||
$.ajax({
|
||||
url: loc() + '/travelAgencyImport',
|
||||
type: "post",
|
||||
data: data,
|
||||
processData: false,
|
||||
contentType: false,
|
||||
success: (resp) => {
|
||||
if (resp.code===0){
|
||||
this.pageData();
|
||||
this.importVisible = false
|
||||
this.importLoading = false
|
||||
}else {
|
||||
this.notifyWarning("导入失败")
|
||||
this.importLoading = false
|
||||
}
|
||||
},
|
||||
error: (resp) => {
|
||||
this.notifyWarning("导入失败")
|
||||
this.importLoading = false
|
||||
}
|
||||
})
|
||||
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
|
||||
@@ -45,7 +45,7 @@ layout("/layouts/platform.html"){
|
||||
type="year"
|
||||
value-format="yyyy"
|
||||
placeholder="选择年"
|
||||
style="width: 80%" @change="pageData">
|
||||
style="width: 80%" @change="pageData();getApplyNumAudit()">
|
||||
</el-date-picker>
|
||||
</el-col>
|
||||
<el-col :span="12" v-if="pageForm.lb==='ry'||pageForm.lb===''">
|
||||
@@ -57,7 +57,7 @@ layout("/layouts/platform.html"){
|
||||
placeholder="查询类型"
|
||||
style="width: 110px;">
|
||||
<el-option label="姓名" value="userName"></el-option>
|
||||
<el-option label="工号" value="loginName"></el-option>
|
||||
<el-option label="一卡通号" value="loginName"></el-option>
|
||||
</el-select>
|
||||
<el-button slot="append" @click="pageData">搜索</el-button>
|
||||
</el-input>
|
||||
@@ -152,10 +152,10 @@ layout("/layouts/platform.html"){
|
||||
<span>选择路线：</span>
|
||||
<el-select v-model="pageForm.takePartInLineId" filterable clearable
|
||||
placeholder="请选择线路"
|
||||
style="width: 80%" @change="pageData()">
|
||||
style="width: 80%" @change="lineChange(pageForm.takePartInLineId); doSearch()">
|
||||
<el-option v-for="item in takePartInLines"
|
||||
:key="item.id"
|
||||
:label="item.lineName+'（'+item.playStartTime1+'）'+'（'+item.unionname+'）'"
|
||||
:label="item.lineName"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
@@ -198,6 +198,7 @@ layout("/layouts/platform.html"){
|
||||
<el-row v-if="!pageForm.state">
|
||||
<el-col :span="24" style="color: red;margin-top: 10px">
|
||||
<span>温馨提醒:当前操作查询是【本工会当年参加疗休养的人员（包含校工会线路）】和【其他工会选择本工会线路的疗休养人员】</span>
|
||||
<!--<span>温馨提醒:当前操作查询是【本工会当年参加疗休养的人员（包含校工会线路）】</span>-->
|
||||
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -208,6 +209,18 @@ layout("/layouts/platform.html"){
|
||||
v-if="pageForm.state=='1'||pageForm.state=='3'">
|
||||
<el-col class="query-row-title"></el-col>
|
||||
<el-col class="query-row-content">
|
||||
<el-col :span="12">
|
||||
<span>出行时间：</span>
|
||||
<el-select v-model="pageForm.selectId" filterable clearable
|
||||
placeholder="请选择出行时间"
|
||||
style="width: 80%" @change="doSearch()">
|
||||
<el-option v-for="item in linePlayTimes"
|
||||
:key="item.times"
|
||||
:label="item.times"
|
||||
:value="item.selectId">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<span>选择标段：</span>
|
||||
<el-select v-model="pageForm.lotId" filterable clearable
|
||||
@@ -230,19 +243,19 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never" class="mt10">
|
||||
<table-tool label="" :app="this" ref="table_tool">
|
||||
<template #label_end>
|
||||
<el-radio-group size="medium" v-model="pageForm.lb" class="ml10"
|
||||
<el-radio-group size="small" v-model="pageForm.lb" class="ml10"
|
||||
@change="pageData()"
|
||||
v-if="pageForm.state=='1'">
|
||||
<el-radio-button label="xl">线路列表</el-radio-button>
|
||||
<el-radio-button label="ry">人员列表</el-radio-button>
|
||||
</el-radio-group>
|
||||
<el-radio-group size="medium" v-model="pageForm.lb" class="ml10"
|
||||
<el-radio-group size="small" v-model="pageForm.lb" class="ml10"
|
||||
@change="pageData()"
|
||||
v-if="pageForm.state=='2'">
|
||||
<el-radio-button label="lxs">旅行社列表</el-radio-button>
|
||||
<el-radio-button label="ry">人员列表</el-radio-button>
|
||||
</el-radio-group>
|
||||
<el-radio-group size="medium" v-model="pageForm.lb" class="ml10"
|
||||
<el-radio-group size="small" v-model="pageForm.lb" class="ml10"
|
||||
@change="pageData()"
|
||||
v-if="pageForm.state=='3'">
|
||||
<el-radio-button label="jd">酒店列表</el-radio-button>
|
||||
@@ -252,31 +265,48 @@ layout("/layouts/platform.html"){
|
||||
style="color: red">当前报名人数有教职工{{applyNum.count1}}人，家属有{{applyNum.count2}}人</span>
|
||||
</template>
|
||||
<template #func>
|
||||
<el-button icon="el-icon-s-promotion" @click="openImport" size="medium"
|
||||
<el-button icon="el-icon-s-promotion" @click="openImport" size="small"
|
||||
type="primary">参加人员导入
|
||||
</el-button>
|
||||
<!--# if(@shiro.hasRole('H04')){ #-->
|
||||
<template>
|
||||
<el-button icon="el-icon-s-promotion"
|
||||
@click="location.href='/platform/theRapyRecuperation/query/exportDeclareForm'"
|
||||
size="medium" type="primary">申报表导出
|
||||
size="small" type="primary">申报表导出
|
||||
</el-button>
|
||||
<el-button icon="el-icon-s-promotion"
|
||||
@click="location.href='/platform/theRapyRecuperation/query/exportTravelers'"
|
||||
size="medium" type="primary">出行人员导出
|
||||
size="small" type="primary">出行人员导出
|
||||
</el-button>
|
||||
</template>
|
||||
<!--# } #-->
|
||||
<el-button icon="el-icon-s-promotion" size="medium" type="primary"
|
||||
<el-button icon="el-icon-s-promotion" size="small" type="primary"
|
||||
@click="userDrawer = true"
|
||||
:disabled="multipleSelection.length==0"
|
||||
class="mr10" v-if="pageForm.lb=='ry'||!pageForm.lb">设置参加人员
|
||||
class="mr5" v-if="pageForm.lb=='ry'||!pageForm.lb">设置参加人员
|
||||
</el-button>
|
||||
<el-button icon="el-icon-s-promotion" size="medium" type="primary"
|
||||
@click="doExport"
|
||||
class="mr10" v-if="pageForm.state">导出
|
||||
|
||||
<el-button icon="el-icon-s-promotion" size="small" type="primary"
|
||||
@click="doReimbursement"
|
||||
:disabled="multipleSelection.length==0"
|
||||
class="mr5" v-if="pageForm.state == '2' && pageForm.lb == 'ry'">一键报销
|
||||
</el-button>
|
||||
<el-radio-group @change="pageData()" size="medium"
|
||||
|
||||
<el-dropdown v-if="pageForm.state" class="ml10 mr10">
|
||||
<el-button size="small" type="primary">
|
||||
导出报名人员<i class="el-icon-arrow-down el-icon--right"></i>
|
||||
</el-button>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item @click.native="doExport">
|
||||
导出压缩包（zip）
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item @click.native="doExportExcel">
|
||||
导出表格（excel）
|
||||
</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
|
||||
<el-radio-group @change="pageData()" size="small"
|
||||
v-model="pageForm.regionalNature"
|
||||
v-if="pageForm.state=='1'">
|
||||
<el-radio-button label="">全部</el-radio-button>
|
||||
@@ -298,13 +328,13 @@ layout("/layouts/platform.html"){
|
||||
width="55">
|
||||
</el-table-column>
|
||||
|
||||
|
||||
<el-table-column align="center" header-align="center" type="index" label="序号"
|
||||
width="80px" key="#index">
|
||||
<template scope="scope">
|
||||
<span>{{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
align="center"
|
||||
header-align="center"
|
||||
@@ -319,15 +349,23 @@ layout("/layouts/platform.html"){
|
||||
</el-link>
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop=='isFamily'">
|
||||
<el-link type="primary" @click="openUser(row)">
|
||||
<el-link v-if="!row.familyNumber" type="primary" @click="openView(row)">
|
||||
{{row.isFamily?'携带':'未携带'}}（{{row.isFamily}}）
|
||||
</el-link>
|
||||
|
||||
<el-link v-else type="primary">
|
||||
{{row.familyNumber?'携带':'未携带'}}（{{row.familyNumber}}）
|
||||
</el-link>
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop=='lineNum'">
|
||||
<el-link type="primary" @click="openApplyUser(row)">
|
||||
|
||||
<el-link v-if="!row.familyNumber" type="primary" @click="openView(row)">
|
||||
{{row.lineNum}}（{{row.signUpUserFamilyNum}}）
|
||||
</el-link>
|
||||
<el-link v-else type="primary">
|
||||
{{row.lineNum}}（{{row.familyNumber}}）
|
||||
</el-link>
|
||||
|
||||
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop=='signUpMode'">
|
||||
{{signUpModeName(row.signUpMode)}}
|
||||
@@ -408,23 +446,32 @@ layout("/layouts/platform.html"){
|
||||
{{row.lotName}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="150px"
|
||||
<el-table-column label="操作" width="250px"
|
||||
v-if="pageForm.lb==='ry'||pageForm.lb===''||pageForm.lb==='xl'">
|
||||
<template scope="{row}">
|
||||
<template v-if="pageForm.lb==='xl'">
|
||||
<el-button @click="openApplyUser(row)" size="mini" type="primary">
|
||||
查看
|
||||
</el-button>
|
||||
<el-button @click="doRemind(row)" size="mini" type="primary">
|
||||
<!--<el-button @click="doRemind(row)" size="mini" type="primary">
|
||||
提醒
|
||||
</el-button>
|
||||
</el-button>-->
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-button @click="openView(row)" size="mini" type="primary"
|
||||
plain="">查看
|
||||
<el-button @click="openView(row)" size="mini" type="primary">查看
|
||||
</el-button>
|
||||
|
||||
|
||||
<el-button @click="openEdit(row)" size="mini" type="primary">编辑
|
||||
</el-button>
|
||||
<el-dropdown class="ml10 mr10" trigger="click">
|
||||
<el-button size="mini" type="primary">
|
||||
调整<i class="el-icon-arrow-down el-icon--right"></i>
|
||||
</el-button>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item @click.native="doModify(row)">保留报名记录</el-dropdown-item>
|
||||
<el-dropdown-item @click.native="doDelete(row)">删除报名记录</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</template>
|
||||
|
||||
</template>
|
||||
@@ -474,18 +521,18 @@ layout("/layouts/platform.html"){
|
||||
<el-table-column label="年龄" prop="age"></el-table-column>
|
||||
<el-table-column label="床型" prop="bedType">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo.bedType }}
|
||||
{{ row.bedInfo?.bedType }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="床位" prop="bedNum">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo.bedNum }}
|
||||
{{ row.bedInfo?.bedNum }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="意向拼床人" prop="otherSleepUser">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo.otherSleepUser ?
|
||||
row.bedInfo.otherSleepUser : '暂无' }}
|
||||
{{ row.bedInfo?.otherSleepUser ?
|
||||
row.bedInfo?.otherSleepUser : '暂无' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="关系" prop="relation"></el-table-column>
|
||||
@@ -562,7 +609,7 @@ layout("/layouts/platform.html"){
|
||||
<el-dialog
|
||||
title="查看个人信息"
|
||||
:visible.sync="userFindDialogVisible"
|
||||
width="80%">
|
||||
width="80%" top="2%">
|
||||
<enroll-info ref="viewEnrollInfo" :union_id="unionId"></enroll-info>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="userFindDialogVisible = false" type="primary">关闭</el-button>
|
||||
@@ -617,7 +664,7 @@ layout("/layouts/platform.html"){
|
||||
width="55">
|
||||
</el-table-column>
|
||||
<el-table-column type="index" label="序号" width="80"></el-table-column>
|
||||
<el-table-column prop="loginName" label="工号"></el-table-column>
|
||||
<el-table-column prop="loginName" label="一卡通号"></el-table-column>
|
||||
<el-table-column prop="userName" label="姓名"></el-table-column>
|
||||
<el-table-column prop="unitName" label="单位"></el-table-column>
|
||||
<el-table-column prop="unionName" label="工会"></el-table-column>
|
||||
@@ -642,7 +689,7 @@ layout("/layouts/platform.html"){
|
||||
<el-timeline>
|
||||
<el-timeline-item timestamp="下载模板" placement="top">
|
||||
<el-card>
|
||||
<el-button size="medium" type=""
|
||||
<el-button size="small" type=""
|
||||
@click="location.href='/platform/basics/downloadTemplate?filePath=travel/TravelEnrollImport.xlsx&fileName=参加人员导入模板.xls'"
|
||||
icon="el-icon-download">下载模板
|
||||
</el-button>
|
||||
@@ -663,7 +710,7 @@ layout("/layouts/platform.html"){
|
||||
:auto-upload="false"
|
||||
:limit="1"
|
||||
:file-list="importData.fileList">
|
||||
<el-button size="medium" type="" icon="el-icon-upload"
|
||||
<el-button size="small" type="" icon="el-icon-upload"
|
||||
style="width: 200px">选择文件
|
||||
</el-button>
|
||||
<div class="el-upload__tip" slot="tip" style="color: #F56C6C">
|
||||
@@ -715,6 +762,129 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
</el-drawer>
|
||||
|
||||
<el-dialog
|
||||
title="修改信息"
|
||||
:visible.sync="editVisible"
|
||||
:close-on-click-modal="false"
|
||||
width="50%">
|
||||
<el-form :model="editFormData" label-width="120px" :rules="rules" ref="editForm" style="margin-right: 40px">
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="loginName" label="工号">
|
||||
<el-input v-model="editFormData.loginName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="姓名">
|
||||
<el-input v-model="editFormData.userName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="手机号">
|
||||
<el-input v-model="editFormData.mobile" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="身份证号">
|
||||
<el-input v-model="editFormData.idCard" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="unionName" label="工会">
|
||||
<el-input v-model="editFormData.unionName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="unitName" label="单位">
|
||||
<el-input v-model="editFormData.unitName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-form-item prop="prop" :label="labelName">
|
||||
<template v-if="modifyConfig.familyInfo == 2">
|
||||
<el-collapse v-model="activeNames">
|
||||
<el-collapse-item title="点击可展开详细信息" name="1">
|
||||
<el-card shadow="never">
|
||||
<el-table :data="editFormData.companionList">
|
||||
<el-table-column label="姓名" prop="userName"></el-table-column>
|
||||
<el-table-column label="性别" prop="sex"></el-table-column>
|
||||
<el-table-column label="身份证号" prop="idCard" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="年龄" prop="age"></el-table-column>
|
||||
<el-table-column label="床型" prop="bedType">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo?.bedType }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="床位" prop="bedNum">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo?.bedNum }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="意向拼床人" prop="otherSleepUser">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo?.otherSleepUser ?
|
||||
row.bedInfo?.otherSleepUser : '暂无' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="关系" prop="relation"></el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-input v-model="editFormData.bedType" readonly></el-input>
|
||||
</template>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="travelName" label="旅行社" v-if="pageForm.state==='2'">
|
||||
<el-select v-model="editFormData.agencyId" filterable clearable
|
||||
placeholder="请选择旅行社"
|
||||
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in agencyLists"
|
||||
:key="item.id"
|
||||
:label="item.travelAgencyName"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item prop="travelLine" :label="lineLabelName" v-if="pageForm.state==='1'">
|
||||
<el-select v-model="editFormData.takePartInLineId" filterable clearable
|
||||
placeholder="请选择线路"
|
||||
@change="validateLine"
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in unionSelectLines"
|
||||
:key="item.id"
|
||||
:label="item.lineName + '-' + item.regionalNature + '【' + item.lotName + '】' + '（' + item.playStartTime + '至' + item.playEndTime + '）' + '（' + item.signUpMode + '）'"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item prop="specificTime" label="出行时间" v-if="pageForm.state==='3'">
|
||||
<el-select v-model="editFormData.specificTime" filterable clearable
|
||||
placeholder="请选择出行时间"
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in editSpecificTimes"
|
||||
:key="item"
|
||||
:label="item"
|
||||
:value="item">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="editVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="doEdit">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
@@ -769,7 +939,7 @@ layout("/layouts/platform.html"){
|
||||
lotId: ''
|
||||
},
|
||||
tableColumnUsers: [
|
||||
{prop: 'loginName', label: '工号'},
|
||||
{prop: 'loginName', label: '一卡通号'},
|
||||
{prop: 'userName', label: '姓名'},
|
||||
{prop: 'unitName', label: '单位', sortable: true},
|
||||
{prop: 'unionName', label: '工会', sortable: true},
|
||||
@@ -787,25 +957,198 @@ layout("/layouts/platform.html"){
|
||||
],
|
||||
options: [
|
||||
{label: "线路", value: "1"},
|
||||
// {label: "旅行社", value: "2"},
|
||||
{label: "酒店", value: "3"},
|
||||
{label: "旅行社", value: "2"},
|
||||
// {label: "酒店", value: "3"},
|
||||
],
|
||||
unionDisabled: false,
|
||||
unitDisabled: false,
|
||||
modifyConfig: {},
|
||||
multipleSelection: [],
|
||||
linePlayTimes: [],
|
||||
multipleSelection2: [],
|
||||
//人员导入
|
||||
importVisible: false,
|
||||
importLoading: false,
|
||||
importData: {},
|
||||
|
||||
editVisible: false,
|
||||
editFormData: {},
|
||||
rules: {
|
||||
loginName: [{required: true, message: '请填写工号', trigger: ['blur', 'change']}],
|
||||
userName: [{required: true, message: '请填写姓名', trigger: ['blur', 'change']}],
|
||||
unionName: [{required: true, message: '请选择工会', trigger: ['blur', 'change']}],
|
||||
unitName: [{required: true, message: '请选择单位', trigger: ['blur', 'change']}],
|
||||
// travelName: [{required: true, message: '请选择旅行社', trigger: ['blur', 'change']}],
|
||||
specificTime: [{required: true, message: '请选择出行时间', trigger: ['blur', 'change']}],
|
||||
// travelLine: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
},
|
||||
editSpecificTimes: [],
|
||||
|
||||
labelName: '',
|
||||
unionSelectLines: [],
|
||||
lineLabelName: '',
|
||||
activeNames:[]
|
||||
}
|
||||
},
|
||||
components: {
|
||||
'enroll-info': httpVueLoader('/components/theRapyRecuperation/Enrollinfo.vue'),
|
||||
'enroll-info': httpVueLoader('/components/theRapyRecuperation/Enrollinfo.vue?v=1.0.1'),
|
||||
'line-info': httpVueLoader('/components/theRapyRecuperation/LineInfo.vue')
|
||||
},
|
||||
methods: {
|
||||
doModify(row){
|
||||
this.$confirm("您确定要调整【<span style='color: red'>" + row.userName + "</span>】的此条报名信息吗？", '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
dangerouslyUseHTMLString: true,
|
||||
type: 'warning',
|
||||
callback: async (a, b) => {
|
||||
if ("confirm" === a) {//确认后再执行
|
||||
const resp = await $.post('/platform/theRapyRecuperation/line/enroll/doModify/' + row.id)
|
||||
if (resp.code === 0) {
|
||||
await this.doSearch()
|
||||
this.$message.success('调整成功')
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
async doReimbursement(){
|
||||
if (this.multipleSelection && this.multipleSelection.length > 0){
|
||||
const enrollIds = this.multipleSelection.filter(v=>v.isTakePartIn).map(v=>v.id)
|
||||
|
||||
let msg = ''
|
||||
if(enrollIds.length == this.multipleSelection.length){
|
||||
msg='您确定要将勾选的报名信息设为已报销吗？'
|
||||
} else {
|
||||
msg='已为您忽略未参加的教工信息，您确定要将忽略后的数据设为已报销吗？'
|
||||
}
|
||||
|
||||
if (!enrollIds || enrollIds.length == 0){
|
||||
this.$message.warning('暂无已参加的老师，不能报销')
|
||||
this.$refs.table.clearSelection();
|
||||
return
|
||||
}
|
||||
console.log(enrollIds)
|
||||
this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
dangerouslyUseHTMLString: true,
|
||||
type: 'warning',
|
||||
callback: async (a, b) => {
|
||||
debugger
|
||||
if ("confirm" === a) {//确认后再执行
|
||||
const resp = await $.post('/platform/theRapyRecuperation/user/query/doReimbursement',{data:JSON.stringify(enrollIds)})
|
||||
if (resp.code === 0) {
|
||||
await this.doSearch()
|
||||
this.$refs.table.clearSelection();
|
||||
if (enrollIds.length == this.multipleSelection.length){
|
||||
this.$message.success('操作成功')
|
||||
} else {
|
||||
this.$message.success('操作成功,已为您过滤未参加人员')
|
||||
}
|
||||
} else {
|
||||
this.$message.warning('操作失败')
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$message.warning('请勾选需要报销的报名信息')
|
||||
}
|
||||
},
|
||||
async lineChange(val) {
|
||||
this.pageForm.selectId = '';
|
||||
const data = this.takePartInLines.find(v => v.id === val)
|
||||
if (!data) {
|
||||
return
|
||||
}
|
||||
const resp = await $.get('/platform/theRapyRecuperation/TheRapyXghAudit/getLinePlayTimeByLineId', {
|
||||
lineId: data.id,
|
||||
year: this.pageForm.year,
|
||||
signUpMode: 1,
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.linePlayTimes = resp.data
|
||||
}
|
||||
},
|
||||
async validateLine() {
|
||||
const resp = await $.post('/platform/theRapyRecuperation/line/enroll/validSignUpInfo'
|
||||
, {enroll: JSON.stringify(this.editFormData)})
|
||||
if (resp.code !== 0) {
|
||||
this.$message.warning(resp.msg)
|
||||
this.editFormData.takePartInLineId = ''
|
||||
}
|
||||
},
|
||||
async doDelete(row) {
|
||||
this.$confirm("您确定要删除【<span style='color: red'>" + row.userName + "</span>】的此条报名信息吗？", '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
dangerouslyUseHTMLString: true,
|
||||
type: 'warning',
|
||||
callback: async (a, b) => {
|
||||
if ("confirm" === a) {//确认后再执行
|
||||
const resp = await $.post('/platform/theRapyRecuperation/line/enroll/doDeleteMyEnrollInfoById/' + row.id)
|
||||
if (resp.code === 0) {
|
||||
await this.doSearch()
|
||||
this.$message.success('删除成功')
|
||||
await this.getApplyNumAudit();
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
async doSearch() {
|
||||
this.pageForm.pageNumber = 1;
|
||||
this.pageData();
|
||||
await this.getApplyNumAudit()
|
||||
await this.getXlByUnion()
|
||||
},
|
||||
async doEdit() {
|
||||
this.$refs['editForm'].validate().then(async () => {
|
||||
const confirm = await this.$confirm('您确定要修改这位老师的报名信息吗？', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
if (!this.editFormData.takePartInLineId && !this.editFormData.takePartInBaseManagementId) {
|
||||
this.$message.warning('请选择线路')
|
||||
return
|
||||
}
|
||||
const resp = await $.post('/platform/theRapyRecuperation/user/query/doEdit', this.editFormData)
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success(resp.msg)
|
||||
this.editVisible = false
|
||||
await this.doSearch();
|
||||
} else {
|
||||
this.$notify.error(resp.msg)
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
async openEdit(row) {
|
||||
this.editFormData = {};
|
||||
const resp = await $.get("/platform/theRapyRecuperation/TheRapyAudit/findOne", {id: row.id})
|
||||
if (resp.code === 0) {
|
||||
this.editFormData = {...resp.data.viewData}
|
||||
if (this.modifyConfig.familyInfo == 2) {
|
||||
this.editFormData.companionList = resp.data.viewData.companionList
|
||||
this.labelName = "家属信息"
|
||||
} else {
|
||||
this.editFormData.bedType = resp.data.viewData.familyNumber
|
||||
this.labelName = "家属数量"
|
||||
}
|
||||
}
|
||||
if (row.takePartInBaseManagementId) {
|
||||
this.editSpecificTime(row.takePartInBaseManagementId);
|
||||
this.lineLabelName = "酒店"
|
||||
} else if (row.takePartInLineId) {
|
||||
this.lineLabelName = '线路'
|
||||
}
|
||||
this.editVisible = true
|
||||
},
|
||||
openUser(row) {
|
||||
this.companionList = row.companionList
|
||||
this.familyDrawer = true
|
||||
@@ -941,26 +1284,61 @@ layout("/layouts/platform.html"){
|
||||
},
|
||||
doExport() {
|
||||
const {
|
||||
year,
|
||||
searchName,
|
||||
year,
|
||||
searchKeyword,
|
||||
unionId,
|
||||
unitId,
|
||||
agencyId,
|
||||
specificTime,
|
||||
takePartInLineId,
|
||||
state,
|
||||
lotId,
|
||||
linePlayTime,
|
||||
} = this.pageForm
|
||||
window.open(loc() + "/doExport?year=" + year +
|
||||
"&searchName=" + searchName +
|
||||
"&searchKeyword" + searchKeyword +
|
||||
let types = this.pageForm.state == 1 ? JSON.stringify(['line']) : JSON.stringify(['travel'])
|
||||
window.open("/platform/theRapyRecuperation/user/query/doExport?" +
|
||||
"searchName=" + searchName +
|
||||
"&searchKeyword=" + searchKeyword +
|
||||
"&startYear=" + year +
|
||||
"&endYear=" + year +
|
||||
"&unionId=" + unionId +
|
||||
"&unitId=" + unitId +
|
||||
"&agencyId=" + agencyId +
|
||||
"&specificTime=" + specificTime +
|
||||
"&takePartInLineId=" + takePartInLineId +
|
||||
"&state=" + state +
|
||||
"&lotId=" + lotId)
|
||||
|
||||
"&lotId=" + lotId +
|
||||
"&satisfyPeople=false" +
|
||||
"&types=" + types +
|
||||
"&linePlayTime=" + linePlayTime)
|
||||
},
|
||||
doExportExcel() {
|
||||
const {
|
||||
searchName,
|
||||
year,
|
||||
searchKeyword,
|
||||
unionId,
|
||||
agencyId,
|
||||
specificTime,
|
||||
takePartInLineId,
|
||||
state,
|
||||
lotId,
|
||||
linePlayTime,
|
||||
} = this.pageForm
|
||||
let types = this.pageForm.state == 1 ? JSON.stringify(['line']) : JSON.stringify(['travel'])
|
||||
window.open("/platform/theRapyRecuperation/user/query/doExportExcel?" +
|
||||
"searchName=" + searchName +
|
||||
"&searchKeyword=" + searchKeyword +
|
||||
"&startYear=" + year +
|
||||
"&endYear=" + year +
|
||||
"&unionId=" + unionId +
|
||||
"&agencyId=" + agencyId +
|
||||
"&specificTime=" + specificTime +
|
||||
"&takePartInLineId=" + takePartInLineId +
|
||||
"&state=" + state +
|
||||
"&lotId=" + lotId +
|
||||
"&satisfyPeople=false" +
|
||||
"&types=" + types +
|
||||
"&linePlayTime=" + linePlayTime)
|
||||
},
|
||||
pageSizeChange(val) {
|
||||
this.pageForm.pageNumber = val;
|
||||
@@ -1032,10 +1410,22 @@ layout("/layouts/platform.html"){
|
||||
|
||||
}
|
||||
},
|
||||
pageOrder1(column) {
|
||||
async pageOrder1(column) {
|
||||
this.pageForm.pageOrderName = column.prop;
|
||||
this.pageForm.pageOrderBy = column.order;
|
||||
this.getSelfUnionUser();
|
||||
if (this.pageForm.lb === "") {
|
||||
this.getSelfUnionUser()
|
||||
} else if (this.pageForm.lb === "xl") {
|
||||
await this.getXlData()
|
||||
} else if (this.pageForm.lb === "lxs") {
|
||||
this.getLxsData()
|
||||
await this.getAgencyList()
|
||||
} else if (this.pageForm.lb === "jd") {
|
||||
this.getJdData()
|
||||
await this.getJdList()
|
||||
} else {
|
||||
await this.getRyData()
|
||||
}
|
||||
},
|
||||
getSelfUnionUser() {
|
||||
this.tableLoading = true
|
||||
@@ -1055,29 +1445,32 @@ layout("/layouts/platform.html"){
|
||||
async pageData() {
|
||||
if (this.pageForm.lb === "") {
|
||||
this.tableColumns = [
|
||||
{prop: 'loginName', label: '工号'},
|
||||
{prop: 'loginName', label: '一卡通号'},
|
||||
{prop: 'userName', label: '姓名'},
|
||||
{prop: 'unitName', label: '单位', sortable: true},
|
||||
{prop: 'unionName', label: '工会', sortable: true},
|
||||
{prop: 'lineOrMaName', label: '线路/酒店', sortable: true},
|
||||
{prop: 'lineOrMaName', label: '线路/旅行社', sortable: true},
|
||||
//{prop: 'travelAgencyName', label: '旅行社', sortable: true},
|
||||
{prop: 'times', label: '出行时间'},
|
||||
{prop: 'regionalNature', label: '线路类型', sortable: true},
|
||||
{prop: 'isFamily', label: '是否携带家属'},
|
||||
{prop: 'isTakePartIn', label: '是否参加'},
|
||||
{prop: 'stateId', label: '审核状态'},
|
||||
//{prop: 'reimbursementStatus', label: '是否报销'},
|
||||
// {prop: 'stateId', label: '审核状态'},
|
||||
]
|
||||
this.getSelfUnionUser()
|
||||
} else if (this.pageForm.lb === "xl") {
|
||||
this.tableColumns = [
|
||||
{prop: 'year', label: '年度'},
|
||||
{prop: 'lineName', label: '线路名称', sortable: true},
|
||||
{prop: 'times', label: '出行时间'},
|
||||
// {prop: 'times', label: '出行时间'},
|
||||
{prop: 'linePlayTime', label: '出行时间'},
|
||||
{prop: 'travelAgencyName', label: '承担旅行社', sortable: true},
|
||||
{prop: 'unionname', label: '创建工会', sortable: true},
|
||||
{prop: 'regionalNature', label: '线路类型', sortable: true},
|
||||
{prop: 'signUpMode', label: '组织形式', sortable: true},
|
||||
{prop: 'contact', label: '联系人', sortable: true},
|
||||
{prop: 'contactMobileNumber', label: '联系方式'},
|
||||
{prop: 'contact', label: '联系人', sortable: true, checked: 0},
|
||||
{prop: 'contactMobileNumber', label: '联系方式', checked: 0},
|
||||
{prop: 'lineNum', label: '报名人数（家属）'}
|
||||
]
|
||||
await this.getXlData()
|
||||
@@ -1085,11 +1478,11 @@ layout("/layouts/platform.html"){
|
||||
this.tableColumns = [
|
||||
{label: '年度', prop: 'year'},
|
||||
{label: '旅行社名称', prop: 'travelAgencyName', sortable: true},
|
||||
{label: '旅行社编号', prop: 'serialNumber', sortable: true},
|
||||
//{label: '旅行社编号', prop: 'serialNumber', sortable: true},
|
||||
{label: '联系人', prop: 'contact'},
|
||||
{label: '联系人手机', prop: 'contactMobileNumber'},
|
||||
{label: '邮箱', prop: 'email'},
|
||||
{label: '官网', prop: 'officialWebsite'},
|
||||
//{label: '官网', prop: 'officialWebsite'},
|
||||
{label: '报名人数', prop: 'agencyNum', sortable: true},
|
||||
]
|
||||
this.getLxsData()
|
||||
@@ -1098,7 +1491,7 @@ layout("/layouts/platform.html"){
|
||||
this.tableColumns = [
|
||||
{label: '年度', prop: 'year'},
|
||||
{label: '酒店名称', prop: 'baseName', sortable: true},
|
||||
// {label: '酒店编号', prop: 'serialNumber', sortable: true},
|
||||
//{label: '酒店编号', prop: 'serialNumber', sortable: true},
|
||||
{label: '联系人', prop: 'baseContactPerson'},
|
||||
{label: '联系人手机', prop: 'baseContactNumber'},
|
||||
{label: '承担旅行社', prop: 'travelAgencyName', sortable: true},
|
||||
@@ -1109,17 +1502,33 @@ layout("/layouts/platform.html"){
|
||||
this.getJdData()
|
||||
await this.getJdList()
|
||||
} else {
|
||||
this.tableColumns = [
|
||||
{prop: 'loginName', label: '工号'},
|
||||
{prop: 'userName', label: '姓名'},
|
||||
{prop: 'unitName', label: '单位', sortable: true},
|
||||
{prop: 'unionName', label: '工会', sortable: true},
|
||||
{prop: 'lineOrMaName', label: '线路/酒店'},
|
||||
{prop: 'times', label: '出行时间'},
|
||||
{prop: 'isFamily', label: '是否携带家属'},
|
||||
{prop: 'isTakePartIn', label: '是否参加'},
|
||||
{prop: 'stateId', label: '审核状态'},
|
||||
]
|
||||
if(this.pageForm.state == '2') {
|
||||
this.tableColumns = [
|
||||
{prop: 'loginName', label: '一卡通号'},
|
||||
{prop: 'userName', label: '姓名'},
|
||||
{prop: 'unitName', label: '单位', sortable: true},
|
||||
{prop: 'unionName', label: '工会', sortable: true},
|
||||
{prop: 'travelAgencyName', label: '旅行社'},
|
||||
{prop: 'isFamily', label: '是否携带家属'},
|
||||
{prop: 'isTakePartIn', label: '是否参加'},
|
||||
{prop: 'reimbursementStatus', label: '是否报销'},
|
||||
//{prop: 'stateId', label: '审核状态'},
|
||||
]
|
||||
} else {
|
||||
this.tableColumns = [
|
||||
{prop: 'loginName', label: '一卡通号'},
|
||||
{prop: 'userName', label: '姓名'},
|
||||
{prop: 'unitName', label: '单位', sortable: true},
|
||||
{prop: 'unionName', label: '工会', sortable: true},
|
||||
{prop: 'lineOrMaName', label: '线路/酒店'},
|
||||
{prop: 'times', label: '出行时间'},
|
||||
{prop: 'isFamily', label: '是否携带家属'},
|
||||
{prop: 'isTakePartIn', label: '是否参加'},
|
||||
//{prop: 'reimbursementStatus', label: '是否报销'},
|
||||
//{prop: 'stateId', label: '审核状态'},
|
||||
]
|
||||
}
|
||||
|
||||
await this.getRyData()
|
||||
}
|
||||
await this.getApplyNum()
|
||||
@@ -1141,11 +1550,6 @@ layout("/layouts/platform.html"){
|
||||
year: this.pageForm.year,
|
||||
state: this.pageForm.state2
|
||||
})
|
||||
data.forEach(v => {
|
||||
if (!v.unionname) {
|
||||
v.unionname = '校工会'
|
||||
}
|
||||
})
|
||||
this.takePartInLines = data
|
||||
},
|
||||
async getAgencyList() {
|
||||
@@ -1233,7 +1637,8 @@ layout("/layouts/platform.html"){
|
||||
state2: this.pageForm.state2,
|
||||
regionalNature: this.pageForm.regionalNature,
|
||||
takePartInLineId: this.pageForm.takePartInLineId,
|
||||
year: this.pageForm.year
|
||||
year: this.pageForm.year,
|
||||
selectId: this.pageForm.selectId
|
||||
})
|
||||
this.applyNum = data
|
||||
},
|
||||
@@ -1249,7 +1654,6 @@ layout("/layouts/platform.html"){
|
||||
{label: "其他工会人员（选我线路）" + data.count3 + "人", value: "3"},
|
||||
{label: "选择校工会线路人员" + data.count4 + "人", value: "4"}
|
||||
]
|
||||
|
||||
},
|
||||
async getModifyConfig() {
|
||||
const res = await $.post('/platform/theRapyRecuperation/TheRapyConfig/findOne')
|
||||
@@ -1275,11 +1679,11 @@ layout("/layouts/platform.html"){
|
||||
});
|
||||
this.importLoading = true
|
||||
|
||||
const resp = await $.post('/platform/theRapyRecuperation/user/query/enrollImport',data)
|
||||
if (resp.code === 0){
|
||||
const resp = await $.post('/platform/theRapyRecuperation/user/query/enrollImport', data)
|
||||
if (resp.code === 0) {
|
||||
await this.pageData();
|
||||
this.importVisible = false
|
||||
}else {
|
||||
} else {
|
||||
this.notifyWarning("导入失败")
|
||||
this.importLoading = false
|
||||
}
|
||||
@@ -1288,6 +1692,15 @@ layout("/layouts/platform.html"){
|
||||
this.importVisible = false;
|
||||
this.pageData();
|
||||
},
|
||||
async getUnionSelectLine() {
|
||||
const resp = await $.post('/platform/theRapyRecuperation/user/query/getUnionSelectLine', {
|
||||
year: this.pageForm.year,
|
||||
signUpMode: 1,
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.unionSelectLines = resp.data
|
||||
}
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
await this.getModifyConfig()
|
||||
@@ -1311,6 +1724,7 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
}
|
||||
this.flushUnits()
|
||||
await this.getUnionSelectLine()
|
||||
}
|
||||
})
|
||||
</script>
|
||||
|
||||
+432
-26
@@ -47,7 +47,7 @@ layout("/layouts/platform.html"){
|
||||
type="year"
|
||||
value-format="yyyy"
|
||||
placeholder="选择年"
|
||||
style="width: 38%" @change="doSearch">
|
||||
style="width: 38%" @change="getUnionSelectLine(); doSearch()">
|
||||
</el-date-picker>
|
||||
<span>至</span>
|
||||
<el-date-picker
|
||||
@@ -56,7 +56,7 @@ layout("/layouts/platform.html"){
|
||||
type="year"
|
||||
value-format="yyyy"
|
||||
placeholder="选择年"
|
||||
style="width: 38%" @change="doSearch">
|
||||
style="width: 38%" @change="getUnionSelectLine(); doSearch()">
|
||||
</el-date-picker>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
@@ -68,7 +68,7 @@ layout("/layouts/platform.html"){
|
||||
placeholder="查询类型"
|
||||
style="width: 110px;">
|
||||
<el-option label="姓名" value="userName"></el-option>
|
||||
<el-option label="工号" value="loginName"></el-option>
|
||||
<el-option label="一卡通号" value="loginName"></el-option>
|
||||
</el-select>
|
||||
<el-button slot="append" @click="doSearch">搜索</el-button>
|
||||
</el-input>
|
||||
@@ -138,12 +138,12 @@ layout("/layouts/platform.html"){
|
||||
:key="item.value"
|
||||
:type="item.label"
|
||||
size="medium"
|
||||
@click="checkSignUpModeState(item.value)"
|
||||
@click="checkSignUpModeState(item.value);doSearch()"
|
||||
style="margin-right: 10px;cursor: pointer;margin-bottom: 5px;"
|
||||
v-for="item in signUpModeOptions">
|
||||
{{ item.label }}
|
||||
</el-tag>
|
||||
<el-link :underline="false" @click="signUpModeClear"
|
||||
<el-link :underline="false" @click="signUpModeClear();doSearch()"
|
||||
type="danger" v-if="signUpModeOptions.length && pageForm.signUpMode">清空
|
||||
</el-link>
|
||||
</el-col>
|
||||
@@ -175,7 +175,7 @@ layout("/layouts/platform.html"){
|
||||
style="width: 80%" @change="doSearch()">
|
||||
<el-option v-for="item in takePartInLines"
|
||||
:key="item.id"
|
||||
:label="item.lineName+'（'+item.playStartTime1+'）'+'（'+item.unionname+'）'"
|
||||
:label="item.lineName+'（'+item.unionname+'）'"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
@@ -217,14 +217,23 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<table-tool label="人员列表" :app="this">
|
||||
<template #func>
|
||||
<el-button style="margin-right: 10px" @click="openImport" size="medium" type="primary">参加人员导入
|
||||
<el-button icon="el-icon-s-promotion" size="small" type="primary"
|
||||
@click="doExport"
|
||||
v-if="pageForm.state">导出
|
||||
</el-button>
|
||||
<el-button icon="el-icon-s-promotion" size="medium" type="primary"
|
||||
<el-button @click="openImport" size="small" type="primary">参加人员导入
|
||||
</el-button>
|
||||
<el-button icon="el-icon-s-promotion" size="small" type="primary"
|
||||
@click="userDrawer = true"
|
||||
:disabled="multipleSelection.length==0"
|
||||
class="mr10">设置参加人员
|
||||
class="mr5">设置参加人员
|
||||
</el-button>
|
||||
<el-radio-group @change="doSearch()" size="medium"
|
||||
<el-button size="small" type="primary"
|
||||
@click="doReimbursement"
|
||||
:disabled="multipleSelection.length==0"
|
||||
class="mr10">一键报销
|
||||
</el-button>
|
||||
<el-radio-group @change="doSearch()" size="small"
|
||||
v-model="pageForm.regionalNature"
|
||||
v-if="pageForm.state=='1'">
|
||||
<el-radio-button label="">全部</el-radio-button>
|
||||
@@ -264,7 +273,12 @@ layout("/layouts/platform.html"){
|
||||
</el-link>-->
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop=='isFamily'">
|
||||
{{row.isFamily?'携带':'未携带'}}（{{row.isFamily}}）
|
||||
<el-link v-if="!row.familyNumber" type="primary" @click="openView(row)">
|
||||
{{row.isFamily?'携带':'未携带'}}（{{row.isFamily}}）
|
||||
</el-link>
|
||||
<el-link v-else type="primary">
|
||||
{{row.familyNumber?'携带':'未携带'}}（{{row.familyNumber}}）
|
||||
</el-link>
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop=='isTakePartIn'">
|
||||
{{row.isTakePartIn?'已参加':'未参加'}}
|
||||
@@ -275,10 +289,23 @@ layout("/layouts/platform.html"){
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="100px">
|
||||
<el-table-column label="操作" width="250px">
|
||||
<template scope="{row}">
|
||||
<el-button @click="openView(row)" size="mini" type="primary">查看
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')}"
|
||||
@click="openEdit(row)" size="mini" type="primary">编辑
|
||||
</el-button>
|
||||
<el-dropdown class="ml10 mr10" trigger="click">
|
||||
<el-button size="mini" type="primary">
|
||||
调整<i class="el-icon-arrow-down el-icon--right"></i>
|
||||
</el-button>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item @click.native="doModify(row)">保留报名记录</el-dropdown-item>
|
||||
<el-dropdown-item @click.native="doDelete(row)">删除报名记录</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -286,7 +313,6 @@ layout("/layouts/platform.html"){
|
||||
|
||||
</el-card>
|
||||
|
||||
|
||||
</template>
|
||||
<template #view>
|
||||
<enroll-info ref="viewEnrollInfo"></enroll-info>
|
||||
@@ -295,7 +321,6 @@ layout("/layouts/platform.html"){
|
||||
<line-info ref="viewLineInfo"></line-info>
|
||||
</template>
|
||||
|
||||
|
||||
<el-drawer
|
||||
size="70%"
|
||||
title="批量设置参加人员"
|
||||
@@ -343,7 +368,7 @@ layout("/layouts/platform.html"){
|
||||
width="55">
|
||||
</el-table-column>
|
||||
<el-table-column type="index" label="序号" width="80"></el-table-column>
|
||||
<el-table-column prop="loginName" label="工号"></el-table-column>
|
||||
<el-table-column prop="loginName" label="一卡通号"></el-table-column>
|
||||
<el-table-column prop="userName" label="姓名"></el-table-column>
|
||||
<el-table-column prop="unitName" label="单位"></el-table-column>
|
||||
<el-table-column prop="unionName" label="工会"></el-table-column>
|
||||
@@ -358,7 +383,6 @@ layout("/layouts/platform.html"){
|
||||
</span>
|
||||
</el-drawer>
|
||||
|
||||
|
||||
<el-dialog
|
||||
title="参加人员导入"
|
||||
:visible.sync="importVisible"
|
||||
@@ -407,7 +431,142 @@ layout("/layouts/platform.html"){
|
||||
</span>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog
|
||||
title="修改信息"
|
||||
:visible.sync="editVisible"
|
||||
:close-on-click-modal="false"
|
||||
width="50%">
|
||||
<el-form :model="editFormData" label-width="120px" :rules="rules" ref="editForm" style="margin-right: 40px">
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="loginName" label="工号">
|
||||
<el-input v-model="editFormData.loginName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="姓名">
|
||||
<el-input v-model="editFormData.userName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="手机号">
|
||||
<el-input v-model="editFormData.mobile" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="userName" label="身份证号">
|
||||
<el-input v-model="editFormData.idCard" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="unionName" label="工会">
|
||||
<el-input v-model="editFormData.unionName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col span="12">
|
||||
<el-form-item prop="unitName" label="单位">
|
||||
<el-input v-model="editFormData.unitName" readonly></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-form-item prop="prop" :label="labelName">
|
||||
<template v-if="modifyConfig.familyInfo == 2">
|
||||
<el-collapse v-model="activeNames">
|
||||
<el-collapse-item title="点击可展开详细信息" name="1">
|
||||
<el-card shadow="never">
|
||||
<el-table :data="editFormData.companionList">
|
||||
<el-table-column label="姓名" prop="userName"></el-table-column>
|
||||
<el-table-column label="性别" prop="sex"></el-table-column>
|
||||
<el-table-column label="身份证号" prop="idCard" show-overflow-tooltip></el-table-column>
|
||||
<el-table-column label="年龄" prop="age"></el-table-column>
|
||||
<el-table-column label="床型" prop="bedType">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo?.bedType }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="床位" prop="bedNum">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo?.bedNum }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="意向拼床人" prop="otherSleepUser">
|
||||
<template scope="{row}">
|
||||
{{ row.bedInfo?.otherSleepUser ?
|
||||
row.bedInfo?.otherSleepUser : '暂无' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="关系" prop="relation"></el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</template>
|
||||
<template v-else>
|
||||
<el-input v-model="editFormData.bedType" readonly></el-input>
|
||||
</template>
|
||||
</el-form-item>
|
||||
<!--<el-form-item prop="travelName" label="旅行社">
|
||||
<el-select v-model="editFormData.agencyId" filterable clearable
|
||||
placeholder="请选择旅行社"
|
||||
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in agencyLists"
|
||||
:key="item.id"
|
||||
:label="item.travelAgencyName"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>-->
|
||||
<el-form-item prop="travelLine" :label="lineLabelName">
|
||||
<div v-if="pageForm.state==='1'">
|
||||
<el-select v-model="editFormData.takePartInLineId" filterable clearable
|
||||
placeholder="请选择线路"
|
||||
@change="validateLine"
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in unionSelectLines"
|
||||
:key="item.id"
|
||||
:label="item.lineName + '-' + item.regionalNature + '【' + item.lotName + '】' + '（' + item.playStartTime + '至' + item.playEndTime + '）' + '（' + item.signUpMode + '）'"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div v-if="pageForm.state==='3'">
|
||||
<el-select v-model="editFormData.takePartInBaseManagementId" filterable clearable
|
||||
placeholder="请选择目的地"
|
||||
style="width: 100%"
|
||||
@change="editSpecificTime(editFormData.takePartInBaseManagementId)">
|
||||
<el-option :key="item.id"
|
||||
:label="item.baseName +'（'+item.lotName+'）'"
|
||||
:value="item.id"
|
||||
v-for="item in jdList">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item prop="specificTime" label="出行时间" v-if="pageForm.state==='3'">
|
||||
<el-select v-model="editFormData.specificTime" filterable clearable
|
||||
placeholder="请选择出行时间"
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in editSpecificTimes"
|
||||
:key="item"
|
||||
:label="item"
|
||||
:value="item">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="editVisible = false">取 消</el-button>
|
||||
<el-button type="primary" @click="doEdit">确 定</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</guava>
|
||||
</div>
|
||||
|
||||
@@ -427,15 +586,15 @@ layout("/layouts/platform.html"){
|
||||
|
||||
options: [
|
||||
{label: "线路", value: "1"},
|
||||
// {label: "旅行社", value: "2"},
|
||||
{label: "酒店", value: "3"},
|
||||
{label: "旅行社", value: "2"},
|
||||
// {label: "酒店", value: "3"},
|
||||
],
|
||||
agencyLists: [],
|
||||
unionOptions: [],
|
||||
unitOptions: [],
|
||||
takePartInLines: [],
|
||||
tableColumns: [
|
||||
{prop: 'loginName', label: '工号'},
|
||||
{prop: 'loginName', label: '一卡通号'},
|
||||
{prop: 'userName', label: '姓名'},
|
||||
{prop: 'unitName', label: '单位', sortable: true},
|
||||
{prop: 'unionName', label: '工会', sortable: true},
|
||||
@@ -447,17 +606,20 @@ layout("/layouts/platform.html"){
|
||||
{prop: 'isFamily', label: '是否携带家属'},
|
||||
{prop: 'signingUptime', label: '报名时间', checked: 0},
|
||||
{prop: 'isTakePartIn', label: '是否参加'},
|
||||
{prop: 'reimbursementStatus', label: '是否报销'},
|
||||
{prop: 'takePartInTime', label: '参加时间', checked: 0},
|
||||
],
|
||||
pageForm: {
|
||||
startYear: (moment().format('YYYY') - 2) + '',
|
||||
startYear: moment().format('YYYY'),
|
||||
endYear: moment().format('YYYY'),
|
||||
searchName: "userName",
|
||||
unionId: '',
|
||||
agencyId: '',
|
||||
state: '1',
|
||||
regionalNature: '',
|
||||
signUpMode: null
|
||||
signUpMode: '',
|
||||
lotId: '',
|
||||
takePartInLineId: '',
|
||||
},
|
||||
multipleSelection: [],
|
||||
multipleSelection2: [],
|
||||
@@ -469,13 +631,210 @@ layout("/layouts/platform.html"){
|
||||
{label: '校工会组织', value: 2},
|
||||
{label: '分工会组织', value: 1},
|
||||
],
|
||||
|
||||
editVisible: false,
|
||||
editFormData: {},
|
||||
rules: {
|
||||
loginName: [{required: true, message: '请填写工号', trigger: ['blur', 'change']}],
|
||||
userName: [{required: true, message: '请填写姓名', trigger: ['blur', 'change']}],
|
||||
unionName: [{required: true, message: '请选择工会', trigger: ['blur', 'change']}],
|
||||
unitName: [{required: true, message: '请选择单位', trigger: ['blur', 'change']}],
|
||||
// travelName: [{required: true, message: '请选择旅行社', trigger: ['blur', 'change']}],
|
||||
specificTime: [{required: true, message: '请选择出行时间', trigger: ['blur', 'change']}],
|
||||
// travelLine: [{required: true, message: '必填', trigger: ['blur', 'change']}],
|
||||
},
|
||||
editSpecificTimes: [],
|
||||
|
||||
labelName: '',
|
||||
unionSelectLines: [],
|
||||
lineLabelName: '',
|
||||
activeNames: [],
|
||||
|
||||
title:'',
|
||||
dialogVisible:false,
|
||||
}
|
||||
},
|
||||
components: {
|
||||
'enroll-info': httpVueLoader('/components/theRapyRecuperation/Enrollinfo.vue'),
|
||||
'enroll-info': httpVueLoader('/components/theRapyRecuperation/Enrollinfo.vue?v=1.0.1'),
|
||||
'line-info': httpVueLoader('/components/theRapyRecuperation/LineInfo.vue')
|
||||
},
|
||||
methods: {
|
||||
async doReimbursement(){
|
||||
if (this.multipleSelection && this.multipleSelection.length > 0){
|
||||
const enrollIds = this.multipleSelection.filter(v=>v.isTakePartIn).map(v=>v.id)
|
||||
|
||||
let msg = ''
|
||||
if(enrollIds.length == this.multipleSelection.length){
|
||||
msg='您确定要将勾选的报名信息设为已报销吗？'
|
||||
} else {
|
||||
msg='已为您忽略未参加的教工信息，您确定要将忽略后的数据设为已报销吗？'
|
||||
}
|
||||
|
||||
if (!enrollIds || enrollIds.length == 0){
|
||||
this.$message.warning('暂无已参加的老师，不能报销')
|
||||
this.$refs.table.clearSelection();
|
||||
return
|
||||
}
|
||||
console.log(enrollIds)
|
||||
this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
dangerouslyUseHTMLString: true,
|
||||
type: 'warning',
|
||||
callback: async (a, b) => {
|
||||
debugger
|
||||
if ("confirm" === a) {//确认后再执行
|
||||
const resp = await $.post(loc() + '/doReimbursement',{data:JSON.stringify(enrollIds)})
|
||||
if (resp.code === 0) {
|
||||
await this.doSearch()
|
||||
this.$refs.table.clearSelection();
|
||||
if (enrollIds.length == this.multipleSelection.length){
|
||||
this.$message.success('操作成功')
|
||||
} else {
|
||||
this.$message.success('操作成功,已为您过滤未参加人员')
|
||||
}
|
||||
} else {
|
||||
this.$message.warning('操作失败')
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$message.warning('请勾选需要报销的报名信息')
|
||||
}
|
||||
},
|
||||
doModify(row){
|
||||
this.$confirm("您确定要调整【<span style='color: red'>" + row.userName + "</span>】的此条报名信息吗？", '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
dangerouslyUseHTMLString: true,
|
||||
type: 'warning',
|
||||
callback: async (a, b) => {
|
||||
if ("confirm" === a) {//确认后再执行
|
||||
const resp = await $.post('/platform/theRapyRecuperation/line/enroll/doModify/' + row.id)
|
||||
if (resp.code === 0) {
|
||||
await this.doSearch()
|
||||
this.$message.success('调整成功')
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
doExport() {
|
||||
const {
|
||||
takePartInBaseManagementId,
|
||||
searchName,
|
||||
startYear,
|
||||
endYear,
|
||||
signUpMode,
|
||||
searchKeyword,
|
||||
unionId,
|
||||
agencyId,
|
||||
specificTime,
|
||||
takePartInLineId,
|
||||
state,
|
||||
lotId,
|
||||
linePlayTime,
|
||||
} = this.pageForm
|
||||
let types = this.pageForm.state == 1 ? JSON.stringify(['line']) : JSON.stringify(['travel'])
|
||||
window.open(loc() + "/doExport?takePartInBaseManagementId=" + takePartInBaseManagementId +
|
||||
"&searchName=" + searchName +
|
||||
"&searchKeyword=" + searchKeyword +
|
||||
"&startYear=" + startYear +
|
||||
"&endYear=" + endYear +
|
||||
"&signUpMode=" + signUpMode +
|
||||
"&unionId=" + unionId +
|
||||
"&agencyId=" + agencyId +
|
||||
"&specificTime=" + specificTime +
|
||||
"&takePartInLineId=" + takePartInLineId +
|
||||
"&state=" + state +
|
||||
"&lotId=" + lotId +
|
||||
"&satisfyPeople=false" +
|
||||
"&types=" + types +
|
||||
"&linePlayTime=" + linePlayTime)
|
||||
},
|
||||
async validateLine() {
|
||||
const resp = await $.post('/platform/theRapyRecuperation/line/enroll/validSignUpInfo'
|
||||
, {enroll: JSON.stringify(this.editFormData)})
|
||||
if (resp.code !== 0) {
|
||||
this.$message.warning(resp.msg)
|
||||
this.editFormData.takePartInLineId = ''
|
||||
}
|
||||
},
|
||||
async doEdit() {
|
||||
this.$refs['editForm'].validate().then(async () => {
|
||||
const confirm = await this.$confirm('您确定要修改这位老师的报名信息吗？', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
})
|
||||
if (confirm === "confirm") {
|
||||
if (!this.editFormData.takePartInLineId && !this.editFormData.takePartInBaseManagementId) {
|
||||
this.$message.warning('请选择线路')
|
||||
return
|
||||
}
|
||||
const resp = await $.post('/platform/theRapyRecuperation/user/query/doEdit', this.editFormData)
|
||||
if (resp.code === 0) {
|
||||
this.$notify.success(resp.msg)
|
||||
this.editVisible = false
|
||||
await this.doSearch();
|
||||
} else {
|
||||
this.$notify.error(resp.msg)
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
async openEdit(row) {
|
||||
this.getUnionSelectLine(row.takePartInLineId)
|
||||
this.editFormData = {};
|
||||
const resp = await $.get("/platform/theRapyRecuperation/TheRapyAudit/findOne", {id: row.id})
|
||||
if (resp.code === 0) {
|
||||
this.editFormData = {...resp.data.viewData}
|
||||
if (this.modifyConfig.familyInfo == 2) {
|
||||
this.editFormData.companionList = resp.data.viewData.companionList
|
||||
this.labelName = "家属信息"
|
||||
} else {
|
||||
this.editFormData.bedType = resp.data.viewData.familyNumber
|
||||
this.labelName = "家属数量"
|
||||
}
|
||||
}
|
||||
if (row.takePartInBaseManagementId) {
|
||||
this.editSpecificTime(row.takePartInBaseManagementId);
|
||||
this.lineLabelName = "酒店"
|
||||
} else if (row.takePartInLineId) {
|
||||
this.lineLabelName = '线路'
|
||||
}
|
||||
this.editVisible = true
|
||||
},
|
||||
editSpecificTime(id) {
|
||||
const jd = this.jdList.find(v => v.id === id)
|
||||
if (jd) {
|
||||
const lot = this.modifyConfig.lots.find(v => v.id === jd.lotId)
|
||||
if (lot.lotName === '四晚五天') {
|
||||
this.editSpecificTimes = this.getTimeByLot1(jd)
|
||||
} else if (lot.lotName === '两晚三天') {
|
||||
this.editSpecificTimes = this.getTimeByLot2(jd)
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
doDelete(row) {
|
||||
this.$confirm("您确定要删除【<span style='color: red'>" + row.userName + "</span>】的此条报名信息吗？", '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
dangerouslyUseHTMLString: true,
|
||||
type: 'warning',
|
||||
callback: async (a, b) => {
|
||||
if ("confirm" === a) {//确认后再执行
|
||||
const resp = await $.post('/platform/theRapyRecuperation/line/enroll/doDeleteMyEnrollInfoById/' + row.id)
|
||||
if (resp.code === 0) {
|
||||
await this.doSearch()
|
||||
this.$message.success('删除成功')
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
async signUpModeClear() {
|
||||
this.pageForm.signUpMode = ''
|
||||
this.takePartInLines = await this.getXlByUnion()
|
||||
@@ -580,6 +939,39 @@ layout("/layouts/platform.html"){
|
||||
this.pageForm.pageNumber = 1
|
||||
this.pageData()
|
||||
await this.getXlLxsUserCount()
|
||||
this.takePartInLines = await this.getXlByUnion()
|
||||
|
||||
if (this.pageForm.state == '2') {
|
||||
this.tableColumns = [
|
||||
{prop: 'loginName', label: '一卡通号'},
|
||||
{prop: 'userName', label: '姓名'},
|
||||
{prop: 'unitName', label: '单位', sortable: true},
|
||||
{prop: 'unionName', label: '工会', sortable: true},
|
||||
{prop: 'travelAgencyName', label: '旅行社'},
|
||||
{prop: 'isFamily', label: '是否携带家属'},
|
||||
{prop: 'signingUptime', label: '报名时间', checked: 0},
|
||||
{prop: 'isTakePartIn', label: '是否参加'},
|
||||
{prop: 'reimbursementStatus', label: '是否报销'},
|
||||
{prop: 'takePartInTime', label: '参加时间', checked: 0},
|
||||
]
|
||||
} else {
|
||||
this.tableColumns = [
|
||||
{prop: 'loginName', label: '一卡通号'},
|
||||
{prop: 'userName', label: '姓名'},
|
||||
{prop: 'unitName', label: '单位', sortable: true},
|
||||
{prop: 'unionName', label: '工会', sortable: true},
|
||||
// {prop: 'travelAgencyName', label: '旅行社'},
|
||||
{prop: 'lineName', label: '线路/酒店'},
|
||||
{prop: 'playStartTime', label: '出行时间'},
|
||||
{prop: 'regionalNature', label: '线路类型'},
|
||||
{prop: 'lotName', label: '标段'},
|
||||
{prop: 'isFamily', label: '是否携带家属'},
|
||||
{prop: 'signingUptime', label: '报名时间', checked: 0},
|
||||
{prop: 'isTakePartIn', label: '是否参加'},
|
||||
{prop: 'reimbursementStatus', label: '是否报销'},
|
||||
{prop: 'takePartInTime', label: '参加时间', checked: 0},
|
||||
]
|
||||
}
|
||||
},
|
||||
async getLines() {
|
||||
const {data} = await $.post("/platform/theRapyRecuperation/travelAgency/selectLineByAgencyId", {
|
||||
@@ -604,7 +996,8 @@ layout("/layouts/platform.html"){
|
||||
async getXlByUnion() {
|
||||
const {data} = await $.post("/platform/theRapyRecuperation/TheRapyAudit/getXlByUnion", {
|
||||
unionId: this.pageForm.unionId,
|
||||
year: this.pageForm.year,
|
||||
year: this.pageForm.startYear,
|
||||
endYear: this.pageForm.endYear,
|
||||
signUpMode: this.pageForm.signUpMode,
|
||||
})
|
||||
data.forEach(v => {
|
||||
@@ -636,7 +1029,8 @@ layout("/layouts/platform.html"){
|
||||
const {data} = await $.post("/platform/theRapyRecuperation/user/query/getXlLxsUserCount", {
|
||||
unionId: this.pageForm.unionId,
|
||||
startYear: this.pageForm.startYear,
|
||||
endYear: this.pageForm.endYear
|
||||
endYear: this.pageForm.endYear,
|
||||
signUpMode: this.pageForm.signUpMode
|
||||
})
|
||||
this.options.forEach((v, index) => {
|
||||
if (v.value === "1") {
|
||||
@@ -679,10 +1073,10 @@ layout("/layouts/platform.html"){
|
||||
processData: false,
|
||||
contentType: false,
|
||||
success: (data) => {
|
||||
if (data.code === 0){
|
||||
if (data.code === 0) {
|
||||
this.pageData();
|
||||
this.importVisible = false
|
||||
}else {
|
||||
} else {
|
||||
this.importLoading = false
|
||||
}
|
||||
},
|
||||
@@ -696,9 +1090,21 @@ layout("/layouts/platform.html"){
|
||||
this.importVisible = false;
|
||||
this.pageData();
|
||||
},
|
||||
async getUnionSelectLine(disPlayUnionSelectId = null) {
|
||||
const resp = await $.post('/platform/theRapyRecuperation/user/query/getUnionSelectLine', {
|
||||
startYear: this.pageForm.startYear,
|
||||
endYear: this.pageForm.endYear,
|
||||
disPlayUnionSelectId: disPlayUnionSelectId
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.unionSelectLines = resp.data
|
||||
}
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
await this.getModifyConfig()
|
||||
await this.getAgencyList()
|
||||
await this.getUnionSelectLine();
|
||||
this.unionOptions = await getUnions(null)
|
||||
this.flushUnits()
|
||||
await this.getXlLxsUserCount()
|
||||
|
||||
@@ -129,7 +129,7 @@ layout("/layouts/platform.html"){
|
||||
</div>
|
||||
|
||||
<el-table :data="tableData">
|
||||
<el-table-column label="工号" prop="loginName"></el-table-column>
|
||||
<el-table-column label="一卡通号" prop="loginName"></el-table-column>
|
||||
<el-table-column label="姓名" prop="userName"></el-table-column>
|
||||
<el-table-column label="参加时间" prop="takePartInTime"></el-table-column>
|
||||
</el-table>
|
||||
|
||||
@@ -75,6 +75,34 @@ layout("/layouts/platform.html"){
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">线路类型：</div>
|
||||
<div class="search-item-option">
|
||||
<el-radio-group class="mr0-radio"
|
||||
v-model="pageForm.regionalNature">
|
||||
<el-radio-button :label="item.value"
|
||||
border v-for="item in regionalNatureList">
|
||||
{{item.label}}
|
||||
</el-radio-button>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">时间标段：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select @change="doSearch" clearable filterable
|
||||
style="width: 100%"
|
||||
v-model="pageForm.lotId">
|
||||
<el-option :key="item.id"
|
||||
:label="item.lotName"
|
||||
:value="item.id"
|
||||
v-for="item in lotList"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="search-query">
|
||||
<el-button @click="doSearch" icon="el-icon-search" type="primary">搜索</el-button>
|
||||
</div>
|
||||
@@ -119,9 +147,12 @@ layout("/layouts/platform.html"){
|
||||
</el-switch>
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop==='signUpUserAndFamilyNum'">
|
||||
<span class="text-primary">
|
||||
<span class="text-primary" v-if="configData.familyInfo == 2">
|
||||
{{row.signUpUserNum + row.signUpUserFamilyNum}}
|
||||
</span>
|
||||
<span class="text-primary" v-else>
|
||||
{{row.signUpUserNum + row.familyNumber}}
|
||||
</span>
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop==='playTime'">
|
||||
<template v-if="row.playStartTime">{{row.playStartTime + '至' + row.playEndTime}}</template>
|
||||
@@ -131,7 +162,7 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<el-table-column label="操作" width="100px">
|
||||
<template scope="{row}">
|
||||
<el-button @click="openViewSignUpUsers(row.id,row.unionId)" size="mini" type="primary">调整
|
||||
<el-button @click="openViewSignUpUsers(row.usId,row.unionId)" size="mini" type="primary">调整
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -153,7 +184,7 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<el-table :row-class-name="getRowClassName" :cell-class-name="getColumnClassName"
|
||||
:data="schoolFreeSignUpUserList" ref="adjustTable">
|
||||
<el-table-column :selectable="(row)=>{return row.isNormal}" type="selection"></el-table-column>
|
||||
<el-table-column selectable="" type="selection"></el-table-column>
|
||||
<el-table-column label="序号" type="expand" width="150px">
|
||||
<template scope="{row}">
|
||||
<el-card class="companion_card" shadow="never">
|
||||
@@ -161,7 +192,7 @@ layout("/layouts/platform.html"){
|
||||
家属信息
|
||||
</h4>
|
||||
<el-table :data="row.companionList">
|
||||
<el-table-column label="工号" prop="loginName"></el-table-column>
|
||||
<el-table-column label="一卡通号" prop="loginName"></el-table-column>
|
||||
<el-table-column label="姓名" prop="userName"></el-table-column>
|
||||
<el-table-column label="性别" prop="sex"></el-table-column>
|
||||
<el-table-column label="关系" prop="relation"></el-table-column>
|
||||
@@ -171,16 +202,19 @@ layout("/layouts/platform.html"){
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="姓名" prop="userName"></el-table-column>
|
||||
<el-table-column label="工号" prop="loginName"></el-table-column>
|
||||
<el-table-column label="一卡通号" prop="loginName"></el-table-column>
|
||||
<el-table-column label="性别" prop="sex"></el-table-column>
|
||||
<el-table-column label="单位" prop="unitName" show-overflow-tooltip sortable></el-table-column>
|
||||
<el-table-column label="工会" prop="unionName" show-overflow-tooltip sortable></el-table-column>
|
||||
<el-table-column label="报名时间" prop="signingUptime"></el-table-column>
|
||||
<el-table-column label="家属人数" prop="companionCount">
|
||||
<template scope="{row}">
|
||||
<span class="text-primary">
|
||||
<span v-if="configData.familyInfo === 2" class="text-primary">
|
||||
{{row.companionCount}}
|
||||
</span>
|
||||
<span v-else class="text-primary">
|
||||
{{row.familyNumber}}
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否调整" prop="isNormal">
|
||||
@@ -218,6 +252,8 @@ layout("/layouts/platform.html"){
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
lotList: [],
|
||||
regionalNatureList: [],
|
||||
schoolFreeLineList: [],
|
||||
pageForm: {
|
||||
year: new Date().getFullYear().toString(),
|
||||
@@ -236,7 +272,7 @@ layout("/layouts/platform.html"){
|
||||
// {label: '组织形式', prop: 'signUpMode', sortable: true},
|
||||
{label: '创建模式', prop: 'createMode'},
|
||||
// {label: '报名模式', prop: 'signUpMode'},
|
||||
{label: '最少成团人数', prop: 'minimumGroupSize'},
|
||||
{label: '最少参与教工', prop: 'minimumGroupSize'},
|
||||
{label: '报名人数（含家属）', prop: 'signUpUserAndFamilyNum', width: '150px'},
|
||||
{label: '是否启用', prop: 'isDisabled', sortable: true}
|
||||
|
||||
@@ -244,11 +280,15 @@ layout("/layouts/platform.html"){
|
||||
schoolFreeSignUpUserList: [],
|
||||
currentLineId: null,
|
||||
currentLineSelectUnionId: null,
|
||||
unionOptions: []
|
||||
|
||||
unionOptions: [],
|
||||
configData: {},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
async getLotList() {
|
||||
const {data} = await $.post('/platform/theRapyRecuperation/TheRapyConfig/findOne')
|
||||
this.lotList = data.lots
|
||||
},
|
||||
getRowClassName({row, rowIndex}) {
|
||||
if (row.companionCount === 0) {
|
||||
return 'row-expand-cover'
|
||||
@@ -332,20 +372,52 @@ layout("/layouts/platform.html"){
|
||||
})
|
||||
if (confirm !== 'confirm') return
|
||||
const lineId = this.currentLineId
|
||||
|
||||
const selection = this.$refs.adjustTable.selection
|
||||
const loginNames = selection.map(v => v.loginName)
|
||||
const loginNames = selection.filter(v=>v.isNormal === true).map(v => v.loginName)
|
||||
|
||||
if (loginNames.length == 0) {
|
||||
this.$message.warning('所有教职工已调整，请勿重复勾选')
|
||||
return
|
||||
}
|
||||
|
||||
const resp = await $.post(loc() + '/adjustmentUser', {lineId, loginNames: JSON.stringify(loginNames)})
|
||||
if (resp.code === 0) {
|
||||
this.notifySuccess(resp.msg)
|
||||
await this.openViewSignUpUsers(this.currentLineId, this.currentLineSelectUnionId)
|
||||
await this.pageData();
|
||||
} else {
|
||||
this.notifyWarning(resp.msg)
|
||||
}
|
||||
},
|
||||
smsAlerts() {
|
||||
async smsAlerts() {
|
||||
if (this.$refs.adjustTable.selection.length === 0) {
|
||||
this.notifyWarning('请选择需要发送短信通知的人员')
|
||||
return
|
||||
}
|
||||
const confirm = await this.$confirm('此操作会向已调整的人员发送短信，您确定要发送短信提醒吗？', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
})
|
||||
if (confirm !== 'confirm') return
|
||||
|
||||
const lineId = this.currentLineId
|
||||
const selection = this.$refs.adjustTable.selection
|
||||
const loginNames = selection.filter(v=>v.isNormal === false).map(v => v.loginName)
|
||||
|
||||
if (loginNames.length == 0) {
|
||||
this.$message.warning('暂无已调整人员，请先进行人员调整')
|
||||
return
|
||||
}
|
||||
|
||||
const resp = await $.post( loc() + '/smsAlerts',{lineId:lineId,loginNames: JSON.stringify(loginNames)})
|
||||
if (resp.code === 0) {
|
||||
this.notifySuccess(resp.msg)
|
||||
await this.openViewSignUpUsers(this.currentLineId, this.currentLineSelectUnionId)
|
||||
await this.pageData();
|
||||
} else {
|
||||
this.notifyWarning(resp.msg)
|
||||
}
|
||||
},
|
||||
async lineStatusChange(id) {
|
||||
const resp = await $.post('/platform/theRapyRecuperation/line/openClosedLine/' + id)
|
||||
@@ -355,12 +427,19 @@ layout("/layouts/platform.html"){
|
||||
this.notifyWarning(resp.msg)
|
||||
}
|
||||
},
|
||||
async getConfigData() {
|
||||
const resp = await $.get('/platform/theRapyRecuperation/TheRapyConfig/findOne')
|
||||
this.configData = resp.data
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
await this.getConfigData()
|
||||
this.createModeList = await getEnumOptions('TheRapyRecuperationLineCreateMode')
|
||||
this.signUpModeList = await getEnumOptions('TheRapyRecuperationSignUpMode')
|
||||
this.regionalNatureList = await getEnumOptions('TheRapyRecuperationProvinceType')
|
||||
this.unionOptions = await getUnions(null)
|
||||
await this.findUnionSignUpModeLineList()
|
||||
this.lotList = this.getLotList()
|
||||
await this.pageData()
|
||||
}
|
||||
})
|
||||
|
||||
@@ -233,7 +233,7 @@ layout("/layouts/platform.html"){
|
||||
<el-card shadow="never">
|
||||
<el-table :data="clusterTableData">
|
||||
<el-table-column label="序号" type="index"></el-table-column>
|
||||
<el-table-column label="工号" prop="loginName"></el-table-column>
|
||||
<el-table-column label="一卡通号" prop="loginName"></el-table-column>
|
||||
<el-table-column label="姓名" prop="userName"></el-table-column>
|
||||
<el-table-column label="性别" prop="sex"></el-table-column>
|
||||
<el-table-column label="工会" prop="unionName"></el-table-column>
|
||||
@@ -265,7 +265,7 @@ layout("/layouts/platform.html"){
|
||||
ref="originalGroupMembersTable"
|
||||
v-show="batchMoveData.originalGroup && batchMoveData.originalGroup.members">
|
||||
<el-table-column type="selection"></el-table-column>
|
||||
<el-table-column label="工号" prop="loginName"></el-table-column>
|
||||
<el-table-column label="一卡通号" prop="loginName"></el-table-column>
|
||||
<el-table-column label="姓名" prop="userName"></el-table-column>
|
||||
<el-table-column label="性别" prop="sex"></el-table-column>
|
||||
<el-table-column label="工会" prop="unionName"></el-table-column>
|
||||
@@ -328,7 +328,7 @@ layout("/layouts/platform.html"){
|
||||
{label: '旅行社名称', prop: 'travelAgencyName', sortable: true},
|
||||
{label: '线路类型', prop: 'regionalNature', sortable: true},
|
||||
{label: '出行时间', prop: 'times', sortable: true},
|
||||
{label: '最少成团人数', prop: 'minimumGroupSize', sortable: true},
|
||||
{label: '最少参与教工', prop: 'minimumGroupSize', sortable: true},
|
||||
// {label: '创建工会', prop: 'createUnionName'},
|
||||
// {label: '创建人', prop: 'createUserName', sortable: true},
|
||||
// {label: '创建模式', prop: 'createMode'},
|
||||
|
||||
+413
-39
@@ -31,6 +31,7 @@ layout("/layouts/platform.html"){
|
||||
style="width: 100%"
|
||||
placeholder="选择年度"
|
||||
type="year"
|
||||
@change="doSearch"
|
||||
v-model="pageForm.year"
|
||||
value-format="yyyy">
|
||||
</el-date-picker>
|
||||
@@ -48,11 +49,26 @@ layout("/layouts/platform.html"){
|
||||
<el-option :key="item.id"
|
||||
:label="item.travelAgencyName"
|
||||
:value="item.id"
|
||||
v-for="item in travelAgencyOptions"></el-option>
|
||||
v-for="item in travelAgencyArray"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">线路类型：</div>
|
||||
<div class="search-item-option">
|
||||
<el-radio-group class="mr0-radio"
|
||||
@change="doSearch"
|
||||
:disabled = "pageForm.mode == 1"
|
||||
v-model="pageForm.regionalNature">
|
||||
<el-radio-button :label="item.value"
|
||||
border v-for="item in regionalNatureList">
|
||||
{{item.label}}
|
||||
</el-radio-button>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">线路名称：</div>
|
||||
<div class="search-item-option">
|
||||
@@ -98,10 +114,16 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
|
||||
<el-card class="mt10" shadow="never">
|
||||
<table-tool :app="this" label="线路列表">
|
||||
<table-tool :app="this" label="线路列表（温馨提示：如查询条件的年度为空时，已选择默认查询当年选择的线路）">
|
||||
<template #func>
|
||||
<el-radio-group @change="doSearch" size="medium" v-model="pageForm.selectStatus">
|
||||
<el-radio-button :label="0">全部</el-radio-button>
|
||||
|
||||
<el-button @click="showGiveTimes" type="primary"
|
||||
size="small" style="margin-right: 10px">
|
||||
一键统赋时间
|
||||
</el-button>
|
||||
|
||||
<el-radio-group @change="doSearch" size="small" v-model="pageForm.selectStatus">
|
||||
<!--<el-radio-button :label="0">全部</el-radio-button>-->
|
||||
<el-radio-button :label="1">已选择</el-radio-button>
|
||||
<el-radio-button :label="-1">可选择</el-radio-button>
|
||||
</el-radio-group>
|
||||
@@ -110,8 +132,11 @@ layout("/layouts/platform.html"){
|
||||
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
|
||||
ref="table"
|
||||
align="center"
|
||||
row-key="id"
|
||||
@selection-change="handleSelectionChange"
|
||||
header-align="center">
|
||||
<el-table-column type="selection"></el-table-column>
|
||||
<el-table-column type="selection" reserve-selection width="55px"
|
||||
:selectable="(row)=>{return row.isDisabled==true || !(row.usId==null || row.usId == '')}"></el-table-column>
|
||||
|
||||
<el-table-column :index="indexMethod" align="center" header-align="center" label="序号" type="index"
|
||||
width="80px"></el-table-column>
|
||||
@@ -123,6 +148,7 @@ layout("/layouts/platform.html"){
|
||||
header-align="center"
|
||||
:show-overflow-tooltip="column.prop!=='playTime'"
|
||||
:key="column.prop"
|
||||
v-if="pageForm.mode != 2 || (pageForm.mode == 2 && column.prop !== 'isOpen')"
|
||||
v-for="column in tableColumns"
|
||||
:width="column.width"
|
||||
>
|
||||
@@ -142,6 +168,9 @@ layout("/layouts/platform.html"){
|
||||
<template scope="{row:{createMode}}" v-else-if="column.prop==='createMode'">
|
||||
{{createModeName(createMode)}}
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop==='belongUnionName'">
|
||||
{{pageForm.mode == 2 && pageForm.selectStatus == 1 ? '校工会' : row.belongUnionName}}
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop==='playTime'">
|
||||
<template v-if="row.playTimes">
|
||||
<!--<el-tooltip placement="top">
|
||||
@@ -154,11 +183,14 @@ layout("/layouts/platform.html"){
|
||||
</el-tooltip>-->
|
||||
<el-tooltip placement="top">
|
||||
<div slot="content">
|
||||
<div v-for="(t,ti) in row.playTimes.split(',')" :key="t" :class="[ti==row.playTimes.split(',').length-1?'':'mb10']">
|
||||
<div v-for="(t,ti) in row.playTimes.split(',')" :key="t"
|
||||
:class="[ti==row.playTimes.split(',').length-1?'':'mb10']">
|
||||
{{t}}
|
||||
</div>
|
||||
</div>
|
||||
<div style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis">{{row.playTimes}}</div>
|
||||
<div style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis">
|
||||
{{row.playTimes}}
|
||||
</div>
|
||||
</el-tooltip>
|
||||
<!-- <div v-for="t in row.playTimes.split(',')" :key="t">
|
||||
{{t}}
|
||||
@@ -175,6 +207,20 @@ layout("/layouts/platform.html"){
|
||||
<span v-else>{{row.belongUnionName}}</span>
|
||||
</template>
|
||||
|
||||
<template scope="{row}" v-else-if="column.prop==='isOpen'">
|
||||
<template v-if="row.usId">
|
||||
<el-switch
|
||||
@change="doEditOpen(row)"
|
||||
v-model="row.isOpen"
|
||||
active-color="#13ce66"
|
||||
inactive-color="#ff4949">
|
||||
</el-switch>
|
||||
</template>
|
||||
<template v-else>
|
||||
<span>暂未选择</span>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="操作" width="100px">
|
||||
@@ -240,7 +286,11 @@ layout("/layouts/platform.html"){
|
||||
<el-row class="playPeriod">
|
||||
|
||||
<el-descriptions border :column="3" class="playPeriodTable">
|
||||
<el-descriptions-item label="报名开始时间">
|
||||
<el-descriptions-item>
|
||||
<template slot="label">
|
||||
<span class="text-danger">*</span>
|
||||
报名开始时间
|
||||
</template>
|
||||
<el-form-item :prop="'times.' + $index + '.signUpStartTime'"
|
||||
:rules="{required:true,message:'报名开始时间',trigger:['change','blur']}"
|
||||
label-width="0">
|
||||
@@ -251,19 +301,28 @@ layout("/layouts/platform.html"){
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="报名结束时间">
|
||||
<el-descriptions-item>
|
||||
<template slot="label">
|
||||
<span class="text-danger">*</span>
|
||||
报名结束时间
|
||||
</template>
|
||||
<el-form-item :prop="'times.' + $index + '.signUpEndTime'"
|
||||
:rules="{required:true,message:'报名结束时间',trigger:['change','blur']}"
|
||||
label-width="0">
|
||||
<el-date-picker style="width: 100%"
|
||||
type="datetime"
|
||||
@change="doSetChangeTimeByZjxu($index,row.signUpEndTime)"
|
||||
v-model="row.signUpEndTime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="变更截至时间">
|
||||
<el-descriptions-item>
|
||||
<template slot="label">
|
||||
<span class="text-danger">*</span>
|
||||
变更截至时间
|
||||
</template>
|
||||
<el-form-item :prop="'times.' + $index + '.changeEndTime'"
|
||||
:rules="{required:true,message:'变更截至时间',trigger:['change','blur']}"
|
||||
label-width="0">
|
||||
@@ -275,7 +334,11 @@ layout("/layouts/platform.html"){
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="出行开始时间">
|
||||
<el-descriptions-item>
|
||||
<template slot="label">
|
||||
<span class="text-danger">*</span>
|
||||
出行开始时间
|
||||
</template>
|
||||
<el-form-item :prop="'times.' + $index + '.playStartTime'"
|
||||
:rules="{required:true,message:'出行开始时间',trigger:['change','blur']}"
|
||||
label-width="0">
|
||||
@@ -287,7 +350,11 @@ layout("/layouts/platform.html"){
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="出行结束时间">
|
||||
<el-descriptions-item>
|
||||
<template slot="label">
|
||||
<span class="text-danger">*</span>
|
||||
出行结束时间
|
||||
</template>
|
||||
<el-form-item :prop="'times.' + $index + '.playEndTime'"
|
||||
:rules="{required:true,message:'出行结束时间',trigger:['change','blur']}"
|
||||
label-width="0">
|
||||
@@ -298,7 +365,29 @@ layout("/layouts/platform.html"){
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="联系人">
|
||||
<el-descriptions-item>
|
||||
<template slot="label">
|
||||
<span class="text-danger">*</span>
|
||||
旅行社
|
||||
</template>
|
||||
<el-form-item :prop="'times.' + $index + '.travelAgencyId'"
|
||||
:rules="{required:true,message:'联系人',trigger:['change','blur']}"
|
||||
label-width="0">
|
||||
<el-select v-model="row.travelAgencyId" style="width: 100%" clearable filterable
|
||||
placeholder="请选择旅行社" @change="(val) => {selectTravelChange(val, row)}">
|
||||
<el-option :key="item.id"
|
||||
:label="item.travelAgencyName+'('+ item.year +'年)'"
|
||||
:value="item.id"
|
||||
v-for="item in travelAgencyList"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<template slot="label">
|
||||
<span class="text-danger">*</span>
|
||||
联系人
|
||||
</template>
|
||||
<el-form-item :prop="'times.' + $index + '.contact'"
|
||||
:rules="{required:true,message:'联系人',trigger:['change','blur']}"
|
||||
label-width="0">
|
||||
@@ -306,7 +395,11 @@ layout("/layouts/platform.html"){
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="联系方式">
|
||||
<el-descriptions-item>
|
||||
<template slot="label">
|
||||
<span class="text-danger">*</span>
|
||||
联系方式
|
||||
</template>
|
||||
<el-form-item :prop="'times.' + $index + '.contactPhone'"
|
||||
:rules="[
|
||||
{ required: true, message: '手机号码不能为空', trigger: 'blur' },
|
||||
@@ -317,16 +410,16 @@ layout("/layouts/platform.html"){
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="最少成团人数">
|
||||
<!--<el-descriptions-item label="最少参与教工">
|
||||
<el-form-item :prop="'times.' + $index + '.minimumGroupSize'"
|
||||
:rules="[
|
||||
{ required: true, message: '最少成团人数不能为空', trigger: 'blur' },
|
||||
{ pattern: /^[0-9]*$/, message: '最少成团人数格式不正确', trigger: 'blur' }
|
||||
{ required: true, message: '最少参与教工不能为空', trigger: 'blur' },
|
||||
{ pattern: /^[0-9]*$/, message: '最少参与教工格式不正确', trigger: 'blur' }
|
||||
]"
|
||||
label-width="0">
|
||||
<el-input clearable v-model="row.minimumGroupSize"></el-input>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions-item>-->
|
||||
|
||||
<el-descriptions-item label="交通工具">
|
||||
<el-form-item :prop="'times.' + $index + '.trafficTools'"
|
||||
@@ -345,11 +438,11 @@ layout("/layouts/platform.html"){
|
||||
</el-descriptions-item>
|
||||
|
||||
|
||||
<el-descriptions-item label="预计人数（含家属）">
|
||||
<el-descriptions-item label="最少成团人数(包括家属)">
|
||||
<el-form-item :prop="'times.' + $index + '.estimatedFamilyNumbers'"
|
||||
:rules="[
|
||||
{ required: false, message: '预计人数（含家属）不能为空', trigger: 'blur' },
|
||||
{ pattern: /^[0-9]*$/, message: '预计人数（含家属）格式不正确', trigger: 'blur' }
|
||||
{ required: false, message: '最少成团人数不能为空', trigger: 'blur' },
|
||||
{ pattern: /^[0-9]*$/, message: '最少成团人数格式不正确', trigger: 'blur' }
|
||||
]"
|
||||
label-width="0">
|
||||
<el-input clearable v-model="row.estimatedFamilyNumbers"></el-input>
|
||||
@@ -376,7 +469,7 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<div class="text-right">
|
||||
<el-button
|
||||
@click="formData.times.push({enable:true,minimumGroupSize:lineConfig.groupNumber,estimatedCost:lineConfig.cost})"
|
||||
@click="formData.times.push({enable:true,minimumGroupSize:lineConfig.groupNumber,estimatedCost:lineConfig.cost, estimatedFamilyNumbers: lineConfig.outsideQuota})"
|
||||
size="mini" type="primary">新增出行时间
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -422,6 +515,11 @@ layout("/layouts/platform.html"){
|
||||
<el-descriptions-item label="出行结束时间">
|
||||
{{row.playEndTime}}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="旅行社">
|
||||
{{row.travelAgencyName}}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="联系人">
|
||||
{{row.contact}}
|
||||
</el-descriptions-item>
|
||||
@@ -430,9 +528,9 @@ layout("/layouts/platform.html"){
|
||||
{{row.contactPhone}}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="最少成团人数">
|
||||
<!--<el-descriptions-item label="最少参与教工">
|
||||
{{row.minimumGroupSize}}
|
||||
</el-descriptions-item>
|
||||
</el-descriptions-item>-->
|
||||
|
||||
<el-descriptions-item label="交通工具">
|
||||
{{row.trafficTools}}
|
||||
@@ -442,7 +540,7 @@ layout("/layouts/platform.html"){
|
||||
{{row.estimatedCost}}
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="预计人数（含家属）">
|
||||
<el-descriptions-item label="成团人数包括家属">
|
||||
{{row.estimatedFamilyNumbers}}
|
||||
</el-descriptions-item>
|
||||
|
||||
@@ -467,6 +565,103 @@ layout("/layouts/platform.html"){
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :close-on-click-modal="false" :visible.sync="setGiveLineTimeDialog" title="统赋出行时间段信息"
|
||||
width="80%">
|
||||
<el-form :model="giveLineTimesData" :rules="giveLineTimesRules" label-width="0" ref="giveLineTimesForm"
|
||||
size="small">
|
||||
<div v-for="(row,$index) in giveLineTimesData.times" :key="row.id" class="panel panel-default mt20"
|
||||
style="border: none">
|
||||
<div class="panel-heading"
|
||||
style="background: #fafafa;border:1px solid #ebeef5;border-bottom: none;display: flex;align-items: center;justify-content: space-between">
|
||||
<h3 class="panel-title">
|
||||
出行时间段
|
||||
</h3>
|
||||
</div>
|
||||
<el-row class="playPeriod">
|
||||
<el-descriptions border :column="3" class="playPeriodTable">
|
||||
<el-descriptions-item label="报名开始时间">
|
||||
<el-form-item :prop="'times.' + $index + '.signUpStartTime'"
|
||||
:rules="{required:false,message:'报名开始时间',trigger:['change','blur']}"
|
||||
label-width="0">
|
||||
<el-date-picker style="width: 100%"
|
||||
type="datetime"
|
||||
v-model="row.signUpStartTime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="报名结束时间">
|
||||
<el-form-item :prop="'times.' + $index + '.signUpEndTime'"
|
||||
:rules="{required:false,message:'报名结束时间',trigger:['change','blur']}"
|
||||
label-width="0">
|
||||
<el-date-picker style="width: 100%"
|
||||
type="datetime"
|
||||
v-model="row.signUpEndTime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="变更截至时间">
|
||||
<el-form-item :prop="'times.' + $index + '.changeEndTime'"
|
||||
:rules="{required:false,message:'变更截至时间',trigger:['change','blur']}"
|
||||
label-width="0">
|
||||
<el-date-picker style="width: 100%"
|
||||
type="datetime"
|
||||
v-model="row.changeEndTime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="出行开始时间">
|
||||
<el-form-item :prop="'times.' + $index + '.playStartTime'"
|
||||
:rules="{required:false,message:'出行开始时间',trigger:['change','blur']}"
|
||||
label-width="0">
|
||||
<el-date-picker style="width: 100%"
|
||||
type="datetime"
|
||||
v-model="row.playStartTime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="出行结束时间">
|
||||
<el-form-item :prop="'times.' + $index + '.playEndTime'"
|
||||
:rules="{required:false,message:'出行结束时间',trigger:['change','blur']}"
|
||||
label-width="0">
|
||||
<el-date-picker style="width: 100%"
|
||||
type="datetime"
|
||||
v-model="row.playEndTime"
|
||||
value-format="yyyy-MM-dd HH:mm:ss">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="是否开启">
|
||||
<el-form-item :prop="'times.' + $index + '.enable'"
|
||||
label-width="0">
|
||||
<el-switch
|
||||
v-model="row.enable"
|
||||
:active-value="true"
|
||||
:inactive-value="false"
|
||||
active-color="#13ce66"
|
||||
inactive-color="#ff4949">
|
||||
</el-switch>
|
||||
</el-form-item>
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</el-row>
|
||||
</div>
|
||||
<el-alert closable show-icon style="margin:10px 0"
|
||||
title="温馨提醒:变更时间应该大于报名截至时间，小于出行时间。"
|
||||
type="warning"></el-alert>
|
||||
</el-form>
|
||||
<el-row justify="end" type="flex">
|
||||
<el-button @click="setGiveLineTimeDialog=false">取消</el-button>
|
||||
<el-button @click="doSetGiveLineTimes" type="primary">提交</el-button>
|
||||
</el-row>
|
||||
</el-dialog>
|
||||
</guava>
|
||||
</div>
|
||||
|
||||
@@ -517,20 +712,61 @@ layout("/layouts/platform.html"){
|
||||
callback()
|
||||
}
|
||||
|
||||
//统赋时间
|
||||
const validateGiveSignUpEndTime = (rule, value, callback) => {
|
||||
console.log(value)
|
||||
if (!value) {
|
||||
callback(new Error('请选择报名截至时间'))
|
||||
}
|
||||
if (this.giveLineTimesData.signUpStartTime) {
|
||||
if (Date.parse(value) <= Date.parse(this.giveLineTimesData.signUpStartTime)) {
|
||||
callback(new Error('报名截至时间必须大于报名开始时间'))
|
||||
}
|
||||
}
|
||||
callback()
|
||||
}
|
||||
|
||||
const validateGiveChangeEndTime = (rule, value, callback) => {
|
||||
if (!value) {
|
||||
callback(new Error('请选择变更截至时间'))
|
||||
}
|
||||
if (this.giveLineTimesData.signUpEndTime) {
|
||||
if (Date.parse(value) <= Date.parse(this.giveLineTimesData.signUpEndTime)) {
|
||||
callback(new Error('变更截至时间必须大于报名截至时间'))
|
||||
}
|
||||
}
|
||||
callback()
|
||||
}
|
||||
|
||||
const validateGivePlayEndTime = (rule, value, callback) => {
|
||||
if (!value) {
|
||||
callback(new Error('请选择出行结束时间'))
|
||||
}
|
||||
if (this.giveLineTimesData.playStartTime) {
|
||||
if (Date.parse(value) <= Date.parse(this.giveLineTimesData.playStartTime)) {
|
||||
callback(new Error('出行结束时间必须大于出行开始时间'))
|
||||
}
|
||||
}
|
||||
callback()
|
||||
}
|
||||
|
||||
return {
|
||||
travelAgencyArray: [],
|
||||
travelAgencyList: [],
|
||||
tableColumns: [
|
||||
{label: '年度', prop: 'year', sortable: true},
|
||||
// {label: '年度', prop: 'year', sortable: true},
|
||||
{label: '线路名称', prop: 'lineName', sortable: true},
|
||||
{label: '线路类型', prop: 'regionalNature', sortable: true},
|
||||
{label: '时间标段', prop: 'lotName', sortable: true, sortProp: 'lotValue'},
|
||||
{label: '出行时间', prop: 'playTime', sortable: true, sortProp: 'playStartTime', width: 230},
|
||||
{label: '承担旅行社', prop: 'travelAgencyName', sortable: true},
|
||||
{label: '出行时间', prop: 'playTime', sortable: 'custom', sortProp: 'playStartTime', width: 230},
|
||||
//{label: '承担旅行社', prop: 'travelAgencyName', sortable: true},
|
||||
// {label: '所属分工会', prop: 'belongUnionName', sortable: true},
|
||||
{label: '组织形式', prop: 'signUpMode', sortable: true},
|
||||
// {label: '编号', prop: 'serialNumber', sortable: true},
|
||||
// {label: '创建模式', prop: 'createMode', sortable: true},
|
||||
//{label: '创建人', prop: 'createUserName', sortable: true},
|
||||
{label: '创建工会', prop: 'createUnionName', sortable: true},
|
||||
{label: '选择工会', prop: 'belongUnionName', sortable: true},
|
||||
{label: '是否开放对外报名', prop: 'isOpen', sortable: true},
|
||||
// {label: '是否启用', prop: 'isDisabled', sortable: true}
|
||||
],
|
||||
rules: {
|
||||
@@ -557,9 +793,9 @@ layout("/layouts/platform.html"){
|
||||
},
|
||||
pageForm: {
|
||||
keywords: null,
|
||||
year: new Date().getFullYear().toString(),
|
||||
selectStatus: -1,
|
||||
unionId: null
|
||||
unionId: null,
|
||||
regionalNature: '省内'
|
||||
},
|
||||
createModeList: [],
|
||||
signUpModeList: [],
|
||||
@@ -572,11 +808,66 @@ layout("/layouts/platform.html"){
|
||||
lineConfig: {
|
||||
groupNumber: null,
|
||||
cost: null
|
||||
}
|
||||
},
|
||||
regionalNatureList: [{label:'全部线路',name:'provinceAll',ordinal:0,provinceIn:'provinceIn',provinceOut:'provinceOut',value:'全部'}],
|
||||
|
||||
multipleSelection: [],
|
||||
giveLineTimesData: {
|
||||
times: []
|
||||
},
|
||||
giveLineTimesRules: {
|
||||
signUpStartTime: [{required: false, message: '请选择报名开始时间', trigger: ['change', 'blur']}],
|
||||
signUpEndTime: [{
|
||||
required: false,
|
||||
validator: validateGiveSignUpEndTime,
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
changeEndTime: [{
|
||||
required: false,
|
||||
validator: validateGiveChangeEndTime,
|
||||
trigger: ['change', 'blur']
|
||||
}],
|
||||
playStartTime: [{required: false, message: '请选择出行开始时间', trigger: ['change', 'blur']}],
|
||||
playEndTime: [{required: false, validator: validateGivePlayEndTime, trigger: ['change', 'blur']}],
|
||||
},
|
||||
setGiveLineTimeDialog: false,
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
computed: {},
|
||||
computed: {
|
||||
computedChangeEndTime() {
|
||||
return this.formData.times.map(row => ({
|
||||
...row,
|
||||
changeEndTime: row.signUpEndTime,
|
||||
}));
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
doSearch() {
|
||||
this.tableData = []
|
||||
this.tableKey = new Date().getTime()
|
||||
this.pageForm.pageNumber = 1
|
||||
this.pageData()
|
||||
},
|
||||
selectTravelChange(val, row) {
|
||||
const o = this.travelAgencyList.find(o => o.id === val)
|
||||
console.log(o)
|
||||
row.contact = o.contact
|
||||
row.contactPhone = o.contactMobileNumber
|
||||
},
|
||||
pageOrder(column) {
|
||||
if(column.prop === 'playTime') {
|
||||
this.pageForm.pageOrderName = 'playStartTime'
|
||||
} else {
|
||||
this.pageForm.pageOrderName = column.prop;
|
||||
}
|
||||
this.pageForm.pageOrderBy = column.order;
|
||||
this.pageData();
|
||||
},
|
||||
doSetChangeTimeByZjxu(index, value){
|
||||
this.$set(this.formData.times[index], "changeEndTime", value)
|
||||
},
|
||||
async openViewLineInfo({id, usUnionId}) {
|
||||
this.$refs.guava.view()
|
||||
this.$refs.viewLineInfo.openView(id, usUnionId)
|
||||
@@ -585,7 +876,8 @@ layout("/layouts/platform.html"){
|
||||
const resp = await $.post(loc() + '/selectLineInfo', {
|
||||
lineId: id,
|
||||
unionId: usUnionId,
|
||||
mode: GetQueryString('mode')
|
||||
mode: GetQueryString('mode'),
|
||||
year: this.pageForm.year
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.timeLots = resp.data
|
||||
@@ -601,13 +893,22 @@ layout("/layouts/platform.html"){
|
||||
const resp = await $.post(loc() + '/selectLineInfo', {
|
||||
lineId: id,
|
||||
unionId: usUnionId,
|
||||
mode: GetQueryString('mode')
|
||||
mode: GetQueryString('mode'),
|
||||
year: this.pageForm.year
|
||||
})
|
||||
if (resp.code === 0 && resp.data) {
|
||||
this.$set(this.formData, 'times', resp.data)
|
||||
this.formData = {
|
||||
times:[]
|
||||
}
|
||||
if(resp.data && resp.data.length > 0){
|
||||
this.$set(this.formData, 'times', resp.data)
|
||||
}else{
|
||||
this.formData.times.push({enable:true,minimumGroupSize:this.lineConfig.groupNumber,estimatedCost:this.lineConfig.cost, estimatedFamilyNumbers: this.lineConfig.outsideQuota})
|
||||
}
|
||||
this.formData.lineId = id
|
||||
this.formData.signUpMode = signUpMode
|
||||
this.$set(this.formData, 'lineName', lineName)
|
||||
|
||||
this.setLineTimeDialog = true
|
||||
} else {
|
||||
this.notifyWarning(resp.msg)
|
||||
@@ -669,7 +970,7 @@ layout("/layouts/platform.html"){
|
||||
},
|
||||
async getTravelAgencyOptions() {
|
||||
const {data} = await $.get(loc() + '/getTravelAgencyOptions')
|
||||
this.travelAgencyOptions = data
|
||||
this.travelAgencyArray = data
|
||||
},
|
||||
async getLotList() {
|
||||
const {data} = await $.post('/platform/theRapyRecuperation/TheRapyConfig/findOne')
|
||||
@@ -678,15 +979,88 @@ layout("/layouts/platform.html"){
|
||||
async getLineConfig(lineId) {
|
||||
const {data} = await $.post(loc() + '/getLineConfig/' + lineId)
|
||||
this.lineConfig = data
|
||||
},
|
||||
handleSelectionChange(val) {
|
||||
this.multipleSelection = val;
|
||||
},
|
||||
async selectTravelAgencyList() {
|
||||
const resp = await $.post('/platform/theRapyRecuperation/travelAgency/selectTravelAgency', {year: new Date().getFullYear()})
|
||||
this.travelAgencyList = resp.data
|
||||
},
|
||||
showGiveTimes() {
|
||||
if (!this.multipleSelection || this.multipleSelection.length == 0) {
|
||||
this.$message.warning('请在线路列表中勾选您想要统赋时间的线路！');
|
||||
return
|
||||
}
|
||||
this.giveLineTimesData = {
|
||||
times: [{
|
||||
signUpStartTime: '',
|
||||
signUpEndTime: '',
|
||||
changeEndTime: '',
|
||||
playStartTime: '',
|
||||
playEndTime: '',
|
||||
}]
|
||||
}
|
||||
this.setGiveLineTimeDialog = true;
|
||||
},
|
||||
async doSetGiveLineTimes() {
|
||||
const valid = await this.$refs['giveLineTimesForm'].validate()
|
||||
if (!valid) return
|
||||
|
||||
const confirm = await this.$confirm('请再次确认，是否为选择线路统赋时间?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
})
|
||||
if (confirm !== 'confirm') return
|
||||
|
||||
const lineIds = this.multipleSelection.map(v => v.usId)
|
||||
|
||||
const fmtData = this.giveLineTimesData.times.map(v => {
|
||||
return {
|
||||
...v,
|
||||
signUpMode: this.formData.signUpMode,
|
||||
mode: GetQueryString('mode')
|
||||
}
|
||||
})
|
||||
|
||||
const resp = await $.post(loc() + '/setGiveLineTimes', {
|
||||
lineIds: JSON.stringify(lineIds),
|
||||
lineUnionSelects: JSON.stringify(fmtData)
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.setGiveLineTimeDialog = false
|
||||
this.pageData()
|
||||
this.$message.success(resp.msg)
|
||||
this.$refs.table.clearSelection()
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
},
|
||||
async doEditOpen(row){
|
||||
console.log(row)
|
||||
const resp = await $.get(loc() + '/doEditOpen',{id:row.usId})
|
||||
if (resp.code === 0){
|
||||
this.$message.success(resp.msg)
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
this.pageData()
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
this.$set(this.pageForm, 'mode', GetQueryString('mode'))
|
||||
if(this.pageForm.mode == 2) {
|
||||
this.$set(this.pageForm, 'regionalNature', '全部')
|
||||
}
|
||||
this.pageData()
|
||||
this.createModeList = await getEnumOptions('TheRapyRecuperationLineCreateMode')
|
||||
this.signUpModeList = await getEnumOptions('TheRapyRecuperationSignUpMode')
|
||||
this.regionalNatureList.push(...await getEnumOptions('TheRapyRecuperationProvinceType'))
|
||||
// const result = await getEnumOptions('TheRapyRecuperationProvinceType')
|
||||
this.unionOptions = await getUnions(null)
|
||||
this.travelAgencyOptions = this.getTravelAgencyOptions()
|
||||
this.travelAgencyOptions = this.selectTravelAgencyList()
|
||||
await this.getTravelAgencyOptions()
|
||||
this.lotList = this.getLotList()
|
||||
}
|
||||
})
|
||||
@@ -695,4 +1069,4 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<!--#
|
||||
}
|
||||
#-->
|
||||
#-->
|
||||
|
||||
@@ -0,0 +1,505 @@
|
||||
<!--#
|
||||
layout("/layouts/platform.html"){
|
||||
#-->
|
||||
<style>
|
||||
.query-row {
|
||||
height: 70px;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.query-row .el-col {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.query-row:not(:last-child) {
|
||||
border-bottom: 1px dashed rgb(230, 230, 230);
|
||||
}
|
||||
|
||||
.query-row-title {
|
||||
width: 120px;
|
||||
}
|
||||
|
||||
.el-table-container {
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
<div id="app" v-cloak>
|
||||
<guava ref="guava">
|
||||
<template>
|
||||
<el-card shadow="never">
|
||||
<el-row align="middle" class="query-row" type="flex">
|
||||
<el-col class="query-row-title"></el-col>
|
||||
<el-col class="query-row-content">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<span>年  度：</span>
|
||||
<el-date-picker
|
||||
:clearable="false"
|
||||
v-model="pageForm.startYear"
|
||||
type="year"
|
||||
value-format="yyyy"
|
||||
placeholder="选择年"
|
||||
style="width: 38%" @change="getUnionSelectLine(); doSearch()">
|
||||
</el-date-picker>
|
||||
<span>至</span>
|
||||
<el-date-picker
|
||||
:clearable="false"
|
||||
v-model="pageForm.endYear"
|
||||
type="year"
|
||||
value-format="yyyy"
|
||||
placeholder="选择年"
|
||||
style="width: 38%" @change="doSearch">
|
||||
</el-date-picker>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<span>所属工会：</span>
|
||||
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会"
|
||||
@change="doSearch()"
|
||||
filterable clearable style="width: 80%">
|
||||
<el-option
|
||||
v-for="item in unions"
|
||||
:key="item.id"
|
||||
:label="item.unionname"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
<el-row align="middle" class="query-row" type="flex">
|
||||
<el-col class="query-row-title"></el-col>
|
||||
<el-col class="query-row-content">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<span>路线类型：</span>
|
||||
<el-select v-model="pageForm.regionalNature" filterable
|
||||
placeholder="请选择线路"
|
||||
style="width: 80%"
|
||||
@change="lineTypeChange">
|
||||
<el-option label="全部" value=""></el-option>
|
||||
<el-option label="省内" value="省内"></el-option>
|
||||
<el-option label="省外" value="省外"></el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<span>线  路：</span>
|
||||
<el-select v-model="pageForm.takePartInLineId" filterable clearable
|
||||
placeholder="请选择线路"
|
||||
style="width: 80%" @change="lineChange">
|
||||
<el-option v-for="item in lineList"
|
||||
:key="item.id"
|
||||
:label="item.lineName + '-' + item.regionalNature + '【' + item.lotName + '】' + '（' + item.signUpMode + '）'"
|
||||
:value="item.lineId">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
<el-row align="middle" class="query-row" type="flex">
|
||||
<el-col class="query-row-title"></el-col>
|
||||
<el-col class="query-row-content">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<span>标  段：</span>
|
||||
<el-select v-model="pageForm.lotId" filterable clearable
|
||||
placeholder="请选择标段"
|
||||
style="width: 80%" @change="doSearch()">
|
||||
<el-option v-for="item in modifyConfig.lots"
|
||||
:key="item.id"
|
||||
:label="item.lotName"
|
||||
:value="item.id">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<span>出行时间：</span>
|
||||
<el-select v-model="pageForm.selectId" filterable clearable
|
||||
placeholder="请选择出行时间"
|
||||
style="width: 80%" @change="playChange">
|
||||
<el-option v-for="item in linePlayTimes"
|
||||
:key="item.times"
|
||||
:label="item.times"
|
||||
:value="item.selectId">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
|
||||
|
||||
<el-card shadow="never" class="mt10">
|
||||
<table-tool label="" :app="this" ref="table_tool">
|
||||
<template #func>
|
||||
<el-button icon="el-icon-s-promotion" size="small" type="primary"
|
||||
@click="doExport"
|
||||
class="mr10">导出成团线路人员
|
||||
</el-button>
|
||||
</template>
|
||||
</table-tool>
|
||||
<el-table :data="tableData" style="width: 100%"
|
||||
ref="table"
|
||||
row-key="id" @sort-change="pageOrder"
|
||||
v-loading="tableLoading">
|
||||
<el-table-column align="center" header-align="center" type="index" label="序号"
|
||||
width="80px" key="#index">
|
||||
<template scope="scope">
|
||||
<span>{{scope.$index+(pageForm.pageNumber - 1) * pageForm.pageSize + 1}} </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
header-align="center"
|
||||
v-for="column in tableColumns"
|
||||
show-overflow-tooltip
|
||||
:label="column.label"
|
||||
:prop="column.prop"
|
||||
:width="column.width"
|
||||
:sortable="column.sortable"
|
||||
>
|
||||
<template scope="{row}" v-if="column.prop=='lineName'">
|
||||
<el-link type="primary" @click="openLine(row)">{{row.lineName}}
|
||||
</el-link>
|
||||
</template>
|
||||
<template scope="{row}" v-if="column.prop=='signUpMode'">
|
||||
<span>{{row.signUpMode == '1' ? '校工会组织' : '分工会组织'}}</span>
|
||||
</template>
|
||||
<template scope="{row}" v-else-if="column.prop=='lineNum'">
|
||||
<el-link v-if="!row.familyNumber" type="primary" @click="openUserData(row)">
|
||||
{{row.lineNum + row.signUpUserFamilyNum}}（{{row.signUpUserFamilyNum}}）
|
||||
</el-link>
|
||||
<el-link v-else type="primary">
|
||||
{{row.lineNum + row.familyNumber}}（{{row.familyNumber}}）
|
||||
</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="380px">
|
||||
<template scope="{row}">
|
||||
<template>
|
||||
<el-button @click="openUserData(row)" size="mini" type="primary">
|
||||
查看人员
|
||||
</el-button>
|
||||
<el-button size="mini" type="primary" @click="sendSuccess(row)">
|
||||
发送成团通知
|
||||
</el-button>
|
||||
|
||||
<el-dropdown class="ml10 mr10" trigger="click">
|
||||
<el-button size="mini" type="primary">
|
||||
发送未成团通知<i class="el-icon-arrow-down el-icon--right"></i>
|
||||
</el-button>
|
||||
<el-dropdown-menu slot="dropdown">
|
||||
<el-dropdown-item @click.native="sendFail(row, true)">保留报名记录</el-dropdown-item>
|
||||
<el-dropdown-item @click.native="sendFail(row, false)">删除报名记录</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</el-dropdown>
|
||||
</template>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<!--#include("/layouts/pagination.html"){}#-->
|
||||
</el-card>
|
||||
</template>
|
||||
|
||||
<template #public>
|
||||
<line-info ref="viewLineInfo"></line-info>
|
||||
</template>
|
||||
|
||||
<template #edit>
|
||||
<el-card shadow="never">
|
||||
<div class="search">
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">工号姓名</div>
|
||||
<div class="search-item-option">
|
||||
<el-input v-model="userPageForm.searchKeyword" maxlength="10" clearable></el-input>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="search-item"
|
||||
v-if="${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('SchoolUnionMemberAdmin')}">
|
||||
<div class="search-item-label">所属工会：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select @change="flushUnits" @clear="flushUnits" clearable="true"
|
||||
filterable="true"
|
||||
placeholder="所属工会" style="width: 100%;"
|
||||
v-model="userPageForm.unionId">
|
||||
<el-option :label="item.unionname" :value="item.id" v-for="item in unions"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="search-item">
|
||||
<div class="search-item-label">所属单位：</div>
|
||||
<div class="search-item-option">
|
||||
<el-select clearable="true" filterable="true" placeholder="所属单位"
|
||||
style="width: 100%;"
|
||||
v-model="userPageForm.unitId">
|
||||
<el-option :label="item.name" :value="item.id" v-for="item in units"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="search-query">
|
||||
<el-button @click="getUserDataByLineId" icon="el-icon-search" type="primary">搜索</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
|
||||
<el-card shadow="never" class="mt10">
|
||||
<el-table :data="userData">
|
||||
<el-table-column
|
||||
align="center"
|
||||
header-align="center"
|
||||
v-for="column in userDataTableColumns"
|
||||
show-overflow-tooltip
|
||||
:label="column.label"
|
||||
:prop="column.prop"
|
||||
:sortable="column.sortable"
|
||||
>
|
||||
<template scope="{row}" v-if="column.prop=='isFamily'">
|
||||
<el-link v-if="!row.familyNumber" type="primary">
|
||||
{{row.isFamily?'携带':'未携带'}}（{{row.isFamily}}）
|
||||
</el-link>
|
||||
<el-link v-else type="primary">
|
||||
{{row.familyNumber?'携带':'未携带'}}（{{row.familyNumber}}）
|
||||
</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-row class="el-pagination-container" style="margin-bottom: 0px">
|
||||
<el-pagination
|
||||
@size-change="userPageSizeChange"
|
||||
@current-change="userPageNumberChange"
|
||||
:current-page="userPageForm.pageNumber"
|
||||
:page-sizes="[5,10, 20, 30, 50]"
|
||||
:page-size="userPageForm.pageSize"
|
||||
layout="total, sizes, prev, pager, next"
|
||||
:total="userPageForm.totalCount">
|
||||
</el-pagination>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</template>
|
||||
</guava>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
const vue = new Vue({
|
||||
el: '#app',
|
||||
mixins: [initTableMixins],
|
||||
data() {
|
||||
return {
|
||||
pageForm: {
|
||||
startYear: moment().format('YYYY'),
|
||||
endYear: moment().format('YYYY'),
|
||||
unionId: '',
|
||||
regionalNature: '',
|
||||
signUpMode: '',
|
||||
lotId: '',
|
||||
takePartInLineId: '',
|
||||
selectId: '',
|
||||
},
|
||||
linePlayTimes: [],
|
||||
tableColumns: [
|
||||
{prop: 'year', label: '年度', width: 60},
|
||||
{prop: 'lineName', label: '线路名称', sortable: true, width: 200},
|
||||
{prop: 'linePlayTime', label: '出行时间', width: 180},
|
||||
{prop: 'travelAgencyName', label: '承担旅行社', sortable: true, width: 180},
|
||||
{prop: 'unionname', label: '选择线路工会', sortable: true},
|
||||
{prop: 'regionalNature', label: '线路类型', sortable: true},
|
||||
{prop: 'contact', label: '联系人', sortable: true, checked: 0},
|
||||
{prop: 'contactMobileNumber', label: '联系方式', checked: 0},
|
||||
{prop: 'estimatedFamilyNumbers', label: '最少成团人数', width: 80},
|
||||
{prop: 'lineNum', label: '报名人数（家属）'},
|
||||
],
|
||||
|
||||
modifyConfig: {},
|
||||
lineList: [],
|
||||
unions: [],
|
||||
units:[],
|
||||
signUpModeOptions: [
|
||||
{label: '校工会组织', value: 2},
|
||||
{label: '分工会组织', value: 1},
|
||||
],
|
||||
|
||||
userPageForm:{
|
||||
pageNumber:1,
|
||||
pageSize: 10
|
||||
},
|
||||
userData:[],
|
||||
userDataTableColumns:[
|
||||
{prop: 'loginName', label: '工号'},
|
||||
{prop: 'userName', label: '姓名'},
|
||||
{prop: 'unionName', label: '所属工会'},
|
||||
{prop: 'unitName', label: '所属单位', sortable: true},
|
||||
{prop: 'isFamily', label: '是否携带家属'},
|
||||
{prop: 'linePlayTime', label: '出行时间', sortable: true}
|
||||
],
|
||||
|
||||
lineUId: '',
|
||||
selectLine: {
|
||||
lineName: '全部'
|
||||
},
|
||||
takePartInLines: [],
|
||||
}
|
||||
},
|
||||
components: {
|
||||
'enroll-info': httpVueLoader('/components/theRapyRecuperation/Enrollinfo.vue?v=1.0.1'),
|
||||
'line-info': httpVueLoader('/components/theRapyRecuperation/LineInfo.vue')
|
||||
},
|
||||
methods: {
|
||||
doExport() {
|
||||
const {
|
||||
startYear,
|
||||
endYear,
|
||||
unionId,
|
||||
takePartInLineId,
|
||||
lotId,
|
||||
linePlayTime,
|
||||
regionalNature,
|
||||
} = this.pageForm
|
||||
window.open("/platform/theRapyRecuperation/user/query/doExport?" +
|
||||
"startYear=" + startYear +
|
||||
"&endYear=" + endYear +
|
||||
"&unionId=" + unionId +
|
||||
"&takePartInLineId=" + takePartInLineId +
|
||||
"&lotId=" + lotId +
|
||||
"®ionalNature=" + regionalNature +
|
||||
"&satisfyPeople=true" +
|
||||
"&types=" + JSON.stringify(['line']) +
|
||||
"&linePlayTime=" + linePlayTime)
|
||||
},
|
||||
async getLinePlayTimeByLineId(id) {
|
||||
const resp = await $.get('/platform/theRapyRecuperation/TheRapyXghAudit/getLinePlayTimeByLineId', {
|
||||
lineId: id,
|
||||
startYear: this.pageForm.startYear,
|
||||
endYear: this.pageForm.endYear,
|
||||
flag: true
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.linePlayTimes = resp.data
|
||||
}
|
||||
},
|
||||
async lineChange(val) {
|
||||
this.pageForm.selectId = ''
|
||||
await this.getLinePlayTimeByLineId(val);
|
||||
await this.doSearch()
|
||||
},
|
||||
async playChange() {
|
||||
await this.doSearch()
|
||||
},
|
||||
lineTypeChange() {
|
||||
this.pageForm.takePartInLineId = ''
|
||||
this.getUnionSelectLine()
|
||||
this.doSearch()
|
||||
},
|
||||
async sendSuccess(row) {
|
||||
this.$confirm("确定发送<span style='color: red'>成团通知</span>吗?", '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
dangerouslyUseHTMLString: true
|
||||
}).then(async () => {
|
||||
const resp = await $.post('/platform/theRapyRecuperation/statistics/sendSuccess', {id: row.lineUId})
|
||||
if (resp.code === 0) {
|
||||
this.$message.success(resp.msg)
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
})
|
||||
},
|
||||
sendFail(row, type) {
|
||||
this.$confirm("确定发送<span style='color: red'>未成团通知</span>并<span style='color: red'>" + (type ? '保留' : '删除') + "报名记录</span>吗?", '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
dangerouslyUseHTMLString: true
|
||||
}).then(async () => {
|
||||
const resp = await $.post('/platform/theRapyRecuperation/statistics/sendFail', {id: row.lineUId, type: type})
|
||||
if (resp.code === 0) {
|
||||
this.$message.success(resp.msg)
|
||||
} else {
|
||||
this.$message.warning(resp.msg)
|
||||
}
|
||||
})
|
||||
},
|
||||
openLine(row) {
|
||||
this.$refs.guava.public()
|
||||
if (row.regionalNature === "省内") {
|
||||
this.$refs.viewLineInfo.findOne(row.lineId, null)
|
||||
} else {
|
||||
this.$refs.viewLineInfo.findOne(row.lineId, row.usUnionId)
|
||||
|
||||
}
|
||||
},
|
||||
openUserData(row){
|
||||
this.lineUId = row.lineUId
|
||||
this.$refs.guava.edit();
|
||||
this.getUserDataByLineId(row)
|
||||
},
|
||||
async getUnionSelectLine() {
|
||||
const resp = await $.post('/platform/theRapyRecuperation/user/query/getUnionSelectLine', {
|
||||
startYear: this.pageForm.startYear,
|
||||
endYear: this.pageForm.endYear,
|
||||
signUpMode: this.pageForm.signUpMode,
|
||||
flag: true,
|
||||
regionalNature: this.pageForm.regionalNature
|
||||
})
|
||||
if (resp.code === 0) {
|
||||
this.lineList = resp.data
|
||||
}
|
||||
},
|
||||
async getModifyConfig() {
|
||||
const res = await $.post('/platform/theRapyRecuperation/TheRapyConfig/findOne')
|
||||
if (res.code === 0) {
|
||||
this.modifyConfig = res.data
|
||||
}
|
||||
},
|
||||
async flushUnits() {
|
||||
this.$set(this.userData, "unitId", "")
|
||||
if ("${@shiro.hasRole('sysadmin')||@shiro.hasRole('A06')||@shiro.hasRole('SchoolUnionMemberAdmin')}" === 'true') {
|
||||
this.units = await getUnits(this.userData.unionId)
|
||||
} else {
|
||||
this.units = await getUnits("${@shiro.getPrincipalProperty('unit').getUnionid()}")
|
||||
}
|
||||
},
|
||||
userPageSizeChange(val) {
|
||||
this.userPageForm.pageSize = val;
|
||||
this.getUserDataByLineId();
|
||||
},
|
||||
userPageNumberChange(val) {
|
||||
this.userPageForm.pageNumber = val;
|
||||
this.getUserDataByLineId();
|
||||
},
|
||||
async getUserDataByLineId(row){
|
||||
this.userPageForm.takePartLineId = this.lineUId
|
||||
const resp = await $.post(loc() + '/getUserDateByLine',this.userPageForm)
|
||||
if (resp.code === 0){
|
||||
this.userData = resp.data.list
|
||||
this.userPageForm.totalCount = resp.data.totalCount
|
||||
}
|
||||
}
|
||||
},
|
||||
async created() {
|
||||
this.unions = await getUnions()
|
||||
await this.getModifyConfig();
|
||||
await this.getUnionSelectLine();
|
||||
this.pageData();
|
||||
this.flushUnits();
|
||||
}
|
||||
})
|
||||
</script>
|
||||
<!--#
|
||||
}
|
||||
#-->
|
||||
+83
-31
@@ -12,11 +12,11 @@ layout("/layouts/platform.html"){
|
||||
padding: 12px 25px;
|
||||
}
|
||||
|
||||
.el-dialog__title {
|
||||
font-size: 18px; /* 修改标题字体大小 */
|
||||
color: red; /* 修改标题字体颜色 */
|
||||
border-bottom: none; /* 去掉标题底部边框线 */
|
||||
}
|
||||
/*.el-dialog__title {
|
||||
font-size: 18px; !* 修改标题字体大小 *!
|
||||
color: red; !* 修改标题字体颜色 *!
|
||||
border-bottom: none; !* 去掉标题底部边框线 *!
|
||||
}*/
|
||||
|
||||
</style>
|
||||
|
||||
@@ -33,28 +33,34 @@ layout("/layouts/platform.html"){
|
||||
<el-input v-model="formData.configName" placeholder="请输入配置名称"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item prop="activityGroupId" label="参加人员范围">
|
||||
<el-select v-model="formData.activityGroupId" placeholder="请选择参加人员范围" filterable
|
||||
clearable
|
||||
style="width: 100%">
|
||||
<el-option v-for="item in activityGroupList"
|
||||
:value="item.groupId"
|
||||
:key="item.groupId"
|
||||
:label="item.groupName"></el-option>
|
||||
</el-select>
|
||||
<div style="display: flex; justify-content: space-between">
|
||||
<div style="width: 99%">
|
||||
<el-select v-model="formData.activityGroupId" placeholder="请选择参加人员范围" filterable
|
||||
clearable
|
||||
style="width: 99%">
|
||||
<el-option v-for="item in activityGroupList"
|
||||
:value="item.groupId"
|
||||
:key="item.groupId"
|
||||
:label="item.groupName"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div>
|
||||
<el-button @click="$refs.drawerUserScope.userScopeDialog = true" type="primary">设置</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="省外名额分配" prop="outsideQuota">
|
||||
<el-form-item label="省外最少成团人数(包括家属)" prop="outsideQuota">
|
||||
<el-input v-model.number="formData.outsideQuota"
|
||||
placeholder="请输入省外名额分配"></el-input>
|
||||
placeholder="请输入省外最少成团人数(包括家属)"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="省外名额分配比例" prop="outsideQuotaProportion">
|
||||
<el-slider
|
||||
show-input
|
||||
v-model="formData.outsideQuotaProportion">
|
||||
</el-slider>
|
||||
</el-form-item>
|
||||
<!--<el-form-item label="省外名额分配比例" prop="outsideQuotaProportion">
|
||||
<el-input placeholder="请输入省外名额分配比例" v-model="formData.outsideQuotaProportion">
|
||||
<template slot="append">%</template>
|
||||
</el-input>
|
||||
</el-form-item>-->
|
||||
|
||||
|
||||
<el-form-item label="省外几年去一次" prop="outsideNumber">
|
||||
@@ -64,22 +70,22 @@ layout("/layouts/platform.html"){
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="每年旅行频率" prop="travelFrequency">
|
||||
<el-input max="100" disabled
|
||||
<el-input max="100"
|
||||
placeholder="请输入每年旅行频率"
|
||||
v-model.number="formData.travelFrequency"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="组团人数" prop="groupNumber">
|
||||
<!--<el-form-item label="最少教工人数" prop="groupNumber">
|
||||
<el-input max="100"
|
||||
placeholder="请输入组团人数"
|
||||
placeholder="请输入最少教工人数"
|
||||
v-model.number="formData.groupNumber"></el-input>
|
||||
</el-form-item>
|
||||
</el-form-item>-->
|
||||
|
||||
<el-form-item label="不可取消修改天数" prop="modifyDays">
|
||||
<!--<el-form-item label="不可取消修改天数" prop="modifyDays">
|
||||
<el-input max="100"
|
||||
placeholder="请输入不可取消修改天数"
|
||||
v-model.number="formData.modifyDays"></el-input>
|
||||
</el-form-item>
|
||||
</el-form-item>-->
|
||||
|
||||
<el-form-item label="可以修改几次" prop="modifyNumber">
|
||||
<el-input max="100"
|
||||
@@ -101,6 +107,13 @@ layout("/layouts/platform.html"){
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="旅行社是否需要审核" prop="travelAudit">
|
||||
<el-radio-group v-model="formData.travelAudit">
|
||||
<el-radio-button :label="true">需要</el-radio-button>
|
||||
<el-radio-button :label="false">不需要</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="全批次最多报名人数" prop="allLineSignUpNumber">
|
||||
<el-input max="100"
|
||||
placeholder="请输入全批次最多报名人数"
|
||||
@@ -113,6 +126,20 @@ layout("/layouts/platform.html"){
|
||||
v-model.number="formData.provinceStartYear"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="床位信息" prop="bedInfo">
|
||||
<el-radio-group v-model="formData.bedInfo">
|
||||
<el-radio-button :label="true">需要</el-radio-button>
|
||||
<el-radio-button :label="false">不需要</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="家属信息" prop="familyInfo">
|
||||
<el-radio-group v-model="formData.familyInfo">
|
||||
<el-radio-button :label="1">数量</el-radio-button>
|
||||
<el-radio-button :label="2">详细信息</el-radio-button>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
<vi-title title="标段管理"></vi-title>
|
||||
<el-form-item label="标段">
|
||||
<el-button type="primary" @click="formData.lots.push({})"
|
||||
@@ -153,7 +180,7 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<vi-title title="服务须知"></vi-title>
|
||||
<el-form-item label="疗休养服务须知" prop="notice">
|
||||
<div id="lineContent"></div>
|
||||
<text-editor v-model="formData.notice"></text-editor>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item class="item-button">
|
||||
@@ -200,6 +227,12 @@ layout("/layouts/platform.html"){
|
||||
</span>
|
||||
</el-dialog>
|
||||
</guava>
|
||||
|
||||
<drawer-user-scope
|
||||
@group_change="getActivityGroup"
|
||||
ref="drawerUserScope"
|
||||
:group_id.sync="formData.activityGroupId"
|
||||
></drawer-user-scope>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
@@ -213,6 +246,7 @@ layout("/layouts/platform.html"){
|
||||
formData: {
|
||||
isSnLine: 0,
|
||||
isSwLine: 0,
|
||||
travelAudit: 0,
|
||||
lots: [],
|
||||
configName: '智慧工会疗休养配置',
|
||||
outsideQuota: null,
|
||||
@@ -225,14 +259,17 @@ layout("/layouts/platform.html"){
|
||||
allLineSignUpNumber: null,
|
||||
notice: null,
|
||||
provinceStartYear: null,
|
||||
bedInfo: true,
|
||||
familyInfo: 1,
|
||||
},
|
||||
formRules: {
|
||||
configName: [{required: true, message: '请填写配置名称', trigger: ['blur', 'change']}],
|
||||
isSnLine: [{required: true, message: '请选择省内线路是否需要审核', trigger: ['blur', 'change']}],
|
||||
isSwLine: [{required: true, message: '请选择省外线路是否需要审核', trigger: ['blur', 'change']}],
|
||||
travelAudit: [{required: true, message: '请选择旅行社是否需要审核', trigger: ['blur', 'change']}],
|
||||
outsideQuota: [{
|
||||
required: true,
|
||||
message: '请填写省外名额分配',
|
||||
message: '省外最少成团人数(包括家属)',
|
||||
trigger: ['blur', 'change']
|
||||
}],
|
||||
outsideNumber: [{
|
||||
@@ -247,7 +284,7 @@ layout("/layouts/platform.html"){
|
||||
}],
|
||||
groupNumber: [{
|
||||
required: true,
|
||||
message: '请填写组团人数',
|
||||
message: '请填写最少教工人数',
|
||||
trigger: ['blur', 'change']
|
||||
}],
|
||||
modifyDays: [{
|
||||
@@ -272,6 +309,8 @@ layout("/layouts/platform.html"){
|
||||
}],
|
||||
notice: [{required: true, message: '请输入详细内容', trigger: ['change', 'blur']}],
|
||||
provinceStartYear: [{required: true, message: '请输入省内起始年份', trigger: ['change', 'blur']}],
|
||||
bedInfo: [{required: true, message: '请选择床位信息', trigger: ['change', 'blur']}],
|
||||
familyInfo: [{required: true, message: '请选择家属信息', trigger: ['change', 'blur']}],
|
||||
|
||||
},
|
||||
marks: [],
|
||||
@@ -280,8 +319,12 @@ layout("/layouts/platform.html"){
|
||||
centerDialogVisible:false,
|
||||
tableScopeId:'',
|
||||
tableScopeIndex:'',
|
||||
userScopeDialog: false,
|
||||
}
|
||||
},
|
||||
components: {
|
||||
'drawer-user-scope': httpVueLoader('/components/plugins/DrawerUserScope.vue'),
|
||||
},
|
||||
methods: {
|
||||
async deleteLotsRow(scope) {
|
||||
//this.lotDeleteList.push(scope.row.id);
|
||||
@@ -399,7 +442,16 @@ layout("/layouts/platform.html"){
|
||||
async created() {
|
||||
this.findOne();
|
||||
this.initLineContentEditor();
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
'formData.activityGroupId': {
|
||||
async handler(newVal, oldVal) {
|
||||
this.activityGroupList = await getActivityGroup()
|
||||
this.userScopeDialog = false
|
||||
},
|
||||
deep: true
|
||||
},
|
||||
},
|
||||
})
|
||||
</script>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user