Merge remote-tracking branch 'remotes/origin/intex_online20250327' into intex

src/views/wms/basicDataManage/supplierManage/supplierDeliCount/supplierDeliCount.data.ts

@@ -20,6 +20,13 @@ export const SupplierDeliCount = useCrudSchemas(reactive<CrudSchema[]>([
     isSearch: true,
     isForm: false,
   },
+  {
+    label: '数量',
+    field: 'consumeQty',
+    sort: 'custom',
+    isSearch: false,
+    isForm: false,
+  },
   {
     label: '受入号',
     field: 'model',

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@@ -56,6 +56,19 @@ export const PurchasePlanMain = useCrudSchemas(
         }
       }
     },
+    {
+      label: '来源',
+      field: 'source',
+      sort: 'custom',
+      dictType: DICT_TYPE.PURCHASE_PLAN_SOURCE,
+      dictClass: 'string',
+      isTable: true,
+      isForm: false,
+      sortTableDefault: 2,
+      table: {
+        width: 150
+      },
+    },
     {
       label: '供应商代码',
       field: 'supplierCode',
@@ -412,19 +425,6 @@ export const PurchasePlanMain = useCrudSchemas(
         width: 150
       },
     },
-    {
-      label: '来源',
-      field: 'source',
-      sort: 'custom',
-      dictType: DICT_TYPE.PURCHASE_PLAN_SOURCE,
-      dictClass: 'string',
-      isTable: false,
-      isForm: false,
-      sortTableDefault: 13,
-      table: {
-        width: 150
-      },
-    },
     {
       label: '开始时间',
       field: 'beginTime',