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

src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts

@@ -97,26 +97,26 @@ export const DeliverJobMain = useCrudSchemas(
       },
       isTable: false
     },
-    {
+    // {
-      label: '客户订单号',
+    //   label: '客户订单号',
-      field: 'customerOrderNumber',
+    //   field: 'customerOrderNumber',
-      sort: 'custom',
+    //   sort: 'custom',
-      table: {
+    //   table: {
-        width: 180
+    //     width: 180
-      },
+    //   },
-      isSearch: true,
+    //   isSearch: true,
-      search: {
+    //   search: {
-        component: 'Input',
+    //     component: 'Input',
-      },
+    //   },
-      isTable: true,
+    //   isTable: true,
-      isForm: true,
+    //   isForm: true,
-      form: {
+    //   form: {
-        component: 'Input',
+    //     component: 'Input',
-        componentProps: {
+    //     componentProps: {
           
-        }
+    //     }
-      }
+    //   }
-    },
+    // },
 
     {
       label: '承运商',
@@ -761,6 +761,26 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
+  {
+      label: '客户订单号',
+      field: 'customerOrderNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true,
+      search: {
+        component: 'Input',
+      },
+      isTable: true,
+      isForm: true,
+      form: {
+        component: 'Input',
+        componentProps: {
+          
+        }
+      }
+    },
   {
     label: '品番',
     field: 'itemCode',
@@ -824,6 +844,8 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  
+
   {
     label: '在途库位',
     field: 'onTheWayLocationCode',

src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts

@@ -63,26 +63,26 @@ export const DeliverRecordMain = useCrudSchemas(
     //     width: 150
     //   },
     // },
-    {
+    // {
-      label: '客户订单号',
+    //   label: '客户订单号',
-      field: 'customerOrderNumber',
+    //   field: 'customerOrderNumber',
-      sort: 'custom',
+    //   sort: 'custom',
-      table: {
+    //   table: {
-        width: 180
+    //     width: 180
-      },
+    //   },
-      isSearch: true,
+    //   isSearch: true,
-      search: {
+    //   search: {
-        component: 'Input',
+    //     component: 'Input',
-      },
+    //   },
-      isTable: true,
+    //   isTable: true,
-      isForm: true,
+    //   isForm: true,
-      form: {
+    //   form: {
-        component: 'Input',
+    //     component: 'Input',
-        componentProps: {
+    //     componentProps: {
           
-        }
+    //     }
-      }
+    //   }
-    },
+    // },
     {
       label: '状态',
       field: 'status',
@@ -553,6 +553,26 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
+  {
+      label: '客户订单号',
+      field: 'customerOrderNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true,
+      search: {
+        component: 'Input',
+      },
+      isTable: true,
+      isForm: true,
+      form: {
+        component: 'Input',
+        componentProps: {
+          
+        }
+      }
+    },
   {
     label: '品番',
     field: 'itemCode',
@@ -645,6 +665,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  
   {
     label: '单价',
     field: 'singlePrice',

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@@ -271,26 +271,26 @@ export const DeliverRequestMain = useCrudSchemas(
       isTable: false,
       isForm: false,
     },
-    {
+    // {
-      label: '客户订单号',
+    //   label: '客户订单号',
-      field: 'customerOrderNumber',
+    //   field: 'customerOrderNumber',
-      sort: 'custom',
+    //   sort: 'custom',
-      table: {
+    //   table: {
-        width: 180
+    //     width: 180
-      },
+    //   },
-      isSearch: true,
+    //   isSearch: true,
-      search: {
+    //   search: {
-        component: 'Input',
+    //     component: 'Input',
-      },
+    //   },
-      isTable: true,
+    //   isTable: true,
-      isForm: true,
+    //   isForm: true,
-      form: {
+    //   form: {
-        component: 'Input',
+    //     component: 'Input',
-        componentProps: {
+    //     componentProps: {
           
-        }
+    //     }
-      }
+    //   }
-    },
+    // },
     {
       label: '承运商',
       field: 'carrierCode',
@@ -819,6 +819,26 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     }
   //   }
   // },
+  {
+      label: '客户订单号',
+      field: 'customerOrderNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true,
+      search: {
+        component: 'Input',
+      },
+      isTable: true,
+      isForm: true,
+      form: {
+        component: 'Input',
+        componentProps: {
+          
+        }
+      }
+    },
   {
     label: '品番',
     field: 'itemCode',

src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts

@@ -55,20 +55,20 @@ export const DeliverRecordMain = useCrudSchemas(
       isTable: true,
       isForm: false,
     },
-    {
+    // {
-      label: '客户订单号',
+    //   label: '客户订单号',
-      field: 'customerOrderNumber',
+    //   field: 'customerOrderNumber',
-      sort: 'custom',
+    //   sort: 'custom',
-      table: {
+    //   table: {
-        width: 180
+    //     width: 180
-      },
+    //   },
-      isSearch: true,
+    //   isSearch: true,
-      isTable: true,
+    //   isTable: true,
-      isForm: false,
+    //   isForm: false,
-      search: {
+    //   search: {
-        component: 'Input',
+    //     component: 'Input',
-      }
+    //   }
-    },
+    // },
     {
       label: '车牌号',
       field: 'vehiclePlateNumber',
@@ -252,14 +252,21 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
+  
   {
-    label: '到库位',
+      label: '客户订单号',
-    field: 'toLocationCode',
+      field: 'customerOrderNumber',
-    sort: 'custom',
+      sort: 'custom',
-    table: {
+      table: {
-      width: 150
+        width: 180
+      },
+      isSearch: true,
+      isTable: true,
+      isForm: false,
+      search: {
+        component: 'Input',
+      }
     },
-  },
   {
     label: '品番',
     field: 'itemCode',
@@ -411,6 +418,14 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain: true,
   },
+  {
+    label: '到库位',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '到库位组',
     field: 'toLocationGroupCode',

src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts

@@ -50,20 +50,20 @@ export const DeliverRecordMain = useCrudSchemas(
       },
       isTable: true
     },
-    {
+    // {
-      label: '客户订单号',
+    //   label: '客户订单号',
-      field: 'customerOrderNumber',
+    //   field: 'customerOrderNumber',
-      sort: 'custom',
+    //   sort: 'custom',
-      table: {
+    //   table: {
-        width: 180
+    //     width: 180
-      },
+    //   },
-      isSearch: true,
+    //   isSearch: true,
-      isTable: true,
+    //   isTable: true,
-      isForm: true,
+    //   isForm: true,
-      search: {
+    //   search: {
-        component: 'Input',
+    //     component: 'Input',
-      }
+    //   }
-    },
+    // },
     {
       label: '车牌号',
       field: 'vehiclePlateNumber',
@@ -306,6 +306,20 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
+   {
+      label: '客户订单号',
+      field: 'customerOrderNumber',
+      sort: 'custom',
+      table: {
+        width: 180
+      },
+      isSearch: true,
+      isTable: true,
+      isForm: true,
+      search: {
+        component: 'Input',
+      }
+    },
   {
     label: '品番',
     field: 'itemCode',

src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts

@@ -4,6 +4,7 @@ import * as CustomerApi from '@/api/wms/customer'
 import { Customer } from '../../../basicDataManage/customerManage/customer/customer.data'
 import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+import { truncate } from 'fs'
 
 
 /**
@@ -55,20 +56,20 @@ export const DeliverRecordMain = useCrudSchemas(
       isTable: true,
       isForm: false,
     },
-    {
+    // {
-      label: '客户订单号',
+    //   label: '客户订单号',
-      field: 'customerOrderNumber',
+    //   field: 'customerOrderNumber',
-      sort: 'custom',
+    //   sort: 'custom',
-      table: {
+    //   table: {
-        width: 180
+    //     width: 180
-      },
+    //   },
-      isSearch: true,
+    //   isSearch: true,
-      isTable: true,
+    //   isTable: true,
-      isForm: false,
+    //   isForm: false,
-      search: {
+    //   search: {
-        component: 'Input',
+    //     component: 'Input',
-      }
+    //   }
-    },
+    // },
     {
       label: '车牌号',
       field: 'vehiclePlateNumber',
@@ -244,14 +245,21 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150
   //   },
   // },
+  
   {
-    label: '到库位',
+      label: '客户订单号',
-    field: 'toLocationCode',
+      field: 'customerOrderNumber',
-    sort: 'custom',
+      sort: 'custom',
-    table: {
+      table: {
-      width: 150
+        width: 180
+      },
+      isSearch: true,
+      isTable: true,
+      isForm: false,
+      search: {
+        component: 'Input',
+      }
     },
-  },
   {
     label: '品番',
     field: 'itemCode',
@@ -350,6 +358,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain: true,
   },
+  
   {
     label: '单价',
     field: 'singlePrice',
@@ -402,6 +411,14 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     hiddenInMain: true,
   },
+  {
+    label: '到库位',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '到库位组',
     field: 'toLocationGroupCode',