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)
},