commit
This commit is contained in:
@jyuhsin
@@ -16,7 +16,7 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = {
|
||||
></el-date-picker>
|
||||
</search-item>
|
||||
|
||||
<search-item label="活动时间">
|
||||
<search-item label="活动名称">
|
||||
<el-input clearable placeholder="请输入活动名称"
|
||||
v-model="pageForm.name"></el-input>
|
||||
</search-item>
|
||||
@@ -168,7 +168,8 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = {
|
||||
this.showApprovalForm = true
|
||||
this.formData = {
|
||||
processTaskId: row.taskId,
|
||||
taskName: row.curTaskName
|
||||
taskName: row.curTaskName,
|
||||
id: row.id
|
||||
}
|
||||
this.$refs.editInfo.onOpen(row)
|
||||
})
|
||||
|
||||
@@ -46,12 +46,6 @@ const ACTIVITY_CULTURE_USER_STATISTICS = {
|
||||
<el-input @keyup.enter.native="doSearch" clearable
|
||||
placeholder="请输入姓名或工号"
|
||||
v-model="pageForm.searchKeyword">
|
||||
<el-select placeholder="姓名/工号" slot="prepend"
|
||||
style="width: 80px;"
|
||||
v-model="pageForm.searchName">
|
||||
<el-option label="姓名" value="atp.username"></el-option>
|
||||
<el-option label="工号" value="atp.loginanme"></el-option>
|
||||
</el-select>
|
||||
</el-input>
|
||||
</search-item>
|
||||
|
||||
|
||||
@@ -7,9 +7,7 @@ layout("/layouts/platform.html"){
|
||||
<div id="app" v-cloak>
|
||||
<guava ref="guava">
|
||||
<el-card v-if="isCanApply" shadow="never">
|
||||
<div slot="header" class="clearfix">
|
||||
<h3 style="color: rgb(24, 103, 176)">年度优秀协会申报</h3>
|
||||
</div>
|
||||
<snaker-start slot="header" label="年度优秀协会申报" define_key="XHPY"></snaker-start>
|
||||
|
||||
<el-form :model="formData" ref="form" :rules="formRules" label-width="120px" style="padding: 0 30px">
|
||||
<el-row :gutter="30">
|
||||
|
||||
@@ -10,10 +10,7 @@ layout("/layouts/platform.html"){
|
||||
|
||||
<guava>
|
||||
<el-card shadow="never">
|
||||
|
||||
<div slot="header" class="clearfix">
|
||||
<h3 style="color: rgb(24, 103, 176)">考核登记</h3>
|
||||
</div>
|
||||
<snaker-start slot="header" label="考核登记" define_key="XHNS"></snaker-start>
|
||||
|
||||
<el-steps :active="registerTypeName" finish-status="success" simple>
|
||||
<el-step title="基础信息"></el-step>
|
||||
|
||||
@@ -66,6 +66,9 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
</template>
|
||||
|
||||
<template #edit_func>
|
||||
<snaker-start slot="header" label="" define_key="XHBGLS"></snaker-start>
|
||||
</template>
|
||||
<template #edit>
|
||||
<el-form :model="formData" ref="formRef" size="small" label-width="80px" :rules="formRules">
|
||||
<el-form-item label="协会名称" prop="clubId">
|
||||
@@ -75,7 +78,7 @@ layout("/layouts/platform.html"){
|
||||
</el-form-item>
|
||||
<el-form-item label="协会成员" prop="userId">
|
||||
<el-select v-model="formData.userId" @change="userChange" placeholder="请选择协会成员" filterable clearable style="width: 100%">
|
||||
<el-option v-for="item in userList" :key="item.userId" :label="item.userName" :value="item.userId"></el-option>
|
||||
<el-option v-for="item,index in userList" :key="index" :label="item.userName" :value="item.userId"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="身份" prop="nowRoleCode">
|
||||
@@ -184,6 +187,12 @@ layout("/layouts/platform.html"){
|
||||
this.id = row.id
|
||||
this.taskId = row.taskId
|
||||
this.formData = clone(row)
|
||||
this.$axios.post("/platform/club/infoManage/change/queryClubUsers", {clubId: this.formData.clubId}).then((res) => {
|
||||
if (res.code === 0) {
|
||||
this.userList = res.data
|
||||
this.userChange(this.formData.userId)
|
||||
}
|
||||
})
|
||||
this.$refs.guava.edit(() => {})
|
||||
},
|
||||
async onSubmit() {
|
||||
|
||||
@@ -63,6 +63,9 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
</template>
|
||||
|
||||
<template #edit_func>
|
||||
<snaker-start slot="header" label="" define_key="XHHJBG"></snaker-start>
|
||||
</template>
|
||||
<template #edit>
|
||||
<el-form :model="formData" ref="formRef" size="small" label-width="80px" :rules="formRules">
|
||||
<el-form-item label="协会名称" prop="clubId">
|
||||
|
||||
@@ -63,6 +63,9 @@ layout("/layouts/platform.html"){
|
||||
</el-card>
|
||||
</template>
|
||||
|
||||
<template #edit_func>
|
||||
<snaker-start slot="header" label="" define_key="XHZCXD"></snaker-start>
|
||||
</template>
|
||||
<template #edit>
|
||||
<el-form :model="formData" ref="formRef" size="small" label-width="80px" :rules="formRules">
|
||||
<el-form-item label="协会名称" prop="clubId">
|
||||
|
||||
@@ -16,8 +16,8 @@ layout("/layouts/platform.html"){
|
||||
@change="doSearch"
|
||||
></el-date-picker>
|
||||
</search-item>
|
||||
<search-item label="关键字：">
|
||||
<el-input clearable placeholder="请输入姓名或者工号查询" v-model="pageForm.searchKeyword"></el-input>
|
||||
<search-item label="姓名/工号：">
|
||||
<el-input clearable placeholder="请输入姓名或工号" v-model="pageForm.searchKeyword"></el-input>
|
||||
</search-item>
|
||||
<search-item label="所属工会：">
|
||||
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable style="width: 100%">
|
||||
|
||||
@@ -118,7 +118,7 @@ const CLUB_MANAGER_TEMPLATE = {
|
||||
managePersonChange(val, row, index) {
|
||||
const cloneData = clone(this.managePerson)
|
||||
cloneData.splice(index, 1)
|
||||
const u = cloneData.find((o) => val && o.userId === val && o.roleCode === row.roleCode)
|
||||
const u = cloneData.find((o) => val && o.userId === val)
|
||||
if (u) {
|
||||
this.$message.warning("理事机构不能重复")
|
||||
this.$set(row, "loginName", "")
|
||||
|
||||
@@ -5,9 +5,7 @@ layout("/layouts/platform.html"){
|
||||
<div id="app" v-cloak>
|
||||
<el-card shadow="never">
|
||||
<!--标题-->
|
||||
<div slot="header" class="clearfix">
|
||||
<h3 style="color: rgb(24, 103, 176)">注册协会</h3>
|
||||
</div>
|
||||
<snaker-start slot="header" label="注册协会" define_key="XHZC"></snaker-start>
|
||||
<!--步骤条-->
|
||||
<el-steps :active="activeName" finish-status="success" simple>
|
||||
<el-step title="协会基本信息"></el-step>
|
||||
|
||||
Reference in New Issue
Block a user