sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

intex_online_yejiaxing
songguoqiang 3 days ago
parent
4d56ff1a06 0090c6efed
commit
37f3809a51
6 changed files with 221 additions and 112 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 60
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
  2. 59
      src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
  3. 60
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
  4. 55
      src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
  5. 42
      src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
  6. 57
      src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts

60
src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
View File

@ -97,26 +97,26 @@ export const DeliverJobMain = useCrudSchemas(
},
isTable: false
},
{
label: '客户订单号',
field: 'customerOrderNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true,
search: {
component: 'Input',
},
isTable: true,
isForm: true,
form: {
component: 'Input',
componentProps: {
// {
// label: '客户订单号',
// field: 'customerOrderNumber',
// sort: 'custom',
// table: {
// width: 180
// },
// isSearch: true,
// search: {
// component: 'Input',
// },
// isTable: true,
// isForm: true,
// form: {
// component: 'Input',
// 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',

59
src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
View File

@ -63,26 +63,26 @@ export const DeliverRecordMain = useCrudSchemas(
// 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: 'customerOrderNumber',
// sort: 'custom',
// table: {
// width: 180
// },
// isSearch: true,
// search: {
// component: 'Input',
// },
// isTable: true,
// isForm: true,
// form: {
// component: 'Input',
// 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',

60
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
View File

@ -271,26 +271,26 @@ export const DeliverRequestMain = useCrudSchemas(
isTable: false,
isForm: false,
},
{
label: '客户订单号',
field: 'customerOrderNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true,
search: {
component: 'Input',
},
isTable: true,
isForm: true,
form: {
component: 'Input',
componentProps: {
// {
// label: '客户订单号',
// field: 'customerOrderNumber',
// sort: 'custom',
// table: {
// width: 180
// },
// isSearch: true,
// search: {
// component: 'Input',
// },
// isTable: true,
// isForm: true,
// form: {
// component: 'Input',
// 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',
@ -927,7 +947,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
disabled: true
}
}
},
},
// {
// label: '承运商',
// field: 'carrierCode',

55
src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts
View File

@ -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,14 +252,21 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
// width: 150
// },
// },
{
label: '到库位',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
label: '客户订单号',
field: 'customerOrderNumber',
sort: 'custom',
table: {
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',

42
src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts
View File

@ -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',

57
src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts
View File

@ -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,14 +245,21 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
// width: 150
// },
// },
{
label: '到库位',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
label: '客户订单号',
field: 'customerOrderNumber',
sort: 'custom',
table: {
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',

Write Preview
Loading…
Cancel
Save