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

commit

Browse Source
This commit is contained in:
@jyuhsin
2025-04-23 17:45:45 +08:00
parent 96895296f8
commit 18f298b879
26 changed files with 183 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html
+6 -9
View File
@@ -71,7 +71,7 @@ layout("/mobile/platform.html"){
</style>
<div id="app" v-cloak>
<van-sticky>
<van-nav-bar title="分工会入会接收" left-text="返回" left-arrow @click-left="pjaxReplace('/mobile/index')"></van-nav-bar>
<van-nav-bar title="分工会入会审核" left-text="返回" left-arrow @click-left="pjaxReplace('/mobile/index')"></van-nav-bar>
<van-search
v-model="pageForm.searchKeyword"
placeholder="请输入工号或者姓名进行查询"
@@ -103,7 +103,6 @@ layout("/mobile/platform.html"){
<van-row>
<van-col span="24"><span style="color: grey">工作单位：</span>{{item.unitName}}</van-col>
<van-col span="24"><span style="color: grey">所属工会：</span><span>{{item.unionName}}</span></van-col>
<van-col span="24"><span style="color: grey">分配工会：</span><span>{{item.allocationUnionName}}</span></van-col>
<van-col span="24"><span style="color: grey">在职状态：</span>{{item.userState}}</van-col>
<van-col span="24"><span style="color: grey">人员类型：</span><span>{{item.personType}}</span></van-col>
</van-row>
@@ -121,12 +120,12 @@ layout("/mobile/platform.html"){
type="info" style="margin-right: 4px">查看
</van-button>
<van-button size="small" type="primary"
v-if="item.applyStateId === 50"
v-if="item.applyStateId === 20"
@click="openApproval(item)"
style="margin-right: 4px">审核
</van-button>
<van-button size="small" type="danger"
v-if="[70].includes(item.applyStateId)"
v-if="[30, 40].includes(item.applyStateId)"
@click="openRevoke(item.id)"
style="margin-right: 4px">撤回
</van-button>
@@ -145,13 +144,11 @@ layout("/mobile/platform.html"){
</van-sticky>
<member-apply-audit-info ref="memberApplyAuditInfoRef"></member-apply-audit-info>
<div v-if="showApprovalForm">
<div class="process-title">{{ '分工会接收' }}</div>
<div class="process-title">{{ '分工会审核' }}</div>
<van-form>
<van-field label="审核人员" readonly name="username" v-model="formData.username" required></van-field>
<van-field label="审核时间" readonly name="auditTime" v-model="formData.auditTime" required></van-field>
<van-field label="审核意见" name="auditOpinion"
type="textarea" maxlength="200" show-word-limit
v-model="formData.auditOpinion" placeholder="请输入审核意见" required></van-field>
<van-field label="审核意见" name="auditOpinion" v-model="formData.auditOpinion" placeholder="请输入审核意见" required></van-field>
</van-form>
<div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
<van-button type="default" block @click="infoShow=false">取消</van-button>
@@ -236,7 +233,7 @@ layout("/mobile/platform.html"){
}
let msg = '确定要通过此条申请吗？'
if (approvalType === 0) {
msg = '确定要拒绝接收该教工的工会关系吗？'
msg = '拒绝后不可撤回，确定要拒绝此条申请吗？'
} else if (approvalType === 2) {
msg = '确定要退回此条申请吗？'
}
src/main/resources/views/mobile/member/apply/schoolUnionAudit/index.html
+4 -26
View File
@@ -105,7 +105,6 @@ layout("/mobile/platform.html"){
<van-row>
<van-col span="24"><span style="color: grey">工作单位：</span>{{item.unitName}}</van-col>
<van-col span="24"><span style="color: grey">所属工会：</span><span>{{item.unionName}}</span></van-col>
<van-col span="24"><span style="color: grey">分配工会：</span><span>{{item.allocationUnionName}}</span></van-col>
<van-col span="24"><span style="color: grey">在职状态：</span>{{item.userState}}</van-col>
<van-col span="24"><span style="color: grey">人员类型：</span><span>{{item.personType}}</span></van-col>
</van-row>
@@ -123,12 +122,12 @@ layout("/mobile/platform.html"){
type="info" style="margin-right: 4px">查看
</van-button>
<van-button size="small" type="primary"
v-if="[20, 70].includes(item.applyStateId)"
v-if="[50].includes(item.applyStateId)"
@click="openApproval(item)"
style="margin-right: 4px">{{ item.applyStateId === 70 ? '重新审核' : '审核' }}
style="margin-right: 4px">审核
</van-button>
<van-button size="small" type="danger"
v-if="[30, 50].includes(item.applyStateId)"
v-if="[60, 70].includes(item.applyStateId)"
@click="openRevoke(item.id)"
style="margin-right: 4px">撤回
</van-button>
@@ -152,22 +151,7 @@ layout("/mobile/platform.html"){
<van-field label="审核人员" readonly name="username" v-model="formData.username" required></van-field>
<van-field label="审核时间" readonly name="auditTime" v-model="formData.auditTime" required></van-field>
<van-field label="当前工会" readonly name="unionName" v-model="unionName" required></van-field>
<van-field label="分配工会" v-model="formData.unionName" readonly clickable required
@click="unionPicker = true" placeholder="请选择分配工会"
:rules="[{ required:true, message: '请选择分配工会' }]"></van-field>
<van-popup v-model="unionPicker" position="bottom"
get-container="body"
safe-area-inset-bottom>
<van-picker
show-toolbar
:columns="unions"
@confirm="doSetAllocationUnion"
@cancel="unionPicker = false"
></van-picker>
</van-popup>
<van-field label="审核意见" name="auditOpinion"
type="textarea" maxlength="200" show-word-limit
v-model="formData.auditOpinion" placeholder="请输入审核意见" required></van-field>
<van-field label="审核意见" name="auditOpinion" v-model="formData.auditOpinion" placeholder="请输入审核意见" required></van-field>
</van-form>
<div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
<van-button type="default" block @click="infoShow=false">取消</van-button>
@@ -262,11 +246,6 @@ layout("/mobile/platform.html"){
this.$toast.fail('请填写审核意见')
return
}
if (!this.formData.unionId) {
this.$toast.fail('请选择分配工会')
return
}
let msg = '确定要通过此条申请吗？'
if (approvalType === 0) {
msg = '拒绝后不可撤回，确定要拒绝此条申请吗？'
@@ -282,7 +261,6 @@ layout("/mobile/platform.html"){
const resp = await $.post('/platform/member/apply/schoolUnion/audit/approval', {
audit: JSON.stringify(this.formData),
id: this.id,
unionId: this.formData.unionId
})
if (resp.code === 0) {
this.$toast.success(resp.msg)
src/main/resources/views/mobile/welfare/list/receive.html
+1 -1
View File
@@ -656,7 +656,7 @@ layout("/mobile/platform.html"){
this.confirmPopup = false
await this.getProjectInfo()
setTimeout(() => {
window.location.reload()
pjaxReplace('/mobile/welfare/mine/myWelfare')
}, 1000)
},
src/main/resources/views/platform/member/apply/branchUnionAudit/index.html
+6 -7
View File
@@ -45,8 +45,8 @@ layout("/layouts/platform.html"){
<el-table-column label="操作" width="220">
<template slot-scope="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="[50].includes(row.applyStateId)" @click="openAudit(row)" size="mini" type="primary">审核</el-button>
<el-button v-if="[70].includes(row.applyStateId)" @click="doRevoke(row)" size="mini" type="danger">撤回</el-button>
<el-button v-if="[20].includes(row.applyStateId)" @click="openAudit(row)" size="mini" type="primary">审核</el-button>
<el-button v-if="[30,40,50].includes(row.applyStateId)" @click="doRevoke(row)" size="mini" type="danger">撤回</el-button>
</template>
</el-table-column>
</el-table>
@@ -57,7 +57,7 @@ layout("/layouts/platform.html"){
<template #view>
<member-apply-audit-info ref="memberApplyAuditInfoRef"></member-apply-audit-info>
<div v-if="showApprovalForm">
<div class="process-title" style="margin: 20px 0">分工会接收</div>
<div class="process-title" style="margin: 20px 0">分工会审核</div>
<el-form :model="formData" ref="approvalFormRef" label-position="left" label-width="80px">
<el-row :gutter="20">
<el-col :span="12">
@@ -89,8 +89,8 @@ layout("/layouts/platform.html"){
<el-row type="flex" justify="end">
<el-button plain @click="$refs.guava.index()">取消</el-button>
<!-- <el-button type="danger" @click="doApproval(2)">退回申请</el-button>-->
<el-button type="danger" @click="doApproval(0)">拒绝接收</el-button>
<el-button type="primary" @click="doApproval(1)">同意接收</el-button>
<el-button type="danger" @click="doApproval(0)">拒绝申请</el-button>
<el-button type="primary" @click="doApproval(1)">同意申请</el-button>
</el-row>
</div>
</template>
@@ -116,8 +116,7 @@ layout("/layouts/platform.html"){
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "allocationUnionName", label: "分配工会", sortable: true },
{ prop: "sign", label: "签字" },
// { prop: "sign", label: "签字" },
{ prop: "stateName", label: "当前节点", sortable: true }
],
src/main/resources/views/platform/member/apply/schoolUnionAudit/index.html
+3 -28
View File
@@ -45,10 +45,8 @@ layout("/layouts/platform.html"){
<el-table-column label="操作" width="220">
<template slot-scope="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="[20, 70].includes(row.applyStateId)" @click="openAudit(row)" size="mini" type="primary">
{{ (row.applyStateId === 70) ? '重新审核' : '审核' }}
</el-button>
<el-button v-if="[30, 50].includes(row.applyStateId)" @click="doRevoke(row)" size="mini" type="danger">撤回</el-button>
<el-button v-if="[50].includes(row.applyStateId)" @click="openAudit(row)" size="mini" type="primary">审核</el-button>
<el-button v-if="[60, 70].includes(row.applyStateId)" @click="doRevoke(row)" size="mini" type="danger">撤回</el-button>
</template>
</el-table-column>
</el-table>
@@ -74,23 +72,6 @@ layout("/layouts/platform.html"){
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="分配工会关系" prop="unionId">
<el-select clearable filterable placeholder="请选择工会" style="width: 100%;"
v-model="formData.unionId">
<el-option :key="item.id" :label="item.unionname" :value="item.id"
v-for="item in unions"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="当前所在工会" prop="unionName">
<el-input v-model="unionName" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="24">
<el-form-item label="审核意见" prop="auditOpinion" :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
@@ -137,8 +118,7 @@ layout("/layouts/platform.html"){
{ prop: "personType", label: "人员类型", sortable: true },
{ prop: "unionName", label: "所属工会", sortable: true },
{ prop: "unitName", label: "所属单位", sortable: true },
{ prop: "allocationUnionName", label: "分配工会", sortable: true },
{ prop: "sign", label: "签字" },
// { prop: "sign", label: "签字" },
{ prop: "stateName", label: "当前节点", sortable: true }
],
@@ -175,11 +155,6 @@ layout("/layouts/platform.html"){
})
},
doApproval(approvalType){
if (approvalType === 1 && !this.formData.unionId) {
this.$message.warning('请分配工会关系')
return
}
let msg = '确定要通过此条申请吗？'
if (approvalType === 0) {
msg = '拒绝后不可撤回，确定要拒绝此条申请吗？'
src/main/resources/views/platform/member/change/record/index.html
+1 -1
View File
@@ -167,7 +167,7 @@ layout("/layouts/platform.html"){
label="操作"
width="100px" fixed="right">
<template scope="{row}">
<el-button size="mini" type="primary" @click="openView(row.userId)">查看</el-button>
<el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
</template>
</el-table-column>
</el-table>
src/main/resources/views/platform/retired/partyBranch/manage.html
+2
View File
@@ -218,6 +218,7 @@ layout("/layouts/platform.html"){
</el-dialog>
<el-dialog :visible.sync="userDialogVisible" title="新增党支部人员" width="40%">
<vi-title title="温馨提醒：人员下拉框中查询的是退休的人员"></vi-title>
<el-form :model="partyBranchUserFormData" label-width="80px" ref="partyBranchUserForm">
<el-form-item label="人员" prop="userIds"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
@@ -245,6 +246,7 @@ layout("/layouts/platform.html"){
</el-dialog>
<el-dialog :visible.sync="committeeDialogVisible" title="新增党支部委员" width="40%">
<vi-title title="温馨提醒：人员下拉框中查询的是退休，并且政治面貌为中共党员的人员"></vi-title>
<el-form :model="partyBranchCommitteeFormData" label-width="80px" ref="partyBranchCommitteeForm">
<el-form-item label="人员" prop="userId"
:rules="[{required:true,message:'必填',trigger:['change','blur']}]">
src/main/resources/views/platform/specialstaff/manage/index.html
+1 -1
View File
@@ -238,7 +238,7 @@ layout("/layouts/platform.html"){
</template>
<!-- 杭州医学院多单位人员 -->
<template v-if="formData.specialStaffType == 'HMC_RELATION'">
<template v-if="formData.specialStaffType == 'ZJITC_RELATION'">
<el-row :gutter="10">
<el-col :span="24">
<el-form-item label="所属工会(工会关系)" prop="unionRelationUnionId">
src/main/resources/views/platform/welfare/member/MemberMange.html
+3 -3
View File
@@ -246,9 +246,9 @@ layout("/layouts/platform.html"){
<!-- <el-dropdown-item :command="{type:'edit',data:row}" v-if="judgmentAuthority">-->
<!-- 编辑-->
<!-- </el-dropdown-item>-->
<!-- <el-dropdown-item :command="{type:'delete',data:row}">-->
<!-- 移除-->
<!-- </el-dropdown-item>-->
<el-dropdown-item :command="{type:'delete',data:row}">
移除
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>