Merge remote-tracking branch 'origin/main'
This commit is contained in:
@jyuhsin
@@ -616,6 +616,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
|
||||
this.$axios.post('/platform/activity/culture/applyActivity/save', {data: JSON.stringify(formData)}).then(res => {
|
||||
if (res.code === 0) {
|
||||
this.$message.success("保存成功")
|
||||
this.$emit("goBack")
|
||||
if (this.activity_type === 40002) {
|
||||
commonUtil.pjaxPush("/platform/activity/culture/infoManage/union")
|
||||
} else if (this.activity_type === 40003) {
|
||||
@@ -656,6 +657,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
|
||||
data: JSON.stringify(formData)
|
||||
}).then(res => {
|
||||
if (res.code === 0) {
|
||||
this.$emit("goBack")
|
||||
this.$message.success("提交成功")
|
||||
if (this.activity_type === 40002) {
|
||||
commonUtil.pjaxPush("/platform/activity/culture/infoManage/union")
|
||||
@@ -698,6 +700,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
|
||||
taskId: this.taskId
|
||||
}).then(res => {
|
||||
if (res.code === 0) {
|
||||
this.$emit("goBack")
|
||||
this.$message.success("提交成功")
|
||||
if (this.activity_type === 40002) {
|
||||
commonUtil.pjaxPush("/platform/activity/culture/infoManage/union")
|
||||
@@ -776,11 +779,11 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
|
||||
this.$emit("goBack")
|
||||
} else {
|
||||
if (this.activity_type === 40002) {
|
||||
pjaxReplace("/platform/activity/culture/infoManage/union")
|
||||
commonUtil.pjaxPush("/platform/activity/culture/infoManage/union")
|
||||
} else if (this.activity_type === 40003) {
|
||||
pjaxReplace("/platform/activity/culture/infoManage/club")
|
||||
commonUtil.pjaxPush("/platform/activity/culture/infoManage/club")
|
||||
} else {
|
||||
pjaxReplace("/platform/activity/culture/infoManage/school")
|
||||
commonUtil.pjaxPush("/platform/activity/culture/infoManage/school")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -130,7 +130,7 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = {
|
||||
`,
|
||||
props: {
|
||||
activity_type: {
|
||||
value: { type: Object, default: "" }
|
||||
value: {type: Object, default: ""}
|
||||
}
|
||||
},
|
||||
store,
|
||||
@@ -141,20 +141,20 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = {
|
||||
unionList: [],
|
||||
showApprovalForm: false,
|
||||
auditList: [
|
||||
{ code: true, name: "已审核" },
|
||||
{ code: false, name: "未审核" }
|
||||
{code: true, name: "已审核"},
|
||||
{code: false, name: "未审核"}
|
||||
],
|
||||
pageForm: {
|
||||
approval: false,
|
||||
year: new Date().getFullYear() + ""
|
||||
},
|
||||
tableColumns: [
|
||||
{ prop: "name", label: "活动名称" },
|
||||
{ prop: "address", label: "活动地点" },
|
||||
{ prop: "projectTypeName", label: "活动项目类型" },
|
||||
{ prop: "tussueName", label: "举办单位" },
|
||||
{ prop: "time", label: "活动日期" },
|
||||
{ prop: "applyTime", label: "创建时间", sortable: true },
|
||||
{prop: "name", label: "活动名称"},
|
||||
{prop: "address", label: "活动地点"},
|
||||
{prop: "projectTypeName", label: "活动项目类型"},
|
||||
{prop: "tussueName", label: "举办单位"},
|
||||
{prop: "time", label: "活动日期"},
|
||||
{prop: "applyTime", label: "创建时间", sortable: true},
|
||||
]
|
||||
}
|
||||
},
|
||||
@@ -164,7 +164,7 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = {
|
||||
methods: {
|
||||
|
||||
openAudit(row) {
|
||||
this.$refs.guava.edit(()=>{
|
||||
this.$refs.guava.edit(() => {
|
||||
this.showApprovalForm = true
|
||||
this.formData = {
|
||||
processTaskId: row.taskId,
|
||||
@@ -175,7 +175,7 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = {
|
||||
|
||||
},
|
||||
onView(row) {
|
||||
this.$refs.guava.edit(()=>{
|
||||
this.$refs.guava.edit(() => {
|
||||
this.showApprovalForm = false
|
||||
this.$refs.editInfo.onOpen(row)
|
||||
})
|
||||
@@ -197,11 +197,11 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = {
|
||||
cancelButtonText: "取消",
|
||||
type: "warning"
|
||||
}).then(() => {
|
||||
this.$axios.post("/flow/common/executeTask", {
|
||||
this.$axios.post("/platform/activity/culture/auditActivity/doReview", {
|
||||
data: JSON.stringify({
|
||||
...this.formData,
|
||||
submitType: val
|
||||
})
|
||||
}), id: this.formData.id
|
||||
}).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.$refs.guava.index()
|
||||
@@ -230,8 +230,8 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = {
|
||||
// 根据 activity_type 动态添加流程相关列
|
||||
if (this.activity_type === 40002 || this.activity_type === 40003) {
|
||||
this.tableColumns.push(
|
||||
{prop: "curTaskName", label: "当前节点"},
|
||||
{prop: "instanceState", label: "流程状态"}
|
||||
{prop: "curTaskName", label: "当前节点"},
|
||||
{prop: "instanceState", label: "流程状态"}
|
||||
);
|
||||
}
|
||||
this.unionList = await this.$businessTool.listUnion()
|
||||
|
||||
@@ -56,6 +56,12 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
|
||||
<template scope="{row}" v-else-if="column.prop=='projectTypeName'">
|
||||
{{row.projectTypeName}}({{row.projectTypeCode}})
|
||||
</template>
|
||||
|
||||
<template scope="{row}" v-else-if="column.prop=='tussueName'">
|
||||
<span v-if="row.activity_type==40002">{{row.unionname?row.unionname:'暂无'}}</span>
|
||||
<span v-if="row.activity_type==40003">{{row.clubName?row.clubName:'暂无'}}</span>
|
||||
<span v-if="row.activity_type==40001">校工会</span>
|
||||
</template>
|
||||
|
||||
<template scope="{row}" v-else-if="column.prop=='isUnseal'">
|
||||
<el-switch
|
||||
|
||||
@@ -151,50 +151,63 @@ var ACTIVITY_SPORTS_APPLY_USER = {
|
||||
v-loading="applyUserTabLoading">
|
||||
|
||||
<el-table-column :reserve-selection="true"
|
||||
align="center" header-align="center"
|
||||
|
||||
type="selection"
|
||||
width="55">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
align="center" header-align="center" label="序号"
|
||||
label="序号"
|
||||
type="index"
|
||||
width="80">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
align="center" header-align="center" label="所属队"
|
||||
label="所属队"
|
||||
prop="team" width="80">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
align="center" header-align="center" label="姓名"
|
||||
label="姓名"
|
||||
prop="username" width="130">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
align="center" header-align="center" label="教工号"
|
||||
label="教工号"
|
||||
prop="loginname" width="130">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
align="center" header-align="center" label="单位"
|
||||
label="单位"
|
||||
prop="unitname"
|
||||
sortable>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
align="center" header-align="center" label="性别"
|
||||
label="性别"
|
||||
prop="sex" width="80">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="联系方式"
|
||||
prop="mobile" width="150">
|
||||
<template v-slot="{row}">
|
||||
<el-input placeholder="请输入联系方式"
|
||||
v-model="row.mobile"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
align="center" header-align="center" label="年龄"
|
||||
label="职级"
|
||||
prop="professionalLevel" width="80">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
label="年龄"
|
||||
prop="age" width="80">
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
align="center" header-align="center" label="身份"
|
||||
label="身份"
|
||||
prop="identity" width="300px">
|
||||
<template scope="{$index,row}">
|
||||
<el-tag :disable-transitions="false"
|
||||
@@ -530,6 +543,14 @@ var ACTIVITY_SPORTS_APPLY_USER = {
|
||||
})
|
||||
return
|
||||
}
|
||||
//判断每一个选手填写的是否正确
|
||||
for (let i = 0; i < applyUserList.length; i++) {
|
||||
if (!applyUserList[i].mobile) {
|
||||
this.$message.warning("请输入联系方式!")
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (projectType !== "1") {
|
||||
for (let i = 0; i < teamApplyData.length; i++) {
|
||||
@@ -697,6 +718,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
|
||||
loginname: v.loginname,
|
||||
username: v.username,
|
||||
age: v.age,
|
||||
professionalLevel: v.professionalLevel,
|
||||
birthday: v.birthday,
|
||||
unitId: v.unitId,
|
||||
unionId: v.unionId,
|
||||
@@ -850,7 +872,7 @@ var ACTIVITY_SPORTS_APPLY_USER = {
|
||||
return {
|
||||
id: user.id,
|
||||
loginname: user.loginname,
|
||||
name: user.username + "（" + (user.sex ? user.sex : "") + "-" + user.loginname + "）"
|
||||
name: user.username + "（" + (user.sex ? user.sex : "") + "-" + user.loginname + "-" + user.age + (user.professionalLevel ? ("-" + user.professionalLevel) : "") + "）"
|
||||
}
|
||||
},
|
||||
uniteApplyReset() {
|
||||
|
||||
@@ -69,8 +69,9 @@ var ACTIVITY_SPORTS_DELETE_USER = {
|
||||
{ prop: "name", label: "所属小队" },
|
||||
{ prop: "username", label: "姓名" },
|
||||
{ prop: "loginname", label: "工号" },
|
||||
{ prop: "mobile", label: "电话" },
|
||||
{ prop: "sex", label: "性别" },
|
||||
{ prop: "mobile", label: "联系方式" },
|
||||
{ prop: "professionalLevel", label: "职级" },
|
||||
{ prop: "identity", label: "身份", sortable: true },
|
||||
{ prop: "allName", label: "报名项目" }
|
||||
]
|
||||
|
||||
@@ -270,7 +270,7 @@ let ACTIVITY_SPORTS_ADD_ACTIVITY = {
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item prop="files" label="封面图" v-if="formData.applyWay.includes(1)">
|
||||
<el-form-item prop="files" label="封面图" >
|
||||
<file-upload
|
||||
:value.sync="formData.image"
|
||||
:upload_number="1"
|
||||
|
||||
Reference in New Issue
Block a user