c-zhouhf1/zhgh_ncu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
那些花儿
2025-10-17 08:54:14 +08:00
parent fbcee4d894
commit 901db5224f
11 changed files with 272 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/dayofficework/fund/member/mine/index.html
-3
View File
@@ -9,9 +9,6 @@ layout("/layouts/platform.html"){
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
style="width: 100%"></el-date-picker>
</search-item>
<search-item label="标题">
<el-input v-model="pageForm.searchKeyword" placeholder="标题" clearable></el-input>
</search-item>
</search>
</el-card>
<el-card shadow="never">
src/main/resources/views/platform/zhgh/dayofficework/fund/member/schoolUnionApproval/index.html
+17 -3
View File
@@ -9,8 +9,19 @@ layout("/layouts/platform.html"){
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
style="width: 100%"></el-date-picker>
</search-item>
<search-item label="标题">
<el-input v-model="pageForm.searchKeyword" placeholder="标题" clearable></el-input>
<search-item label="工号/姓名">
<el-input v-model="pageForm.searchKeyword" placeholder="请输入工号或者姓名查询"
clearable></el-input>
</search-item>
<search-item label="所属工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择所属工会" clearable>
<el-option v-for="item in unionOptions"
:value="item.id"
:key="item.id"
:label="item.name"
></el-option>
</el-select>
</search-item>
</search>
</el-card>
@@ -93,7 +104,8 @@ layout("/layouts/platform.html"){
approval: false
},
formData: {},
showApprovalForm: false
showApprovalForm: false,
unionOptions: []
}
},
methods: {
@@ -154,6 +166,8 @@ layout("/layouts/platform.html"){
},
},
created() {
//工会查询
this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
this.pageData()
}
})
src/main/resources/views/platform/zhgh/dayofficework/fund/member/write/index.html
+6 -8
View File
@@ -79,10 +79,6 @@ layout("/layouts/platform.html"){
</el-col>
</el-row>
<el-form-item label="家庭住址" prop="address">
<el-input v-model="formData.address" placeholder="请输入家庭住址"></el-input>
</el-form-item>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="手机号码" prop="mobile">
@@ -145,7 +141,7 @@ layout("/layouts/platform.html"){
],
address: [{required: true, message: '请输入家庭住址', trigger: 'blur'}],
joinWorkTime: [{required: true, message: '请选择参加工作时间', trigger: 'blur'}],
retireTime: [{required: true, message: '请选择退休时间', trigger: 'blur'}],
retireTime: [{required: false, message: '请选择退休时间', trigger: 'blur'}],
mobile: [{required: true, message: '请输入手机号码', trigger: 'blur'},
{
pattern: /^1[3456789]\d{9}$/,
@@ -219,7 +215,7 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
commonUtil.pjaxPush('/platform/suggestionBox/mine')
commonUtil.pjaxPush('/platform/fundMember/mine')
}
})
})
@@ -235,7 +231,7 @@ layout("/layouts/platform.html"){
}
})
} else {
const {username, loginname, sex, birthday, mobile, union} = this.$store.state.user
const {username, loginname, sex, birthday, mobile, union, userState, idCard} = this.$store.state.user
this.formData = {
userName: username,
loginName: loginname,
@@ -243,7 +239,9 @@ layout("/layouts/platform.html"){
birthday: birthday,
mobile: mobile,
unionId: union?.id,
unionName: union?.name
unionName: union?.name,
userState: userState,
idCard: idCard
}
}
}
src/main/resources/views/platform/zhgh/democratic/proposal/query/comprehensive/index.html
+184 -70
View File
@@ -6,61 +6,174 @@ layout("/layouts/platform.html"){
.el-tag {
cursor: pointer;
}
.search-container {
display: flex;
align-items: center;
min-height: 50px;
border-bottom: 1px solid #ddd;
padding: 12px 0;
margin-bottom: 0;
}
.search-label {
width: 90px;
margin-right: 10px;
font-weight: normal;
color: #333;
font-size: 14px;
}
.search-content {
flex: 1;
display: flex;
gap: 5px;
}
.custom-search-box {
display: flex;
align-items: center;
width: 100%;
background: #ffffff;
border: 1px solid #ccc;
border-radius: 3px;
}
.custom-search-box:hover {
border-color: #999;
}
.custom-search-box:focus-within {
border-color: #4a90e2;
box-shadow: 0 0 3px rgba(74, 144, 226, 0.3);
}
.search-input {
flex: 1;
height: 35px;
padding: 0 10px;
border: none;
outline: none;
font-size: 14px;
color: #333;
background: transparent;
font-family: inherit;
width: 100%;
}
.search-input::placeholder {
color: #999;
}
.filter-row {
display: flex;
align-items: center;
min-height: 50px;
border-bottom: 1px dashed rgb(230, 230, 230);
}
.filter-label {
width: 90px;
margin-right: 10px;
}
.filter-tags {
flex: 1;
display: flex;
gap: 5px;
}
</style>
<div id="app" v-cloak>
<guava ref="guava">
<el-card shadow="never">
<search @search="doSearch">
<search-item label="教代会">
<el-select @change="meetingChange" clearable filterable placeholder="所属教代会"
v-model="pageForm.sessionId">
<el-option :key="item.id" :label="item.fullName" :value="item.id"
v-for="item in sessionOptions"></el-option>
</el-select>
</search-item>
<search-item label="提案名称">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案名称"
v-model="pageForm.name"
style="width: 100%"
></el-input>
</search-item>
<search-item label="提案编码">
<el-input
@keyup.enter.native="doSearch"
clearable
placeholder="请输入提案编码"
v-model="pageForm.code"
style="width: 100%"
></el-input>
</search-item>
<search-item label="姓名/工号：">
<el-input placeholder="请输入提案人姓名或工号查询" clearable
v-model="pageForm.createUserKeyword"></el-input>
</search-item>
<!-- <search-item label="提案人姓名">-->
<!-- <el-input-->
<!-- @keyup.enter.native="doSearch"-->
<!-- clearable-->
<!-- placeholder="请输入提案人姓名"-->
<!-- v-model="pageForm.createUserName"-->
<!-- style="width: 100%"-->
<!-- ></el-input>-->
<!-- </search-item>-->
<!-- <search-item label="提案人工号">-->
<!-- <el-input-->
<!-- @keyup.enter.native="doSearch"-->
<!-- clearable-->
<!-- placeholder="请输入提案人工号"-->
<!-- v-model="pageForm.createUserLoginName"-->
<!-- style="width: 100%"-->
<!-- ></el-input>-->
<!-- </search-item>-->
<!-- 万能搜索框 -->
<div class="search-container">
<div class="search-label">万能搜索</div>
<div class="search-content">
<div class="custom-search-box">
<input
type="text"
v-model="pageForm.commonKeyword"
placeholder="请输入关键词进行搜索"
class="search-input"
@keyup.enter="doSearch"
/>
</div>
</div>
</div>
<div class="filter-row">
<div class="filter-label">搜索来源</div>
<div class="filter-tags">
<el-tag
v-for="item in origins"
:key="item.value"
:effect="pageForm.origins && pageForm.origins.includes(item.value) ? 'dark':'plain'"
@click="tagToggle('origins',item.value)"
>
{{ item.label }}
</el-tag>
</div>
</div>
<div class="filter-row">
<div class="filter-label">届次</div>
<div class="filter-tags">
<el-tag
v-for="item in sessionOptions"
:key="item.id"
:effect="pageForm.sessionIds && pageForm.sessionIds.includes(item.id) ? 'dark':'plain'"
@click="tagToggle('sessionIds',item.id)"
>
{{ item.fullName }}
</el-tag>
</div>
</div>
<div class="filter-row">
<div class="filter-label">提案类别</div>
<div class="filter-tags">
<el-tag
v-for="item in typeOptions"
:key="item.code"
:effect="pageForm.typeIds && pageForm.typeIds.includes(item.id) ? 'dark':'plain'"
@click="tagToggle('typeIds',item.id)"
>
{{ item.name }}
</el-tag>
</div>
</div>
<div class="filter-row">
<div class="filter-label">立案结果</div>
<div class="filter-tags">
<el-tag
v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"
:key="item.code"
:effect="pageForm.caseFilingResults && pageForm.caseFilingResults.includes(item.code) ? 'dark':'plain'"
@click="tagToggle('caseFilingResults',item.code)"
>
{{ item.label }}
</el-tag>
</div>
</div>
<div class="filter-row">
<div class="filter-label">立案类型</div>
<div class="filter-tags">
<el-tag
v-for="item in dict.type.PROPOSAL_CASE_FILING_TYPE"
:key="item.code"
:effect="pageForm.caseFilingTypes && pageForm.caseFilingTypes.includes(item.code) ? 'dark':'plain'"
@click="tagToggle('caseFilingTypes',item.code)"
>
{{ item.label }}
</el-tag>
</div>
</div>
<search @search="doSearch" class="mt10">
<search-item label="代表团">
<el-select clearable filterable placeholder="所属代表团" v-model="pageForm.delegationId">
<el-select clearable filterable placeholder="请选择所属代表团" v-model="pageForm.delegationId">
<el-option :key="item.id" :label="item.name" :value="item.id"
v-for="item in delegationOptions"></el-option>
</el-select>
@@ -78,28 +191,9 @@ layout("/layouts/platform.html"){
v-for="item in unitOptions"></el-option>
</el-select>
</search-item>
<search-item label="提案类别">
<el-select clearable filterable multiple placeholder="提案类别" v-model="pageForm.typeIds">
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in typeOptions"></el-option>
</el-select>
</search-item>
<search-item label="立案结果">
<el-select clearable filterable multiple placeholder="立案结果" v-model="pageForm.caseFilingResults">
<el-option :key="item.code" :label="item.label" :value="item.code" v-for="item in dict.type.PROPOSAL_CASE_FILING_RESULT"></el-option>
</el-select>
</search-item>
<search-item label="立案类型">
<el-select clearable filterable multiple placeholder="立案类型" v-model="pageForm.caseFilingTypes">
<el-option :key="item.code" :label="item.label" :value="item.code" v-for="item in dict.type.PROPOSAL_CASE_FILING_TYPE"></el-option>
</el-select>
</search-item>
<!-- <search-item label="承办单位">-->
<!-- <el-select clearable filterable placeholder="承办单位" v-model="pageForm.undertakeUnitId">-->
<!-- <el-option :key="item.code" :label="item.name" :value="item.id" v-for="item in underTakeOptions"></el-option>-->
<!-- </el-select>-->
<!-- </search-item>-->
</search>
</el-card>
<el-card shadow="never">
<table-tool></table-tool>
<el-table :data="tableData" @sort-change="pageOrder" header-align="center" ref="tableRef"
@@ -177,12 +271,32 @@ layout("/layouts/platform.html"){
unionOptions: [],
unitOptions: [],
pageForm: {
origins: [],
sessionIds: [],
typeIds: [],
caseFilingResults: [],
caseFilingTypes: [],
unionId: null,
unitId: null
}
},
origins: [
{
label: '提案名称',
value: 'name'
},
{
label: '案由',
value: 'brief'
},
{
label: '答复内容',
value: 'answer'
},
{
label: '提案人',
value: 'createUserName'
}
]
}
},
methods: {