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

客户收货

master_hella_20240701
yufei0306 7 months ago
parent
6bbdaafe88
commit
642380b57c
3 changed files with 189 additions and 63 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. 162
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
  2. 89
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
  3. 1
      src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

162
src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
View File

@ -40,6 +40,19 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 180
},
},
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
isForm: false,
sort: 'custom',
table: {
width: 150
},
},
{
label: '客户代码',
field: 'customerCode',
@ -55,6 +68,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '承运商',
@ -63,6 +77,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1000,
},
{
label: '运输方式',
@ -71,6 +86,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1000,
},
{
label: '车牌号',
@ -79,6 +95,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
sortTableDefault:1000,
},
{
label: '申请时间',
@ -91,6 +108,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -111,6 +129,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -131,6 +150,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -151,6 +171,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -168,6 +189,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '到仓库代码',
@ -176,13 +198,14 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '从库区类型范围',
field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -195,13 +218,14 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '到库区类型范围',
field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -214,6 +238,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '出库事务类型',
@ -222,6 +247,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '入库事务类型',
@ -230,6 +256,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '业务类型',
@ -238,6 +265,8 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '部门',
@ -246,13 +275,14 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '接口类型',
field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -265,6 +295,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false,
},
{
label: '创建时间',
@ -277,6 +308,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -293,6 +325,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: {
width: 150
},
isTable: false
},
// {
// label: '代码',
@ -308,7 +341,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isSearch: true,
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -396,6 +429,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 180
},
isTable: false,
},
// {
// label: '销售订单号',
@ -436,6 +470,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '物料描述2',
@ -444,107 +479,138 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '从批次',
field: 'fromBatch',
label: '批次',
field: 'batch',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到批次',
field: 'toBatch',
label: '包装代码',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150
},
},
// {
// label: '包装号',
// field: 'packingNumber',
// sort: 'custom',
// table: {
// width: 150
// },
// },
{
label: '从包装号',
field: 'fromPackingNumber',
label: '包装规格',
field: 'packUnit',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到包装号',
field: 'toPackingNumber',
label: '数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
{
label: '从器具号',
field: 'fromContainerNumber',
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{
label: '到器具号',
field: 'toContainerNumber',
label: '从库位',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '数量',
field: 'qty',
label: '到库位',
field: 'toLocationCode',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
{
label: '从批次',
field: 'fromBatch',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
label: '到批次',
field: 'toBatch',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '从库位代码',
field: 'fromLocationCode',
label: '从包装号',
field: 'fromPackingNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '到库位代码',
field: 'toLocationCode',
label: '到包装号',
field: 'toPackingNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '从器具号',
field: 'fromContainerNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '到器具号',
field: 'toContainerNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '库存状态',
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -559,7 +625,9 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
},
form: {
component: 'InputNumber',
}
},
isTable: false,
},
{
label: '金额',
@ -568,6 +636,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
form: {
component: 'InputNumber',
}
@ -579,6 +648,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
},
{
label: '到库位组代码',
@ -587,6 +657,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
},
{
label: '从库区代码',
@ -595,6 +666,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
},
{
label: '到库区代码',
@ -603,6 +675,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
},
{
label: '从货主代码',
@ -611,6 +684,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
},
{
label: '到货主代码',
@ -619,6 +693,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
},
{
label: '项目代码',
@ -627,6 +702,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
},
// {
// label: '任务明细ID',
@ -649,7 +725,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -662,6 +738,8 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
},
{
label: '创建时间',
@ -674,6 +752,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -690,6 +769,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
table: {
width: 150
},
isTable: false,
},
]))

89
src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
View File

@ -38,30 +38,30 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
isSearch: true,
},
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
isForm: false,
label: '发货记录单号',
field: 'deliverRecordNumber',
sort: 'custom',
table: {
width: 150
},
isSearch: true,
},
{
label: '发货记录单号',
field: 'deliverRecordNumber',
label: '发货计划单号',
field: 'deliverPlanNumber',
sort: 'custom',
table: {
width: 150
},
isSearch: true,
},
{
label: '发货计划单号',
field: 'deliverPlanNumber',
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: true,
isTable: true,
isForm: false,
sort: 'custom',
table: {
width: 150
@ -83,6 +83,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
isTable: false,
},
{
label: '承运商',
@ -91,6 +92,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
sortTableDefault:1000,
},
{
label: '运输方式',
@ -99,6 +101,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
sortTableDefault:1000,
},
{
label: '车牌号',
@ -107,6 +110,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
sortTableDefault:1000,
},
{
label: '申请时间',
@ -119,6 +123,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -139,6 +144,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -156,6 +162,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
isTable: false,
},
{
label: '到仓库代码',
@ -165,13 +172,14 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
isTable: false,
},
{
label: '从库区类型范围',
field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
isForm: false,
sort: 'custom',
table: {
@ -183,7 +191,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'toAreaTypes',
dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
isForm: false,
table: {
@ -195,6 +203,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'fromAreaCodes',
sort: 'custom',
isForm: false,
isTable: false,
table: {
width: 150
},
@ -204,6 +213,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'toAreaCodes',
sort: 'custom',
isForm: false,
isTable: false,
table: {
width: 150
},
@ -215,13 +225,15 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
isForm: false
isForm: false,
isTable: false,
},
{
label: '部门',
field: 'departmentCode',
sort: 'custom',
isForm: false,
isTable: false,
table: {
width: 150
},
@ -255,7 +267,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'autoCommit',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
isForm: false,
sort: 'custom',
table: {
@ -276,7 +288,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'autoAgree',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
isForm: false,
sort: 'custom',
table: {
@ -297,7 +309,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
field: 'autoExecute',
dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string',
isTable: true,
isTable: false,
isForm: false,
sort: 'custom',
table: {
@ -353,6 +365,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
valueFormat: 'x',
}
},
isTable: false,
isForm: false
},
{
@ -370,6 +383,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
valueFormat: 'x',
}
},
isTable: false,
isForm: false
},
{
@ -391,6 +405,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
valueFormat: 'x',
}
},
isTable: false,
isForm: false
},
{
@ -400,6 +415,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
table: {
width: 150
},
isTable: false,
isForm: false
},
{
@ -468,6 +484,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 180
},
isTable: false,
isTableForm: false,
form: {
componentProps: {
@ -516,6 +533,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '物料描述2',
@ -524,6 +542,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
hiddenInMain:true,
},
{
label: '批次',
@ -534,13 +553,29 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
},
},
{
label: '包装号',
label: '包装代码',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '包装规格',
field: 'packUnit',
sort: 'custom',
table: {
width: 150
},
},
{
label: '包装数量',
field: 'packQty',
sort: 'custom',
table: {
width: 150
},
},
{
label: '器具号',
field: 'containerNumber',
@ -548,6 +583,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
isTable: false
},
{
label: '数量',
@ -572,7 +608,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
},
},
{
label: '从库位代码',
label: '从库位',
field: 'fromLocationCode',
sort: 'custom',
table: {
@ -580,7 +616,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
},
},
{
label: '到库位代码',
label: '到库位',
field: 'toLocationCode',
sort: 'custom',
table: {
@ -592,7 +628,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
isTable: false,
sort: 'custom',
table: {
width: 150
@ -605,6 +641,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
isTable: false
},
{
label: '从货主代码',
@ -613,6 +650,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
isTable: false
},
{
label: '到货主代码',
@ -621,6 +659,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
isTable: false
},
{
label: '备注',
@ -629,6 +668,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
isTable: false
},
{
label: '创建时间',
@ -641,6 +681,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -659,6 +700,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
isTable: false,
isTableForm: false,
isForm: false
},
@ -673,6 +715,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 180
},
isTable: false,
form: {
component: 'DatePicker',
componentProps: {
@ -691,6 +734,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
table: {
width: 150
},
isTable: false,
isTableForm: false,
isForm: false
},
@ -703,6 +747,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
width: 150,
fixed: 'right'
},
hiddenInMain:true,
isTableForm:false,
}
]))

1
src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
View File

@ -303,6 +303,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
row['processCode'] = val[0]['code']
}else if(formField == 'itemCode'){
row['itemCode'] = val[0]['itemCode']
row['uom'] = val[0]['uom']
row['bomVersion'] = ''
row['childList'] = []
// 查询标准价格

Write Preview
Loading…
Cancel
Save