Merge branch 'dev' into 'master'

Dev

See merge request !146

src/views/order/podUs/index.vue

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