Skip to content

F
factory_front
Commit 336d59a8 by wusiyi
Options

feat: POD订单(CN)新增收件国家筛选 #1002558

parent 70742842
Showing with 62 additions and 55 deletions
src/types/api/statistic.ts
...@@ -27,11 +27,17 @@ export interface statisticData { ...@@ -27,11 +27,17 @@ export interface statisticData {
outOfStockSkuNum: number outOfStockSkuNum: number
outOfStockProductNum: number outOfStockProductNum: number
yesterdayOverTimeShipmentOrderNum: number yesterdayOverTimeShipmentOrderNum: number
notShipmentProductNum: number
overTimeNotShipmentProductNum: number
yesterdayShipmentProductNum: number
} }
export interface trendType { export interface trendType {
confirmNum: number // 接单数 confirmNum: number // 接单数
produceNum: number // 生产数 produceNum: number // 生产数
shipmentNum: number // 发货数 shipmentNum: number // 发货数
confirmProductNum?: number // 新接数（件）
producedProductNum?: number // 生产数（件）
shipmentProductNum?: number // 发货数（件）
shipmentRateOf24Hour: number // 24小时发货率 shipmentRateOf24Hour: number // 24小时发货率
shipmentRateOf48Hour: number // 48小时发货率 shipmentRateOf48Hour: number // 48小时发货率
overtimeShipmentRate: number // 超48小时发货率 overtimeShipmentRate: number // 超48小时发货率
......
src/views/order/orderTracking/index.vue
...@@ -757,19 +757,6 @@ const handleSelectionChange = (val: PodUsOrderListData[]) => { ...@@ -757,19 +757,6 @@ const handleSelectionChange = (val: PodUsOrderListData[]) => {
selection.value = val selection.value = val
} }
// 修改行样式方法
const getRowStyle = ({ row }: { row: PodUsOrderListData }) => {
// 如果行被选中，设置背景色为 #fdf6ec
if (selection.value.some((item) => item.id === row.id)) {
return {
backgroundColor: '#fdf6ec',
}
}
return {
backgroundColor: '',
}
}
// 获取行类名方法 // 获取行类名方法
const getRowClassName = ({ row }: { row: PodUsOrderListData }) => { const getRowClassName = ({ row }: { row: PodUsOrderListData }) => {
return selection.value.some((item) => item.id === row.id) return selection.value.some((item) => item.id === row.id)
...@@ -1156,7 +1143,6 @@ onMounted(() => { ...@@ -1156,7 +1143,6 @@ onMounted(() => {
:serial-numberable="true" :serial-numberable="true"
:selectionable="true" :selectionable="true"
:paginated-data="tableData" :paginated-data="tableData"
:row-style="getRowStyle"
:row-class-name="getRowClassName" :row-class-name="getRowClassName"
@row-click="rowClick" @row-click="rowClick"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
...@@ -1385,11 +1371,22 @@ onMounted(() => { ...@@ -1385,11 +1371,22 @@ onMounted(() => {
} }
} }
// 确保选中行的背景色在 hover 时也保持 // 设置选中行的背景色
:deep(.el-table__body) { :deep(.el-table__body) {
.el-table__row:hover {
td {
background-color: #e1ebf5 !important;
}
}
.el-table__row.row-selected {
td {
background-color: #faecd8 !important;
}
}
// 确保选中行的背景色在 hover 时也保持
.el-table__row.row-selected:hover { .el-table__row.row-selected:hover {
td { td {
background-color: #fdf6ec !important; background-color: #faecd8 !important;
} }
} }
} }
......
src/views/order/orderTracking/indexcn.vue
...@@ -772,20 +772,6 @@ const handleSelectionChange = (val: PodCnOrderListData[]) => { ...@@ -772,20 +772,6 @@ const handleSelectionChange = (val: PodCnOrderListData[]) => {
selection.value = val selection.value = val
} }
// 修改行样式方法
const getRowStyle = ({ row }: { row: PodCnOrderListData }) => {
// 如果行被选中，设置背景色为 #fdf6ec
if (selection.value.some((item) => item.id === row.id)) {
return {
backgroundColor: '#fdf6ec',
}
}
return {
backgroundColor: '',
}
}
// 获取行类名方法 // 获取行类名方法
const getRowClassName = ({ row }: { row: PodCnOrderListData }) => { const getRowClassName = ({ row }: { row: PodCnOrderListData }) => {
return selection.value.some((item) => item.id === row.id) return selection.value.some((item) => item.id === row.id)
...@@ -1246,7 +1232,6 @@ onMounted(() => { ...@@ -1246,7 +1232,6 @@ onMounted(() => {
:serial-numberable="true" :serial-numberable="true"
:selectionable="true" :selectionable="true"
:paginated-data="tableData" :paginated-data="tableData"
:row-style="getRowStyle"
:row-class-name="getRowClassName" :row-class-name="getRowClassName"
@row-click="rowClick" @row-click="rowClick"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
...@@ -1482,11 +1467,22 @@ onMounted(() => { ...@@ -1482,11 +1467,22 @@ onMounted(() => {
} }
} }
// 确保选中行的背景色在 hover 时也保持 // 设置选中行的背景色
:deep(.el-table__body) { :deep(.el-table__body) {
.el-table__row:hover {
td {
background-color: #e1ebf5 !important;
}
}
.el-table__row.row-selected {
td {
background-color: #faecd8 !important;
}
}
// 确保选中行的背景色在 hover 时也保持
.el-table__row.row-selected:hover { .el-table__row.row-selected:hover {
td { td {
background-color: #fdf6ec !important; background-color: #faecd8 !important;
} }
} }
} }
......
src/views/order/podCN/index.vue
...@@ -5524,15 +5524,8 @@ const getRowStyle = ({ row }: { row: PodCnOrderListData }) => { ...@@ -5524,15 +5524,8 @@ const getRowStyle = ({ row }: { row: PodCnOrderListData }) => {
color: '#67c23a', color: '#67c23a',
} }
} }
// 如果行被选中，设置背景色为 #fdf6ec // 选中状态通过 CSS 类名控制，这里不再处理
if (selection.value.some((item) => item.id === row.id)) { return {}
return {
backgroundColor: '#fdf6ec',
}
}
return {
backgroundColor: '',
}
} }
// 获取行类名方法 // 获取行类名方法
...@@ -6541,11 +6534,22 @@ const onUpdateCustomsDeclarationInfo = () => { ...@@ -6541,11 +6534,22 @@ const onUpdateCustomsDeclarationInfo = () => {
} }
} }
// 确保选中行的背景色在 hover 时也保持 // 设置选中行的背景色
:deep(.el-table__body) { :deep(.el-table__body) {
.el-table__row:hover {
td {
background-color: #e1ebf5 !important;
}
}
.el-table__row.row-selected {
td {
background-color: #faecd8 !important;
}
}
// 确保选中行的背景色在 hover 时也保持
.el-table__row.row-selected:hover { .el-table__row.row-selected:hover {
td { td {
background-color: #fdf6ec !important; background-color: #faecd8 !important;
} }
} }
} }
......
src/views/order/podUs/index.vue
...@@ -6176,15 +6176,8 @@ const getRowStyle = ({ row }: { row: PodUsOrderListData }) => { ...@@ -6176,15 +6176,8 @@ const getRowStyle = ({ row }: { row: PodUsOrderListData }) => {
color: '#67c23a', color: '#67c23a',
} }
} }
// 如果行被选中，设置背景色为 #fdf6ec // 选中状态通过 CSS 类名控制，这里不再处理
if (selection.value.some((item) => item.id === row.id)) { return {}
return {
backgroundColor: '#fdf6ec',
}
}
return {
backgroundColor: '',
}
} }
// 获取行类名方法 // 获取行类名方法
...@@ -7327,11 +7320,22 @@ useRouter().beforeEach((to, from, next) => { ...@@ -7327,11 +7320,22 @@ useRouter().beforeEach((to, from, next) => {
} }
} }
// 确保选中行的背景色在 hover 时也保持 // 设置选中行的背景色
:deep(.el-table__body) { :deep(.el-table__body) {
.el-table__row:hover {
td {
background-color: #e1ebf5 !important;
}
}
.el-table__row.row-selected {
td {
background-color: #faecd8 !important;
}
}
// 确保选中行的背景色在 hover 时也保持
.el-table__row.row-selected:hover { .el-table__row.row-selected:hover {
td { td {
background-color: #fdf6ec !important; background-color: #faecd8 !important;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment