commit
This commit is contained in:
@@ -132,7 +132,7 @@ layout("/layouts/platform.html"){
|
||||
store,
|
||||
data() {
|
||||
return {
|
||||
id: GetQueryString("bizId"),
|
||||
bizId: GetQueryString("bizId"),
|
||||
taskId: GetQueryString("taskId"),
|
||||
formData: {},
|
||||
formRules: {
|
||||
@@ -195,7 +195,7 @@ layout("/layouts/platform.html"){
|
||||
this.$message.warning("请先阅读并同意协议")
|
||||
return
|
||||
}
|
||||
this.$axios.post('/platform/club/join/apply/submit/submitAgain', {
|
||||
this.$axios.post('/platform/club/join/apply/submitAgain', {
|
||||
data: JSON.stringify(this.formData),
|
||||
taskId: GetQueryString("taskId")
|
||||
}).then(res => {
|
||||
@@ -225,12 +225,12 @@ layout("/layouts/platform.html"){
|
||||
})
|
||||
},
|
||||
init() {
|
||||
this.id = GetQueryString("id")
|
||||
this.bizId = GetQueryString("bizId")
|
||||
if (GetQueryString("clubId")) {
|
||||
this.$set(this.formData, "clubId", GetQueryString("clubId"))
|
||||
}
|
||||
if (this.id) {
|
||||
this.$axios.post("/platform/club/join/apply/info", { id: this.id }).then((res) => {
|
||||
if (this.bizId) {
|
||||
this.$axios.post("/platform/club/join/apply/info", { id: this.bizId }).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.formData = res.data
|
||||
this.isAgree = true
|
||||
|
||||
@@ -44,10 +44,7 @@ layout("/layouts/platform.html"){
|
||||
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
|
||||
<el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回</el-button>
|
||||
<el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)" size="mini" type="danger">
|
||||
删除
|
||||
</el-button>
|
||||
<el-button v-else-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
|
||||
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
@@ -95,7 +92,7 @@ layout("/layouts/platform.html"){
|
||||
})
|
||||
},
|
||||
onEdit(row) {
|
||||
location.href = '/platform/club/join/apply?id=' + row.id
|
||||
location.href = '/platform/club/join/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
|
||||
},
|
||||
onDelete(id) {
|
||||
this.$confirm("确定要删除此申请吗?", "提示", {
|
||||
|
||||
@@ -181,6 +181,11 @@ layout("/layouts/platform.html"){
|
||||
await this.userRemoteMethod(resp.data.concatPerson)
|
||||
let formData = resp.data
|
||||
if (resp.data.clubUser.length > 0) {
|
||||
resp.data.clubUser.forEach(item => {
|
||||
if(item.roleCode) {
|
||||
item.roleCode = JSON.parse(item.roleCode)[0]
|
||||
}
|
||||
})
|
||||
resp.data.clubUser = resp.data.clubUser.filter((o) => o.roleCode !== "CLUB_MEMBER")
|
||||
}
|
||||
this.$refs.clubManagerRef.managePerson = clone(resp.data.clubUser)
|
||||
|
||||
@@ -58,10 +58,7 @@ layout("/layouts/platform.html"){
|
||||
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
|
||||
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
|
||||
<el-button v-if="row.canRevoke" size="mini" type="danger" @click="onRevoke(row)">撤回</el-button>
|
||||
<el-button v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" @click="onDelete(row.id)" size="mini" type="danger">
|
||||
删除
|
||||
</el-button>
|
||||
<el-button v-else-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
|
||||
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">
|
||||
删除
|
||||
</el-button>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user