Compare commits

...

2 Commits

Author SHA1 Message Date
zhangrenyuan efe0d2fdb1 feat(home): 添加侧边栏宽度拖拽调整功能 3 weeks ago
zhangrenyuan 3871621c9a fix(ui): 调整表格列宽和翻译,优化活动管理界面布局 3 weeks ago
  1. 17
      package-lock.json
  2. 2
      src/components/locales/lang/en.js
  3. 49
      src/views/activityManage/activity.vue
  4. 105
      src/views/home.vue
  5. 2
      src/views/moneyManage/executor/executor.vue
  6. 2
      src/views/moneyManage/receiveDetail/receiveFinance.vue
  7. 2
      src/views/moneyManage/receiveDetail/receiveManage.vue
  8. 2
      src/views/moneyManage/refundDetail/refundCharge.vue
  9. 2
      src/views/moneyManage/refundDetail/refundFinance.vue
  10. 2
      src/views/moneyManage/refundDetail/refundHeader.vue

17
package-lock.json

@ -116,6 +116,7 @@
"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz",
"integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"@ampproject/remapping": "^2.2.0", "@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.26.2", "@babel/code-frame": "^7.26.2",
@ -2019,6 +2020,7 @@
"version": "6.7.2", "version": "6.7.2",
"resolved": "https://registry.npmmirror.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.2.tgz", "resolved": "https://registry.npmmirror.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.2.tgz",
"integrity": "sha512-yxtOBWDrdi5DD5o1pmVdq3WMCvnobT0LU6R8RyyVXPvFRd2o79/0NCuQoCjNTeZz9EzA9xS3JxNWfv54RIHFEA==", "integrity": "sha512-yxtOBWDrdi5DD5o1pmVdq3WMCvnobT0LU6R8RyyVXPvFRd2o79/0NCuQoCjNTeZz9EzA9xS3JxNWfv54RIHFEA==",
"peer": true,
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-common-types": "6.7.2" "@fortawesome/fontawesome-common-types": "6.7.2"
}, },
@ -2791,6 +2793,7 @@
"resolved": "https://mirrors.huaweicloud.com/repository/npm/@types/lodash-es/-/lodash-es-4.17.12.tgz", "resolved": "https://mirrors.huaweicloud.com/repository/npm/@types/lodash-es/-/lodash-es-4.17.12.tgz",
"integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==", "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@types/lodash": "*" "@types/lodash": "*"
} }
@ -2801,6 +2804,7 @@
"integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==", "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"undici-types": "~6.20.0" "undici-types": "~6.20.0"
} }
@ -3337,6 +3341,7 @@
} }
], ],
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"caniuse-lite": "^1.0.30001688", "caniuse-lite": "^1.0.30001688",
"electron-to-chromium": "^1.5.73", "electron-to-chromium": "^1.5.73",
@ -4241,13 +4246,15 @@
"version": "4.17.21", "version": "4.17.21",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/lodash/-/lodash-4.17.21.tgz", "resolved": "https://mirrors.huaweicloud.com/repository/npm/lodash/-/lodash-4.17.21.tgz",
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
"license": "MIT"
"license": "MIT",
"peer": true
}, },
"node_modules/lodash-es": { "node_modules/lodash-es": {
"version": "4.17.21", "version": "4.17.21",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/lodash-es/-/lodash-es-4.17.21.tgz", "resolved": "https://mirrors.huaweicloud.com/repository/npm/lodash-es/-/lodash-es-4.17.21.tgz",
"integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==", "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
"license": "MIT"
"license": "MIT",
"peer": true
}, },
"node_modules/lodash-unified": { "node_modules/lodash-unified": {
"version": "1.0.3", "version": "1.0.3",
@ -4717,6 +4724,7 @@
"integrity": "sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==", "integrity": "sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@types/estree": "1.0.6" "@types/estree": "1.0.6"
}, },
@ -4794,6 +4802,7 @@
"resolved": "https://registry.npmmirror.com/sass/-/sass-1.86.3.tgz", "resolved": "https://registry.npmmirror.com/sass/-/sass-1.86.3.tgz",
"integrity": "sha512-iGtg8kus4GrsGLRDLRBRHY9dNVA78ZaS7xr01cWnS7PEMQyFtTqBiyCrfpTYTZXRWM94akzckYjh8oADfFNTzw==", "integrity": "sha512-iGtg8kus4GrsGLRDLRBRHY9dNVA78ZaS7xr01cWnS7PEMQyFtTqBiyCrfpTYTZXRWM94akzckYjh8oADfFNTzw==",
"dev": true, "dev": true,
"peer": true,
"dependencies": { "dependencies": {
"chokidar": "^4.0.0", "chokidar": "^4.0.0",
"immutable": "^5.0.2", "immutable": "^5.0.2",
@ -4940,6 +4949,7 @@
"integrity": "sha512-GWANVlPM/ZfYzuPHjq0nxT+EbOEDDN3Jwhwdg1D8TU8oSkktp8w64Uq4auuGLxFSoNTRDncTq2hQHX1Ld9KHkA==", "integrity": "sha512-GWANVlPM/ZfYzuPHjq0nxT+EbOEDDN3Jwhwdg1D8TU8oSkktp8w64Uq4auuGLxFSoNTRDncTq2hQHX1Ld9KHkA==",
"dev": true, "dev": true,
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
"peer": true,
"dependencies": { "dependencies": {
"@jridgewell/source-map": "^0.3.3", "@jridgewell/source-map": "^0.3.3",
"acorn": "^8.8.2", "acorn": "^8.8.2",
@ -4993,6 +5003,7 @@
"integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
"devOptional": true, "devOptional": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"peer": true,
"bin": { "bin": {
"tsc": "bin/tsc", "tsc": "bin/tsc",
"tsserver": "bin/tsserver" "tsserver": "bin/tsserver"
@ -5085,6 +5096,7 @@
"integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==", "integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"esbuild": "^0.24.2", "esbuild": "^0.24.2",
"postcss": "^8.5.1", "postcss": "^8.5.1",
@ -5176,6 +5188,7 @@
"resolved": "https://mirrors.huaweicloud.com/repository/npm/vue/-/vue-3.5.13.tgz", "resolved": "https://mirrors.huaweicloud.com/repository/npm/vue/-/vue-3.5.13.tgz",
"integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==", "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
"license": "MIT", "license": "MIT",
"peer": true,
"dependencies": { "dependencies": {
"@vue/compiler-dom": "3.5.13", "@vue/compiler-dom": "3.5.13",
"@vue/compiler-sfc": "3.5.13", "@vue/compiler-sfc": "3.5.13",

2
src/components/locales/lang/en.js

@ -518,7 +518,7 @@ export default {
payAmount: "Pay Amount", payAmount: "Pay Amount",
receiveCurrency: "Rcv Currency", receiveCurrency: "Rcv Currency",
receiveAmount: "Rcv Amount", receiveAmount: "Rcv Amount",
toSupply: "Pending",
toSupply: "Incomplete",
pending: "Pending", pending: "Pending",
fee: "Fee", fee: "Fee",
transferVoucher: "Transfer IMG", transferVoucher: "Transfer IMG",

49
src/views/activityManage/activity.vue

@ -1,32 +1,34 @@
<template> <template>
<el-card class="card1" style="margin-bottom: 1vh;"> <el-card class="card1" style="margin-bottom: 1vh;">
<div class="condition"> <div class="condition">
<div class="condition-item1">
<el-text size="large">{{ t('common.activityName') }}</el-text>
<el-input v-model="searchForm.activityName" style="width: 10vw" :placeholder="t('common.activityNamePlaceholder')" clearable />
<div class="condition-item">
<el-text size="large" class="label-text">{{ t('common.activityName') }}</el-text>
<el-input v-model="searchForm.activityName" class="input-width" :placeholder="t('common.activityNamePlaceholder')" clearable />
</div> </div>
<div class="condition-item1">
<el-text size="large">{{ t('common.type') }}</el-text>
<div class="condition-item">
<el-text size="large" class="label-text">{{ t('common.type') }}</el-text>
<!-- <el-cascader v-model="searchForm.businessBelong" :options="marketOptions" placeholder="请选择所属地区" clearable <!-- <el-cascader v-model="searchForm.businessBelong" :options="marketOptions" placeholder="请选择所属地区" clearable
style="width: 10vw" /> --> style="width: 10vw" /> -->
<el-select v-model="searchForm.businessBelong" :placeholder="t('common.typePlaceholder')" style="width: 10vw" clearable>
<el-select v-model="searchForm.businessBelong" :placeholder="t('common.typePlaceholder')" class="input-width" clearable>
<el-option :label="t('common.customerBelong')" value="客户归属地" /> <el-option :label="t('common.customerBelong')" value="客户归属地" />
<el-option :label="t('common.activityBelong')" value="活动归属地" /> <el-option :label="t('common.activityBelong')" value="活动归属地" />
</el-select> </el-select>
</div> </div>
<div class="condition-item2">
<el-text size="large">{{ t('common.startTime') }}</el-text>
<div class="condition-item">
<el-text size="large" class="label-text">{{ t('common.startTime') }}</el-text>
<el-date-picker v-model="searchForm.startTime" type="datetime" :placeholder="t('common.startTime')" <el-date-picker v-model="searchForm.startTime" type="datetime" :placeholder="t('common.startTime')"
format="YYYY-MM-DD HH:mm:ss" :default-time="defaultStartTime" clearable />
format="YYYY-MM-DD HH:mm:ss" :default-time="defaultStartTime" class="input-width" clearable />
</div> </div>
<div class="condition-item2">
<el-text size="large">{{ t('common.endTime') }}</el-text>
<div class="condition-item">
<el-text size="large" class="label-text">{{ t('common.endTime') }}</el-text>
<el-date-picker v-model="searchForm.endTime" type="datetime" :placeholder="t('common.endTime')" <el-date-picker v-model="searchForm.endTime" type="datetime" :placeholder="t('common.endTime')"
format="YYYY-MM-DD HH:mm:ss" :default-time="defaultEndTime" clearable />
format="YYYY-MM-DD HH:mm:ss" :default-time="defaultEndTime" class="input-width" clearable />
</div> </div>
<div class="condition-buttons">
<el-button type="primary" @click="getActivity">{{ t('common.search') }}</el-button> <el-button type="primary" @click="getActivity">{{ t('common.search') }}</el-button>
<el-button type="success" @click="reset">{{ t('common.reset') }}</el-button> <el-button type="success" @click="reset">{{ t('common.reset') }}</el-button>
</div> </div>
</div>
</el-card> </el-card>
@ -514,31 +516,42 @@ onMounted(() => {
.condition { .condition {
display: flex; display: flex;
align-items: center; align-items: center;
flex-wrap: wrap;
gap: 10px;
} }
.condition-item1 {
.condition-item {
display: flex; display: flex;
align-items: center; align-items: center;
width: 15vw;
margin-right: 10px;
}
.label-text {
white-space: nowrap;
}
.input-width {
width: 160px;
} }
.condition-item2 {
.condition-buttons {
display: flex; display: flex;
align-items: center; align-items: center;
width: 17vw;
gap: 10px;
margin-left: 10px;
} }
.add-item { .add-item {
display: flex; display: flex;
align-items: center; align-items: center;
width: 17vw;
margin-bottom: 1vh; margin-bottom: 1vh;
/* 去掉固定宽度以适应英文文本 */
} }
.edit-item { .edit-item {
display: flex; display: flex;
align-items: center; align-items: center;
width: 17vw;
margin-bottom: 1vh; margin-bottom: 1vh;
/* 去掉固定宽度以适应英文文本 */
} }
</style> </style>

105
src/views/home.vue

@ -309,6 +309,44 @@ const getPathByQueryId = (queryId) => {
return matchedRoutes[0]?.path || null return matchedRoutes[0]?.path || null
} }
// ------------------ ------------------
const sidebarWidth = ref(230) //
const isResizing = ref(false)
const startResize = (e) => {
// ""
e.preventDefault()
isResizing.value = true
// X
const startX = e.clientX
const startWidth = sidebarWidth.value
//
const doDrag = (e) => {
if (!isResizing.value) return
// = + (X - X)
const newWidth = startWidth + (e.clientX - startX)
//
if (newWidth >= 200 && newWidth <= 350) {
sidebarWidth.value = newWidth
}
}
const stopDrag = () => {
isResizing.value = false
document.removeEventListener('mousemove', doDrag)
document.removeEventListener('mouseup', stopDrag)
document.body.style.cursor = '' //
document.body.style.userSelect = '' //
}
document.addEventListener('mousemove', doDrag)
document.addEventListener('mouseup', stopDrag)
document.body.style.cursor = 'col-resize' //
document.body.style.userSelect = 'none' //
}
// + // +
const handleMessageClick = async (item) => { const handleMessageClick = async (item) => {
const res = await API({ const res = await API({
@ -350,7 +388,10 @@ onMounted(() => getMessage())
<div class="background-glass"> <div class="background-glass">
<!-- 侧边栏 --> <!-- 侧边栏 -->
<div class="sidebar-container"> <div class="sidebar-container">
<el-aside class="sidebar-layout">
<el-aside class="sidebar-layout" :class="{ 'no-transition': isResizing }" :style="{ width: sidebarWidth + 'px' }">
<!-- 拖拽手柄 -->
<div class="resize-handle" @mousedown="startResize"></div>
<div class="logo"> <div class="logo">
<img src="../assets/logo.png" alt="logo" style="width: 9vh; height: 9vh"/> <img src="../assets/logo.png" alt="logo" style="width: 9vh; height: 9vh"/>
</div> </div>
@ -368,7 +409,7 @@ onMounted(() => getMessage())
style="width: 4vh; height: 4vh; margin-right: 4px;" style="width: 4vh; height: 4vh; margin-right: 4px;"
> >
<span class="menu-item-text">{{ menu.menuName }}</span>
<span class="menu-item-text" :title="menu.menuName">{{ menu.menuName }}</span>
</template> </template>
<!-- 子菜单 --> <!-- 子菜单 -->
<template v-for="child in menu.children" :key="child.id"> <template v-for="child in menu.children" :key="child.id">
@ -377,7 +418,7 @@ onMounted(() => getMessage())
<el-icon style="margin-right: 4px;"> <el-icon style="margin-right: 4px;">
<Folder/> <Folder/>
</el-icon> </el-icon>
<span class="menu-item-text">{{ child.menuName }}</span>
<span class="menu-item-text" :title="child.menuName">{{ child.menuName }}</span>
</el-menu-item> </el-menu-item>
<!-- 子菜单有下级 --> <!-- 子菜单有下级 -->
@ -386,7 +427,7 @@ onMounted(() => getMessage())
<el-icon style="margin-right: 4px;"> <el-icon style="margin-right: 4px;">
<Folder/> <Folder/>
</el-icon> </el-icon>
<span class="menu-item-text">{{ child.menuName }}</span>
<span class="menu-item-text" :title="child.menuName">{{ child.menuName }}</span>
</template> </template>
<!-- 递归 下一级--> <!-- 递归 下一级-->
<template v-for="grandChild in child.children" :key="grandChild.id"> <template v-for="grandChild in child.children" :key="grandChild.id">
@ -394,7 +435,7 @@ onMounted(() => getMessage())
<el-icon style="margin-right: 4px;"> <el-icon style="margin-right: 4px;">
<Folder/> <Folder/>
</el-icon> </el-icon>
<span class="menu-item-text">{{ grandChild.menuName }}</span>
<span class="menu-item-text" :title="grandChild.menuName">{{ grandChild.menuName }}</span>
</el-menu-item> </el-menu-item>
</template> </template>
</el-sub-menu> </el-sub-menu>
@ -408,7 +449,7 @@ onMounted(() => getMessage())
:alt="`${menu.menuName}图标`" :alt="`${menu.menuName}图标`"
style="width: 4vh; height: 4vh; margin-right: 4px;" style="width: 4vh; height: 4vh; margin-right: 4px;"
> >
<span class="menu-item-text">{{ menu.menuName }}</span>
<span class="menu-item-text" :title="menu.menuName">{{ menu.menuName }}</span>
</el-menu-item> </el-menu-item>
</template> </template>
</el-menu> </el-menu>
@ -639,19 +680,21 @@ onMounted(() => getMessage())
/* 菜单项文字样式 */ /* 菜单项文字样式 */
.menu-item-text { .menu-item-text {
display: inline-block; display: inline-block;
max-width: 120px; /* 设置最大宽度 */
min-width: 80px; /* 设置最小宽度 */
/* overflow: hidden; */
/* text-overflow: ellipsis; */
/* max-width: 120px; 移除固定最大宽度,使其随容器自适应 */
/* min-width: 80px; */
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap; /* 不换行 */ white-space: nowrap; /* 不换行 */
flex: 1; /* 自动填充剩余空间 */ flex: 1; /* 自动填充剩余空间 */
text-align: left; /* 文字左对齐 */ text-align: left; /* 文字左对齐 */
margin-right: 10px; /* 增加右侧间距,防止紧贴箭头 */
} }
/* 中间可滚动菜单容器 */ /* 中间可滚动菜单容器 */
.menu-scroll-container { .menu-scroll-container {
flex: 1; flex: 1;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden;
padding: 10px 0; padding: 10px 0;
} }
@ -679,6 +722,7 @@ onMounted(() => getMessage())
.sidebar-layout { .sidebar-layout {
width: 16vw; width: 16vw;
min-width: 230px; /* 设置最小宽度,防止内容被压缩 */
height: 100%; height: 100%;
background: #E7F4FD; /* 浅蓝色背景 */ background: #E7F4FD; /* 浅蓝色背景 */
/* backdrop-filter: blur(5px); 毛玻璃效果 --消耗性能 */ /* backdrop-filter: blur(5px); 毛玻璃效果 --消耗性能 */
@ -687,7 +731,30 @@ onMounted(() => getMessage())
display: flex; display: flex;
flex-direction: column; flex-direction: column;
position: relative; position: relative;
transition: all 0.3s ease;
transition: width 0.3s ease; /* 恢复原本的平滑过渡,仅在非拖拽时生效 */
}
/* 拖拽时禁用过渡动画,解决卡顿 */
.sidebar-layout.no-transition {
transition: none !important;
}
/* 拖拽手柄样式 */
.resize-handle {
position: absolute;
top: 0;
right: 0;
width: 5px;
height: 100%;
cursor: col-resize;
z-index: 10;
background: transparent;
transition: background 0.2s;
}
.resize-handle:hover,
.resize-handle:active {
background: rgba(64, 158, 255, 0.5); /* 悬停或拖拽时显示蓝色 */
} }
/* 内容区域容器 */ /* 内容区域容器 */
@ -789,7 +856,7 @@ onMounted(() => getMessage())
/* 消息中心整体容器 */ /* 消息中心整体容器 */
.message-container { .message-container {
padding: 10px 50px 10px 50px; /* 上,右, 下,左 */
padding: 10px 20px 10px 10px; /* 上,右, 下,左 - 减小内边距 */
display: flex; display: flex;
align-items: center; /* 垂直居中 */ align-items: center; /* 垂直居中 */
} }
@ -897,4 +964,18 @@ display: flex;
padding: 8px; padding: 8px;
} }
/* 滚动条美化 */
::-webkit-scrollbar {
width: 6px;
height: 6px;
}
::-webkit-scrollbar-thumb {
background: rgba(0, 0, 0, 0.2);
border-radius: 3px;
}
::-webkit-scrollbar-track {
background: transparent;
}
</style> </style>

2
src/views/moneyManage/executor/executor.vue

@ -111,7 +111,7 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="status" :label="t('common_list.orderStatus')" width="120">
<el-table-column prop="status" :label="t('common_list.orderStatus')" width="130">
<template #default="scope"> <template #default="scope">
{{ scope.row.status === 41 ? t('common_list.refundSuccess') : t('common_list.pending') }} {{ scope.row.status === 41 ? t('common_list.refundSuccess') : t('common_list.pending') }}
</template> </template>

2
src/views/moneyManage/receiveDetail/receiveFinance.vue

@ -122,7 +122,7 @@
</el-table-column> </el-table-column>
<el-table-column fixed="left" prop="jwcode" label="Homily ID" width="110px" /> <el-table-column fixed="left" prop="jwcode" label="Homily ID" width="110px" />
<el-table-column fixed="left" prop="name" :label="t('common_list.name')" width="110px" /> <el-table-column fixed="left" prop="name" :label="t('common_list.name')" width="110px" />
<el-table-column prop="marketName" :label="t('common_list.market')" width="80px" />
<el-table-column prop="marketName" :label="t('common_list.market')" width="110px" />
<el-table-column prop="activity" :label="t('common_list.activity')" width="120px" <el-table-column prop="activity" :label="t('common_list.activity')" width="120px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column prop="goodsName" :label="t('common_list.productName')" width="120px" /> <el-table-column prop="goodsName" :label="t('common_list.productName')" width="120px" />

2
src/views/moneyManage/receiveDetail/receiveManage.vue

@ -122,7 +122,7 @@
</el-table-column> </el-table-column>
<el-table-column fixed="left" prop="jwcode" label="Homily ID" width="110px" /> <el-table-column fixed="left" prop="jwcode" label="Homily ID" width="110px" />
<el-table-column fixed="left" prop="name" :label="t('common_list.name')" width="110px" /> <el-table-column fixed="left" prop="name" :label="t('common_list.name')" width="110px" />
<el-table-column prop="marketName" :label="t('common_list.market')" width="80px" />
<el-table-column prop="marketName" :label="t('common_list.market')" width="110px" />
<el-table-column prop="activity" :label="t('common_list.activity')" width="120px" <el-table-column prop="activity" :label="t('common_list.activity')" width="120px"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column prop="goodsName" :label="t('common_list.productName')" width="120px" /> <el-table-column prop="goodsName" :label="t('common_list.productName')" width="120px" />

2
src/views/moneyManage/refundDetail/refundCharge.vue

@ -72,7 +72,7 @@
<el-table-column prop="refundReason" :label="t('common_list.refundReason')" width="120" <el-table-column prop="refundReason" :label="t('common_list.refundReason')" width="120"
show-overflow-tooltip /> show-overflow-tooltip />
<el-table-column prop="remark" :label="t('common_list.remark')" width="150" show-overflow-tooltip /> <el-table-column prop="remark" :label="t('common_list.remark')" width="150" show-overflow-tooltip />
<el-table-column prop="status" :label="t('common_list.orderStatus')" width="120">
<el-table-column prop="status" :label="t('common_list.orderStatus')" width="130">
<template #default="scope"> <template #default="scope">
{{ {{
[20].includes(scope.row.status) ? t('cash.statusList.pending') : [20].includes(scope.row.status) ? t('cash.statusList.pending') :

2
src/views/moneyManage/refundDetail/refundFinance.vue

@ -66,7 +66,7 @@
<el-table-column prop="submitter" :label="t('common_list.submitter')" width="120" /> <el-table-column prop="submitter" :label="t('common_list.submitter')" width="120" />
<el-table-column prop="refundReason" :label="t('common_list.refundReason')" width="120" show-overflow-tooltip /> <el-table-column prop="refundReason" :label="t('common_list.refundReason')" width="120" show-overflow-tooltip />
<el-table-column prop="remark" :label="t('common_list.remark')" width="150" show-overflow-tooltip /> <el-table-column prop="remark" :label="t('common_list.remark')" width="150" show-overflow-tooltip />
<el-table-column prop="status" :label="t('common_list.orderStatus')" width="120">
<el-table-column prop="status" :label="t('common_list.orderStatus')" width="130">
<template #default="scope"> <template #default="scope">
{{ {{
[10].includes(scope.row.status) ? t('cash.statusList.pending') : [10].includes(scope.row.status) ? t('cash.statusList.pending') :

2
src/views/moneyManage/refundDetail/refundHeader.vue

@ -66,7 +66,7 @@
<el-table-column prop="submitter" :label="t('common_list.submitter')" width="120" /> <el-table-column prop="submitter" :label="t('common_list.submitter')" width="120" />
<el-table-column prop="refundReason" :label="t('common_list.refundReason')" width="120" show-overflow-tooltip /> <el-table-column prop="refundReason" :label="t('common_list.refundReason')" width="120" show-overflow-tooltip />
<el-table-column prop="remark" :label="t('common_list.remark')" width="150" show-overflow-tooltip /> <el-table-column prop="remark" :label="t('common_list.remark')" width="150" show-overflow-tooltip />
<el-table-column prop="status" :label="t('common_list.orderStatus')" width="120">
<el-table-column prop="status" :label="t('common_list.orderStatus')" width="130">
<template #default="scope"> <template #default="scope">
{{ {{
[30].includes(scope.row.status) ? t('cash.statusList.pending') : [30].includes(scope.row.status) ? t('cash.statusList.pending') :

Loading…
Cancel
Save