Commit 5a71e66e by qinjianhui

Merge branch 'dev' into 'master'

Dev

See merge request !146
parents 31e26b72 35fa3b0a
......@@ -5294,6 +5294,7 @@ const showArrange = async (type: number, data?: PodUsOrderListData) => {
typesettingForm.value = {}
if (type === 1 || type === 3) {
typesettingRow.value = data
typesettingVisible.value = true
} else if (type === 2) {
const selectedIds = cardSelection.value.map((item) => item.id)
......@@ -6188,7 +6189,9 @@ const getRowStyle = ({ row }: { row: PodUsOrderListData }) => {
// 获取行类名方法
const getRowClassName = ({ row }: { row: PodUsOrderListData }) => {
return selection.value.some((item) => item.id === row.id) ? 'row-selected' : ''
return selection.value.some((item) => item.id === row.id)
? 'row-selected'
: ''
}
const warehouseList = ref<WarehouseListData[]>([])
const loadWarehouseList = async () => {
......
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