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

Merge branch 'main' of https://dd3skj.picp.vip/zhaoxinyu/v4

Browse Source 
# Conflicts:
#	src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html
This commit is contained in:
=
2025-09-19 09:39:00 +08:00
parent 90f37ef369 f88697c30a
commit bd96676929
183 changed files with 4782 additions and 2271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html
+3 -3
View File
@@ -280,7 +280,7 @@ layout("/layouts/platform.html"){
this.$axios.post("/platform/condolence/apply/save", { data: JSON.stringify(this.formData) }).then(res => {
if (res.code === 0) {
this.$message.success(res.msg)
window.location.href = "/platform/condolence/mine"
commonUtil.pjaxPush("/platform/condolence/mine")
}
})
})
@@ -298,7 +298,7 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success(res.msg)
window.location.href = "/platform/condolence/mine"
commonUtil.pjaxPush("/platform/condolence/mine")
}
})
})
@@ -319,7 +319,7 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success(res.msg)
window.location.href = "/platform/condolence/mine"
commonUtil.pjaxPush("/platform/condolence/mine")
}
})
})
src/main/resources/views/platform/zhgh/staffbenefit/condolence/mine/index.html
+2 -2
View File
@@ -103,7 +103,7 @@ layout("/layouts/platform.html"){
},
methods: {
onAdd() {
window.location.href = '/platform/condolence/apply'
commonUtil.pjaxPush('/platform/condolence/apply')
},
onView(row) {
this.$refs.guava.view(()=>{
@@ -111,7 +111,7 @@ layout("/layouts/platform.html"){
})
},
onEdit(row) {
window.location.href = '/platform/condolence/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
commonUtil.pjaxPush('/platform/condolence/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
src/main/resources/views/platform/zhgh/staffbenefit/contribution/detailed/index.html
+12 -12
View File
@@ -42,8 +42,8 @@ layout("/layouts/platform.html"){
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in unitList"></el-option>
</el-select>
</search-item>
<search-item label="捐款方式：">
<el-select placeholder="请选择捐款方式" v-model="pageForm.payMode" style="width: 100%;"
<search-item label="捐助方式：">
<el-select placeholder="请选择捐助方式" v-model="pageForm.payMode" style="width: 100%;"
clearable @change="doSearch"
filterable>
<el-option label="微信" value="WeChat"></el-option>
@@ -54,7 +54,7 @@ layout("/layouts/platform.html"){
</el-card>
<el-card shadow="never" class="mt20">
<table-tool label="捐款列表">
<table-tool label="捐助列表">
<el-button type="primary" size="small" @click="onExport">
<i class="el-icon-download"></i>
导出
@@ -90,10 +90,10 @@ layout("/layouts/platform.html"){
<template #view>
<el-descriptions :column="2" border class="table_fixed">
<el-descriptions-item label="捐款项目">
<el-descriptions-item label="捐助项目">
{{ viewData.contributionName }}
</el-descriptions-item>
<el-descriptions-item label="捐款人工号">
<el-descriptions-item label="捐助人工号">
{{ viewData.loginName }}
</el-descriptions-item>
<el-descriptions-item label="姓名">
@@ -111,13 +111,13 @@ layout("/layouts/platform.html"){
<el-descriptions-item label="善款金额">
{{ viewData.money || 0}}元
</el-descriptions-item>
<el-descriptions-item label="捐款方式">
<el-descriptions-item label="捐助方式">
{{ viewData.payMode === 'WeChat' ? '微信' : '支付宝' }}
</el-descriptions-item>
<el-descriptions-item label="捐款时间" :span="2">
<el-descriptions-item label="捐助时间" :span="2">
{{ viewData.contributionTime }}
</el-descriptions-item>
<el-descriptions-item label="捐款凭证" :span="2">
<el-descriptions-item label="捐助凭证" :span="2">
<file-preview v-if="viewData.contributionFiles" complete_result :files="viewData.contributionFiles"></file-preview>
<span v-else>暂无</span>
</el-descriptions-item>
@@ -136,15 +136,15 @@ layout("/layouts/platform.html"){
data() {
return {
tableColumns: [
{prop: 'contributionName', label: '捐款项目'},
{prop: 'loginName', label: '捐款人工号'},
{prop: 'contributionName', label: '捐助项目'},
{prop: 'loginName', label: '捐助人工号'},
{prop: 'userName', label: '姓名'},
{prop: 'mobile', label: '联系方式'},
{prop: 'unionName', label: '所属工会'},
{prop: 'unitName', label: '所属单位'},
{prop: 'money', label: '善款金额'},
{prop: 'payMode', label: '捐款方式'},
{prop: 'contributionTime', label: '捐款时间'},
{prop: 'payMode', label: '捐助方式'},
{prop: 'contributionTime', label: '捐助时间'},
],
contributionOptions: [],
unionList: [],
src/main/resources/views/platform/zhgh/staffbenefit/contribution/list/basicForm.js
+6 -6
View File
@@ -6,8 +6,8 @@ const basicForm = {
<el-input type="text" v-model="formData.contributionName" maxlength="50"
placeholder="请填写项目名称"></el-input>
</el-form-item>
<el-form-item label="所属捐款专题" prop="contributionTypeCode">
<el-select placeholder="所属捐款专题" v-model="formData.contributionTypeCode"
<el-form-item label="所属捐助专题" prop="contributionTypeCode">
<el-select placeholder="所属捐助专题" v-model="formData.contributionTypeCode"
style="width: 100%;"
clearable
filterable>
@@ -16,7 +16,7 @@ const basicForm = {
:value="item.typeCode"></el-option>
</el-select>
</el-form-item>
<el-form-item label="捐款时间" prop="contributionTime">
<el-form-item label="捐助时间" prop="contributionTime">
<el-date-picker
style="width: 100%;"
v-model="formData.contributionTime"
@@ -27,16 +27,16 @@ const basicForm = {
end-placeholder="请选择结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="捐款模式" prop="contributionMode">
<el-form-item label="捐助模式" prop="contributionMode">
<el-radio-group v-model="formData.contributionMode">
<el-radio-button :label="1">水滴筹</el-radio-button>
<el-radio-button :label="2">一日捐</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="捐款链接" prop="contributionUrl"
<el-form-item label="捐助链接" prop="contributionUrl"
v-if="formData.contributionMode === 1">
<el-input type="text" v-model="formData.contributionUrl" maxlength="50"
placeholder="请填写捐款链接"></el-input>
placeholder="请填写捐助链接"></el-input>
</el-form-item>
<el-form-item label="是否开启" prop="isContributionEnable">
<el-switch v-model="formData.isContributionEnable" active-color="#13ce66"
src/main/resources/views/platform/zhgh/staffbenefit/contribution/list/info.js
+4 -4
View File
@@ -5,16 +5,16 @@ const info = {
<el-descriptions-item label="项目名称">
{{ viewData.contributionName }}
</el-descriptions-item>
<el-descriptions-item label="所属捐款专题">
<el-descriptions-item label="所属捐助专题">
{{ viewData.typeName }}
</el-descriptions-item>
<el-descriptions-item label="捐款时间">
<el-descriptions-item label="捐助时间">
{{ viewData.contributionStartTime + ' 至 ' + viewData.contributionEndTime }}
</el-descriptions-item>
<el-descriptions-item label="捐款模式">
<el-descriptions-item label="捐助模式">
{{ viewData.contributionMode === 1 ? '水滴筹' : '一日捐' }}
</el-descriptions-item>
<el-descriptions-item label="捐款链接" :span="2">
<el-descriptions-item label="捐助链接" :span="2">
{{ viewData.contributionUrl || '暂无' }}
</el-descriptions-item>
<el-descriptions-item label="项目介绍" :span="2">
src/main/resources/views/platform/zhgh/staffbenefit/contribution/statistics/index.html
+4 -4
View File
@@ -38,7 +38,7 @@ layout("/layouts/platform.html"){
</el-card>
<el-card shadow="never" class="mt20">
<table-tool label="捐款列表"></table-tool>
<table-tool label="捐助列表"></table-tool>
<el-table :data="tableData" @sort-change="pageOrder" :size="tableSize"
row-key="id" show-summary :summary-method="getSummaries"
max-height="600">
@@ -73,9 +73,9 @@ layout("/layouts/platform.html"){
tableColumns: [
{prop: 'unionCode', label: '工会编码'},
{prop: 'name', label: '工会名称'},
{prop: 'contributionUserNum', label: '捐款人数'},
{prop: 'contributionNum', label: '捐款多少笔'},
{prop: 'money', label: '捐款总额(元)'},
{prop: 'contributionUserNum', label: '捐助人数'},
{prop: 'contributionNum', label: '捐助多少笔'},
{prop: 'money', label: '捐助总额(元)'},
],
contributionOptions: [],
unionList: [],
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/apply/index.html
+30 -30
View File
@@ -26,7 +26,7 @@ layout("/layouts/platform.html"){
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="受补助人">
<template v-if="formData.mode == 2">
<el-select :remote-method="queryRecipients"
@@ -64,8 +64,8 @@ layout("/layouts/platform.html"){
</el-date-picker>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="所属单位">
<el-form-item prop="unitName">
<el-input maxlength="50" clearable placeholder="所在单位"
@@ -84,8 +84,8 @@ layout("/layouts/platform.html"){
v-model="formData.officialCapacity"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="手机号码">
<el-form-item prop="mobile">
<el-input maxlength="11" clearable placeholder="请填写手机号码"
@@ -98,8 +98,8 @@ layout("/layouts/platform.html"){
v-model="formData.idCard" maxlength="18"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="本人月收入">
<el-form-item prop="monthlyIncome">
<el-input-number clearable
@@ -117,8 +117,8 @@ layout("/layouts/platform.html"){
v-model="formData.bankCardNum"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="困难类型" :span="3">
<el-form-item prop="subsidyStandards">
<el-select v-model="formData.subsidyStandards" style="width: 100%">
@@ -128,8 +128,8 @@ layout("/layouts/platform.html"){
</el-select>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="申请原因" :span="3">
<el-form-item prop="reason">
<el-input maxlength="500" :autosize="{ minRows: 5, maxRows: 10}"
@@ -140,8 +140,8 @@ layout("/layouts/platform.html"){
type="textarea"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="家庭成员经济收入" :span="3">
<el-form-item prop="familyList">
<el-table :data="formData.familyList" border max-height="500" size="mini" style="width: 100%">
@@ -200,8 +200,8 @@ layout("/layouts/platform.html"){
</el-table>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="附件" :span="3">
<el-form-item prop="files">
<file-upload :value.sync="formData.files"
@@ -210,8 +210,8 @@ layout("/layouts/platform.html"){
complete_result></file-upload>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="签字" :span="3">
<el-form-item prop="sign">
<pc-signature v-model="formData.sign"></pc-signature>
@@ -219,7 +219,7 @@ layout("/layouts/platform.html"){
</el-descriptions-item>
</el-descriptions>
</el-form>
<el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button>
<el-button type="primary" @click="onSubmit" v-if="!taskId">提交</el-button>
@@ -263,7 +263,7 @@ layout("/layouts/platform.html"){
reason: [{required: true, message: '必填', trigger: ['blur', 'change']}],
sign: [{required: true, message: '必填', trigger: ['blur', 'change']}]
},
// 替他人申请相关
subsidizedList: []
}
@@ -279,12 +279,12 @@ layout("/layouts/platform.html"){
this.$axios.post('/platform/difficultHelp/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) {
this.$message.success("保存成功")
window.location.href = '/platform/difficultHelp/mine'
commonUtil.pjaxPush('/platform/difficultHelp/mine')
}
})
})
},
// 提交
onSubmit() {
this.$confirm("您确定要提交吗？", "提示", {
@@ -297,12 +297,12 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/difficultHelp/mine'
commonUtil.pjaxPush('/platform/difficultHelp/mine')
}
})
})
},
onFinishTask() {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
@@ -315,12 +315,12 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/difficultHelp/mine'
commonUtil.pjaxPush('/platform/difficultHelp/mine')
}
})
})
},
// 查询受助人
queryRecipients(key) {
this.$axios.get("/platform/difficultHelp/apply/queryRecipients", {
@@ -412,12 +412,12 @@ layout("/layouts/platform.html"){
const format15 = /^\d{15}$/;
// 校验外国人永久居留身份证号
const format15Foreign = /^[a-zA-Z]{3}[0-9]{4}[0-9]{2}((01|03|05|07|08|10|12)(0[1-9]|[1-2][0-9]|3[0-1])|(04|06|09|11)(0[1-9]|[1-2][0-9]|30)|02(0[1-9]|[1-2][0-9]))[0-9]{2}$/;
// 校验格式
if (!(format18.test(idCard) || format15.test(idCard) || format15Foreign.test(idCard))) {
return { status: 0, msg: '身份证号码格式不正确' };
}
// 校验出生日期
let year, month, day;
if (idCard.length === 18) {
@@ -431,12 +431,12 @@ layout("/layouts/platform.html"){
} else {
return { status: 0, msg: '身份证号码格式不正确' };
}
const date = new Date(year, month - 1, day);
if (date.getFullYear() !== parseInt(year, 10) || date.getMonth() + 1 !== parseInt(month, 10) || date.getDate() !== parseInt(day, 10)) {
return { status: 0, msg: '身份证出生日期不正确' };
}
// 校验18位身份证号的校验码
if (idCard.length === 18) {
const coefficients = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2];
@@ -450,7 +450,7 @@ layout("/layouts/platform.html"){
return { status: 0, msg: '身份证校验码不正确' };
}
}
return { status: 1, msg: '校验通过' };
},
/**
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/mine/index.html
+10 -10
View File
@@ -14,11 +14,11 @@ layout("/layouts/platform.html"){
value-format="yyyy">
</el-date-picker>
</search-item>
<search-item label="受助人">
<el-input placeholder="请输入受助人工号或姓名" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable
filterable
@@ -29,7 +29,7 @@ layout("/layouts/platform.html"){
v-for="item in unions"></el-option>
</el-select>
</search-item>
<search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位"
style="width: 100%;" v-model="pageForm.unitId">
@@ -39,12 +39,12 @@ layout("/layouts/platform.html"){
</search-item>
</search>
</el-card>
<el-card shadow="never" class="mt10">
<table-tool label="申请记录">
<el-button size="small" type="primary" @click="onApply">帮扶申请</el-button>
</table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
ref="table" row-key="id" style="width: 100%">
<el-table-column :index="indexMethod" header-align="center" label="序号"
@@ -78,7 +78,7 @@ layout("/layouts/platform.html"){
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #view>
<info ref="infoRef"></info>
</template>
@@ -88,7 +88,7 @@ layout("/layouts/platform.html"){
<script>
<!--#include("../common/info.js"){}#-->
new Vue({
el: "#app",
mixins: [initTableMixins],
@@ -117,7 +117,7 @@ layout("/layouts/platform.html"){
},
methods: {
onApply(){
window.location.href = '/platform/difficultHelp/apply'
commonUtil.pjaxPush('/platform/difficultHelp/apply')
},
openView(row) {
this.$refs.guava.view(() => {
@@ -125,8 +125,8 @@ layout("/layouts/platform.html"){
})
},
onEdit(row) {
window.location.href = '/platform/difficultHelp/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
},
commonUtil.pjaxPush('/platform/difficultHelp/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
src/main/resources/views/platform/zhgh/staffbenefit/difficulthelp/reading/index.html
+9 -9
View File
@@ -14,11 +14,11 @@ layout("/layouts/platform.html"){
value-format="yyyy">
</el-date-picker>
</search-item>
<search-item label="受助人">
<el-input placeholder="请输入受助人工号或姓名" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="所属工会">
<el-select @change="flushUnits" @clear="flushUnits" clearable
filterable
@@ -29,7 +29,7 @@ layout("/layouts/platform.html"){
v-for="item in unions"></el-option>
</el-select>
</search-item>
<search-item label="所属单位">
<el-select clearable filterable placeholder="所属单位"
style="width: 100%;" v-model="pageForm.unitId">
@@ -39,11 +39,11 @@ layout("/layouts/platform.html"){
</search-item>
</search>
</el-card>
<el-card shadow="never" class="mt10">
<table-tool label="数据列表">
</table-tool>
<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder"
ref="table" row-key="id" style="width: 100%">
<el-table-column :index="indexMethod" header-align="center" label="序号"
@@ -72,7 +72,7 @@ layout("/layouts/platform.html"){
</el-table>
<!--#include("/layouts/pagination.html"){}#-->
</el-card>
<template #view>
<info ref="infoRef"></info>
</template>
@@ -82,7 +82,7 @@ layout("/layouts/platform.html"){
<script>
<!--#include("../common/info.js"){}#-->
new Vue({
el: "#app",
mixins: [initTableMixins],
@@ -116,8 +116,8 @@ layout("/layouts/platform.html"){
})
},
onEdit(row) {
window.location.href = '/platform/difficultHelp/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
},
commonUtil.pjaxPush('/platform/difficultHelp/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
confirmButtonText: "确定",
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html
+58 -110
View File
@@ -120,8 +120,16 @@ layout("/layouts/platform.html"){
placeholder="请输入办证机关"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="奖励金额" prop="bonus">
<el-input type="text" v-model="formData.bonus"
placeholder="请输入奖励金额"></el-input>
</el-form-item>
</el-col>
</el-row>
<!-- 以下项目保持单独一行 -->
<el-form-item prop="honorFiles" label="独生子女父母光荣证">
<file-upload :upload_number="5" :value.sync="formData.honorFiles"
@@ -168,23 +176,9 @@ layout("/layouts/platform.html"){
taskId: GetQueryString("taskId"),
formData: {},
formRules: {
userName: [{ required: true, message: '职工姓名不能为空', trigger: 'blur' }],
sex: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
birthday: [{ required: true, message: '出生年月不能为空', trigger: 'blur' }],
unitName: [{ required: true, message: '原工作单位不能为空', trigger: 'blur' }],
retireTime: [{ required: true, message: '请选择退休时间', trigger: 'change' }],
loverName: [{ required: true, message: '请输入爱人姓名', trigger: 'blur' }],
loverSex: [{ required: true, message: '请选择爱人性别', trigger: 'change' }],
loverUnitName: [{ required: true, message: '请输入爱人工作单位', trigger: 'blur' }],
marryTime: [{ required: true, message: '请选择结婚日期', trigger: 'change' }],
childrenBirthday: [{ required: true, message: '请选择子女出生日', trigger: 'change' }],
getCertificateTime: [{ required: true, message: '请选择领独生子女证日', trigger: 'change' }],
childrenGraceNumber: [{ required: true, message: '请输入独生子女光荣证号', trigger: 'blur' }],
office: [{ required: true, message: '请输入办证机关', trigger: 'blur' }],
honorFiles: [{ required: true, message: '请上传独生子女父母光荣证', trigger: 'change' }],
retireFiles: [{ required: true, message: '请上传退休证', trigger: 'change' }],
sign: [{ required: true, message: '请签字', trigger: 'change' }],
declarationAgreed: [{ required: true, message: '请勾选申报理由', trigger: 'change', type: 'enum', enum: [true] }]
declarationAgreed: [
{ required: true, message: '请勾选申报理由', trigger: 'change' }
]
},
}
},
@@ -200,106 +194,59 @@ layout("/layouts/platform.html"){
this.$axios.post('/platform/dsznfmtx/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) {
this.$message.success(res.msg)
window.location.href = '/platform/dsznfmtx/mine/index'
commonUtil.pjaxPush('/platform/dsznfmtx/mine/index')
}
})
})
},
// 提交验证
validateBeforeSubmit() {
return new Promise((resolve) => {
this.$refs.formRef.validate((valid) => {
if (valid) {
resolve(true);
} else {
this.$message.error('请完善表单信息并勾选申报理由');
resolve(false);
}
});
});
},
// 添加检查是否为退休人员的方法
async checkRetirementStatus() {
try {
const resp = await this.$axios.post('/platform/dsznfmtx/apply/checkRetirementStatus');
// 如果返回code为0且data为true，表示用户是退休人员
if (resp.code === 0 && resp.data === true) {
return true;
}
return false;
} catch (error) {
console.error('检查退休状态失败:', error);
return false;
}
},
// 检查用户是否已申请过
async checkUserApplication() {
try {
const resp = await this.$axios.post('/platform/dsznfmtx/apply/checkUserApplied');
// 如果返回code为0且data为true，表示用户已申请过
if (resp.code === 0 && resp.data === true) {
return true;
}
return false;
} catch (error) {
console.error('检查用户申请状态失败:', error);
return false;
}
},
// 提交
async onSubmit() {
// 检查是否为退休人员
const isRetired = await this.checkRetirementStatus();
if (!isRetired) {
this.$message.warning('您不是退休人员，无法申请此项福利');
return;
}
if (!this.bizId) {
const isApplied = await this.checkUserApplication();
if (isApplied) {
this.$message.warning('您已经提交过申请，不能重复申请');
return;
onSubmit() {
this.$refs.formRef.validate((valid) => {
if (valid) {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post('/platform/dsznfmtx/apply/submit', {
data: JSON.stringify(this.formData)
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
commonUtil.pjaxPush('/platform/dsznfmtx/mine/index')
}
})
})
} else {
this.$message.error('请完善表单信息并勾选申报理由');
return false;
}
}
const isValid = await this.validateBeforeSubmit();
if (!isValid) return;
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post('/platform/dsznfmtx/apply/submit', {
data: JSON.stringify(this.formData)
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/dsznfmtx/mine/index'
}
})
})
});
},
// 再次提交
async onFinishTask() {
const isValid = await this.validateBeforeSubmit();
if (!isValid) return;
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post('/platform/dsznfmtx/apply/submitAgain', {
data: JSON.stringify(this.formData),
taskId: GetQueryString("taskId")
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/dsznfmtx/mine/index'
}
})
})
onFinishTask() {
this.$refs.formRef.validate((valid) => {
if (valid) {
this.$confirm("您确定要提交吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.$axios.post('/platform/dsznfmtx/apply/submitAgain', {
data: JSON.stringify(this.formData),
taskId: GetQueryString("taskId")
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
commonUtil.pjaxPush('/platform/dsznfmtx/mine/index')
}
})
})
} else {
this.$message.error('请完善表单信息并勾选申报理由');
return false;
}
});
},
async findOne(id) {
const resp = await $.get('/platform/dsznfmtx/apply/findOne', {id})
@@ -325,7 +272,9 @@ layout("/layouts/platform.html"){
sex: sex,
birthday: birthday,
}
}
}
},
created() {
@@ -335,7 +284,6 @@ layout("/layouts/platform.html"){
</script>
<!--#
}
#-->
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/mine/index.html
+1 -2
View File
@@ -75,8 +75,7 @@ layout("/layouts/platform.html"){
})
},
onEdit(row) {
//commonUtil.pjaxPush('/platform/dsznfmtx/apply/index', {taskId: (row.startTaskId || ''), bizId: row.id})
window.location.href = '/platform/dsznfmtx/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
commonUtil.pjaxPush('/platform/dsznfmtx/apply/index', {taskId: (row.startTaskId || ''), bizId: row.id})
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
src/main/resources/views/platform/zhgh/staffbenefit/legal/apply/basicForm.js
+1 -1
View File
@@ -102,7 +102,7 @@ const basicForm = {
cancelButtonText: "取消",
type: "warning"
}).then(async () => {
const resp = await this.$axios.post("/platform/legal/apply/onSubmit", this.formData)
const resp = await this.$axios.post("/platform/legal/apply/submit", this.formData)
if (resp.code === 0) {
this.$message.success(resp.msg)
this.$emit('refresh')
src/main/resources/views/platform/zhgh/staffbenefit/legal/apply/index.html
-4
View File
@@ -1,10 +1,6 @@
<!--#
layout("/layouts/platform.html"){
#-->
<link rel="stylesheet" href="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.css">
<script src="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.min.js"></script>
<style>
#calendar {
max-width: 1200px;
src/main/resources/views/platform/zhgh/staffbenefit/legal/appointmentSet/index.html
-4
View File
@@ -1,10 +1,6 @@
<!--#
layout("/layouts/platform.html"){
#-->
<link rel="stylesheet" href="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.css">
<script src="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.min.js"></script>
<style>
#calendar {
max-width: 1200px;
src/main/resources/views/platform/zhgh/staffbenefit/legal/list/index.html
+3 -3
View File
@@ -77,7 +77,7 @@ layout("/layouts/platform.html"){
{prop: 'appointmentUserName', label: '姓名'},
{prop: 'appointmentLoginName', label: '工号'},
{prop: 'appointmentUnitName', label: '单位'},
{prop: 'doctorUserName', label: '心理咨询师'},
{prop: 'doctorUserName', label: '咨询师'},
],
}
},
@@ -88,13 +88,13 @@ layout("/layouts/platform.html"){
})
},
onDelete(row) {
this.$confirm("您确定要删除吗, 是否继续?", "提示", {
this.$confirm("您确定要删除吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.$axios.post("/platform/legal/list/onDelete", { id: row.id }).then((res) => {
this.$axios.post("/platform/legal/list/delete", { id: row.id }).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.pageData()
src/main/resources/views/platform/zhgh/staffbenefit/legal/onlinePost/basicForm.js
+2 -2
View File
@@ -18,7 +18,7 @@ const basicForm = {
<el-form-item>
<div class="text-primary">
<i class="el-icon-warning"></i>
提示：不会发布您的个人隐私信息，您咨询的内容只有心理咨询师可查看并回复。
提示：不会发布您的个人隐私信息，您咨询的内容只有咨询师可查看并回复。
</div>
</el-form-item>
</el-form>
@@ -52,7 +52,7 @@ const basicForm = {
cancelButtonText: "取消",
type: "warning"
}).then(async () => {
const resp = await this.$axios.post("/platform/legal/onlinePost/onSubmit", this.formData)
const resp = await this.$axios.post("/platform/legal/onlinePost/submit", this.formData)
if (resp.code === 0) {
this.$message.success(resp.msg)
this.$emit('refresh')
src/main/resources/views/platform/zhgh/staffbenefit/legal/onlinePost/index.html
+2 -2
View File
@@ -126,13 +126,13 @@ layout("/layouts/platform.html"){
})
},
onDelete(row) {
this.$confirm("您确定要删除吗, 是否继续?", "提示", {
this.$confirm("您确定要删除吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.$axios.post("/platform/legal/onlinePost/onDelete", { id: row.id }).then((res) => {
this.$axios.post("/platform/legal/onlinePost/delete", { id: row.id }).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.pageData()
src/main/resources/views/platform/zhgh/staffbenefit/legal/onlinePost/info.js
+4 -4
View File
@@ -56,17 +56,17 @@ const info = {
},
},
style: /*language=CSS*/ `
.el-timeline-item {
/deep/ .el-timeline-item {
padding-bottom: 20px;
}
.el-timeline-item__wrapper {
/deep/ .el-timeline-item__wrapper {
padding-left: 28px;
top: -3px;
}
.el-timeline-item__tail {
/deep/ .el-timeline-item__tail {
left: 4px;
}
.user-face{
/deep/ .user-face{
display: flex;
}
`
src/main/resources/views/platform/zhgh/staffbenefit/legal/onlineReply/basicForm.js
+1 -1
View File
@@ -51,7 +51,7 @@ const basicForm = {
cancelButtonText: "取消",
type: "warning"
}).then(async () => {
const resp = await this.$axios.post("/platform/legal/onlineReply/onSubmit", this.formData)
const resp = await this.$axios.post("/platform/legal/onlineReply/submit", this.formData)
if (resp.code === 0) {
this.$message.success(resp.msg)
this.$emit('refresh')
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/apply/index.html
+3 -3
View File
@@ -220,7 +220,7 @@ layout("/layouts/platform.html"){
this.$axios.post('/platform/maternityLeave/apply/save', {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) {
this.$message.success(res.msg)
window.location.href = '/platform/maternityLeave/mine/index'
commonUtil.pjaxPush('/platform/maternityLeave/mine/index')
}
})
})
@@ -253,7 +253,7 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/maternityLeave/mine/index'
commonUtil.pjaxPush('/platform/maternityLeave/mine/index')
}
})
})
@@ -274,7 +274,7 @@ layout("/layouts/platform.html"){
}).then(res => {
if (res.code === 0) {
this.$message.success("提交成功")
window.location.href = '/platform/maternityLeave/mine/index'
commonUtil.pjaxPush('/platform/maternityLeave/mine/index')
}
})
})
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html
+1 -1
View File
@@ -75,7 +75,7 @@ layout("/layouts/platform.html"){
})
},
onEdit(row) {
window.location.href = '/platform/maternityLeave/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
commonUtil.pjaxPush('/platform/maternityLeave/apply/index?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id)
},
onRevoke(row) {
this.$confirm("您确定要撤回吗？", "提示", {
src/main/resources/views/platform/zhgh/staffbenefit/psychology/apply/basicForm.js
+1 -1
View File
@@ -102,7 +102,7 @@ const basicForm = {
cancelButtonText: "取消",
type: "warning"
}).then(async () => {
const resp = await this.$axios.post("/platform/psychology/apply/onSubmit", this.formData)
const resp = await this.$axios.post("/platform/psychology/apply/submit", this.formData)
if (resp.code === 0) {
this.$message.success(resp.msg)
this.$emit('refresh')
src/main/resources/views/platform/zhgh/staffbenefit/psychology/apply/index.html
-4
View File
@@ -1,10 +1,6 @@
<!--#
layout("/layouts/platform.html"){
#-->
<link rel="stylesheet" href="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.css">
<script src="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.min.js"></script>
<style>
#calendar {
max-width: 1200px;
src/main/resources/views/platform/zhgh/staffbenefit/psychology/appointmentSet/index.html
-4
View File
@@ -1,10 +1,6 @@
<!--#
layout("/layouts/platform.html"){
#-->
<link rel="stylesheet" href="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.css">
<script src="${base!}/assets/platform/plugins/fullcalendar/fullcalendar.min.js"></script>
<style>
#calendar {
max-width: 1200px;
src/main/resources/views/platform/zhgh/staffbenefit/psychology/list/index.html
+3 -3
View File
@@ -77,7 +77,7 @@ layout("/layouts/platform.html"){
{prop: 'appointmentUserName', label: '姓名'},
{prop: 'appointmentLoginName', label: '工号'},
{prop: 'appointmentUnitName', label: '单位'},
{prop: 'doctorUserName', label: '心理咨询师'},
{prop: 'doctorUserName', label: '咨询师'},
],
}
},
@@ -88,13 +88,13 @@ layout("/layouts/platform.html"){
})
},
onDelete(row) {
this.$confirm("您确定要删除吗, 是否继续?", "提示", {
this.$confirm("您确定要删除吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.$axios.post("/platform/psychology/list/onDelete", { id: row.id }).then((res) => {
this.$axios.post("/platform/psychology/list/delete", { id: row.id }).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.pageData()
src/main/resources/views/platform/zhgh/staffbenefit/psychology/onlinePost/basicForm.js
+2 -2
View File
@@ -18,7 +18,7 @@ const basicForm = {
<el-form-item>
<div class="text-primary">
<i class="el-icon-warning"></i>
提示：不会发布您的个人隐私信息，您咨询的内容只有心理咨询师可查看并回复。
提示：不会发布您的个人隐私信息，您咨询的内容只有咨询师可查看并回复。
</div>
</el-form-item>
</el-form>
@@ -52,7 +52,7 @@ const basicForm = {
cancelButtonText: "取消",
type: "warning"
}).then(async () => {
const resp = await this.$axios.post("/platform/psychology/onlinePost/onSubmit", this.formData)
const resp = await this.$axios.post("/platform/psychology/onlinePost/submit", this.formData)
if (resp.code === 0) {
this.$message.success(resp.msg)
this.$emit('refresh')
src/main/resources/views/platform/zhgh/staffbenefit/psychology/onlinePost/index.html
+2 -2
View File
@@ -126,13 +126,13 @@ layout("/layouts/platform.html"){
})
},
onDelete(row) {
this.$confirm("您确定要删除吗, 是否继续?", "提示", {
this.$confirm("您确定要删除吗？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.$axios.post("/platform/psychology/onlinePost/onDelete", { id: row.id }).then((res) => {
this.$axios.post("/platform/psychology/onlinePost/delete", { id: row.id }).then((res) => {
if (res.code === 0) {
this.$message.success(res.msg)
this.pageData()
src/main/resources/views/platform/zhgh/staffbenefit/psychology/onlinePost/info.js
+4 -4
View File
@@ -56,17 +56,17 @@ const info = {
},
},
style: /*language=CSS*/ `
.el-timeline-item {
/deep/ .el-timeline-item {
padding-bottom: 20px;
}
.el-timeline-item__wrapper {
/deep/ .el-timeline-item__wrapper {
padding-left: 28px;
top: -3px;
}
.el-timeline-item__tail {
/deep/ .el-timeline-item__tail {
left: 4px;
}
.user-face{
/deep/ .user-face{
display: flex;
}
`
src/main/resources/views/platform/zhgh/staffbenefit/psychology/onlineReply/basicForm.js
+1 -1
View File
@@ -51,7 +51,7 @@ const basicForm = {
cancelButtonText: "取消",
type: "warning"
}).then(async () => {
const resp = await this.$axios.post("/platform/psychology/onlineReply/onSubmit", this.formData)
const resp = await this.$axios.post("/platform/psychology/onlineReply/submit", this.formData)
if (resp.code === 0) {
this.$message.success(resp.msg)
this.$emit('refresh')