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

commit

Browse Source
This commit is contained in:
JyuHsin
2026-04-08 09:31:08 +08:00
parent ed5754a6c1
commit 532f73d257
4 changed files with 244 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/declarereimbursement/reimbursement/controller/ActivityReimbursementMineController.java
+9 -1
View File
@@ -155,7 +155,15 @@ public class ActivityReimbursementMineController {
if (!group.isEmpty()) { if (!group.isEmpty()) {
cnd.and(group); cnd.and(group);
} else { } else {
cnd.and("info.userId", "=", SecurityUtil.getUserId()); if(!SecurityUtil.getUserLoginname().equals("CS2025015")){
cnd.and("info.userId", "=", SecurityUtil.getUserId());
}
}
if (StrUtil.isNotBlank(pageParam.getSearchKeyword())){
SqlExpressionGroup groupUser = new SqlExpressionGroup();
groupUser.orLike("info.userName", pageParam.getSearchKeyword());
groupUser.orLike("info.loginName", pageParam.getSearchKeyword());
cnd.and(groupUser);
} }
cnd.andEX("info.clubId", "=", pageParam.getClubId()); cnd.andEX("info.clubId", "=", pageParam.getClubId());
src/main/resources/static/components/plugins/sysFilePreview/index.vue
+228 -214
View File
@@ -1,50 +1,50 @@
<template> <template>
<div> <div>
<div class="file-preview-container" v-if="fileList && fileList.length > 0"> <div class="file-preview-container" v-if="fileList && fileList.length > 0">
<div class="file-item" title="点击查看" v-for="(item, index) in fileList" :key="item.id"> <div class="file-item" title="点击查看" v-for="(item, index) in fileList" :key="item.id">
<el-image <el-image
v-if="item.suffix === 'jpg' || item.suffix === 'png' || item.suffix === 'jpeg' || item.suffix === 'gif'" v-if="item.suffix === 'jpg' || item.suffix === 'png' || item.suffix === 'jpeg' || item.suffix === 'gif'"
:src="item.thumbnail" :src="item.thumbnail"
:fit="'cover'" :fit="'cover'"
:style="{ width: '100%', height: '100%' }" :style="{ width: '100%', height: '100%' }"
@click.stop="onPreView(item, index)" @click.stop="onPreView(item, index)"
></el-image> ></el-image>
<el-image <el-image
v-else v-else
:src="$commonUtil.getFileItemShowIcon(item.suffix)" :src="$commonUtil.getFileItemShowIcon(item.suffix)"
:fit="'cover'" :fit="'cover'"
@click.stop="onPreView(item, index)" @click.stop="onPreView(item, index)"
:style="{ width: '100%', height: '100%' }" :style="{ width: '100%', height: '100%' }"
></el-image> ></el-image>
<div class="file-download" title="点击下载" @click="$downLoad(item.downloadPath)"> <div class="file-download" title="点击下载" @click="$downLoad(item.downloadPath)">
<i class="el-icon-download"></i> <i class="el-icon-download"></i>
{{ item.name }} {{ item.name }}
</div>
</div>
</div> </div>
<el-empty v-else description="暂无" :image-size="60"></el-empty> </div>
</div>
<el-empty v-else description="暂无" :image-size="60"></el-empty>
<el-drawer class="file-preview-drawer" title="附件查看" size="78%" :visible.sync="fileDialog" :append-to-body="true"> <el-drawer class="file-preview-drawer" title="附件查看" size="78%" :visible.sync="fileDialog" :append-to-body="true">
<div class="file-preview-title">附件数量：（共{{ fileList.length }}个）</div> <div class="file-preview-title">附件数量：（共{{ fileList.length }}个）</div>
<el-row> <el-row>
<el-col :span="5"> <el-col :span="5">
<el-menu class="file-preview-menu" :default-active="defaultActive + ''" @select="menuSelect"> <el-menu class="file-preview-menu" :default-active="defaultActive + ''" @select="menuSelect">
<el-menu-item v-for="(file, index) in fileList" :key="index" :index="index + ''"> <el-menu-item v-for="(file, index) in fileList" :key="index" :index="index + ''">
<el-image <el-image
:src="$commonUtil.getFileItemShowIcon(file.suffix)" :src="$commonUtil.getFileItemShowIcon(file.suffix)"
fit="cover" fit="cover"
:style="{ width: '30px', height: '30px' }" :style="{ width: '30px', height: '30px' }"
></el-image> ></el-image>
<span slot="title">{{ file.name }}</span> <span slot="title">{{ file.name }}</span>
</el-menu-item> </el-menu-item>
</el-menu> </el-menu>
</el-col> </el-col>
<el-col :span="19" class="preview-content-col"> <el-col :span="19" class="preview-content-col">
<div class="preview-content-wrapper"> <div class="preview-content-wrapper">
<div class="preview-main-content" v-loading="officeLoading" element-loading-text="拼命加载中"> <div class="preview-main-content" v-loading="officeLoading" element-loading-text="拼命加载中">
<el-image <el-image
v-if="file?.suffix === 'jpg' || file?.suffix === 'png' || file?.suffix === 'jpeg' || file?.suffix === 'gif'" v-if="file?.suffix === 'jpg' || file?.suffix === 'png' || file?.suffix === 'jpeg' || file?.suffix === 'gif'"
:src="file.downloadPath" :src="file.downloadPath"
:fit="'cover'" :fit="'cover'"
@@ -52,154 +52,157 @@
@load="officeLoading = false" @load="officeLoading = false"
@error="officeLoading = false" @error="officeLoading = false"
class="file-preview-image" class="file-preview-image"
></el-image> ></el-image>
<div v-else style="height: 100%"> <div v-else style="height: 100%">
<iframe v-if="['doc', 'docx', 'xls', 'xlsx'].includes(file?.suffix)" <iframe v-if="['doc', 'docx', 'xls', 'xlsx'].includes(file?.suffix)"
frameborder="0" frameborder="0"
width="100%" width="100%"
height="100%" height="100%"
@load="officeLoading = false" @load="officeLoading = false"
:src="'/assets/platform/plugins/pdfJs/web/viewer.html?file=/platform/sys/file/convertPDF?id=' + file.id" :src="'/assets/platform/plugins/pdfJs/web/viewer.html?file=/platform/sys/file/convertPDF?id=' + file.id"
></iframe> ></iframe>
<iframe v-if="['pdf'].includes(file?.suffix)" <iframe v-if="['pdf'].includes(file?.suffix)"
frameborder="0" frameborder="0"
width="100%" width="100%"
height="100%" height="100%"
@load="officeLoading = false" @load="officeLoading = false"
:src="'/assets/platform/plugins/pdfJs/web/viewer.html?file=' + file.downloadPath" :src="'/assets/platform/plugins/pdfJs/web/viewer.html?file=' + file.downloadPath"
></iframe> ></iframe>
</div>
</div>
<div class="preview-footer">
<el-button type="primary" size="small" @click="previous">上一个</el-button>
<el-button type="primary" size="small" @click="next">下一个</el-button>
<el-button type="primary" size="small" @click="fileDialog = false">关闭</el-button>
</div> </div>
</div> </div>
</el-col> <div class="preview-footer">
</el-row> <el-button type="primary" size="small" @click="previous">上一个</el-button>
<el-button type="primary" size="small" @click="next">下一个</el-button>
<el-button type="primary" size="small" @click="fileDialog = false">关闭</el-button>
</div>
</div>
</el-col>
</el-row>
</el-drawer> </el-drawer>
</div> </div>
</template> </template>
<script> <script>
module.exports = { module.exports = {
name: "sysFilePreview", name: "sysFilePreview",
props: { props: {
files: { files: {
type: [String, Array], type: [String, Array],
default: undefined, default: undefined,
required: false required: false
},
complete_result: {
type: Boolean,
default: false,
required: false
}
}, },
watch: { complete_result: {
files: { type: Boolean,
handler(val) { default: false,
if (val) { required: false
this.buildEchoFileObject(val)
} else {
this.fileList = []
}
},
immediate: true
}
},
data() {
return {
fileList: [],
fileDialog: false,
defaultActive: 0,
file: {},
officeLoading: true,
}
},
methods: {
next() {
this.defaultActive = Number(this.defaultActive)
if(this.defaultActive === this.fileList.length - 1) {
this.$message.error('已经是最后一个附件了')
return
}
this.defaultActive = this.defaultActive + 1
this.file = this.fileList[this.defaultActive]
},
previous() {
this.defaultActive = Number(this.defaultActive)
if(this.defaultActive === 0) {
this.$message.error('已经是第一个附件了')
return
}
this.defaultActive = this.defaultActive - 1
this.file = this.fileList[this.defaultActive]
},
menuSelect(index) {
index = Number(index)
this.defaultActive = Number(this.defaultActive)
if(index !== this.defaultActive) {
this.officeLoading = true
}
this.defaultActive = index
this.file = this.fileList[index]
},
onPreView(item, index) {
this.file = item
this.defaultActive = index
this.fileDialog = true
},
buildEchoFileObject(val) {
let ids = []
if (this.complete_result) {
if (Array.isArray(val)) {
ids = val.map((item) => {
if (item.response.data.includes("=")) {
return item?.response?.data.substring(item?.response?.data.lastIndexOf("=") + 1)
} else {
return item?.response?.data
}
})
} else {
try {
ids = JSON.parse(val).map((item) => {
if (item.response.data.includes("=")) {
return item?.response?.data.substring(item?.response?.data.lastIndexOf("=") + 1)
} else {
return item?.response?.data
}
})
} catch (err) {
this.fileList = []
}
}
} else {
//那就是链接 没有直接存id的吧。。
if (Array.isArray(val)) {
ids = val.map((item) => {
return item.substring(item.lastIndexOf("=") + 1)
})
} else {
ids = val.split(",").map((item) => {
return item.substring(item.lastIndexOf("=") + 1)
})
}
}
this.requestFullFile(ids)
},
requestFullFile(ids) {
this.$axios.post("/platform/sys/file/previewFileData", { ids: JSON.stringify(ids) }).then((res) => {
if (res.code === 0) {
this.fileList = res.data
}
})
}
} }
},
watch: {
files: {
handler(val) {
if (val) {
this.buildEchoFileObject(val)
} else {
this.fileList = []
}
},
immediate: true
}
},
data() {
return {
fileList: [],
fileDialog: false,
defaultActive: 0,
file: {},
officeLoading: true,
}
},
methods: {
next() {
this.defaultActive = Number(this.defaultActive)
if (this.defaultActive === this.fileList.length - 1) {
this.$message.error('已经是最后一个附件了')
return
}
this.defaultActive = this.defaultActive + 1
this.file = this.fileList[this.defaultActive]
},
previous() {
this.defaultActive = Number(this.defaultActive)
if (this.defaultActive === 0) {
this.$message.error('已经是第一个附件了')
return
}
this.defaultActive = this.defaultActive - 1
this.file = this.fileList[this.defaultActive]
},
menuSelect(index) {
index = Number(index)
this.defaultActive = Number(this.defaultActive)
if (index !== this.defaultActive) {
this.officeLoading = true
}
this.defaultActive = index
this.file = this.fileList[index]
},
onPreView(item, index) {
this.file = item
this.defaultActive = index
this.fileDialog = true
},
buildEchoFileObject(val) {
let ids = []
if (this.complete_result) {
if (Array.isArray(val)) {
ids = val.map((item) => {
if (item.response.data.includes("=")) {
return item?.response?.data.substring(item?.response?.data.lastIndexOf("=") + 1)
} else {
return item?.response?.data
}
})
} else {
try {
ids = JSON.parse(val).map((item) => {
if (item.response.data.includes("=")) {
return item?.response?.data.substring(item?.response?.data.lastIndexOf("=") + 1)
} else {
return item?.response?.data
}
})
} catch (err) {
this.fileList = []
}
}
} else {
//那就是链接 没有直接存id的吧。。
if (Array.isArray(val)) {
ids = val.map((item) => {
return item.substring(item.lastIndexOf("=") + 1)
})
} else {
ids = val.split(",").map((item) => {
return item.substring(item.lastIndexOf("=") + 1)
})
}
}
this.requestFullFile(ids)
},
requestFullFile(ids) {
this.$axios.post("/platform/sys/file/previewFileData", {ids: JSON.stringify(ids)}).then((res) => {
if (res.code === 0) {
res.data.map(v => {
v.suffix = v.suffix.toLowerCase()
})
this.fileList = res.data
}
})
}
}
} }
</script> </script>
@@ -208,19 +211,23 @@ module.exports = {
margin: 0; margin: 0;
height: calc(100vh - 43px - 32px - 20px - 10px); height: calc(100vh - 43px - 32px - 20px - 10px);
} }
.file-preview-drawer .el-col { .file-preview-drawer .el-col {
height: 100%; height: 100%;
padding: 0; padding: 0;
} }
.file-preview-title { .file-preview-title {
padding-left: 20px; padding-left: 20px;
font-weight: bold; font-weight: bold;
margin-bottom: 10px; margin-bottom: 10px;
} }
.file-preview-menu { .file-preview-menu {
height: 100%; height: 100%;
padding-left: 10px; padding-left: 10px;
} }
.file-preview-menu .el-menu-item, .file-preview-menu .el-menu-item,
.file-preview-menu .el-submenu__title { .file-preview-menu .el-submenu__title {
height: 40px; height: 40px;
@@ -229,6 +236,7 @@ module.exports = {
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.file-preview-drawer iframe { .file-preview-drawer iframe {
vertical-align: bottom; vertical-align: bottom;
display: block; display: block;
@@ -237,6 +245,7 @@ module.exports = {
.preview-content-col { .preview-content-col {
/*padding: 0 20px 10px;*/ /*padding: 0 20px 10px;*/
} }
.preview-content-wrapper { .preview-content-wrapper {
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -244,17 +253,20 @@ module.exports = {
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
} }
.preview-main-content { .preview-main-content {
flex: 1; flex: 1;
overflow: auto; overflow: auto;
margin: 0 10px 10px; margin: 0 10px 10px;
box-sizing: border-box; box-sizing: border-box;
} }
.preview-main-content .file-preview-image { .preview-main-content .file-preview-image {
margin: 0 auto; margin: 0 auto;
max-width: 80%; max-width: 80%;
display: block; display: block;
} }
.preview-footer { .preview-footer {
line-height: 60px; line-height: 60px;
padding: 0 10px; padding: 0 10px;
@@ -265,9 +277,11 @@ module.exports = {
/* position: sticky; /* position: sticky;
bottom: 0; */ bottom: 0; */
} }
.file-preview-drawer .el-menu-item.is-active { .file-preview-drawer .el-menu-item.is-active {
font-weight: bold; font-weight: bold;
} }
.file-preview-drawer .el-drawer__body { .file-preview-drawer .el-drawer__body {
padding: 0; padding: 0;
} }
@@ -275,57 +289,57 @@ module.exports = {
<style scoped> <style scoped>
.file-preview-container { .file-preview-container {
position: relative; position: relative;
display: flex; display: flex;
width: 100%; width: 100%;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
column-gap: 10px; column-gap: 10px;
} }
.file-preview-container .file-item { .file-preview-container .file-item {
width: 118px; width: 118px;
height: 118px; height: 118px;
position: relative; position: relative;
transition: all 500ms; transition: all 500ms;
border-radius: 5px; border-radius: 5px;
cursor: pointer; cursor: pointer;
text-align: center; text-align: center;
column-gap: 15px; column-gap: 15px;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.file-preview-container .file-item:hover { .file-preview-container .file-item:hover {
background: rgb(230, 230, 230); background: rgb(230, 230, 230);
} }
.file-preview-container .file-item .el-image { .file-preview-container .file-item .el-image {
width: 90px !important; width: 90px !important;
height: 100%; height: 100%;
transform: translateY(10px); transform: translateY(10px);
} }
.file-preview-container .file-item .file-download { .file-preview-container .file-item .file-download {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 24px; height: 24px;
line-height: 24px; line-height: 24px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
color: white; color: white;
background-color: rgb(160, 160, 160); background-color: rgb(160, 160, 160);
border-radius: 2px; border-radius: 2px;
opacity: 0.95; opacity: 0.95;
} }
.el-empty { .el-empty {
padding: 0; padding: 0;
} }
</style> </style>
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/common/info.js
+3 -3
View File
@@ -46,14 +46,14 @@ const INFO = {
</template> </template>
<el-descriptions-item label="费用" :span="2"> <el-descriptions-item label="费用" :span="2">
<el-table :data="viewData.budgets" border max-height="500" size="mini" <el-table :data="viewData.budgets" border max-height="500" size="mini"
style="width: calc(1200px - 150px - 15%)" show-summary :summary-method="getSummaries"> show-summary :summary-method="getSummaries">
<el-table-column label="序号" sortable type="index" fixed></el-table-column> <el-table-column label="序号" sortable type="index" fixed></el-table-column>
<el-table-column label="费用项目名称" fixed prop="name" fixed></el-table-column> <el-table-column label="费用项目名称" fixed prop="name" fixed></el-table-column>
<el-table-column label="预算费用" prop="budgetPrice" <el-table-column label="预算费用" prop="budgetPrice"
v-if="viewData.activityReimbursementMode==='activity'"></el-table-column> v-if="viewData.activityReimbursementMode==='activity'"></el-table-column>
<el-table-column label="实际费用" prop="actualPrice"></el-table-column> <el-table-column label="实际费用" prop="actualPrice"></el-table-column>
<el-table-column label="收款人" prop="username"></el-table-column> <el-table-column label="收款人" prop="username"></el-table-column>
<el-table-column label="支行名称" prop="bankName"></el-table-column> <el-table-column label="支行名称" prop="bankName"width="180"></el-table-column>
<el-table-column label="报销卡号" prop="bankCardNum" width="180"></el-table-column> <el-table-column label="报销卡号" prop="bankCardNum" width="180"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column> <el-table-column label="备注" prop="remark"></el-table-column>
</el-table> </el-table>
@@ -166,7 +166,7 @@ const INFO = {
sums[index] = values.reduce((prev, curr) => { sums[index] = values.reduce((prev, curr) => {
const value = Number(curr); const value = Number(curr);
if (!isNaN(value)) { if (!isNaN(value)) {
return prev + curr; return Number((prev + curr).toFixed(2));
} else { } else {
return prev; return prev;
} }
src/main/resources/views/platform/zhgh/activity/declarereimbursement/reimbursement/mine/index.html
+4 -1
View File
@@ -96,7 +96,10 @@ layout("/layouts/platform.html"){
</el-button> </el-button>
<el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回 <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
</el-button> </el-button>
<el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" <el-button v-if="(row.taskKey === 'startTask' || !row.instanceId)&&$store.state.user.loginname!=='CS2025015'" @click="onDelete(row.id)"
size="mini" type="danger">删除
</el-button>
<el-button v-if="$store.state.user.loginname==='CS2025015'" @click="onDelete(row.id)"
size="mini" type="danger">删除 size="mini" type="danger">删除
</el-button> </el-button>