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

commit

Browse Source
This commit is contained in:
c-zhouhf1
2026-05-12 17:40:32 +08:00
parent dc1d2aba8a
commit d37105f03b
17 changed files with 636 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/application-dev.yaml
+17 -5
View File
@@ -1,11 +1,11 @@
nutz:
application:
name: zhgh_whcp_new
name: zhgh_ypi
mvc:
ignore: ^(.+[.])(jsp|png|gif|jpg|js|css|jspx|jpeg|html|mp3|mp4|ico|svg|vue)$
exclusions: /favicon/*,/assets/*,/druid/*,/upload/*,/components/*
server:
port: 8080
port: 80
host: 0.0.0.0
jetty:
@@ -21,7 +21,7 @@ jetty:
#结合ftp使用,或用nginx代理ftp路径
#staticPath: /Users/wizzer/temp/files
#开发模式静态资源
staticPathLocal: D:/myProject/zhgh_whcp_new/src/main/resources/static
staticPathLocal: E:/projects/zhgh_ypi/src/main/resources/static
security:
tokenName: saToken
@@ -70,7 +70,7 @@ redis:
#nodes=192.168.6.31:6377,192.168.6.31:6378,192.168.6.28:6377,192.168.6.28:6378,192.168.6.34:6377,192.168.6.34:6378
jdbc:
url: jdbc:mysql://192.168.21.203/zhgh_whcp_new?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
url: jdbc:mysql://192.168.21.203/zhgh_ypi?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
username: root
password: root
validationQuery: select 1
@@ -86,7 +86,7 @@ xsssql:
beetl:
RESOURCE:
#本地路径,开发时设置本地路径,便于调试
rootLocal: D:/myProject/zhgh_whcp_new/src/main/resources/views/
rootLocal: E:/projects/zhgh_ypi/src/main/resources/views/
root: views/
DELIMITER_STATEMENT_START: "<!--#"
DELIMITER_STATEMENT_END: "#-->"
@@ -164,3 +164,15 @@ minio:
endPoint: http://192.168.21.214:9000
bucket: jshvc
school-oa:
todo:
insert-url: https://i.ypi.edu.cn/string_unified_handle_service/handle/insert
update-url: https://i.ypi.edu.cn/string_unified_handle_service/handle/{uniqueId}/updateUniqueId
update-handle-url: https://i.ypi.edu.cn/string_unified_handle_service/handle/{uniqueId}/updateHandle
delete-url: https://i.ypi.edu.cn/string_unified_handle_service/handle/{uniqueId}/deleteUniqueId
delete-flow-url: https://i.ypi.edu.cn/string_unified_handle_service/handle/{flowId}/deleteFlowId
app-code: 1553e2f0c1c54b5d854ffee1eae181eb
secret-key: f8a1da28b66644238659bce33f7ead6e
domain-name: i.ypi.edu.cn
intercept-domain-name:
src/main/resources/views/platform/zhgh/staffbenefit/condolence/apply/index.html
+21 -3
View File
@@ -240,9 +240,15 @@ layout("/layouts/platform.html"){
</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>
<el-button type="primary" @click="onFinishTask" v-else>提交</el-button>
<el-button type="primary" plain @click="onSave" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "保存" }}
</el-button>
<el-button type="primary" @click="onSubmit" :loading="submitLoading" v-if="!taskId">
{{ submitLoading ? "提交中..." : "提交" }}
</el-button>
<el-button type="primary" @click="onFinishTask" :loading="submitLoading" v-else>
{{ submitLoading ? "提交中..." : "提交" }}
</el-button>
</el-row>
</el-card>
</div>
@@ -256,6 +262,9 @@ layout("/layouts/platform.html"){
bizId: GetQueryString("bizId"),
taskId: GetQueryString("taskId"),
formData: {},
// 保存和提交请求期间控制按钮转圈，避免用户重复点击。
saveLoading: false,
submitLoading: false,
formRules: {
helpUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
payUserId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
@@ -363,11 +372,14 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.submitLoading = true
this.$axios.post("/platform/condolence/apply/save", {data: JSON.stringify(this.formData)}).then(res => {
if (res.code === 0) {
this.$message.success(res.msg)
commonUtil.pjaxPush("/platform/condolence/mine")
}
}).finally(() => {
this.submitLoading = false
})
})
},
@@ -379,6 +391,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.submitLoading = true
this.$axios.post("/platform/condolence/apply/submit", {
data: JSON.stringify(this.formData)
}).then(res => {
@@ -386,6 +399,8 @@ layout("/layouts/platform.html"){
this.$message.success(res.msg)
commonUtil.pjaxPush("/platform/condolence/mine")
}
}).finally(() => {
this.submitLoading = false
})
})
}
@@ -399,6 +414,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.submitLoading = true
this.$axios.post("/platform/condolence/apply/submitAgain", {
data: JSON.stringify(this.formData),
taskId: GetQueryString("taskId")
@@ -407,6 +423,8 @@ layout("/layouts/platform.html"){
this.$message.success(res.msg)
commonUtil.pjaxPush("/platform/condolence/mine")
}
}).finally(() => {
this.submitLoading = false
})
})
}
src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html
+15 -4
View File
@@ -88,9 +88,15 @@ layout("/layouts/platform.html"){
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "退回到发起人" }}
</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "拒绝申请" }}
</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "同意申请" }}
</el-button>
</el-row>
</div>
</condolence-info>
@@ -124,7 +130,9 @@ layout("/layouts/platform.html"){
{prop: 'instanceState', label: '流程状态'},
],
formData: {},
showApprovalForm: false
showApprovalForm: false,
// 审核提交请求期间控制按钮转圈，避免重复提交审批意见。
submitLoading: false
}
},
methods: {
@@ -150,6 +158,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.submitLoading = true
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
@@ -161,6 +170,8 @@ layout("/layouts/platform.html"){
this.$message.success(res.msg)
this.doSearch()
}
}).finally(() => {
this.submitLoading = false
})
})
},
src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolPrincipalApproval/index.html
+15 -4
View File
@@ -108,9 +108,15 @@ layout("/layouts/platform.html"){
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "退回到发起人" }}
</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "拒绝申请" }}
</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "同意申请" }}
</el-button>
</el-row>
</div>
</condolence-info>
@@ -147,7 +153,9 @@ layout("/layouts/platform.html"){
unionList: [],
unitList: [],
formData: {},
showApprovalForm: false
showApprovalForm: false,
// 审核提交请求期间控制按钮转圈，避免重复提交审批意见。
submitLoading: false
}
},
methods: {
@@ -173,6 +181,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.submitLoading = true
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
@@ -184,6 +193,8 @@ layout("/layouts/platform.html"){
this.$message.success(res.msg)
this.doSearch()
}
}).finally(() => {
this.submitLoading = false
})
})
},
src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html
+15 -4
View File
@@ -108,9 +108,15 @@ layout("/layouts/platform.html"){
</el-form>
<el-row type="flex" justify="end">
<el-button @click="$refs.guava.index()" size="small">取消</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
<el-button @click="handleTaskAction(6)" size="small" type="info" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "退回到发起人" }}
</el-button>
<el-button @click="handleTaskAction(2)" size="small" type="danger" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "拒绝申请" }}
</el-button>
<el-button @click="handleTaskAction(1)" size="small" type="primary" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "同意申请" }}
</el-button>
</el-row>
</div>
</condolence-info>
@@ -147,7 +153,9 @@ layout("/layouts/platform.html"){
unionList: [],
unitList: [],
formData: {},
showApprovalForm: false
showApprovalForm: false,
// 审核提交请求期间控制按钮转圈，避免重复提交审批意见。
submitLoading: false
}
},
methods: {
@@ -173,6 +181,7 @@ layout("/layouts/platform.html"){
cancelButtonText: "取消",
type: "warning"
}).then(() => {
this.submitLoading = true
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
@@ -184,6 +193,8 @@ layout("/layouts/platform.html"){
this.$message.success(res.msg)
this.doSearch()
}
}).finally(() => {
this.submitLoading = false
})
})
},
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html
+21 -3
View File
@@ -377,9 +377,15 @@ layout("/layouts/platform_h5.html"){
<!-- 提交按钮 -->
<div class="form-actions">
<van-button native-type="button" @click="onSave" round type="info" plain>保存申请</van-button>
<van-button @click="onSubmit" round type="info" v-if="!taskId">提交申请</van-button>
<van-button @click="onFinishTask" round type="info" v-else>提交申请</van-button>
<van-button native-type="button" @click="onSave" round type="info" plain :loading="saveLoading">
{{ saveLoading ? "保存中..." : "保存申请" }}
</van-button>
<van-button @click="onSubmit" round type="info" :loading="submitLoading" v-if="!taskId">
{{ submitLoading ? "提交中..." : "提交申请" }}
</van-button>
<van-button @click="onFinishTask" round type="info" :loading="submitLoading" v-else>
{{ submitLoading ? "提交中..." : "提交申请" }}
</van-button>
</div>
</van-form>
</div>
@@ -394,6 +400,9 @@ layout("/layouts/platform_h5.html"){
bizId: GetQueryString("bizId"),
taskId: GetQueryString("taskId"),
formData: {},
// 保存和提交请求期间控制按钮转圈，避免用户重复点击。
saveLoading: false,
submitLoading: false,
chooseType: {},
userOptions: [],
@@ -540,11 +549,14 @@ layout("/layouts/platform_h5.html"){
title: "提示",
message: "您确定保存吗？"
}).then(() => {
this.saveLoading = true
this.$axios.post("/platform/condolence/apply/save", { data: JSON.stringify(this.formData) }).then(res => {
if (res.code === 0) {
this.$toast(res.msg)
this.$pjaxReplace("/platform/condolence/mine/h5")
}
}).finally(() => {
this.saveLoading = false
})
})
},
@@ -558,11 +570,14 @@ layout("/layouts/platform_h5.html"){
title: "提示",
message: "您确定要提交申请吗？"
}).then(() => {
this.submitLoading = true
this.$axios.post("/platform/condolence/apply/submit", { data: JSON.stringify(this.formData) }).then(res => {
if (res.code === 0) {
this.$toast(res.msg)
this.$pjaxReplace("/platform/condolence/mine/h5")
}
}).finally(() => {
this.submitLoading = false
})
})
})
@@ -577,6 +592,7 @@ layout("/layouts/platform_h5.html"){
title: "提示",
message: "您确定要提交申请吗？"
}).then(() => {
this.submitLoading = true
this.$axios.post("/platform/condolence/apply/submitAgain", {
data: JSON.stringify(this.formData),
taskId: GetQueryString("taskId")
@@ -585,6 +601,8 @@ layout("/layouts/platform_h5.html"){
this.$toast(res.msg)
this.$pjaxReplace("/platform/condolence/mine/h5")
}
}).finally(() => {
this.submitLoading = false
})
})
})
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/branchUnionApproval/index.html
+15 -4
View File
@@ -79,9 +79,15 @@ layout("/layouts/platform_h5.html"){
</van-cell-group>
</van-form>
<div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
<van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
<van-button type="danger" block @click="handleTaskAction(20)">不同意</van-button>
<van-button type="primary" block @click="handleTaskAction(1)">同意</van-button>
<van-button type="danger" block @click="handleTaskAction(6)" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "退回" }}
</van-button>
<van-button type="danger" block @click="handleTaskAction(20)" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "不同意" }}
</van-button>
<van-button type="primary" block @click="handleTaskAction(1)" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "同意" }}
</van-button>
</div>
</div>
</info>
@@ -109,7 +115,9 @@ layout("/layouts/platform_h5.html"){
},
typeOptions: [],
formData: {},
showApprovalForm: false
showApprovalForm: false,
// 审核提交请求期间控制按钮转圈，避免重复提交审批意见。
submitLoading: false
}
},
methods: {
@@ -145,6 +153,7 @@ layout("/layouts/platform_h5.html"){
title: "提示",
message: "您确定要提交吗？"
}).then(() => {
this.submitLoading = true
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
@@ -156,6 +165,8 @@ layout("/layouts/platform_h5.html"){
this.$toast.success(res.msg)
this.doSearch()
}
}).finally(() => {
this.submitLoading = false
})
}).catch(() => {
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolPrincipalApproval/index.html
+15 -4
View File
@@ -79,9 +79,15 @@ layout("/layouts/platform_h5.html"){
</van-cell-group>
</van-form>
<div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
<van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
<van-button type="danger" block @click="handleTaskAction(20)">不同意</van-button>
<van-button type="primary" block @click="handleTaskAction(1)">同意</van-button>
<van-button type="danger" block @click="handleTaskAction(6)" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "退回" }}
</van-button>
<van-button type="danger" block @click="handleTaskAction(20)" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "不同意" }}
</van-button>
<van-button type="primary" block @click="handleTaskAction(1)" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "同意" }}
</van-button>
</div>
</div>
</info>
@@ -109,7 +115,9 @@ layout("/layouts/platform_h5.html"){
},
typeOptions: [],
formData: {},
showApprovalForm: false
showApprovalForm: false,
// 审核提交请求期间控制按钮转圈，避免重复提交审批意见。
submitLoading: false
}
},
methods: {
@@ -145,6 +153,7 @@ layout("/layouts/platform_h5.html"){
title: "提示",
message: "您确定要提交吗？"
}).then(() => {
this.submitLoading = true
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
@@ -156,6 +165,8 @@ layout("/layouts/platform_h5.html"){
this.$toast.success(res.msg)
this.doSearch()
}
}).finally(() => {
this.submitLoading = false
})
}).catch(() => {
src/main/resources/views/platform/zhghh5/staffbenefit/condolence/schoolUnionApproval/index.html
+15 -4
View File
@@ -79,9 +79,15 @@ layout("/layouts/platform_h5.html"){
</van-cell-group>
</van-form>
<div style="display: flex; justify-content: space-between; column-gap: 10px; padding: 10px">
<van-button type="danger" block @click="handleTaskAction(6)">退回</van-button>
<van-button type="danger" block @click="handleTaskAction(20)">不同意</van-button>
<van-button type="primary" block @click="handleTaskAction(1)">同意</van-button>
<van-button type="danger" block @click="handleTaskAction(6)" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "退回" }}
</van-button>
<van-button type="danger" block @click="handleTaskAction(20)" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "不同意" }}
</van-button>
<van-button type="primary" block @click="handleTaskAction(1)" :loading="submitLoading">
{{ submitLoading ? "提交中..." : "同意" }}
</van-button>
</div>
</div>
</info>
@@ -109,7 +115,9 @@ layout("/layouts/platform_h5.html"){
},
typeOptions: [],
formData: {},
showApprovalForm: false
showApprovalForm: false,
// 审核提交请求期间控制按钮转圈，避免重复提交审批意见。
submitLoading: false
}
},
methods: {
@@ -145,6 +153,7 @@ layout("/layouts/platform_h5.html"){
title: "提示",
message: "您确定要提交吗？"
}).then(() => {
this.submitLoading = true
this.$axios.post("/flow/common/executeTask", {
data: JSON.stringify({
...this.formData,
@@ -156,6 +165,8 @@ layout("/layouts/platform_h5.html"){
this.$toast.success(res.msg)
this.doSearch()
}
}).finally(() => {
this.submitLoading = false
})
}).catch(() => {