慰问阅览增加导出;文化活动直接读取联系人电话;校工会活动默认主办单位和承办单位为工会,同时也可以选择其他单位;活动单位选择只显示二级单位,不显示三级单位
This commit is contained in:
+1
@@ -215,6 +215,7 @@ public class TrainSignUpManageController {
|
||||
map.put("id", unit.getId());
|
||||
map.put("name", unit.getName());
|
||||
map.put("type", "unit");
|
||||
map.put("unitLevel", unit.getUnitLevel());
|
||||
result.add(map);
|
||||
}
|
||||
List<SysClub> clubList = dao.query(SysClub.class, Cnd.NEW().asc(SysClub::getClubCode));
|
||||
|
||||
@@ -925,8 +925,9 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
|
||||
this.$set(this.formData, "time", val)
|
||||
},
|
||||
userChang(id) {
|
||||
const userList = this.$refs.userData.options
|
||||
this.$set(this.formData, "mobile", id ? userList.find((v) => v.id === id).mobile : null)
|
||||
const user = this.userList.find((item) => item.userId === id)
|
||||
// 联系人来自远程查询结果;清空选择或未找到联系人时同步清空联系方式。
|
||||
this.$set(this.formData, "mobile", user ? (user.mobile || "") : "")
|
||||
},
|
||||
async getActivityTwoLevelType(code) {
|
||||
const {data} = await this.$axios.post("/platform/activity/basic/settings/getActivityTwoLevelType", {code: code})
|
||||
@@ -961,6 +962,8 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
|
||||
otherFiles: [],
|
||||
tissuePersonList: [],
|
||||
unionUserNumberLimit: [],
|
||||
hostUnitIds: [],
|
||||
undertakeUnitIds: [],
|
||||
signUpMethod: null,
|
||||
rangerMeter: 100,
|
||||
isEnrollSystem: true,
|
||||
@@ -979,7 +982,20 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
|
||||
v.name = v.clubName
|
||||
})
|
||||
const units = await this.$businessTool.listUnit()
|
||||
this.unitOptions = this.clubOptions.concat(units)
|
||||
if (this.activity_type === 40001) {
|
||||
// 校工会活动只选二级单位;新建时为主办和承办单位预选默认单位,仍可添加其他单位。
|
||||
this.unitOptions = units.filter((unit) => unit.unitLevel === 2)
|
||||
if (!id) {
|
||||
const defaultUnit = this.unitOptions.find((unit) => unit.name === "工会、离退休工作处")
|
||||
if (defaultUnit) {
|
||||
this.$set(this.formData, "hostUnitIds", [defaultUnit.id])
|
||||
this.$set(this.formData, "undertakeUnitIds", [defaultUnit.id])
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// 分工会和协会申报保留协会选项,仅排除三级单位。
|
||||
this.unitOptions = this.clubOptions.concat(units.filter((unit) => unit.unitLevel !== 3))
|
||||
}
|
||||
},
|
||||
async queryUserByIds(ids) {
|
||||
const {data} = await this.$axios.post("/platform/activity/culture/applyActivity/queryUserByIds", {ids: JSON.stringify(ids)})
|
||||
|
||||
@@ -1203,6 +1203,7 @@ let ACTIVITY_SPORTS_ADD_ACTIVITY = {
|
||||
v.name = v.clubName
|
||||
})
|
||||
const units = await this.$businessTool.listUnit()
|
||||
this.unitOptions = this.clubOptions.concat(units)
|
||||
// 保留协会选项,主办、承办和协办单位均不提供三级单位。
|
||||
this.unitOptions = this.clubOptions.concat(units.filter((unit) => unit.unitLevel !== 3))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -596,7 +596,8 @@ const basicForm = {
|
||||
},
|
||||
async selectUnitAndClub() {
|
||||
const resp = await this.$axios.post("/platform/trainSignUp/manage/selectUnitAndClub")
|
||||
this.undertakeOptions = resp.data
|
||||
// 接口中的协会没有单位层级,保留协会并过滤三级单位。
|
||||
this.undertakeOptions = resp.data.filter((item) => item.type !== "unit" || item.unitLevel !== 3)
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
|
||||
@@ -74,9 +74,10 @@ layout("/layouts/platform.html"){
|
||||
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" fixed="right" width="180">
|
||||
<el-table-column label="操作" fixed="right" width="280">
|
||||
<template slot-scope="{row}">
|
||||
<el-button @click="onView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button v-if="row.instanceState === 20" @click="doExport(row)" size="mini" type="primary">导出报销单</el-button>
|
||||
<el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)" size="mini" type="danger">
|
||||
删除
|
||||
</el-button>
|
||||
@@ -119,6 +120,10 @@ layout("/layouts/platform.html"){
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 仅已完成的慰问申请显示报销单入口,沿用“我的申请”的 Word 导出接口。
|
||||
doExport(row) {
|
||||
window.location.href = "/platform/condolence/mine/doExport?id=" + (row.id || '')
|
||||
},
|
||||
onDelete(id) {
|
||||
this.$confirm("您确定要删除吗?", "提示", {
|
||||
confirmButtonText: "确定",
|
||||
|
||||
Reference in New Issue
Block a user