Browse Source

Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

master_hella_20240701
zhaoxuebing 7 months ago
parent
commit
b029ec1fd9
  1. 2
      src/views/mes/productOffline/index.vue
  2. 2
      src/views/mes/productionPlan/productionPlan.data.ts
  3. 2
      src/views/mes/workScheduling/index.vue
  4. 2
      src/views/mes/workScheduling/workScheduling.data.ts
  5. 162
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts
  6. 89
      src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts
  7. 234
      src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
  8. 1
      src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue
  9. 511
      src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

2
src/views/mes/productOffline/index.vue

@ -83,7 +83,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
const setV = {} const setV = {}
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
setV['workBillno'] = val[0]['schedulingCode']// setV['workBillno'] = val[0]['schedulingCode']//
setV['planCode'] = val[0]['planMaserCode']// setV['planCode'] = val[0]['planMasterCode']//
setV['processCode'] = val[0]['workingNode']// setV['processCode'] = val[0]['workingNode']//
setV['stationCode'] = val[0]['currentWorkstation']// setV['stationCode'] = val[0]['currentWorkstation']//
// job_mes_work_scheduling // job_mes_work_scheduling

2
src/views/mes/productionPlan/productionPlan.data.ts

@ -213,7 +213,7 @@ export const workscheduling = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '计划编号', label: '计划编号',
field: 'planMaserCode', field: 'planMasterCode',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
table: { table: {

2
src/views/mes/workScheduling/index.vue

@ -29,7 +29,7 @@
> >
<template #schedulingCode="{row}"> <template #schedulingCode="{row}">
<el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)"> <el-button type="primary" link @click="openDetail(row, '工单详情', row.schedulingCode)">
<span>{{ row.planMaserCode }}</span> <span>{{ row.planMasterCode }}</span>
</el-button> </el-button>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">

2
src/views/mes/workScheduling/workScheduling.data.ts

@ -44,7 +44,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
}, },
{ {
label: '计划编号', label: '计划编号',
field: 'planMaserCode', field: 'planMasterCode',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
isForm: true, isForm: true,

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

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

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

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

234
src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts

@ -45,34 +45,28 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true isSearch: true
}, },
{ {
label: '任务单号', label: '状态',
field: 'jobNumber', field: 'status',
sort: 'custom', dictType: DICT_TYPE.REQUEST_STATUS,
table: { dictClass: 'string',
width: 180, isForm:false,
show:false isTable: true,
},
isSearch: true
},
{
label: '出库事务类型',
field: 'outTransactionType',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '入库事务类型', label: '车间',
field: 'inTransactionType', field: 'workshopCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, }
}, },
{ {
label: '车间代码', label: '生产线',
field: 'workshopCode', field: 'productionLineCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -94,6 +88,34 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
} }
}, },
{
label: '任务单号',
field: 'jobNumber',
sort: 'custom',
table: {
width: 180,
show:false
},
isTable: false,
},
{
label: '出库事务类型',
field: 'outTransactionType',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '入库事务类型',
field: 'inTransactionType',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{ {
label: '执行时间', label: '执行时间',
field: 'executeTime', field: 'executeTime',
@ -105,6 +127,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -125,6 +148,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -146,6 +170,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -166,6 +191,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -182,13 +208,14 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '接口类型', label: '接口类型',
field: 'interfaceType', field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE, dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -201,6 +228,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '备注', label: '备注',
@ -209,6 +237,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建者', label: '创建者',
@ -217,6 +246,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建时间', label: '创建时间',
@ -229,6 +259,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -254,13 +285,14 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150, width: 150,
show: false show: false
}, },
isTable: false,
}, },
{ {
label: '从库区类型范围', label: '从库区类型范围',
field: 'fromAreaTypes', field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -273,6 +305,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '是否可用', label: '是否可用',
@ -280,7 +313,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: true,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -357,23 +390,46 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150, width: 150,
show: false show: false
}, },
isTable: false,
}, },
{ {
label: '包装号', label: '来源工位代码',
field: 'packingNumber', field: 'workStationCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 150
show: false }
},
{
label: '工序代码',
field: 'processCode',
sort: 'custom',
table: {
width: 150
}
},
{
label: '物料代码',
field: 'itemCode',
sort: 'custom',
table: {
width: 150
}
},
{
label: '物料名称',
field: 'itemName',
sort: 'custom',
table: {
width: 150
}, },
}, },
{ {
label: '器具号', label: 'Bom版本',
field: 'containerNumber', field: 'bomVersion',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150, width: 150
show: false
}, },
}, },
{ {
@ -386,45 +442,77 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '来源生产线代码', label: '报废数量',
field: 'productionLineCode', field: 'qty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
},
form: {
component: 'InputNumber',
} }
}, },
{ {
label: '来源工位代码', label: '计量单位',
field: 'workStationCode', field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
} },
}, },
{ {
label: '工序代码', label: '单价',
field: 'processCode', field: 'singlePrice',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
},
form: {
component: 'InputNumber',
} }
}, },
{ {
label: '物料代码', label: '金额',
field: 'itemCode', field: 'amount',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
},
form: {
component: 'InputNumber',
} }
}, },
{ {
label: '从库位代码', label: '来源库位',
field: 'fromLocationCode', field: 'fromLocationCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{
label: '包装号',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150,
show: false
},
isTable: false,
},
{
label: '器具号',
field: 'containerNumber',
sort: 'custom',
table: {
width: 150,
show: false
},
isTable: false,
},
{ {
label: '从库位组代码', label: '从库位组代码',
field: 'fromLocationGroupCode', field: 'fromLocationGroupCode',
@ -432,6 +520,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '从库区代码', label: '从库区代码',
@ -440,13 +529,14 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '库存状态', label: '库存状态',
field: 'inventoryStatus', field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS, dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -457,34 +547,13 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'reason', field: 'reason',
dictType: DICT_TYPE.SCRAP_REASON, dictType: DICT_TYPE.SCRAP_REASON,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom',
table: {
width: 150
},
},
{
label: '单价',
field: 'singlePrice',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
form: {
component: 'InputNumber',
}
},
{
label: '金额',
field: 'amount',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
}, },
{ {
label: '单据号', label: '单据号',
field: 'number', field: 'number',
@ -492,6 +561,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
}, },
{ {
label: '备注', label: '备注',
@ -500,6 +570,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建时间', label: '创建时间',
@ -512,6 +583,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -528,15 +600,9 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{
label: '物料名称',
field: 'itemName',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '物料描述1', label: '物料描述1',
field: 'itemDesc1', field: 'itemDesc1',
@ -544,6 +610,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '物料描述2', label: '物料描述2',
@ -552,6 +619,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '项目代码', label: '项目代码',
@ -560,28 +628,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
}, isTable: false,
{
label: '数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
}
},
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
}, },
// { // {
// label: '任务明细ID', // label: '任务明细ID',
@ -604,7 +651,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'interfaceType', field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE, dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -619,6 +666,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150, width: 150,
fixed: 'right' fixed: 'right'
}, },
hiddenInMain: true,
isTableForm: true, isTableForm: true,
tableForm: { tableForm: {
type: 'action', type: 'action',

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

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

511
src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

@ -62,7 +62,26 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
isSearch: true, isSearch: true,
}, },
{ {
label: '车间代码', label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: true,
isForm:false,
isTable: true,
sort: 'custom',
table: {
width: 150
},
form: {
value: '1',
componentProps: {
disabled: true
}
}
},
{
label: '车间',
field: 'workshopCode', field: 'workshopCode',
sort: 'custom', sort: 'custom',
table: { table: {
@ -86,6 +105,53 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{
label: '生产线',
field: 'productionLineCode',
sort: 'custom',
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'workshopCode',
value: 'workshopCode',
message: '请填写车间代码!',
isMainValue: true
}]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'workshopCode',
value: 'workshopCode',
message: '请填写车间代码!',
isMainValue: true
}]
}
}
},
{ {
label: '班组', label: '班组',
field: 'team', field: 'team',
@ -150,7 +216,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'fromAreaTypes', field: 'fromAreaTypes',
dictType: DICT_TYPE.AREA_TYPE, dictType: DICT_TYPE.AREA_TYPE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable:false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -164,6 +230,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
isSearch: true, isSearch: true,
isForm: false, isForm: false,
}, },
@ -174,6 +241,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
form: { form: {
value: 'ProductScrap', value: 'ProductScrap',
componentProps: { componentProps: {
@ -182,25 +250,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isForm: false, isForm: false,
}, },
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isSearch: true,
isForm:false,
isTable: true,
sort: 'custom',
table: {
width: 150
},
form: {
value: '1',
componentProps: {
disabled: true
}
}
},
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -212,6 +262,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable:false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -230,6 +281,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
isForm: false, isForm: false,
}, },
{ {
@ -239,6 +291,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
detail: { detail: {
dateFormat: 'YYYY-MM-DD HH:mm:ss' dateFormat: 'YYYY-MM-DD HH:mm:ss'
}, },
isTable:false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 180
@ -265,6 +318,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable:false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -292,6 +346,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
formatter: (_: Recordable, __: TableColumn, cellValue: number) => { formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return userDeptArray.find((account) => account.id == cellValue)?.name return userDeptArray.find((account) => account.id == cellValue)?.name
}, },
@ -319,6 +374,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable:false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -337,6 +393,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
isForm: false isForm: false
}, },
{ {
@ -344,7 +401,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoCommit', field: 'autoCommit',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable:false,
isForm:false, isForm:false,
sort: 'custom', sort: 'custom',
table: { table: {
@ -365,7 +422,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoAgree', field: 'autoAgree',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable:false,
isForm:false, isForm:false,
sort: 'custom', sort: 'custom',
table: { table: {
@ -386,7 +443,7 @@ export const ProductscrapRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'autoExecute', field: 'autoExecute',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable:false,
isForm:false, isForm:false,
sort: 'custom', sort: 'custom',
table: { table: {
@ -478,56 +535,11 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150, width: 150,
show: false show: false
}, },
isTable: false,
isForm: false, isForm: false,
isTableForm: false, isTableForm: false,
}, },
{
label: '来源生产线代码',
field: 'productionLineCode',
sort: 'custom',
table: {
width: 150
},
tableForm:{
isInpuFocusShow: true,
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'workshopCode',
value: 'workshopCode',
message: '请填写车间代码!',
isMainValue: true
}]
},
form: {
// labelMessage: '信息提示说明!!!',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段
searchTitle: '生产线信息', // 查询弹窗标题
searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类
searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},{
key: 'workshopCode',
value: 'workshopCode',
message: '请填写车间代码!',
isMainValue: true
}]
}
}
},
{ {
label: '来源工位代码', label: '来源工位代码',
field: 'workStationCode', field: 'workStationCode',
@ -659,6 +671,173 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
}], }],
}, },
}, },
{
label: '物料名称',
field: 'itemName',
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTableForm: false,
},
{
label: 'Bom版本',
field: 'bomVersion',
sort: 'custom',
table: {
width: 150
},
tableForm: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
searchField: 'version', // 查询弹窗赋值字段
searchTitle: '物料清单信息', // 查询弹窗标题
searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
searchCondition: [{
key:'productItemCode',
value:'itemCode',
message: '请填写物料代码!',
isMainValue: true
},{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
},
form: {
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
searchField: 'version', // 查询弹窗赋值字段
searchTitle: '物料清单信息', // 查询弹窗标题
searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
searchCondition: [{
key:'productItemCode',
value:'itemCode',
message: '请填写物料代码!',
isMainValue: true
},{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
},
},
{
label: '批次',
field: 'batch',
sort: 'custom',
table: {
width: 150,
},
isForm: false,
isTable:true,
},
{
label: '报废数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
componentProps: {
min: 0,
precision: 6
},
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 6
}
},
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm: {
type: 'Select',
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{
label: '单价',
field: 'singlePrice',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
componentProps: {
disabled: true,
min: 0,
precision: 6
},
},
tableForm: {
disabled: true,
type: 'InputNumber',
min: 0,
precision: 6
}
},
{
label: '金额',
field: 'amount',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
componentProps: {
disabled:true,
min: 0,
precision: 6,
}
},
tableForm: {
type: 'InputNumber',
disabled:true,
min: 0,
precision: 6,
},
},
{
label: '来源库位',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true
},
form: {
componentProps:{
disabled: true
}
}
},
{ {
label: '包装号', label: '包装号',
field: 'packingNumber', field: 'packingNumber',
@ -705,37 +884,8 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
disabled: true disabled: true
} }
}, },
{
label: '批次',
field: 'batch',
sort: 'custom',
table: {
width: 150,
show: false
},
isTable: false,
isTableForm: false,
isForm: false,
tableForm: {
disabled: true
}
},
{
label: '从库位代码',
field: 'fromLocationCode',
sort: 'custom',
table: {
width: 150
},
tableForm: {
disabled: true
},
form: {
componentProps:{
disabled: true
}
}
},
{ {
label: '库存状态', label: '库存状态',
field: 'inventoryStatus', field: 'inventoryStatus',
@ -758,17 +908,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'reason', field: 'reason',
dictType: DICT_TYPE.SCRAP_REASON, dictType: DICT_TYPE.SCRAP_REASON,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom',
table: {
width: 150
},
isForm: false,
isTableForm: false,
},
{
label: '物料名称',
field: 'itemName',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -776,6 +916,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
isForm: false, isForm: false,
isTableForm: false, isTableForm: false,
}, },
{ {
label: '物料描述1', label: '物料描述1',
field: 'itemDesc1', field: 'itemDesc1',
@ -783,6 +924,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
isTableForm: false, isTableForm: false,
}, },
@ -793,73 +935,12 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
isTableForm: false, isTableForm: false,
}, },
{
label: '数量',
field: 'qty',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
componentProps: {
min: 0,
precision: 6
},
},
tableForm: {
type: 'InputNumber',
min: 0,
precision: 6
}
},
{
label: '单价',
field: 'singlePrice',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
componentProps: {
disabled: true,
min: 0,
precision: 6
},
},
tableForm: {
disabled: true,
type: 'InputNumber',
min: 0,
precision: 6
}
},
{
label: '金额',
field: 'amount',
sort: 'custom',
table: {
width: 150
},
form: {
component: 'InputNumber',
componentProps: {
disabled:true,
min: 0,
precision: 6,
}
},
tableForm: {
type: 'InputNumber',
disabled:true,
min: 0,
precision: 6,
},
},
{ {
label: '项目代码', label: '项目代码',
field: 'projectCode', field: 'projectCode',
@ -867,29 +948,11 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
isTableForm: false, isTableForm: false,
}, },
{
label: '计量单位',
field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {
width: 150
},
tableForm: {
type: 'Select',
disabled: true
},
form: {
componentProps: {
disabled: true
}
}
},
{ {
label: '最后更新时间', label: '最后更新时间',
field: 'updateTime', field: 'updateTime',
@ -901,6 +964,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -920,6 +984,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
@ -930,6 +995,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
isTableForm: false, isTableForm: false,
form: { form: {
componentProps: { componentProps: {
@ -941,6 +1007,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
label: '备注', label: '备注',
field: 'remark', field: 'remark',
sort: 'custom', sort: 'custom',
isTable: false,
table: { table: {
width: 150 width: 150
}, },
@ -956,6 +1023,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -975,55 +1043,11 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
{
label: 'Bom版本',
field: 'bomVersion',
sort: 'custom',
table: {
width: 150
},
tableForm: {
isInpuFocusShow: true,
searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
searchField: 'version', // 查询弹窗赋值字段
searchTitle: '物料清单信息', // 查询弹窗标题
searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
searchCondition: [{
key:'productItemCode',
value:'itemCode',
message: '请填写物料代码!',
isMainValue: true
},{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
},
form: {
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Bom版本', // 输入框占位文本
searchField: 'version', // 查询弹窗赋值字段
searchTitle: '物料清单信息', // 查询弹窗标题
searchAllSchemas: Bom.allSchemas, // 查询弹窗所需类
searchPage: BomApi.getBomPage, // 查询弹窗所需分页方法
searchCondition: [{
key:'productItemCode',
value:'itemCode',
message: '请填写物料代码!',
isMainValue: true
},{
key: 'available',
value: 'TRUE',
isMainValue: false
}]
}
},
},
{ {
label: '操作', label: '操作',
field: 'action', field: 'action',
@ -1033,6 +1057,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150, width: 150,
fixed: 'right' fixed: 'right'
}, },
hiddeInMain:true,
tableForm: { tableForm: {
type: 'action', type: 'action',
buttonText: 'Bom', buttonText: 'Bom',

Loading…
Cancel
Save