Skip to content

F
factory_front
Commit 46551e46 by wusiyi
Options

Merge branch 'dev_sorting_rule' into 'dev' 

Dev sorting rule

See merge request !286
parents 1466df3b 0a8d4cec
Showing with 464 additions and 117 deletions
components.d.ts
......@@ -15,6 +15,8 @@ declare module 'vue' {
ElCard: typeof import('element-plus/es')['ElCard']
ElCarousel: typeof import('element-plus/es')['ElCarousel']
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
ElCascader: typeof import('element-plus/es')['ElCascader']
ElCascaderPanel: typeof import('element-plus/es')['ElCascaderPanel']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
ElCol: typeof import('element-plus/es')['ElCol']
......@@ -22,8 +24,6 @@ declare module 'vue' {
ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
ElDialog: typeof import('element-plus/es')['ElDialog']
ElDivider: typeof import('element-plus/es')['ElDivider']
ElDrawer: typeof import('element-plus/es')['ElDrawer']
......@@ -37,7 +37,6 @@ declare module 'vue' {
ElImage: typeof import('element-plus/es')['ElImage']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElLink: typeof import('element-plus/es')['ElLink']
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopover: typeof import('element-plus/es')['ElPopover']
......
package.json
......@@ -18,7 +18,7 @@
"bignumber.js": "^9.3.0",
"dayjs": "^1.11.13",
"echarts": "^6.0.0",
"element-plus": "^2.6.0",
"element-plus": "^2.14.3",
"lodash-es": "^4.17.21",
"luxon": "^3.7.1",
"pinia": "^2.1.7",
......
src/api/factoryOrderNew.ts
......@@ -74,7 +74,6 @@ export function getFactoryOrderNewListApi(
/** 请求体与 `factory/podOrder/list_page` 一致 */
export function getPodOrderAcceptedStatisticsApi(
data: SearchForm,
currentPage: number,
pageSize: number,
status?: string,
subStatus?: number,
......@@ -88,7 +87,7 @@ export function getPodOrderAcceptedStatisticsApi(
}>
>('factory/podOrder/acceptedStatistics', {
...normalizePodOrderQueryPayload({ ...data } as Record<string, unknown>),
currentPage,
currentPage: 1,
pageSize,
status,
acceptedStatus: subStatus,
......
src/api/order.ts
......@@ -804,3 +804,9 @@ export function getFactoryOrderFlowConfigApi() {
'report/factory-order-flow-config/get-config',
)
}
// 配货分拣 商品类目
export function getCategoryListApi() {
return axios.get<never, BaseRespData<OperatorList[]>>(
'allocation-sorting-rule/find-custom-category-list',
)
}
src/components/TableView.vue
......@@ -126,11 +126,11 @@ const attrs = useAttrs()
const slots = useSlots() as Record<string, Slot>
const setCurrentRow = (row: T) => {
tableRef.value?.setCurrentRow(row)
tableRef.value?.setCurrentRow(row as Record<PropertyKey, any>)
}
const toggleRowSelection = (row: T, selected: boolean = true) => {
tableRef.value?.toggleRowSelection(row, selected)
tableRef.value?.toggleRowSelection(row as Record<PropertyKey, any>, selected)
}
const clearSelection = () => {
......@@ -139,11 +139,11 @@ const clearSelection = () => {
const toggleAllSelection = () => {
tableRef.value?.toggleAllSelection()
}
const rowClick = (row:NonNullable<unknown>)=>{
const rowClick = (row: NonNullable<unknown>) => {
console.log(row)
console.log(tableRef.value,props.rowClickSelect)
if(props.rowClickSelect){
tableRef.value?.toggleRowSelection(row,true)
console.log(tableRef.value, props.rowClickSelect)
if (props.rowClickSelect) {
tableRef.value?.toggleRowSelection(row as Record<PropertyKey, any>, true)
}
}
const handleTableHeaderClick = (column: { type?: string }, event: Event) => {
......@@ -170,7 +170,10 @@ const selectAllRows = (select: boolean, setInternalIsMore?: boolean) => {
nextTick(() => {
if (tableRef.value && props.paginatedData.length > 0) {
props.paginatedData.forEach((row) => {
tableRef.value?.toggleRowSelection(row, select)
tableRef.value?.toggleRowSelection(
row as Record<PropertyKey, any>,
select,
)
})
}
......
src/main.ts
......@@ -4,6 +4,7 @@ import App from './App.vue'
import router, { registerDynamicRoutes } from './router'
import store from './store'
import './styles/index.scss'
import 'element-plus/es/components/message/style/css'
import roleShow from './utils/roleShow'
import VxeUITable from 'vxe-table'
import 'vxe-table/lib/style.css'
......@@ -46,5 +47,4 @@ app
.use(VxeUITable)
.mount('#app')
app.config.globalProperties.$isPermissionBtn = isPermissionBtn
src/styles/element.scss
......@@ -44,4 +44,24 @@
}
.el-loading-mask {
z-index: 1020 !important;
}
\ No newline at end of file
}
/* ElMessage：兼容 Vite 预构建旧版 JS（无 is-center）与新版 CSS 的定位差异 */
.el-message {
left: 50%;
transform: translateX(-50%);
}
.el-message.is-left {
left: 16px;
right: auto;
transform: none;
}
.el-message.is-right {
left: auto;
right: 16px;
transform: none;
}
.el-message.is-center {
left: 50%;
transform: translateX(-50%);
}
src/types/api/order.ts
......@@ -304,6 +304,8 @@ export interface SortingList {
warehouseName: string
autoPrint: boolean
defaultWarehouse: 0 | 1
matchType: 1 | 2 // 匹配类型：1=所有条件(且) 2=任一条件(或)
conditions: SortingRuleCondition[] // 配货规则
}
// 配货分拣 详情
......@@ -328,7 +330,7 @@ export interface SortingRuleCondition {
ruleId?: number
conditionType: string // 条件
operator: string // 操作符
conditionValue?: string | number | string[]
conditionValue?: string | number | (string | number)[]
}
// 配货分拣 配货区/操作符/条件
......
src/views/AccountStatementNote.vue
......@@ -516,9 +516,14 @@
</template>
<script setup lang="ts">
import { ElMessage, ElRadioGroup, ElTree, TableColumnCtx } from 'element-plus'
import {
ElMessage,
ElRadioGroup,
ElTree,
TableColumnCtx,
type TableInstance,
} from 'element-plus'
import splitDiv from '@/components/splitDiv/splitDiv.vue'
import { ElTable } from 'element-plus'
import usePageList from '@/utils/hooks/usePageList'
import { useValue } from '@/utils/hooks/useValue'
import {
......@@ -554,7 +559,9 @@ interface Tree {
code?: string
children?: Tree[]
}
interface SummaryMethodProps<T = AccountStatementNote> {
interface SummaryMethodProps<
T extends Record<PropertyKey, any> = AccountStatementNote,
> {
columns: TableColumnCtx<T>[]
data: T[]
}
......@@ -568,7 +575,7 @@ const dateRange = ref<string[]>([])
const selections = ref<AccountStatementNote[]>([])
const detailList = ref<ItemList[]>([])
const tabsValue = ref<string>('0')
const singleTableRef = ref<InstanceType<typeof ElTable>>()
const singleTableRef = ref<TableInstance>()
const currentRow = ref<AccountStatementNote | null>(null)
const logList = ref<LogList[]>([])
......@@ -583,7 +590,7 @@ const {
refresh: search,
onCurrentPageChange: handleCurrentChange,
onPageSizeChange: handleSizeChange,
} = usePageList({
} = usePageList<AccountStatementNote>({
query: (page, pageSize) =>
customJomallReconciliation(
{
......@@ -623,7 +630,7 @@ const getTreeNum = async () => {
console.error(e)
}
}
const rowClick = (row: AccountStatementNote) => {
const rowClick = (row: AccountStatementNote | null) => {
if (!row) {
currentRow.value = null
}
......@@ -789,7 +796,7 @@ const submitConfirmOrder = async () => {
search()
await getTreeNum()
if (singleTableRef.value) {
singleTableRef.value!.setCurrentRow(currentRow.value)
singleTableRef.value!.setCurrentRow(currentRow.value ?? undefined)
}
}
watch(
......
src/views/order/allocationSortingRule/components/addDialog.vue
......@@ -4,6 +4,7 @@
:title="isEdit ? '编辑配货区' : '新增配货区'"
:close-on-click-modal="false"
width="800px"
destroy-on-close
>
<el-form ref="formRef" label-width="170px" :model="form" :rules="rules">
<el-form-item label="配货区说明" prop="areaDesc">
......@@ -63,9 +64,9 @@
<el-select
v-model="item.operator"
style="width: 160px"
style="width: 100px"
:disabled="isDisabled"
placeholder="请选择关系"
placeholder="关系"
>
<el-option
v-for="operator in getAvailableOperators(item.conditionType)"
......@@ -79,13 +80,12 @@
<el-select
v-model="item.conditionValue"
class="platform-select"
style="width: 160px"
style="width: 190px"
:disabled="isDisabled"
placeholder="请选择平台"
filterable
multiple
collapse-tags
collapse-tags-tooltip
:max-collapse-tags="1"
clearable
popper-class="customize-select-style"
......@@ -105,11 +105,47 @@
</el-option>
</el-select>
</template>
<template v-else-if="item.conditionType === 'order_category'">
<el-cascader
v-model="item.conditionValue"
class="category-cascader"
style="width: 190px"
placeholder="请选择商品类目"
:options="categoryList"
:props="{
label: 'name',
value: 'id',
children: 'children',
multiple: true,
emitPath: true,
}"
collapse-tags
collapse-tags-tooltip
:max-collapse-tags="1"
tag-type="info"
show-checked-strategy="parent"
clearable
:disabled="isDisabled"
>
<template #tag="{ data, deleteTag }">
<el-tag
v-for="tag in data.slice(0, 1)"
:key="tag.key"
type="info"
:closable="tag.closable"
class="category-cascader-tag"
@close="deleteTag(tag)"
>
{{ tag.text }}
</el-tag>
</template>
</el-cascader>
</template>
<template v-else>
<el-input-number
v-model="item.conditionValue"
style="width: 160px"
style="width: 190px"
:min="1"
:max="999"
:disabled="isDisabled"
......@@ -202,19 +238,7 @@ import type {
SortingRuleCondition,
SortingRuleDetail,
} from '@/types/api/order'
import {
getAreaListApi,
getConditionTypeListApi,
getOperatorListApi,
addAreaApi,
editAreaApi,
} from '@/api/order'
// 配货规则条件
const pickingRuleList = ref<OperatorList[]>()
// 配货规则操作符
const operatorList = ref<OperatorList[]>()
import { getAreaListApi, addAreaApi, editAreaApi } from '@/api/order'
const props = defineProps<{
modelValue: boolean
......@@ -223,6 +247,9 @@ const props = defineProps<{
warehouseId: number
warehouseName: string
isDisabled?: boolean
categoryList: OperatorList[]
pickingRuleList: OperatorList[]
operatorList: OperatorList[]
}>()
const emit = defineEmits<{
(e: 'update:modelValue', value: boolean): void
......@@ -264,33 +291,38 @@ const getAvailablePickingRules = (currentIndex: number) => {
const selectedFields = form.value.conditions
.filter((_, index) => index !== currentIndex)
.map((item) => item.conditionType)
return pickingRuleList.value?.filter(
return props.pickingRuleList.filter(
(rule) => !selectedFields.includes(rule.code),
)
}
// 根据配货规则类型获取可用的操作符
const getAvailableOperators = (conditionType: string) => {
const list = operatorList.value ?? []
if (conditionType === 'order_total_num') {
return list.filter((operator) => operator.code !== 'in')
} else if (conditionType === 'order_platform') {
return list.filter((operator) => operator.code === 'in')
const list = props.operatorList
const matchers: Record<string, (code: string) => boolean> = {
order_total_num: (code) => code !== 'in' && code !== 'contain',
order_platform: (code) => code === 'in',
order_category: (code) => code === 'contain',
}
return list
const matcher = matchers[conditionType]
return matcher ? list.filter((operator) => matcher(operator.code)) : list
}
// 配货规则条件改变
const handleConditionTypeChange = (item: SortingRuleCondition) => {
// 平台 只能选 in属于
if (item.conditionType === 'order_platform') {
item.conditionValue = undefined
item.operator = 'in'
}
// 订单总件数 清空字段
else if (item.conditionType === 'order_total_num') {
item.conditionValue = undefined
item.operator = 'gt'
switch (item.conditionType) {
case 'order_platform':
item.conditionValue = undefined
item.operator = 'in'
break
case 'order_total_num':
item.conditionValue = undefined
item.operator = 'gt'
break
case 'order_category':
item.conditionValue = undefined
item.operator = 'contain'
break
}
}
......@@ -311,7 +343,8 @@ const validateConditions = (
for (let i = 0; i < items.length; i++) {
const item = items[i]
const isValueValid =
item.conditionType === 'order_platform'
item.conditionType === 'order_platform' ||
item.conditionType === 'order_category'
? Array.isArray(item.conditionValue) && item.conditionValue.length > 0
: item.conditionValue !== null && item.conditionValue !== undefined
if (!item.conditionType || !isValueValid || !item.operator) {
......@@ -352,14 +385,29 @@ const rules = computed(() => {
const platformList = platformJson
// 将详情返回的字符串条件值转为表单可用格式
const formatConditionsForForm = (conditions: SortingRuleCondition[]) =>
conditions.map((item) => ({
...item,
conditionValue:
typeof item.conditionValue === 'string'
? item.conditionValue.split(',').filter(Boolean)
: item.conditionValue,
}))
conditions.map((item) => {
if (
typeof item.conditionValue !== 'string' ||
(item.conditionType !== 'order_platform' &&
item.conditionType !== 'order_category')
) {
return item
}
const values = item.conditionValue.split(',').filter(Boolean)
// 类目 id 一般为 number，需与级联 options 的 id 类型一致才能回显
if (item.conditionType === 'order_category') {
return {
...item,
conditionValue: values.map((v) => {
const num = Number(v)
return Number.isNaN(num) ? v : num
}),
}
}
return { ...item, conditionValue: values }
})
// 添加配货规则
const addPickingRuleItem = () => {
......@@ -397,20 +445,6 @@ const loadAreaList = async () => {
}
}
// 获取配货规则条件
const getConditionTypeList = async () => {
const res = await getConditionTypeListApi()
if (res.code !== 200) return
pickingRuleList.value = res.data
}
// 获取配货规则操作符
const getOperatorList = async () => {
const res = await getOperatorListApi()
if (res.code !== 200) return
operatorList.value = res.data
}
// 提交
const handleSubmit = async () => {
form.value.warehouseId = props.warehouseId
......@@ -425,7 +459,9 @@ const handleSubmit = async () => {
(item): SortingRuleCondition => ({
...item,
conditionValue: Array.isArray(item.conditionValue)
? item.conditionValue.join(',')
? item.conditionValue
.map((v) => (Array.isArray(v) ? v[v.length - 1] : v))
.join(',')
: item.conditionValue,
}),
),
......@@ -442,7 +478,7 @@ const handleSubmit = async () => {
}
onMounted(async () => {
await Promise.all([loadAreaList(), getConditionTypeList(), getOperatorList()])
await loadAreaList()
if (props.editData) {
form.value = {
...props.editData,
......@@ -500,7 +536,6 @@ onMounted(async () => {
:deep(.el-select__selection) {
flex-wrap: nowrap;
overflow: hidden;
}
:deep(.el-select__selected-item) {
......@@ -529,4 +564,21 @@ onMounted(async () => {
flex-wrap: wrap;
}
}
// cascader 样式，确保单行显示
.category-cascader {
.el-cascader__tags {
display: flex !important;
flex-wrap: nowrap !important;
align-items: center;
overflow: hidden;
}
.category-cascader-tag {
flex: 0 1 auto !important;
min-width: 0 !important;
max-width: 100%;
overflow: hidden;
}
}
</style>
src/views/order/allocationSortingRule/index.vue
......@@ -47,6 +47,62 @@
class="table-container"
>
<TableView :paginated-data="sortingList" :columns="columns">
<template #conditions="{ row }">
<div v-if="row.areaCode === 'AREA_0'">默认分拣口</div>
<div v-else class="conditions-text">
<div class="match-type">
{{
row.matchType === 1
? '满足以下所有条件：'
: '满足以下任一条件：'
}}
</div>
<div
v-for="(item, index) in row.conditions || []"
:key="index"
class="condition-item"
>
<span
class="condition-text"
:title="formatConditionText(item)"
>
{{ index + 1 }}、 {{ formatConditionText(item) }}
</span>
<el-popover
v-if="item.conditionType === 'order_category'"
placement="bottom"
:width="'auto'"
trigger="click"
>
<el-cascader-panel
class="category-cascader-panel-readonly"
:model-value="getCategoryCascaderValue(item)"
:options="categoryList"
:props="{
label: 'name',
value: 'id',
children: 'children',
multiple: true,
emitPath: true,
checkOnClickNode: false,
checkOnClickLeaf: false,
showPrefix: false,
}"
/>
<template #reference>
<el-button
type="primary"
link
class="category-detail-btn"
>
详情
</el-button>
</template>
</el-popover>
</div>
</div>
</template>
<template #autoPrint="{ row }">
{{ row.autoPrint ? '开启' : '关闭' }}
</template>
......@@ -78,6 +134,9 @@
:edit-data="editData"
:warehouse-id="searchForm.warehouseId"
:warehouse-name="searchForm.warehouseName"
:category-list="categoryList"
:picking-rule-list="pickingRuleList"
:operator-list="operatorList"
@submit="getSortingRuleList"
/>
<el-dialog
......@@ -97,7 +156,9 @@ import { loadWarehouseListApi } from '@/api/common'
import type { WarehouseListData } from '@/types'
import type {
LogListData,
OperatorList,
SortingList,
SortingRuleCondition,
SortingRuleDetail,
} from '@/types/api/order'
import type { CustomColumn } from '@/types/table'
......@@ -107,6 +168,9 @@ import {
getConfigApi,
updateConfighApi,
getAreaInfoApi,
getCategoryListApi,
getConditionTypeListApi,
getOperatorListApi,
} from '@/api/order'
import TableView from '@/components/TableView.vue'
import LogList from '@/components/LogList.vue'
......@@ -128,11 +192,13 @@ const columns: CustomColumn<SortingList>[] = [
align: 'center',
},
{
key: 'conditionsText',
prop: 'conditionsText',
key: 'conditions',
prop: 'conditions',
label: '配货规则',
minWidth: 250,
align: 'left',
slot: 'conditions',
showOverflowTooltip: false,
},
{
key: 'areaName',
......@@ -174,6 +240,9 @@ const columns: CustomColumn<SortingList>[] = [
const warehouseList = ref<WarehouseListData[]>([]) // 仓库列表
const sortingList = ref<SortingList[]>([]) // 规则列表
const categoryList = ref<OperatorList[]>([]) // 商品类目
const pickingRuleList = ref<OperatorList[]>([]) // 配货规则条件
const operatorList = ref<OperatorList[]>([]) // 配货规则操作符
const isEnableSorting = ref(false) // 是否开启配货分拣
const currentId = ref(0) // 当前操作id
const isEdit = ref(false) // 是否编辑
......@@ -188,6 +257,139 @@ const searchForm = ref({
warehouseName: '',
})
type CategoryNode = OperatorList & {
id?: number | string
name?: string
children?: CategoryNode[]
}
// 获取节点下全部叶子 id
const getCategoryLeafIds = (node: CategoryNode): string[] => {
if (!node.children?.length) return node.id != null ? [String(node.id)] : []
return node.children.flatMap(getCategoryLeafIds)
}
// 格式化已选类目：某项下所有子项都被选中时，只展示该项路径
const formatSelectedCategories = (
list: CategoryNode[],
selectedIds: Set<string>,
path: string[] = [],
): string[] => {
const result: string[] = []
for (const item of list) {
const currentPath = [...path, item.name ?? '']
const leafIds = getCategoryLeafIds(item)
const allSelected =
leafIds.length > 0 && leafIds.every((id) => selectedIds.has(id))
if (allSelected) {
result.push(currentPath.join('->'))
continue
}
if (item.children?.length) {
result.push(
...formatSelectedCategories(item.children, selectedIds, currentPath),
)
} else if (item.id != null && selectedIds.has(String(item.id))) {
result.push(currentPath.join('->'))
}
}
return result
}
// 根据叶子 id 查找类目完整路径（用于级联回显）
const findCategoryPath = (
list: CategoryNode[],
targetId: string | number,
path: (string | number)[] = [],
): (string | number)[] | null => {
for (const item of list) {
if (item.id == null) continue
const currentPath = [...path, item.id]
if (String(item.id) === String(targetId)) return currentPath
if (item.children?.length) {
const found = findCategoryPath(item.children, targetId, currentPath)
if (found) return found
}
}
return null
}
// 将条件值转为级联回显路径
const getCategoryCascaderValue = (item: SortingRuleCondition) => {
const ids = String(item.conditionValue ?? '')
.split(',')
.filter(Boolean)
return ids
.map((id) => {
const num = Number(id)
return findCategoryPath(
categoryList.value as CategoryNode[],
Number.isNaN(num) ? id : num,
)
})
.filter((path): path is (string | number)[] => !!path)
}
// 配货规则展示文案
const formatConditionText = (item: SortingRuleCondition) => {
// 配货规则条件
const typeDesc =
pickingRuleList.value.find((r) => r.code === item.conditionType)?.desc ??
item.conditionType
// 配货规则操作符
const operatorDesc =
operatorList.value.find((r) => r.code === item.operator)?.desc ??
item.operator
let valueText = ''
switch (item.conditionType) {
case 'order_category': {
const selectedIds = new Set(
String(item.conditionValue ?? '')
.split(',')
.filter(Boolean),
)
valueText = formatSelectedCategories(
categoryList.value as CategoryNode[],
selectedIds,
).join('、')
break
}
case 'order_platform':
valueText = String(item.conditionValue ?? '')
.split(',')
.filter(Boolean)
.join('、')
break
default:
valueText = String(item.conditionValue ?? '')
break
}
return `${typeDesc}${operatorDesc} ${valueText}`
}
// 获取商品类目
const getCategoryList = async () => {
const res = await getCategoryListApi()
if (res.code !== 200) return
categoryList.value = res.data
}
// 获取配货规则条件
const getConditionTypeList = async () => {
const res = await getConditionTypeListApi()
if (res.code !== 200) return
pickingRuleList.value = res.data
}
// 获取配货规则操作符
const getOperatorList = async () => {
const res = await getOperatorListApi()
if (res.code !== 200) return
operatorList.value = res.data
}
// 加载仓库列表
const loadWarehouseList = async () => {
try {
......@@ -303,9 +505,16 @@ const deleteArea = async (id: number) => {
// }
onMounted(async () => {
await loadWarehouseList()
await getFunctionSwitch()
loading.value = true
await Promise.all([
loadWarehouseList(),
getFunctionSwitch(),
getCategoryList(),
getConditionTypeList(),
getOperatorList(),
])
await getSortingRuleList()
loading.value = false
})
</script>
......@@ -340,4 +549,46 @@ onMounted(async () => {
margin-top: 10px;
}
}
.conditions-text {
padding: 4px 0;
line-height: 1.6;
overflow: hidden;
.match-type {
color: #666;
margin-bottom: 2px;
}
.condition-item {
display: flex;
align-items: center;
color: #333;
overflow: hidden;
min-width: 0;
.condition-text {
flex: 1;
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.category-detail-btn {
flex-shrink: 0;
margin-left: 4px;
padding: 0;
height: auto;
}
}
}
</style>
<style lang="scss">
// 详情面板只读：可展开，禁止勾选
.category-cascader-panel-readonly {
.el-checkbox {
pointer-events: none;
}
}
</style>
src/views/order/factoryOrderNew/hooks/useOrderStatusTree.ts
......@@ -91,7 +91,6 @@ export function useOrderStatusTree(options: UseOrderStatusTreeOptions) {
try {
const res = await getPodOrderAcceptedStatisticsApi(
getQueryPayload(),
currentPage.value,
pageSize.value,
status.value,
getListPageAcceptedSubStatus(),
......
src/views/order/factoryOrderNew/index.vue
......@@ -2348,6 +2348,13 @@ const baseProductColumns = computed(() => [
align: 'center',
},
{
key: 'categoryName',
prop: 'categoryName',
label: '商品类目',
minWidth: 160,
align: 'center',
},
{
prop: 'price',
label: '价格',
minWidth: 100,
......
src/views/order/podUs/PodMakeOrder.vue
......@@ -1764,6 +1764,7 @@ const resetPlatform = () => {
.basic-info-item {
display: flex;
align-items: center;
overflow: hidden;
span:last-child {
flex: 1;
......
src/views/podBillOrder/index.vue
......@@ -901,7 +901,7 @@
</template>
<script setup lang="ts">
import { ElMessage, ElTable, ElTree, TableColumnCtx } from 'element-plus'
import { ElMessage, ElTree, TableColumnCtx, type TableInstance } from 'element-plus'
import splitDiv from '@/components/splitDiv/splitDiv.vue'
import { CircleClose, Plus } from '@element-plus/icons-vue'
// import pendingReconciliation from './pendingReconciliation.vue'
......@@ -945,7 +945,9 @@ interface Tree {
children?: Tree[]
}
interface SummaryMethodProps<T = AccountStatementNote> {
interface SummaryMethodProps<
T extends Record<PropertyKey, any> = AccountStatementNote,
> {
columns: TableColumnCtx<T>[]
data: T[]
}
......@@ -973,7 +975,7 @@ const selections = ref<AccountStatementNote[]>([])
const detailSelections = ref<ItemList[]>([])
const detailList = ref<ItemList[]>([])
const tabsValue = ref<string>('0')
const singleTableRef = ref<InstanceType<typeof ElTable>>()
const singleTableRef = ref<TableInstance>()
const currentRow = ref<AccountStatementNote | null>(null)
const paymentDialogVisible = ref(false)
......@@ -1008,7 +1010,7 @@ const {
refresh: search,
onCurrentPageChange: handleCurrentChange,
onPageSizeChange: handleSizeChange,
} = usePageList({
} = usePageList<AccountStatementNote>({
query: (page, pageSize) =>
podReconciliationList(
{
......@@ -1152,7 +1154,7 @@ const getTreeNum = async () => {
console.error(e)
}
}
const rowClick = (row: AccountStatementNote) => {
const rowClick = (row: AccountStatementNote | null) => {
if (!row) {
currentRow.value = null
}
......@@ -1362,7 +1364,7 @@ const submitConfirmOrder = async (type: number) => {
search()
await getTreeNum()
if (singleTableRef.value) {
singleTableRef.value!.setCurrentRow(currentRow.value)
singleTableRef.value!.setCurrentRow(currentRow.value ?? undefined)
}
}
watch(
......
src/views/podBillOrder/pendingReconciliation.vue
......@@ -34,7 +34,7 @@ const {
refresh: search,
onCurrentPageChange: handleCurrentChange,
onPageSizeChange: handleSizeChange,
} = usePageList({
} = usePageList<AccountStatementNote>({
query: (page, pageSize) =>
getPodShipmentDetailsById(
{
......
src/views/podUsBillOrder/editOrder.vue
<script setup lang="ts">
import { ElMessage, ElTable } from 'element-plus'
import { ElMessage } from 'element-plus'
import type { PropType } from 'vue'
import { ProductDetails } from '@/types/api/billOrder.ts'
const selection = ref<ProductDetails[]>([])
defineProps({
list: {
type: Array,
type: Array as PropType<ProductDetails[]>,
default: () => [],
},
})
const handleDetailSelectionChange = (arr:ProductDetails[]) => {
const handleDetailSelectionChange = (arr: ProductDetails[]) => {
selection.value = arr
}
......
src/views/podUsBillOrder/index.vue
......@@ -1040,7 +1040,7 @@
<script setup lang="ts">
import DetailView from './detail.vue'
import EditOrder from './editOrder.vue'
import { ElMessage, ElTable, ElTree, TableColumnCtx } from 'element-plus'
import { ElMessage, ElTree, TableColumnCtx, type TableInstance } from 'element-plus'
import splitDiv from '@/components/splitDiv/splitDiv.vue'
import usePageList from '@/utils/hooks/usePageList'
import { useValue } from '@/utils/hooks/useValue'
......@@ -1084,7 +1084,9 @@ interface Tree {
children?: Tree[]
}
interface SummaryMethodProps<T = AccountStatementNote> {
interface SummaryMethodProps<
T extends Record<PropertyKey, any> = AccountStatementNote,
> {
columns: TableColumnCtx<T>[]
data: T[]
}
......@@ -1105,7 +1107,7 @@ const orderSelections = ref<OrderDetails[]>([])
const detailList = ref<ProductDetails[]>([])
const orderList = ref<OrderDetails[]>([])
const tabsValue = ref<string>('0')
const singleTableRef = ref<InstanceType<typeof ElTable>>()
const singleTableRef = ref<TableInstance>()
const currentRow = ref<AccountStatementNote | null>(null)
const batchSave = async () => {
......@@ -1182,7 +1184,7 @@ const {
refresh: search,
onCurrentPageChange: handleCurrentChange,
onPageSizeChange: handleSizeChange,
} = usePageList({
} = usePageList<AccountStatementNote>({
query: (page, pageSize) =>
podUsReconciliationList(
{
......@@ -1254,7 +1256,7 @@ const getTreeNum = async () => {
console.error(e)
}
}
const rowClick = (row: AccountStatementNote) => {
const rowClick = (row: AccountStatementNote | null) => {
if (!row) {
currentRow.value = null
}
......@@ -1414,7 +1416,7 @@ const submitConfirmOrder = async (type: number) => {
search()
await getTreeNum()
if (singleTableRef.value) {
singleTableRef.value!.setCurrentRow(currentRow.value)
singleTableRef.value!.setCurrentRow(currentRow.value ?? undefined)
}
}
watch(
......
src/views/podUsBillOrder/pendingReconciliation.vue
......@@ -34,7 +34,7 @@ const {
refresh: search,
onCurrentPageChange: handleCurrentChange,
onPageSizeChange: handleSizeChange,
} = usePageList({
} = usePageList<AccountStatementNote>({
query: (page, pageSize) =>
getPodShipmentDetailsById(
{
......
src/views/warehouse/issueDoc.vue
......@@ -894,10 +894,9 @@
</template>
<script setup lang="ts">
import { ElMessage, ElRadioGroup, ElTree } from 'element-plus'
import { ElMessage, ElRadioGroup, ElTree, type TableInstance } from 'element-plus'
import { CirclePlusFilled } from '@element-plus/icons-vue'
import splitDiv from '@/components/splitDiv/splitDiv.vue'
import { ElTable } from 'element-plus'
import usePageList from '@/utils/hooks/usePageList'
import { checkUpdateParams, AnyObject } from '@/utils/hooks/commonUtil'
import { useValue } from '@/utils/hooks/useValue'
......@@ -1064,7 +1063,7 @@ const tradingTime = ref<string[]>([])
const selections = ref<InterWarehousePage[]>([])
const detailList = ref<InterProductList[]>([])
const tabsValue = ref<string>('0')
const singleTableRef = ref<InstanceType<typeof ElTable>>()
const singleTableRef = ref<TableInstance>()
const currentRow = ref<InterWarehousePage | null>(null)
const logList = ref<LogListData[]>([])
const rules = {
......@@ -1399,7 +1398,7 @@ const getWarehouseList = async () => {
console.error(e)
}
}
const rowClick = (row: InterWarehousePage) => {
const rowClick = (row: InterWarehousePage | null) => {
if (!row) {
currentRow.value = null
}
......
src/views/warehouse/receiptDoc.vue
......@@ -629,9 +629,8 @@
</template>
<script setup lang="ts">
import { ElMessage, ElRadioGroup, ElTree } from 'element-plus'
import { ElMessage, ElRadioGroup, ElTree, type TableInstance } from 'element-plus'
import splitDiv from '@/components/splitDiv/splitDiv.vue'
import { ElTable } from 'element-plus'
import ReceiptProductDialog from './components/ReceiptProductDialog.vue'
import usePageList from '@/utils/hooks/usePageList'
import { checkUpdateParams, AnyObject } from '@/utils/hooks/commonUtil'
......@@ -807,7 +806,7 @@ const tradingTime = ref<string[]>([])
const selections = ref<InterWarehousePage[]>([])
const detailList = ref<InterProductList[]>([])
const tabsValue = ref<string>('0')
const singleTableRef = ref<InstanceType<typeof ElTable>>()
const singleTableRef = ref<TableInstance>()
const currentRow = ref<InterWarehousePage | null>(null)
const logList = ref<LogListData[]>([])
const detailLoading = ref(false)
......@@ -1085,7 +1084,7 @@ const getWarehouseList = async () => {
console.error(e)
}
}
const rowClick = (row: InterWarehousePage) => {
const rowClick = (row: InterWarehousePage | null) => {
if (!row) {
currentRow.value = null
}
......
src/views/warehouse/stockingPlan.vue
......@@ -998,10 +998,9 @@
</template>
<script setup lang="ts">
import { ElMessage, ElRadioGroup, ElTree } from 'element-plus'
import { ElMessage, ElRadioGroup, ElTree, type TableInstance } from 'element-plus'
import { CirclePlusFilled } from '@element-plus/icons-vue'
import splitDiv from '@/components/splitDiv/splitDiv.vue'
import { ElTable } from 'element-plus'
import usePageList from '@/utils/hooks/usePageList'
import { checkUpdateParams, AnyObject } from '@/utils/hooks/commonUtil'
import { useValue } from '@/utils/hooks/useValue'
......@@ -1174,7 +1173,7 @@ const tradingTime = ref<string[]>([])
const selections = ref<InterWarehousePage[]>([])
const detailList = ref<InterProductList[]>([])
const tabsValue = ref<string>('0')
const singleTableRef = ref<InstanceType<typeof ElTable>>()
const singleTableRef = ref<TableInstance>()
const currentRow = ref<InterWarehousePage | null>(null)
const logList = ref<LogListData[]>([])
const rules = {
......@@ -1509,7 +1508,7 @@ const getWarehouseList = async () => {
console.error(e)
}
}
const rowClick = (row: InterWarehousePage) => {
const rowClick = (row: InterWarehousePage | null) => {
if (!row) {
currentRow.value = null
}
......
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