Skip to content

W
wangxiaolu-sfa-ui
提交 2f6d234a authored 作者: lidongxu's avatar lidongxu
浏览文件
操作

fix(scm): 修复：水印只在系统内页面显示以及修复勤策发货单表格数量超出范围无法垂直滚动问题

上级 374e77d5
隐藏空白字符变更
内嵌 并排
正在显示 包含 209 行增加 和 185 行删除
src/App.vue
浏览文件 @ 2f6d234a
<template> <template>
<el-watermark :font="font" <template v-if="!isInWhiteList">
:content="content" <el-watermark :font="font"
class="wm-class"> :content="content"
class="wm-class">
<router-view />
</el-watermark>
</template>
<template v-else>
<router-view /> <router-view />
</el-watermark> </template>
<back-to-up /> <back-to-up />
</template> </template>
...@@ -11,6 +16,10 @@ ...@@ -11,6 +16,10 @@
import useSettingsStore from '@/store/modules/settings' import useSettingsStore from '@/store/modules/settings'
import { handleThemeStyle } from '@/utils/theme' import { handleThemeStyle } from '@/utils/theme'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
import { isWhiteList } from '@/permission'
const route = useRoute()
const isInWhiteList = computed(() => isWhiteList(route.path))
const content = computed(() => { const content = computed(() => {
return useUserStore().userInfo.nickName + ' ' + useUserStore().userInfo.phone return useUserStore().userInfo.nickName + ' ' + useUserStore().userInfo.phone
...@@ -19,14 +28,14 @@ const isDark = computed(() => { ...@@ -19,14 +28,14 @@ const isDark = computed(() => {
return useSettingsStore().isDark return useSettingsStore().isDark
}) })
const font = reactive({ const font = reactive({
color: 'rgba(0, 0, 0, .15)', color: 'rgba(0, 0, 0, .05)',
}) })
watch( watch(
isDark, isDark,
() => { () => {
font.color = isDark.value font.color = isDark.value
? 'rgba(255, 255, 255, 0.15)' ? 'rgba(255, 255, 255, 0.05)'
: 'rgba(0, 0, 0, .15)' : 'rgba(0, 0, 0, .05)'
}, },
{ {
immediate: true, immediate: true,
......
src/permission.js
浏览文件 @ 2f6d234a
...@@ -14,9 +14,9 @@ import useVersionStore from '@/store/modules/version' ...@@ -14,9 +14,9 @@ import useVersionStore from '@/store/modules/version'
NProgress.configure({ showSpinner: false }) NProgress.configure({ showSpinner: false })
// 登录页，物流查询页 // 登录页，物流查询页
export const whiteList = ['/login', '/logistics'] const whiteList = ['/login', '/logistics']
const isWhiteList = (path) => { export const isWhiteList = (path) => {
return whiteList.some(pattern => isPathMatch(pattern, path)) return whiteList.some(pattern => isPathMatch(pattern, path))
} }
......
src/views/scm/logistics_receipt/index.vue
浏览文件 @ 2f6d234a
<template> <template>
<div class="app-container"> <div class="app-container">
<div class="container"> <el-row class="client-fix-height container">
<!-- 查询表单 --> <el-col>
<el-form :model="queryParams" <!-- 查询表单 -->
inline <el-form :model="queryParams"
label-position="left"> inline
<el-row> label-position="left">
<el-form-item label="安徽/北京单据编号" <el-row>
prop="sentNo"> <el-form-item label="安徽/北京单据编号"
<el-input v-model="queryParams.sentNo" prop="sentNo">
clearable <el-input v-model="queryParams.sentNo"
placeholder="输入要查询的安徽/北京单独单号" clearable
@input="getLogisticsReceiptList" placeholder="输入要查询的安徽/北京单独单号"
style="width: 250px;" /> @input="getLogisticsReceiptList"
</el-form-item> style="width: 250px;" />
<el-form-item label="快递单号" </el-form-item>
prop="expressNo"> <el-form-item label="快递单号"
<el-input v-model="queryParams.expressNo" prop="expressNo">
clearable <el-input v-model="queryParams.expressNo"
placeholder="输入要查询的快递单号" clearable
@input="getLogisticsReceiptList" /> placeholder="输入要查询的快递单号"
</el-form-item> @input="getLogisticsReceiptList" />
<el-form-item label="DD 单号查询" </el-form-item>
prop="ddNo"> <el-form-item label="DD 单号查询"
<el-input v-model="queryParams.ddNo" prop="ddNo">
clearable <el-input v-model="queryParams.ddNo"
placeholder="输入要查询的 DD 单号" clearable
@input="getLogisticsReceiptList" /> placeholder="输入要查询的 DD 单号"
</el-form-item> @input="getLogisticsReceiptList" />
<el-form-item label="物流公司编码" </el-form-item>
prop="transport"> <el-form-item label="物流公司编码"
<el-input v-model="queryParams.transport" prop="transport">
clearable <el-input v-model="queryParams.transport"
placeholder="输入要查询的物流公司编码" clearable
@input="getLogisticsReceiptList" placeholder="输入要查询的物流公司编码"
style="width: 220px;" /> @input="getLogisticsReceiptList"
</el-form-item> style="width: 220px;" />
<el-form-item label="订单状态" </el-form-item>
prop="isOperateEnd"> <el-form-item label="订单状态"
<el-select v-model="queryParams.isOperateEnd" prop="isOperateEnd">
placeholder="查询订单状态" <el-select v-model="queryParams.isOperateEnd"
clearable placeholder="查询订单状态"
@change="getLogisticsReceiptList"> clearable
<el-option label="已完成" @change="getLogisticsReceiptList">
value="true" /> <el-option label="已完成"
<el-option label="未完成" value="true" />
value="false" /> <el-option label="未完成"
</el-select> value="false" />
</el-form-item>
</el-row>
</el-form>
<!-- 数据表格 -->
<el-table :data="tableList"
border
style="width: 100%"
class="table-container">
<el-table-column v-for="item in columns"
:key="item.label"
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:class-name="item.className">
<template #header="{ column }"
v-if="item.prop === 'receiptPhoto'">
<div class="header-container">
<span>{{ column.label }}</span>
<el-button @click="showPhoto = !showPhoto"
style="margin-left: 10px;">{{ showPhoto ? '隐藏' : '显示' }}图片</el-button>
</div>
</template>
<template #default="scope">
<template v-if="item.prop === 'receiptPhoto'">
<div class="receipt-photo-container"
v-if="showPhoto">
<span v-if="JSON.parse(scope.row[item.prop] || '[]').length === 0">暂无图片</span>
<el-image v-else
v-for="(urlStr, index) in JSON.parse(scope.row[item.prop] || '[]')"
:key="index"
:initial-index="index"
:preview-src-list="JSON.parse(scope.row[item.prop] || '[]')"
preview-teleported
:src="urlStr"
alt="图片"
class="receipt-photo-item"
fit="cover"
style="width: 80px; height: 50px; " />
</div>
</template>
<template v-else-if="item.prop === 'logisticsTrack'">
<el-button type="primary"
@click="handleLogisticsTrack(scope.row)"
text>
查看物流轨迹
</el-button>
</template>
<template v-else-if="item.prop === 'receiptPhotoCompleteFlag'">
<el-select v-model="scope.row[item.prop]"
placeholder="请选择"
style="width: 100%"
@change="handleReceiptPhotoChangeStatus(scope.row)">
<el-option v-for="item in receiptPhotoCompleteFlagOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select>
</template>
<template v-else-if="item.prop === 'sentStatus'">
<el-select v-model="scope.row[item.prop]"
placeholder="请选择"
filterable
style="width: 100%"
@change="handleSentStatusChange(scope.row)">
<el-option v-for="item in sentStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select> </el-select>
</el-form-item>
</el-row>
</el-form>
<!-- 数据表格 -->
<el-table :data="tableList"
border
style="width: 100%"
class="table-container">
<el-table-column v-for="item in columns"
:key="item.label"
:prop="item.prop"
:label="item.label"
:width="item.width"
:fixed="item.fixed"
:class-name="item.className">
<template #header="{ column }"
v-if="item.prop === 'receiptPhoto'">
<div class="header-container">
<span>{{ column.label }}</span>
<el-button @click="showPhoto = !showPhoto"
style="margin-left: 10px;">{{ showPhoto ? '隐藏' : '显示' }}图片</el-button>
</div>
</template> </template>
<template #default="scope">
<template v-if="item.prop === 'receiptPhoto'">
<div class="receipt-photo-container"
v-if="showPhoto">
<span v-if="JSON.parse(scope.row[item.prop] || '[]').length === 0">暂无图片</span>
<el-image v-else
v-for="(urlStr, index) in JSON.parse(scope.row[item.prop] || '[]')"
:key="index"
:initial-index="index"
:preview-src-list="JSON.parse(scope.row[item.prop] || '[]')"
preview-teleported
:src="urlStr"
alt="图片"
class="receipt-photo-item"
fit="cover"
style="width: 80px; height: 50px; " />
</div>
</template>
<template v-else-if="item.prop === 'logisticsTrack'">
<el-button type="primary"
@click="handleLogisticsTrack(scope.row)"
text>
查看物流轨迹
</el-button>
</template>
<template v-else-if="item.prop === 'receiptPhotoCompleteFlag'">
<el-select v-model="scope.row[item.prop]"
placeholder="请选择"
style="width: 100%"
@change="handleReceiptPhotoChangeStatus(scope.row)">
<el-option v-for="item in receiptPhotoCompleteFlagOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select>
</template>
<template v-else-if="item.prop === 'sentStatus'">
<el-select v-model="scope.row[item.prop]"
placeholder="请选择"
filterable
style="width: 100%"
@change="handleSentStatusChange(scope.row)">
<el-option v-for="item in sentStatusOptions"
:key="item.value"
:label="item.label"
:value="item.value" />
</el-select>
</template>
<template v-else> <template v-else>
<!-- 其他字段显示原始值 --> <!-- 其他字段显示原始值 -->
{{ formatter(scope.row, scope.column, scope.row[item.prop]) }} {{ formatter(scope.row, scope.column, scope.row[item.prop]) }}
</template>
</template> </template>
</template> </el-table-column>
</el-table-column> <!-- <el-table-column label="操作"
<!-- <el-table-column label="操作"
width="200" width="200"
fixed="right"> fixed="right">
<template #default="scope"> <template #default="scope">
...@@ -136,13 +137,14 @@ ...@@ -136,13 +137,14 @@
</el-button> </el-button>
</template> </template>
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<pagination :total="total" <pagination :total="total"
v-model:page="queryParams.pageNum" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" v-model:limit="queryParams.pageSize"
@pagination="getLogisticsReceiptList" /> @pagination="getLogisticsReceiptList" />
</div> </el-col>
</el-row>
</div> </div>
</template> </template>
...@@ -402,65 +404,78 @@ const handleSentStatusChange = async (row) => { ...@@ -402,65 +404,78 @@ const handleSentStatusChange = async (row) => {
<style scoped <style scoped
lang="scss"> lang="scss">
.table-container { .app-container {
margin-top: 20px; >.el-row {
.el-col {
display: flex;
flex-direction: column;
height: 100%;
.header-container { .table-container {
display: flex; margin-top: 20px;
align-items: center;
}
::v-deep(.el-image) { .header-container {
img { display: flex;
width: 80px !important; align-items: center;
height: 50px !important; }
}
}
}
.receipt-photo-container { ::v-deep(.el-image) {
padding: 0 15px; img {
display: flex; width: 80px !important;
flex-wrap: wrap; height: 50px !important;
gap: 10px; }
min-width: 200px; }
/* justify-content: center; // 内容整体居中 }
align-items: flex-start; // 顶部对齐 */
justify-content: flex-start; // 改为左对齐，让每行都从左边开始
align-items: flex-start; // 顶部对齐
.receipt-photo-item { .receipt-photo-container {
border-radius: 4px; padding: 0 15px;
border: 1px solid #e4e7ed; display: flex;
transition: all 0.3s; flex-wrap: wrap;
flex: 0 0 80px; // 固定宽度，不伸缩 gap: 10px;
min-width: 200px;
/* justify-content: center; // 内容整体居中
align-items: flex-start; // 顶部对齐 */
justify-content: flex-start; // 改为左对齐，让每行都从左边开始
align-items: flex-start; // 顶部对齐
&:hover { .receipt-photo-item {
border-color: #409eff; border-radius: 4px;
box-shadow: 0 2px 8px rgba(64, 158, 255, 0.2); border: 1px solid #e4e7ed;
} transition: all 0.3s;
} flex: 0 0 80px; // 固定宽度，不伸缩
}
// 让表格列宽自适应内容 &:hover {
::v-deep(.el-table) { border-color: #409eff;
.el-table__body-wrapper { box-shadow: 0 2px 8px rgba(64, 158, 255, 0.2);
.el-table__body { }
.el-table__row {
.cell {
white-space: nowrap;
overflow: visible;
} }
} }
td.el-table__cell.col-receipt-photo { // 让表格列宽自适应内容
.cell { ::v-deep(.el-table) {
padding-right: 0px; // 给回单照片列补充右内边距 .el-table__body-wrapper {
padding-left: 0px; // 给回单照片列补充左内边距 .el-table__body {
text-align: center; // 内容居中 .el-table__row {
.cell {
white-space: nowrap;
overflow: visible;
}
}
td.el-table__cell.col-receipt-photo {
.cell {
padding-right: 0px; // 给回单照片列补充右内边距
padding-left: 0px; // 给回单照片列补充左内边距
text-align: center; // 内容居中
}
}
}
} }
} }
} }
} }
} }
</style> </style>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论