YT-2717：成品发运页面调整

6 days ago · 0090c6efed
6 changed files with 163 additions and 114 deletions
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
@ -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,26 +844,7 @@ 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: '在途库位',
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
@ -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,26 +665,7 @@ 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: 'singlePrice',
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@ -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',
@ -927,25 +947,6 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
        disabled: true
      }
    }
-  }, {
-      label: '客户订单号',
-      field: 'customerOrderNumber',
-      sort: 'custom',
-      table: {
-        width: 180
-      },
-      isSearch: true,
-      search: {
-        component: 'Input',
-      },
-      isTable: true,
-      isForm: true,
-      form: {
-        component: 'Input',
-        componentProps: {
-          
-        }
-      }
  }, 
  // {
  //   label: '承运商',
--- a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@ -55,20 +55,20 @@ export const DeliverRecordMain = useCrudSchemas(
      isTable: true,
      isForm: false,
    },
-    {
-      label: '客户订单号',
-      field: 'customerOrderNumber',
-      sort: 'custom',
-      table: {
-        width: 180
-      },
-      isSearch: true,
-      isTable: true,
-      isForm: false,
-      search: {
-        component: 'Input',
-      }
-    },
+    // {
+    //   label: '客户订单号',
+    //   field: 'customerOrderNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   },
+    //   isSearch: true,
+    //   isTable: true,
+    //   isForm: false,
+    //   search: {
+    //     component: 'Input',
+    //   }
+    // },
    {
      label: '车牌号',
      field: 'vehiclePlateNumber',
@ -252,13 +252,20 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
  //     width: 150
  //   },
  // },
+  
  {
-    label: '到库位',
-    field: 'toLocationCode',
+      label: '客户订单号',
+      field: 'customerOrderNumber',
      sort: 'custom',
      table: {
-      width: 150
+        width: 180
      },
+      isSearch: true,
+      isTable: true,
+      isForm: false,
+      search: {
+        component: 'Input',
+      }
    },
  {
    label: '品番',
@ -411,6 +418,14 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
    },
    hiddenInMain: true,
  },
+  {
+    label: '到库位',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
  {
    label: '到库位组',
    field: 'toLocationGroupCode',
--- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
@ -50,20 +50,20 @@ export const DeliverRecordMain = useCrudSchemas(
      },
      isTable: true
    },
-    {
-      label: '客户订单号',
-      field: 'customerOrderNumber',
-      sort: 'custom',
-      table: {
-        width: 180
-      },
-      isSearch: true,
-      isTable: true,
-      isForm: true,
-      search: {
-        component: 'Input',
-      }
-    },
+    // {
+    //   label: '客户订单号',
+    //   field: 'customerOrderNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   },
+    //   isSearch: true,
+    //   isTable: true,
+    //   isForm: true,
+    //   search: {
+    //     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',
--- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
+++ b/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: '客户订单号',
-      field: 'customerOrderNumber',
-      sort: 'custom',
-      table: {
-        width: 180
-      },
-      isSearch: true,
-      isTable: true,
-      isForm: false,
-      search: {
-        component: 'Input',
-      }
-    },
+    // {
+    //   label: '客户订单号',
+    //   field: 'customerOrderNumber',
+    //   sort: 'custom',
+    //   table: {
+    //     width: 180
+    //   },
+    //   isSearch: true,
+    //   isTable: true,
+    //   isForm: false,
+    //   search: {
+    //     component: 'Input',
+    //   }
+    // },
    {
      label: '车牌号',
      field: 'vehiclePlateNumber',
@ -244,13 +245,20 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
  //     width: 150
  //   },
  // },
+  
  {
-    label: '到库位',
-    field: 'toLocationCode',
+      label: '客户订单号',
+      field: 'customerOrderNumber',
      sort: 'custom',
      table: {
-      width: 150
+        width: 180
      },
+      isSearch: true,
+      isTable: true,
+      isForm: false,
+      search: {
+        component: 'Input',
+      }
    },
  {
    label: '品番',
@ -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',