fix: 操作单布局调用连词接口修改

src/types/api/order/factoryOrderNew.ts

@@ -119,6 +119,9 @@ export interface ProductListData {
   notPassNum?: number
   notPassNum?: number
   payAmount?: number
   payAmount?: number
   weight?: number
   weight?: number
+  inventory?: number
+  occupyInventory?: number
+  freezeInventory?: number
   createTime?: string
   createTime?: string
   updateTime?: string
   updateTime?: string
   version?: number
   version?: number

src/views/order/factoryOrderNew/component/CardLayout.vue

@@ -303,6 +303,7 @@ const {
   refresh,
   refresh,
 } = usePageList<operateOrderListData>({
 } = usePageList<operateOrderListData>({
   initPageSize: props.initPageSize || 100,
   initPageSize: props.initPageSize || 100,
+  initLoad: false,
   query: async (current, size) => {
   query: async (current, size) => {
     const payload = {
     const payload = {
       ...props.queryPayload,
       ...props.queryPayload,

src/views/order/factoryOrderNew/index.vue

@@ -278,7 +278,11 @@
                       style="width: 150px"
                       style="width: 150px"
                     >
                     >
                       <ElOption
                       <ElOption
-                        v-for="(item, index) in ['自有物流', '工厂物流','自提']"
+                        v-for="(item, index) in [
+                          '自有物流',
+                          '工厂物流',
+                          '自提',
+                        ]"
                         :key="index"
                         :key="index"
                         :value="index"
                         :value="index"
                         :label="item"
                         :label="item"
@@ -859,7 +863,7 @@ import {
   CaretBottom,
   CaretBottom,
   Edit,
   Edit,
 } from '@element-plus/icons-vue'
 } from '@element-plus/icons-vue'
-import { computed, onMounted, ref } from 'vue'
+import { computed, nextTick, onMounted, ref } from 'vue'
 import splitDiv from '@/components/splitDiv/splitDiv.vue'
 import splitDiv from '@/components/splitDiv/splitDiv.vue'
 import TableView from '@/components/TableView.vue'
 import TableView from '@/components/TableView.vue'
 import ResultInfo from '@/views/order/components/ResultInfo.vue'
 import ResultInfo from '@/views/order/components/ResultInfo.vue'
@@ -895,6 +899,7 @@ import {
   getFactoryOrderNewOperateDetailApi,
   getFactoryOrderNewOperateDetailApi,
   statusPushApi,
   statusPushApi,
 } from '@/api/factoryOrderNew'
 } from '@/api/factoryOrderNew'
+import BigNumber from 'bignumber.js'
 import { filePath } from '@/api/axios'
 import { filePath } from '@/api/axios'
 import { OrderData } from '@/types/api/podMakeOrder'
 import { OrderData } from '@/types/api/podMakeOrder'
 import useLodop from '@/utils/hooks/useLodop'
 import useLodop from '@/utils/hooks/useLodop'
@@ -1026,7 +1031,9 @@ const refreshCurrentView = (options?: { isRefreshTree?: boolean }) => {
   }
   }
   if (isCardLayout.value) {
   if (isCardLayout.value) {
     cardLayoutRef.value?.clearSelection()
     cardLayoutRef.value?.clearSelection()
+    nextTick(() => {
       cardLayoutRef.value?.refresh(true)
       cardLayoutRef.value?.refresh(true)
+    })
     return
     return
   }
   }
   if (status.value === 'PENDING_RECEIVE') {
   if (status.value === 'PENDING_RECEIVE') {
@@ -1220,7 +1227,7 @@ const baseProductColumns = [
     minWidth: 100,
     minWidth: 100,
     align: 'center',
     align: 'center',
   },
   },
-  { key: 'price', prop: 'price', label: '价格', minWidth: 100, align: 'right' },
+  { prop: 'price', label: '价格', minWidth: 100, align: 'right' },
   {
   {
     prop: 'num',
     prop: 'num',
     label: '数量',
     label: '数量',
@@ -1234,49 +1241,48 @@ const baseProductColumns = [
     align: 'right',
     align: 'right',
   },
   },
   {
   {
-    key: 'availableQuantity',
-    prop: 'availableQuantity',
     label: '可用数量',
     label: '可用数量',
     minWidth: 100,
     minWidth: 100,
     align: 'right',
     align: 'right',
+    render: (row: ProductListData) => {
+      const available = new BigNumber(row.inventory ?? 0)
+        .minus(row.occupyInventory ?? 0)
+        .minus(row.freezeInventory ?? 0)
+        .toNumber()
+      return <span>{available}</span>
+    },
   },
   },
   {
   {
-    key: 'stockQuantity',
-    prop: 'stockQuantity',
+    prop: 'inventory',
     label: '库存数量',
     label: '库存数量',
     minWidth: 100,
     minWidth: 100,
     align: 'right',
     align: 'right',
   },
   },
   {
   {
-    key: 'occupiedQuantity',
-    prop: 'occupiedQuantity',
+    prop: 'occupyInventory',
     label: '占用数量',
     label: '占用数量',
     minWidth: 100,
     minWidth: 100,
     align: 'right',
     align: 'right',
   },
   },
   {
   {
-    key: 'customsNameEnglish',
     prop: 'customsNameEnglish',
     prop: 'customsNameEnglish',
     label: '英文报关名称',
     label: '英文报关名称',
     width: 160,
     width: 160,
     align: 'center',
     align: 'center',
   },
   },
   {
   {
-    key: 'customsNameChinese',
     prop: 'customsNameChinese',
     prop: 'customsNameChinese',
     label: '中文报关名称',
     label: '中文报关名称',
     width: 160,
     width: 160,
     align: 'center',
     align: 'center',
   },
   },
   {
   {
-    key: 'customsWeight',
     prop: 'customsWeight',
     prop: 'customsWeight',
     label: '申报重量(g)',
     label: '申报重量(g)',
     width: 100,
     width: 100,
     align: 'right',
     align: 'right',
   },
   },
   {
   {
-    key: 'customsValue',
     prop: 'customsValue',
     prop: 'customsValue',
     label: '申报价值($)',
     label: '申报价值($)',
     width: 100,
     width: 100,