From 35ca4b7424bad796255619ae15ccaa6ecb0b6c69 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 25 Apr 2024 18:45:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=87=E8=B4=AD/=E5=A4=87=E4=BB=B6--?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=AD=90=E8=A1=A8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestMain.data.ts        | 250 +++++-----
 .../sparereceiptRequestMain.data.ts           | 471 ++++++++++--------
 2 files changed, 403 insertions(+), 318 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 7f9bd71e9..8a8f397c9 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -568,17 +568,7 @@ export const PurchasereceiptRequestMainRules = reactive({
  * @returns {Array} 采购收货申请子表
  */
 export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    hiddenInMain:true,
-    isForm: false
-  },
+  
   {
     label: '订单号',
     field: 'poNumber',
@@ -587,6 +577,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:5,
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择订单号',
@@ -696,6 +687,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    sortTableDefault:5,
     hiddenInMain:true,
     isForm: false,
     tableForm:{
@@ -738,6 +730,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:7,
     hiddenInMain:true,
     isTableForm: false,
     isForm: false
@@ -749,6 +742,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:7,
     hiddenInMain:true,
     isTableForm: false,
     isForm: false
@@ -761,6 +755,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     hiddenInMain:true,
+    isTable:false,
     isTableForm: false,
     isForm: false
   },
@@ -798,7 +793,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         precision: 6
       },
     },
-    hiddenInMain:true,
+    sortTableDefault:9,
     tableForm: {
       type: 'InputNumber',
       min: 1,
@@ -842,6 +837,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    hiddenInMain:true,
+    sortTableDefault:11,
+    isForm: false
+  },
   {
     label: '包装规格',
     field: 'packUnit',
@@ -868,7 +875,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    sortTableDefault:12,
+    sortTableDefault:11,
     form: {
       componentProps: {
         isSearchList: true,
@@ -957,44 +964,84 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '生产日期',
-    field: 'produceDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
     },
+    sortTableDefault:13,
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
+    sortTableDefault:13,
     hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
     form: {
-      component: 'DatePicker',
+      component: 'InputNumber',
       componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-    tableForm:{
-      type:'FormDate',
-      placeholder: '请选择生产日期',
-      valueFormat: 'x',
+        min: 1,
+        precision: 6
+      },
     },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    sortTableDefault:8,
     table: {
       width: 150
     },
-    tableForm:{
-      disabled: true
+    sortTableDefault:13,
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
     }
   },
+  {
+    label: '转换率',
+    field: 'convertRate',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+    hiddenInMain:true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+    },
+    isTableForm: false,
+    isForm: false
+  },
   // {
   //   label: '替代批次',
   //   field: 'altBatch',
@@ -1016,6 +1063,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    sortTableDefault:11,
     hiddenInMain:true,
     form: {
       component: 'DatePicker',
@@ -1032,6 +1080,46 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       valueFormat: 'x',
     },
   },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    hiddenInMain:true,
+    sortTableDefault:11,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    sortTableDefault:8,
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '过期日期',
     field: 'expireDate',
@@ -1040,9 +1128,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
+    sortTableDefault:11,
     table: {
       width: 180
     },
+    isTable:true,
     hiddenInMain:true,
     form: {
       component: 'DatePicker',
@@ -1063,18 +1153,6 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:12,
-    isTableForm: false,
-    isForm: false
-  },
-  
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -1085,6 +1163,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:12,
     hiddenInMain:true,
     isTableForm: false,
     isForm: false,
@@ -1092,57 +1171,26 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'Select'
     }
   },
-  
-  
   {
-    label: '供应商计量数量',
-    field: 'supplierPackQty',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      },
-    },
-    hiddenInMain:true,
+    sortTableDefault:12,
     isTableForm: false,
     isForm: false
   },
+  
   {
-    label: '供应商计量单位',
-    field: 'supplierPackUnit',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false,
-    tableForm: {
-      type: 'Select'
-    }
-  },
-  {
-    label: '转换率',
-    field: 'convertRate',
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
     hiddenInMain:true,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0
-      },
-    },
     isTableForm: false,
     isForm: false
   },
@@ -1161,39 +1209,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     }
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
+  
   {
     label: '备注',
     field: 'remark',
diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index 3f776f728..aaa3173f5 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -567,14 +567,16 @@ export const PurchasereceiptRequestMainRules = reactive({
  * @returns {Array} 采购收货申请子表
  */
 export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  
   {
     label: '订单号',
     field: 'poNumber',
+    hiddenInMain:true,
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    sortTableDefault:5,
     tableForm:{
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择订单号',
@@ -619,6 +621,23 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     }
   },
+  {
+    label: '订单类型',
+    field: 'type',
+    dictType: DICT_TYPE.WORK_ORDER_TYPE,
+    dictClass: 'string',
+    isSearch: false,
+    isTable: false,
+    isTableForm: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isForm: false,
+  },
   {
     label: '订单行',
     field: 'poLine',
@@ -645,6 +664,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     },
     tableForm:{
+      multiple:true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择订单行', // 输入框占位文本
       searchField: 'lineNumber', // 查询弹窗赋值字段
@@ -659,6 +679,20 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }]
     }
   },
+  {
+    label: '行类型',
+    field: 'poLineType',
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    sortTableDefault:5,
+    hiddenInMain:true,
+    isForm: false,
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -666,11 +700,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    isSearch:true,
+    sortTableDefault:6,
     tableForm:{
       disabled: true
     },
-    isSearch: true,
-    sortTableDefault:6,
     form: {
       componentProps: {
         disabled: true
@@ -695,6 +729,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:7,
     hiddenInMain:true,
     isTableForm: false,
     isForm: false
@@ -706,18 +741,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
+    sortTableDefault:7,
     hiddenInMain:true,
     isTableForm: false,
     isForm: false
@@ -730,17 +754,37 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     hiddenInMain:true,
+    isTable:false,
     isTableForm: false,
     isForm: false
   },
+  // {
+  //   label: '数量',
+  //   field: 'qty',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   form: {
+  //     component: 'InputNumber',
+  //     componentProps: {
+  //       min: 1,
+  //       precision: 6
+  //     },
+  //   },
+  //   tableForm: {
+  //     type: 'InputNumber',
+  //     min: 1,
+  //     precision: 6
+  //   }
+  // },
   {
-    label: '数量',
-    field: 'qty',
+    label: '订单数量',
+    field: 'orderQty',
     sort: 'custom',
     table: {
       width: 150
     },
-    hiddenInMain:true,
     form: {
       component: 'InputNumber',
       componentProps: {
@@ -748,6 +792,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         precision: 6
       },
     },
+    sortTableDefault:9,
     tableForm: {
       type: 'InputNumber',
       min: 1,
@@ -792,16 +837,91 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '从库位代码',
-    field: 'fromLocationCode',
+    label: '包装号',
+    field: 'packingNumber',
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:13,
     isTableForm: false,
+    hiddenInMain:true,
+    sortTableDefault:11,
     isForm: false
   },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    isTableForm: false,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    sortTableDefault:11,
+    tableForm:{
+      disabled:true
+    },
+    isForm: true
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:11,
+    form: {
+      componentProps: {
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: false,
+    isForm: true
+  },
   {
     label: '到库位代码',
     field: 'defaultToLocationCode',
@@ -843,55 +963,94 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isForm: false
   },
   {
-    label: '生产日期',
-    field: 'produceDate',
-    formatter: dateFormatter2,
-    detail: {
-      dateFormat: 'YYYY-MM-DD'
+    label: '从货主代码',
+    field: 'fromOwnerCode',
+    sort: 'custom',
+    table: {
+      width: 150
     },
+    sortTableDefault:13,
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '到货主代码',
+    field: 'toOwnerCode',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150
     },
+    sortTableDefault:13,
     hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '供应商计量数量',
+    field: 'supplierPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
     form: {
-      component: 'DatePicker',
+      component: 'InputNumber',
       componentProps: {
-        style: {width: '100%'},
-        type: 'date',
-        dateFormat: 'YYYY-MM-DD',
-        valueFormat: 'x',
-      }
-    },
-    tableForm:{
-      type:'FormDate',
-      placeholder: '请选择生产日期',
-      valueFormat: 'x',
+        min: 1,
+        precision: 6
+      },
     },
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false
   },
   {
-    label: '批次',
-    field: 'batch',
+    label: '供应商计量单位',
+    field: 'supplierPackUnit',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
-    sortTableDefault:8,
-    tableForm:{
-      disabled: true
+    sortTableDefault:13,
+    hiddenInMain:true,
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
     }
   },
   {
-    label: '替代批次',
-    field: 'altBatch',
+    label: '转换率',
+    field: 'convertRate',
     sort: 'custom',
     table: {
       width: 150
     },
-    isTableForm: false,
-    isForm: false,
+    sortTableDefault:13,
     hiddenInMain:true,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0
+      },
+    },
+    isTableForm: false,
+    isForm: false
   },
+  // {
+  //   label: '替代批次',
+  //   field: 'altBatch',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   isTableForm: false,
+  //   isForm: false
+  // },
   {
     label: '到货日期',
     field: 'arriveDate',
@@ -903,6 +1062,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    sortTableDefault:11,
     hiddenInMain:true,
     form: {
       component: 'DatePicker',
@@ -919,6 +1079,46 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       valueFormat: 'x',
     },
   },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    hiddenInMain:true,
+    sortTableDefault:11,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    sortTableDefault:8,
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '过期日期',
     field: 'expireDate',
@@ -927,9 +1127,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       dateFormat: 'YYYY-MM-DD'
     },
     sort: 'custom',
+    sortTableDefault:11,
     table: {
       width: 180
     },
+    isTable:true,
     hiddenInMain:true,
     form: {
       component: 'DatePicker',
@@ -960,137 +1162,35 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    isTableForm: false,
+    sortTableDefault:12,
     hiddenInMain:true,
+    isTableForm: false,
     isForm: false,
     tableForm: {
       type: 'Select'
     }
   },
   {
-    label: '包装数量',
-    field: 'packQty',
+    label: '从库位代码',
+    field: 'fromLocationCode',
     sort: 'custom',
     table: {
       width: 150
     },
     sortTableDefault:12,
-    form: {
-      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packQty',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-
-        ]
-      }
-    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packQty',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isMainValue: true
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
-    },
-    isTableForm: true,
-    isForm: true
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150,
-      componentProps: {
-        disabled: true
-      }
-    },
-    tableForm:{
-      disabled:true
-    },
-    sortTableDefault:11,
-    isTableForm: true,
-    isForm: true
-  },
-  {
-    label: '供应商计量数量',
-    field: 'supplierPackQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 1,
-        precision: 6
-      },
-    },
     isTableForm: false,
     isForm: false
   },
+  
   {
-    label: '供应商计量单位',
-    field: 'supplierPackUnit',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
+    label: '项目代码',
+    field: 'projectCode',
     sort: 'custom',
     table: {
       width: 150
     },
     hiddenInMain:true,
     isTableForm: false,
-    isForm: false,
-    tableForm: {
-      type: 'Select'
-    }
-  },
-  {
-    label: '转换率',
-    field: 'convertRate',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    form: {
-      component: 'InputNumber',
-      componentProps: {
-        min: 0
-      },
-    },
-    isTableForm: false,
     isForm: false
   },
   {
@@ -1108,47 +1208,15 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       }
     }
   },
-  {
-    label: '项目代码',
-    field: 'projectCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '从货主代码',
-    field: 'fromOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  {
-    label: '到货主代码',
-    field: 'toOwnerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
+  
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    hiddenInMain:true,
     table: {
       width: 150
     },
+    hiddenInMain:true,
   },
   {
     label: '创建者',
@@ -1185,17 +1253,18 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
-  // {
-  //   label: '操作',
-  //   field: 'action',
-  //   isDetail: false,
-  //   isForm: false ,
-  //   table: {
-  //     width: 150,
-  //     fixed: 'right'
-  //   },
-  //   isTableForm:false,
-  // }
+  {
+    label: '操作',
+    hiddenInMain:true,
+    field: 'action',
+    isDetail: false,
+    isForm: false ,
+    table: {
+      width: 150,
+      fixed: 'right'
+    },
+    isTableForm:false,
+  }
 ]))
 
 //表单校验

From 0097333b38d096b28b7acd35bf9ec8e332f8483a Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 25 Apr 2024 18:46:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparereceiptRequestMain.data.ts           | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
index aaa3173f5..73e0c4892 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts
@@ -47,9 +47,9 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       width: 180,
       fixed: 'left'
     },
+    sortSearchDefault:1,
     isForm: false,
     isSearch: true,
-    sortSearchDefault:1
   },
   {
     label: '采购订单号',
@@ -96,26 +96,26 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    isForm: true,
-    sortTableDefault:2,
+    isSearch:true,
     sortSearchDefault:3,
-    isSearch: true,
-
+    isForm: true,
+    sortTableDefault:2
   },
   {
     label: '供应商代码',
     field: 'supplierCode',
     sort: 'custom',
+    sortTableDefault:1,
     table: {
       width: 150
     },
-    sortSearchDefault:2,
-    sortTableDefault:1,
     isSearch: true,
+    sortSearchDefault:2,
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
-        isSearchList: true, // 开启查询弹窗
+        disabled: true,
+        isSearchList: false, // 开启查询弹窗
         searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
         searchTitle: '供应商信息', // 查询弹窗标题
@@ -177,6 +177,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isSearch: false,
   },
   {
     label: '车牌号',
@@ -195,7 +196,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //     width: 150
   //   },
   //   form: {
-  //     value: 'spare_PartsReceipt',
+  //     value: 'ASN_ExternalReceipt',
   //     componentProps: {
   //       disabled: true
   //     }
@@ -206,21 +207,21 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '从仓库代码',
     field: 'fromWarehouseCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
     isForm: false,
-    isTable:false
   },
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
     isForm: false,
-    isTable:false
   },
   {
     label: '从库区类型范围',
@@ -250,37 +251,37 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '从库区代码范围',
     field: 'fromAreaCodes',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
     isForm: false,
-    isTable:false
   },
   {
     label: '到库区代码范围',
     field: 'toAreaCodes',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
     isForm: false,
-    isTable:false
   },
   {
     label: '到月台代码',
     field: 'toDockCode',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
     isForm: false,
-    isTable:false
   },
   {
     label: '业务类型',
     field: 'businessType',
     sort: 'custom',
-    isTable:false,
+    isTable: false,
     table: {
       width: 150
     },
@@ -321,8 +322,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
-    isTable:false,
     isForm: false,
+    isTable: false,
   },
   {
     label: '创建者',
@@ -331,8 +332,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTable:false,
     isForm: false,
+    isTable: false,
   },
   {
     label: '申请时间',
@@ -354,8 +355,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
-    isTable:false,
     isForm: false,
+    isTable: false,
   },
   // {
   //   label: '截止时间',
@@ -406,6 +407,7 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
+    isSearch: false,
     isTable: true,
     sortTableDefault:3,
     isForm:false,
@@ -426,8 +428,8 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: false,
-    sort: 'custom',
     isForm:false,
+    sort: 'custom',
     table: {
       width: 150
     },
@@ -507,15 +509,15 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '标签状态',
     field: 'labelStatus',
+    sort: 'custom',
     dictType: DICT_TYPE.LABEL_STATUS,
     dictClass: 'string',
-    sort: 'custom',
     table: {
       width: 150
     },
     isForm: false,
+    isTable: false,
     isSearch: false,
-    isTable:false,
   },
   {
     label: '操作',