bug整改
This commit is contained in:
@@ -356,7 +356,8 @@ public class SysUserController {
|
|||||||
if (StrUtil.isBlank(pathname)) {
|
if (StrUtil.isBlank(pathname)) {
|
||||||
|
|
||||||
}
|
}
|
||||||
Sys_menu menu = sysMenuService.fetch(Cnd.where(Sys_menu::getHref, "like", pathname + "%"));
|
// Sys_menu menu = sysMenuService.fetch(Cnd.where(Sys_menu::getHref, "like", pathname + "%"));
|
||||||
|
Sys_menu menu = sysMenuService.fetch(Cnd.where(Sys_menu::getHref, "=", pathname));
|
||||||
if (menu == null) {
|
if (menu == null) {
|
||||||
return Result.success();
|
return Result.success();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,4 +52,8 @@ public class MemberInfoPageForm extends PageForm {
|
|||||||
private String memberSearchName;
|
private String memberSearchName;
|
||||||
|
|
||||||
private String memberSearchKeyWord;
|
private String memberSearchKeyWord;
|
||||||
|
|
||||||
|
private Integer pageNumber = 1;
|
||||||
|
|
||||||
|
private Integer pageSize = 10;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -146,13 +146,14 @@ const INFO = {
|
|||||||
// 打开
|
// 打开
|
||||||
onOpen(row) {
|
onOpen(row) {
|
||||||
this.row = row
|
this.row = row
|
||||||
|
console.log(row.id)
|
||||||
this.info()
|
this.info()
|
||||||
this.getDoneTasks()
|
this.getDoneTasks()
|
||||||
},
|
},
|
||||||
|
|
||||||
// 获取申请信息
|
// 获取申请信息
|
||||||
info() {
|
info() {
|
||||||
this.$axios.post("/platform/member/change/view/findMemberChangeRecord", { id: this.row.id }).then((res) => {
|
this.$axios.post("/platform/member/change/mine/findMemberChangeRecord", { id: this.row.id }).then((res) => {
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
this.viewData = res.data
|
this.viewData = res.data
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -138,12 +138,16 @@ layout("/layouts/platform.html"){
|
|||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
pageForm: {
|
pageForm: {
|
||||||
|
pageNumber: 1,
|
||||||
|
pageSize: 10,
|
||||||
searchKeyword: "",
|
searchKeyword: "",
|
||||||
unionId: "",
|
unionId: "",
|
||||||
unitId: "",
|
unitId: "",
|
||||||
personTypes: [],
|
personTypes: [],
|
||||||
preparedBys: [],
|
preparedBys: [],
|
||||||
userStates: [],
|
userStates: [],
|
||||||
|
sexTypes: [],
|
||||||
|
totalCount: 0,
|
||||||
cnd: ""
|
cnd: ""
|
||||||
},
|
},
|
||||||
userId: "",
|
userId: "",
|
||||||
|
|||||||
+42
-83
@@ -2,7 +2,7 @@
|
|||||||
layout("/layouts/platform_h5.html"){
|
layout("/layouts/platform_h5.html"){
|
||||||
#-->
|
#-->
|
||||||
|
|
||||||
<style >
|
<style>
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
<div id="app" v-cloak>
|
<div id="app" v-cloak>
|
||||||
@@ -10,7 +10,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
class="custom-nav"></van-nav-bar>
|
class="custom-nav"></van-nav-bar>
|
||||||
|
|
||||||
<div class="form-container">
|
<div class="form-container">
|
||||||
<van-form ref="formRef" >
|
<van-form ref="formRef">
|
||||||
<van-cell-group title="信息填报" class="form-section">
|
<van-cell-group title="信息填报" class="form-section">
|
||||||
<van-field label="经办人" v-model="formData.userName" placeholder="从信息中心获取" readonly></van-field>
|
<van-field label="经办人" v-model="formData.userName" placeholder="从信息中心获取" readonly></van-field>
|
||||||
<van-field label="工号" v-model="formData.loginName" placeholder="从信息中心获取" readonly></van-field>
|
<van-field label="工号" v-model="formData.loginName" placeholder="从信息中心获取" readonly></van-field>
|
||||||
@@ -28,7 +28,8 @@ layout("/layouts/platform_h5.html"){
|
|||||||
required
|
required
|
||||||
></van-field>
|
></van-field>
|
||||||
<van-popup position="bottom" round v-model:show="showReimburseTypePicker">
|
<van-popup position="bottom" round v-model:show="showReimburseTypePicker">
|
||||||
<van-picker :columns="reimburseTypeColumns" @cancel="showReimburseTypePicker = false" @confirm="onReimburseTypeConfirm" show-toolbar></van-picker>
|
<van-picker :columns="reimburseTypeColumns" @cancel="showReimburseTypePicker = false"
|
||||||
|
@confirm="onReimburseTypeConfirm" show-toolbar></van-picker>
|
||||||
</van-popup>
|
</van-popup>
|
||||||
|
|
||||||
<!-- 支付方式 -->
|
<!-- 支付方式 -->
|
||||||
@@ -44,7 +45,8 @@ layout("/layouts/platform_h5.html"){
|
|||||||
required
|
required
|
||||||
></van-field>
|
></van-field>
|
||||||
<van-popup position="bottom" round v-model:show="showPaymentWayPicker">
|
<van-popup position="bottom" round v-model:show="showPaymentWayPicker">
|
||||||
<van-picker :columns="paymentWayColumns" @cancel="showPaymentWayPicker = false" @confirm="onPaymentWayConfirm" show-toolbar></van-picker>
|
<van-picker :columns="paymentWayColumns" @cancel="showPaymentWayPicker = false"
|
||||||
|
@confirm="onPaymentWayConfirm" show-toolbar></van-picker>
|
||||||
</van-popup>
|
</van-popup>
|
||||||
|
|
||||||
<!-- 报销项目 -->
|
<!-- 报销项目 -->
|
||||||
@@ -60,7 +62,8 @@ layout("/layouts/platform_h5.html"){
|
|||||||
required
|
required
|
||||||
></van-field>
|
></van-field>
|
||||||
<van-popup position="bottom" round v-model:show="showReimburseProjectPicker">
|
<van-popup position="bottom" round v-model:show="showReimburseProjectPicker">
|
||||||
<van-picker :columns="reimburseProjectColumns" @cancel="showReimburseProjectPicker = false" @confirm="onReimburseProjectConfirm" show-toolbar></van-picker>
|
<van-picker :columns="reimburseProjectColumns" @cancel="showReimburseProjectPicker = false"
|
||||||
|
@confirm="onReimburseProjectConfirm" show-toolbar></van-picker>
|
||||||
</van-popup>
|
</van-popup>
|
||||||
|
|
||||||
<!-- 报销经费来源 -->
|
<!-- 报销经费来源 -->
|
||||||
@@ -76,7 +79,8 @@ layout("/layouts/platform_h5.html"){
|
|||||||
required
|
required
|
||||||
></van-field>
|
></van-field>
|
||||||
<van-popup position="bottom" round v-model:show="showReimburseFundSourcePicker">
|
<van-popup position="bottom" round v-model:show="showReimburseFundSourcePicker">
|
||||||
<van-picker :columns="reimburseFundSourceColumns" @cancel="showReimburseFundSourcePicker = false" @confirm="onReimburseFundSourceConfirm" show-toolbar></van-picker>
|
<van-picker :columns="reimburseFundSourceColumns" @cancel="showReimburseFundSourcePicker = false"
|
||||||
|
@confirm="onReimburseFundSourceConfirm" show-toolbar></van-picker>
|
||||||
</van-popup>
|
</van-popup>
|
||||||
|
|
||||||
<!-- 联系方式 -->
|
<!-- 联系方式 -->
|
||||||
@@ -93,7 +97,8 @@ layout("/layouts/platform_h5.html"){
|
|||||||
clickable
|
clickable
|
||||||
></van-field>
|
></van-field>
|
||||||
<van-popup position="bottom" round v-model:show="showClubPicker">
|
<van-popup position="bottom" round v-model:show="showClubPicker">
|
||||||
<van-picker :columns="clubColumns" @cancel="showClubPicker = false" @confirm="onClubConfirm" show-toolbar></van-picker>
|
<van-picker :columns="clubColumns" @cancel="showClubPicker = false" @confirm="onClubConfirm"
|
||||||
|
show-toolbar></van-picker>
|
||||||
</van-popup>
|
</van-popup>
|
||||||
|
|
||||||
<!-- 经费余额 -->
|
<!-- 经费余额 -->
|
||||||
@@ -161,7 +166,8 @@ layout("/layouts/platform_h5.html"){
|
|||||||
</div>
|
</div>
|
||||||
</van-popup>
|
</van-popup>
|
||||||
|
|
||||||
<van-field label="联系方式" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'" v-model="formData.condolenceMobile" placeholder="请输入联系方式"></van-field>
|
<van-field label="联系方式" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'"
|
||||||
|
v-model="formData.condolenceMobile" placeholder="请输入联系方式"></van-field>
|
||||||
|
|
||||||
<van-field
|
<van-field
|
||||||
v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'"
|
v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'"
|
||||||
@@ -174,10 +180,12 @@ layout("/layouts/platform_h5.html"){
|
|||||||
clickable
|
clickable
|
||||||
></van-field>
|
></van-field>
|
||||||
<van-popup position="bottom" round v-model:show="showCondolenceTypePicker">
|
<van-popup position="bottom" round v-model:show="showCondolenceTypePicker">
|
||||||
<van-picker :columns="condolenceTypeColumns" @cancel="showCondolenceTypePicker = false" @confirm="onCondolenceTypeConfirm" show-toolbar></van-picker>
|
<van-picker :columns="condolenceTypeColumns" @cancel="showCondolenceTypePicker = false"
|
||||||
|
@confirm="onCondolenceTypeConfirm" show-toolbar></van-picker>
|
||||||
</van-popup>
|
</van-popup>
|
||||||
|
|
||||||
<van-field label="慰问金额" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'" v-model="formData.money" readonly></van-field>
|
<van-field label="慰问金额" v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'"
|
||||||
|
v-model="formData.money" readonly></van-field>
|
||||||
<van-field
|
<van-field
|
||||||
label="慰问时间"
|
label="慰问时间"
|
||||||
v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'"
|
v-if="formData.reimburseProject === 'UNION_REIMBURSE_PROJECT_1'"
|
||||||
@@ -202,7 +210,8 @@ layout("/layouts/platform_h5.html"){
|
|||||||
</template>
|
</template>
|
||||||
<!-- 活动相关字段 (当报销项目不为慰问时显示) -->
|
<!-- 活动相关字段 (当报销项目不为慰问时显示) -->
|
||||||
<template v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">
|
<template v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'">
|
||||||
<van-field label="活动名称" v-model="formData.activityName" placeholder="请输入活动名称"></van-field>
|
<van-field label="活动名称" v-model="formData.activityName"
|
||||||
|
placeholder="请输入活动名称"></van-field>
|
||||||
|
|
||||||
<!-- 活动类型 (当报销项目为活动时显示) -->
|
<!-- 活动类型 (当报销项目为活动时显示) -->
|
||||||
<van-field
|
<van-field
|
||||||
@@ -215,7 +224,8 @@ layout("/layouts/platform_h5.html"){
|
|||||||
clickable
|
clickable
|
||||||
></van-field>
|
></van-field>
|
||||||
<van-popup position="bottom" round v-model:show="showActivityTypePicker">
|
<van-popup position="bottom" round v-model:show="showActivityTypePicker">
|
||||||
<van-picker :columns="activityTypeColumns" @cancel="showActivityTypePicker = false" @confirm="onActivityTypeConfirm" show-toolbar></van-picker>
|
<van-picker :columns="activityTypeColumns" @cancel="showActivityTypePicker = false"
|
||||||
|
@confirm="onActivityTypeConfirm" show-toolbar></van-picker>
|
||||||
</van-popup>
|
</van-popup>
|
||||||
|
|
||||||
<!-- 活动人数 (当报销项目为活动时显示) -->
|
<!-- 活动人数 (当报销项目为活动时显示) -->
|
||||||
@@ -227,8 +237,10 @@ layout("/layouts/platform_h5.html"){
|
|||||||
type="number"
|
type="number"
|
||||||
></van-field>
|
></van-field>
|
||||||
|
|
||||||
<van-field label="活动地点" v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'" v-model="formData.activityPlace" placeholder="请输入活动地点"></van-field>
|
<van-field label="活动地点" v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'"
|
||||||
<van-field label="报销金额" v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'" v-model="formData.money" placeholder="请输入报销金额" type="number"></van-field>
|
v-model="formData.activityPlace" placeholder="请输入活动地点"></van-field>
|
||||||
|
<van-field label="报销金额" v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'"
|
||||||
|
v-model="formData.money" placeholder="请输入报销金额" type="number"></van-field>
|
||||||
<van-field
|
<van-field
|
||||||
label="活动时间"
|
label="活动时间"
|
||||||
v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'"
|
v-if="formData.reimburseProject !== 'UNION_REIMBURSE_PROJECT_1'"
|
||||||
@@ -281,7 +293,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
></van-field>
|
></van-field>
|
||||||
|
|
||||||
<van-field class="more-text" name="files"
|
<van-field class="more-text" name="files"
|
||||||
label="附件" >
|
label="附件">
|
||||||
<template #input>
|
<template #input>
|
||||||
<h5-file-upload
|
<h5-file-upload
|
||||||
slot="input"
|
slot="input"
|
||||||
@@ -310,7 +322,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
new Vue({
|
new Vue({
|
||||||
store,
|
store,
|
||||||
el: '#app',
|
el: '#app',
|
||||||
dicts: ["UNION_REIMBURSE_TYPE","UNION_REIMBURSE_PROJECT","UNION_REIMBURSE_PAYMENT_WAY","UNION_REIMBURSE_FUND_SOURCE"],
|
dicts: ["UNION_REIMBURSE_TYPE", "UNION_REIMBURSE_PROJECT", "UNION_REIMBURSE_PAYMENT_WAY", "UNION_REIMBURSE_FUND_SOURCE"],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
bizId: GetQueryString("bizId"),
|
bizId: GetQueryString("bizId"),
|
||||||
@@ -384,9 +396,9 @@ layout("/layouts/platform_h5.html"){
|
|||||||
// 活动类型
|
// 活动类型
|
||||||
showActivityTypePicker: false,
|
showActivityTypePicker: false,
|
||||||
activityTypeColumns: [
|
activityTypeColumns: [
|
||||||
{ text: '分工会活动', value: '分工会活动' },
|
{text: '分工会活动', value: '分工会活动'},
|
||||||
{ text: '校工会活动', value: '校工会活动' },
|
{text: '校工会活动', value: '校工会活动'},
|
||||||
{ text: '协会(社团)活动', value: '协会(社团)活动' }
|
{text: '协会(社团)活动', value: '协会(社团)活动'}
|
||||||
],
|
],
|
||||||
// 其他数据
|
// 其他数据
|
||||||
clubOptions: [],
|
clubOptions: [],
|
||||||
@@ -448,15 +460,6 @@ layout("/layouts/platform_h5.html"){
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 表单验证
|
|
||||||
try {
|
|
||||||
await this.$refs.formRef.validate();
|
|
||||||
|
|
||||||
this.$toast.loading({
|
|
||||||
message: '保存中...',
|
|
||||||
forbidClick: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
this.$axios.post("/platform/unionReimburse/apply/save", {data: JSON.stringify(this.formData)})
|
this.$axios.post("/platform/unionReimburse/apply/save", {data: JSON.stringify(this.formData)})
|
||||||
.then((res) => {
|
.then((res) => {
|
||||||
this.$toast.clear();
|
this.$toast.clear();
|
||||||
@@ -471,13 +474,9 @@ layout("/layouts/platform_h5.html"){
|
|||||||
this.$toast.clear();
|
this.$toast.clear();
|
||||||
this.$toast.fail('网络错误,请稍后重试');
|
this.$toast.fail('网络错误,请稍后重试');
|
||||||
});
|
});
|
||||||
} catch (error) {
|
|
||||||
// 表单验证失败
|
|
||||||
console.log('表单验证失败', error);
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
// 提交
|
// 提交
|
||||||
async onSubmit(){
|
async onSubmit() {
|
||||||
// 余额校验
|
// 余额校验
|
||||||
if (this.formData.money && this.formData.fundBalance) {
|
if (this.formData.money && this.formData.fundBalance) {
|
||||||
const balance = parseFloat(this.formData.fundBalance);
|
const balance = parseFloat(this.formData.fundBalance);
|
||||||
@@ -486,19 +485,6 @@ layout("/layouts/platform_h5.html"){
|
|||||||
this.$message.warning("经费余额不足");
|
this.$message.warning("经费余额不足");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
try {
|
|
||||||
await this.$refs.formRef.validate();
|
|
||||||
|
|
||||||
this.$dialog.confirm({
|
|
||||||
title: '提示',
|
|
||||||
message: '您确定要提交吗?',
|
|
||||||
}).then(() => {
|
|
||||||
this.$toast.loading({
|
|
||||||
message: '提交中...',
|
|
||||||
forbidClick: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
this.$axios.post('/platform/unionReimburse/apply/submit', {data: JSON.stringify(this.formData)})
|
this.$axios.post('/platform/unionReimburse/apply/submit', {data: JSON.stringify(this.formData)})
|
||||||
.then(res => {
|
.then(res => {
|
||||||
this.$toast.clear();
|
this.$toast.clear();
|
||||||
@@ -513,12 +499,6 @@ layout("/layouts/platform_h5.html"){
|
|||||||
this.$toast.clear();
|
this.$toast.clear();
|
||||||
this.$toast.fail('网络错误,请稍后重试');
|
this.$toast.fail('网络错误,请稍后重试');
|
||||||
});
|
});
|
||||||
}).catch(() => {
|
|
||||||
// 取消提交
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
// 表单验证失败
|
|
||||||
console.log('表单验证失败', error);
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 再次提交
|
// 再次提交
|
||||||
@@ -532,18 +512,6 @@ layout("/layouts/platform_h5.html"){
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
try {
|
|
||||||
await this.$refs.formRef.validate();
|
|
||||||
|
|
||||||
this.$dialog.confirm({
|
|
||||||
title: '提示',
|
|
||||||
message: '您确定要提交吗?',
|
|
||||||
}).then(() => {
|
|
||||||
this.$toast.loading({
|
|
||||||
message: '提交中...',
|
|
||||||
forbidClick: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
this.$axios.post('/platform/unionReimburse/apply/submitAgain', {
|
this.$axios.post('/platform/unionReimburse/apply/submitAgain', {
|
||||||
data: JSON.stringify(this.formData),
|
data: JSON.stringify(this.formData),
|
||||||
taskId: GetQueryString("taskId")
|
taskId: GetQueryString("taskId")
|
||||||
@@ -561,13 +529,6 @@ layout("/layouts/platform_h5.html"){
|
|||||||
this.$toast.clear();
|
this.$toast.clear();
|
||||||
this.$toast.fail('网络错误,请稍后重试');
|
this.$toast.fail('网络错误,请稍后重试');
|
||||||
});
|
});
|
||||||
}).catch(() => {
|
|
||||||
// 取消提交
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
// 表单验证失败
|
|
||||||
console.log('表单验证失败', error);
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
onReimburseTypeConfirm(o) {
|
onReimburseTypeConfirm(o) {
|
||||||
this.$set(this.formData, "reimburseTypeName", o.text); // 显示名称
|
this.$set(this.formData, "reimburseTypeName", o.text); // 显示名称
|
||||||
@@ -657,7 +618,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
this.condolenceOptions = res.data;
|
this.condolenceOptions = res.data;
|
||||||
this.condolenceColumns = res.data.map(item => {
|
this.condolenceColumns = res.data.map(item => {
|
||||||
return {
|
return {
|
||||||
text: item.userName+'('+item.loginName+')'+'('+item.unitName+')'+'('+item.sex+')',
|
text: item.userName + '(' + item.loginName + ')' + '(' + item.unitName + ')' + '(' + item.sex + ')',
|
||||||
value: item.id
|
value: item.id
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -825,14 +786,14 @@ layout("/layouts/platform_h5.html"){
|
|||||||
init() {
|
init() {
|
||||||
this.bizId = GetQueryString("bizId")
|
this.bizId = GetQueryString("bizId")
|
||||||
if (this.bizId) {
|
if (this.bizId) {
|
||||||
this.$axios.post("/platform/unionReimburse/apply/info", { id: this.bizId }).then((res) => {
|
this.$axios.post("/platform/unionReimburse/apply/info", {id: this.bizId}).then((res) => {
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
// 先保存原始数据
|
// 先保存原始数据
|
||||||
const originalData = {...res.data};
|
const originalData = {...res.data};
|
||||||
this.formData = res.data;
|
this.formData = res.data;
|
||||||
|
|
||||||
// 处理报销类别显示
|
// 处理报销类别显示
|
||||||
if (this.reimburseTypeColumns.length > 0 ) {
|
if (this.reimburseTypeColumns.length > 0) {
|
||||||
const matchedReimburseType = this.reimburseTypeColumns.find(item =>
|
const matchedReimburseType = this.reimburseTypeColumns.find(item =>
|
||||||
item.value === originalData.reimburseType
|
item.value === originalData.reimburseType
|
||||||
)
|
)
|
||||||
@@ -854,7 +815,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 处理报销项目显示
|
// 处理报销项目显示
|
||||||
if (this.reimburseProjectColumns.length > 0 ) {
|
if (this.reimburseProjectColumns.length > 0) {
|
||||||
const matchedReimburseProject = this.reimburseProjectColumns.find(item =>
|
const matchedReimburseProject = this.reimburseProjectColumns.find(item =>
|
||||||
item.value === originalData.reimburseProject
|
item.value === originalData.reimburseProject
|
||||||
)
|
)
|
||||||
@@ -865,7 +826,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 处理报销经费来源显示
|
// 处理报销经费来源显示
|
||||||
if (this.reimburseFundSourceColumns.length > 0 ) {
|
if (this.reimburseFundSourceColumns.length > 0) {
|
||||||
const matchedReimburseFundSource = this.reimburseFundSourceColumns.find(item =>
|
const matchedReimburseFundSource = this.reimburseFundSourceColumns.find(item =>
|
||||||
item.value === originalData.reimburseFundSource
|
item.value === originalData.reimburseFundSource
|
||||||
)
|
)
|
||||||
@@ -876,7 +837,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 处理活动类型显示
|
// 处理活动类型显示
|
||||||
if (this.activityTypeColumns.length > 0 ) {
|
if (this.activityTypeColumns.length > 0) {
|
||||||
const matchedActivityType = this.activityTypeColumns.find(item =>
|
const matchedActivityType = this.activityTypeColumns.find(item =>
|
||||||
item.value === originalData.activityType
|
item.value === originalData.activityType
|
||||||
)
|
)
|
||||||
@@ -887,7 +848,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 处理社团显示
|
// 处理社团显示
|
||||||
if (this.clubColumns.length > 0 ) {
|
if (this.clubColumns.length > 0) {
|
||||||
const matchedClub = this.clubColumns.find(item =>
|
const matchedClub = this.clubColumns.find(item =>
|
||||||
item.value === originalData.clubId
|
item.value === originalData.clubId
|
||||||
)
|
)
|
||||||
@@ -897,7 +858,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 处理慰问类型显示
|
// 处理慰问类型显示
|
||||||
if (this.condolenceTypeColumns.length > 0 ) {
|
if (this.condolenceTypeColumns.length > 0) {
|
||||||
const matchedCondolenceType = this.condolenceTypeColumns.find(item =>
|
const matchedCondolenceType = this.condolenceTypeColumns.find(item =>
|
||||||
item.value === originalData.condolenceType
|
item.value === originalData.condolenceType
|
||||||
)
|
)
|
||||||
@@ -924,17 +885,15 @@ layout("/layouts/platform_h5.html"){
|
|||||||
this.$set(this.formData, "unionName", user.union.name)
|
this.$set(this.formData, "unionName", user.union.name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
async created(){
|
||||||
async created() {
|
|
||||||
await this.initDictOptions();
|
await this.initDictOptions();
|
||||||
await this.init();
|
await this.init();
|
||||||
this.queryCondolenceType();
|
this.queryCondolenceType();
|
||||||
this.queryClubs();
|
this.queryClubs();
|
||||||
}
|
}
|
||||||
});
|
})
|
||||||
</script>
|
</script>
|
||||||
<!--#
|
<!--#
|
||||||
}
|
}
|
||||||
|
|||||||
+49
-17
@@ -113,16 +113,18 @@ layout("/layouts/platform_h5.html"){
|
|||||||
|
|
||||||
<van-field v-model="formData.unitName" label="工作单位" readonly></van-field>
|
<van-field v-model="formData.unitName" label="工作单位" readonly></van-field>
|
||||||
<van-field v-model="formData.unionName" label="所属工会" readonly></van-field>
|
<van-field v-model="formData.unionName" label="所属工会" readonly></van-field>
|
||||||
<van-field label="所属校区" v-model="formData.campus" readonly clickable
|
|
||||||
@click="showCampusPicker = true" placeholder="请选择所属校区">
|
<van-field
|
||||||
</van-field>
|
v-model="formData.campusName"
|
||||||
<van-popup v-model="showCampusPicker" position="bottom">
|
name="campusName"
|
||||||
<van-picker
|
label="所属校区"
|
||||||
show-toolbar
|
readonly
|
||||||
:columns="campusColumns"
|
placeholder="请选择所属校区"
|
||||||
@confirm="(v)=>{formData.campus = v;showCampusPicker = false}"
|
@click="showCampusPicker = true"
|
||||||
@cancel="showCampusPicker = false"
|
clickable
|
||||||
></van-picker>
|
></van-field>
|
||||||
|
<van-popup position="bottom" round v-model:show="showCampusPicker">
|
||||||
|
<van-picker :columns="campusColumns" @cancel="showCampusPicker = false" @confirm="onCampusColumns" show-toolbar></van-picker>
|
||||||
</van-popup>
|
</van-popup>
|
||||||
|
|
||||||
<van-field
|
<van-field
|
||||||
@@ -261,6 +263,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
showAcademicDegreePicker: false,
|
showAcademicDegreePicker: false,
|
||||||
// 校区
|
// 校区
|
||||||
showCampusPicker: false,
|
showCampusPicker: false,
|
||||||
|
campusColumns: [],
|
||||||
// 生日
|
// 生日
|
||||||
showDatePicker: false,
|
showDatePicker: false,
|
||||||
}
|
}
|
||||||
@@ -278,7 +281,7 @@ layout("/layouts/platform_h5.html"){
|
|||||||
this.$axios.post('/platform/member/apply/submit/save', {data: JSON.stringify(this.formData)}).then(res => {
|
this.$axios.post('/platform/member/apply/submit/save', {data: JSON.stringify(this.formData)}).then(res => {
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
this.$toast.success(res.msg)
|
this.$toast.success(res.msg)
|
||||||
this.$pjaxReplace('/platform/h5/member/apply/mine')
|
this.$pjaxReplace('/platform/member/apply/mine/h5')
|
||||||
} else {
|
} else {
|
||||||
this.$toast.fail('操作失败')
|
this.$toast.fail('操作失败')
|
||||||
console.log(res.msg)
|
console.log(res.msg)
|
||||||
@@ -405,6 +408,21 @@ layout("/layouts/platform_h5.html"){
|
|||||||
this.$set(this.formData, "email", email)
|
this.$set(this.formData, "email", email)
|
||||||
this.$set(this.formData, "families", families ? families : [])
|
this.$set(this.formData, "families", families ? families : [])
|
||||||
this.$set(this.formData, "personalData", personalData)
|
this.$set(this.formData, "personalData", personalData)
|
||||||
|
|
||||||
|
// 处理校区信息
|
||||||
|
if (campus) {
|
||||||
|
this.$set(this.formData, "campus", campus) // 保存校区代码值
|
||||||
|
// 根据校区代码值查找对应的名称
|
||||||
|
if (this.campusColumns && this.campusColumns.length > 0) {
|
||||||
|
const campusItem = this.campusColumns.find(item => item.value === campus)
|
||||||
|
if (campusItem) {
|
||||||
|
this.$set(this.formData, "campusName", campusItem.text)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.$set(this.formData, "campus", "")
|
||||||
|
this.$set(this.formData, "campusName", "")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
toChinesNum(num){
|
toChinesNum(num){
|
||||||
@@ -425,6 +443,25 @@ layout("/layouts/platform_h5.html"){
|
|||||||
noWan = "0" + noWan;
|
noWan = "0" + noWan;
|
||||||
}
|
}
|
||||||
return overWan ? getWan(overWan) + "万" + getWan(noWan) : getWan(num);
|
return overWan ? getWan(overWan) + "万" + getWan(noWan) : getWan(num);
|
||||||
|
},
|
||||||
|
onCampusColumns(o) {
|
||||||
|
this.$set(this.formData, "campusName", o.text); // 显示名称
|
||||||
|
this.$set(this.formData, "campus", o.value); // 字典值
|
||||||
|
this.showCampusPicker = false;
|
||||||
|
},
|
||||||
|
async initDictOptions() {
|
||||||
|
// 初始化校区字典数据
|
||||||
|
const campusData = await this.$businessTool.getDictOptions('USER_CAMPUS')
|
||||||
|
this.campusColumns = campusData.map(item => {
|
||||||
|
return {value: item.code, text: item.name}
|
||||||
|
})
|
||||||
|
// 初始化完成后,如果已经有用户数据,更新校区显示名称
|
||||||
|
if (this.formData.campus && this.campusColumns.length > 0) {
|
||||||
|
const campusItem = this.campusColumns.find(item => item.value === this.formData.campus)
|
||||||
|
if (campusItem) {
|
||||||
|
this.$set(this.formData, "campusName", campusItem.text)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@@ -452,14 +489,9 @@ layout("/layouts/platform_h5.html"){
|
|||||||
}
|
}
|
||||||
return []
|
return []
|
||||||
},
|
},
|
||||||
campusColumns(){
|
|
||||||
if(this.dict && this.dict.type && this.dict.type.USER_CAMPUS){
|
|
||||||
return this.dict.type.USER_CAMPUS.map(v=>v.value)
|
|
||||||
}
|
|
||||||
return []
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
this.initDictOptions();
|
||||||
this.init()
|
this.init()
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user