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

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

master_hella_20240701
liuchen864 7 months ago
parent
95f05d9b25 ea7d900bd4
commit
9437c6db92
14 changed files with 966 additions and 641 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/mes/productOffline/index.vue
  2. 2
      src/views/mes/productionPlan/productionPlan.data.ts
  3. 10
      src/views/mes/workScheduling/index.vue
  4. 6
      src/views/mes/workScheduling/workScheduling.data.ts
  5. 7
      src/views/qms/inspection/inspectionRequest/index.vue
  6. 157
      src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts
  7. 169
      src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts
  8. 220
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
  9. 109
      src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
  10. 176
      src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
  11. 234
      src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts
  12. 511
      src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts
  13. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
  14. 2
      src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

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

@ -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
View File

@ -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: {

10
src/views/mes/workScheduling/index.vue
View File

@ -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 }">
@ -169,10 +169,10 @@ const buttonBaseClick = (val, item) => {
const butttondata=(row) =>{ return [ const butttondata=(row) =>{ return [
defaultButtons.mainListEditBtn({label:"调序",hasPermi:'mes:workScheduling:update'}), // 编辑 defaultButtons.mainListEditBtn({label:"调序",hasPermi:'mes:workScheduling:update'}), // 编辑
//defaultButtons.mainListDeleteBtn({hasPermi:'mes:workScheduling:delete'}), // 删除 //defaultButtons.mainListDeleteBtn({hasPermi:'mes:workScheduling:delete'}), // 删除
defaultButtons.mainListHandleBtn({label:"终止",name:'terminate',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}), // defaultButtons.mainListHandleBtn({label:"终止",name:'terminate',hide: isShowMainButton(row,['-1','0']),hasPermi:'mes:workScheduling:update'}), //
defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}), defaultButtons.mainListHandleBtn({label:"暂停",name:'pause',hide: isShowMainButton(row,['1']),hasPermi:'mes:workScheduling:update'}),
defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}), defaultButtons.mainListHandleBtn({label:"恢复",name:'resume',hide: isShowMainButton(row,['3']),hasPermi:'mes:workScheduling:update'}),
//defaultButtons.mainListHandleBtn({label:"变更",name:'change', hasPermi:'mes:workScheduling:update'}), // //defaultButtons.mainListHandleBtn({label:"变更",name:'change', hasPermi:'mes:workScheduling:update'}), //
]} ]}
// 列表-操作按钮事件 // 列表-操作按钮事件

6
src/views/mes/workScheduling/workScheduling.data.ts
View File

@ -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,
@ -138,7 +138,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isForm: true, isForm: true,
}, },
{ {
label: '工单模式', label: '工单模式',
field: 'formType', field: 'formType',
@ -150,7 +150,7 @@ export const WorkScheduling = useCrudSchemas(reactive<CrudSchema[]>([
component: 'Select', component: 'Select',
}, },
}, },
{ {
label: '操作', label: '操作',
field: 'action', field: 'action',

7
src/views/qms/inspection/inspectionRequest/index.vue
View File

@ -46,11 +46,8 @@
/> />
<!-- 详情 --> <!-- 详情 -->
<!-- <Detail ref="detailRef" :isBasic="true" :allSchemas="InspectionMain.allSchemas" /> --> <Detail ref="detailRef" :isBasic="true" :allSchemas="InspectionMain.allSchemas" />
<!-- <Detail ref="detailRef" :isBasic="false" :allSchemas="InspectionMain.allSchemas"
:detailAllSchemas="InspectionRequestPackage.allSchemas" :detailAllSchemasRules="InspectionRequestPackageRules"
:apiPage="InspectionMainApi.getInspectionRequestPackageList"
/> -->
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/request/inspection-main/import" :importTemplateData="importTemplateData" <ImportForm ref="importFormRef" url="/request/inspection-main/import" :importTemplateData="importTemplateData"

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

@ -15,6 +15,15 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isSearch: true, isSearch: true,
}, },
{
label: '申请单号',
field: 'requestNumber',
sort: 'custom',
table: {
width: 180
},
isSearch: true,
},
{ {
label: '状态', label: '状态',
field: 'status', field: 'status',
@ -28,64 +37,60 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '申请单号', label: '客户代码',
field: 'requestNumber', field: 'customerCode',
sort: 'custom',
table: {
width: 180
},
isSearch: true,
},
{
label: '发货计划单号',
field: 'deliverPlanNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 150
}, },
}, },
{ {
label: '客户发货单号', label: '发货月台',
field: 'customerDeliverNumber', field: 'deliverDock',
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 150
}, },
}, },
{ {
label: '客户代码', label: '发货类型',
field: 'customerCode', field: 'deliverType',
sort: 'custom', sort: 'custom',
dictType: DICT_TYPE.DELIVER_TYPE,
dictClass: 'string',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '客户月台代码', label: '发货计划单号',
field: 'customerDockCode', field: 'deliverPlanNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 180
}, },
isTable: false,
}, },
{ {
label: '发货月台', label: '客户发货单号',
field: 'deliverDock', field: 'customerDeliverNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 180
}, },
isTable: false,
}, },
{ {
label: '发货类型', label: '客户月台代码',
field: 'deliverType', field: 'customerDockCode',
sort: 'custom', sort: 'custom',
dictType: DICT_TYPE.DELIVER_TYPE,
dictClass: 'string',
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '承运商', label: '承运商',
field: 'carrierCode', field: 'carrierCode',
@ -93,6 +98,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '运输方式', label: '运输方式',
@ -102,6 +108,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '车牌号', label: '车牌号',
@ -110,6 +117,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '申请时间', label: '申请时间',
@ -122,6 +130,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -142,6 +151,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -162,6 +172,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -178,6 +189,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '到仓库代码', label: '到仓库代码',
@ -186,13 +198,14 @@ export const DeliverJobMain = 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
@ -203,7 +216,7 @@ export const DeliverJobMain = 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',
table: { table: {
width: 150 width: 150
@ -216,6 +229,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '到库区代码范围', label: '到库区代码范围',
@ -224,6 +238,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '从月台代码', label: '从月台代码',
@ -232,6 +247,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
// { // {
// label: '状态', // label: '状态',
@ -248,6 +264,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
form: { form: {
component: 'InputNumber', component: 'InputNumber',
} }
@ -259,6 +276,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
form: { form: {
component: 'InputNumber', component: 'InputNumber',
} }
@ -270,6 +288,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '部门', label: '部门',
@ -278,13 +297,14 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '自动完成', label: '自动完成',
field: 'autoComplete', field: 'autoComplete',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -303,7 +323,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyLocation', field: 'allowModifyLocation',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -322,7 +342,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyQty', field: 'allowModifyQty',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -341,7 +361,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowBiggerQty', field: 'allowBiggerQty',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -360,7 +380,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowSmallerQty', field: 'allowSmallerQty',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -379,7 +399,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyInventoryStatus', field: 'allowModifyInventoryStatus',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -398,7 +418,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowContinuousScanning', field: 'allowContinuousScanning',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -417,7 +437,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowPartialComplete', field: 'allowPartialComplete',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -436,7 +456,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyBatch', field: 'allowModifyBatch',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -455,7 +475,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'allowModifyPackingNumber', field: 'allowModifyPackingNumber',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -476,6 +496,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '承接时间', label: '承接时间',
@ -488,6 +509,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -504,6 +526,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '完成时间', label: '完成时间',
@ -516,6 +539,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -532,6 +556,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建时间', label: '创建时间',
@ -544,6 +569,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -560,6 +586,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '最后更新时间', label: '最后更新时间',
@ -572,6 +599,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -588,6 +616,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '操作', label: '操作',
@ -676,6 +705,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false
}, },
// { // {
// label: '销售订单号', // label: '销售订单号',
@ -716,6 +746,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '物料描述2', label: '物料描述2',
@ -724,6 +755,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '批次', label: '批次',
@ -733,22 +765,6 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{
label: '包装号',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150
},
},
{
label: '器具号',
field: 'containerNumber',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '数量', label: '数量',
field: 'qty', field: 'qty',
@ -772,7 +788,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '在途库库位', label: '在途库位',
field: 'onTheWayLocationCode', field: 'onTheWayLocationCode',
sort: 'custom', sort: 'custom',
table: { table: {
@ -780,7 +796,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '从库位代码', label: '从库位',
field: 'fromLocationCode', field: 'fromLocationCode',
sort: 'custom', sort: 'custom',
table: { table: {
@ -788,19 +804,37 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '到库位代码', label: '到库位',
field: 'toLocationCode', field: 'toLocationCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{
label: '包装号',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false,
},
{
label: '器具号',
field: 'containerNumber',
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
@ -813,6 +847,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '项目代码', label: '项目代码',
@ -821,6 +856,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '备注', label: '备注',
@ -829,6 +865,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建时间', label: '创建时间',
@ -841,6 +878,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -857,6 +895,7 @@ export const DeliverJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
])) ]))

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

@ -33,16 +33,38 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '发货计划单号', label: '发货记录单号',
field: 'deliverPlanNumber', field: 'deliverRecordNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 180 width: 150
}, },
isSearch: true,
}, },
// {
// label: '发货计划单号',
// field: 'deliverPlanNumber',
// sort: 'custom',
// table: {
// width: 180
// },
// },
// {
// label: '客户发货单号',
// field: 'customerDeliverNumber',
// sort: 'custom',
// table: {
// width: 150
// },
// },
{ {
label: '客户发货单号', label: '状态',
field: 'customerDeliverNumber', 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
@ -64,6 +86,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '承运商', label: '承运商',
@ -72,6 +95,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '运输方式', label: '运输方式',
@ -80,6 +104,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '车牌号', label: '车牌号',
@ -88,6 +113,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '申请时间', label: '申请时间',
@ -100,6 +126,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -120,6 +147,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -140,6 +168,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -160,6 +189,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -177,6 +207,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '到仓库代码', label: '到仓库代码',
@ -185,13 +216,14 @@ export const DeliverRecordMain = 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
@ -202,7 +234,7 @@ export const DeliverRecordMain = 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',
table: { table: {
width: 150 width: 150
@ -215,6 +247,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '到库区代码范围', label: '到库区代码范围',
@ -223,6 +256,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '从月台代码', label: '从月台代码',
@ -231,6 +265,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '出库事务类型', label: '出库事务类型',
@ -239,6 +274,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '入库事务类型', label: '入库事务类型',
@ -247,6 +283,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '业务类型', label: '业务类型',
@ -255,6 +292,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '部门', label: '部门',
@ -263,13 +301,14 @@ export const DeliverRecordMain = 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
@ -282,6 +321,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建时间', label: '创建时间',
@ -294,6 +334,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -310,6 +351,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
// { // {
// label: '代码', // label: '代码',
@ -325,7 +367,7 @@ export const DeliverRecordMain = 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
@ -413,6 +455,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false
}, },
// { // {
// label: '销售订单号', // label: '销售订单号',
@ -453,6 +496,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '物料描述2', label: '物料描述2',
@ -461,6 +505,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true
}, },
{ {
label: '批次', label: '批次',
@ -479,16 +524,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '从器具号', label: '包装规格',
field: 'fromContainerNumber', field: 'packUnit',
sort: 'custom',
table: {
width: 150
},
},
{
label: '到器具号',
field: 'toContainerNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -517,117 +554,144 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
}, },
}, },
{ {
label: '在途库库位', label: '单价',
field: 'onTheWayLocationCode', field: 'singlePrice',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
form: {
component: 'InputNumber',
}
}, },
{ {
label: '从库位代码', label: '金额',
field: 'fromLocationCode', field: 'amount',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
form: {
component: 'InputNumber',
}
}, },
{ {
label: '到库位代码', label: '在途库库位',
field: 'toLocationCode', field: 'onTheWayLocationCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '库存状态', label: '从库位',
field: 'inventoryStatus', field: 'fromLocationCode',
dictType: DICT_TYPE.INVENTORY_STATUS, sort: 'custom',
dictClass: 'string', table: {
isTable: true, width: 150
},
},
{
label: '到库位',
field: 'toLocationCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '从库位组代码', label: '从库位组',
field: 'fromLocationGroupCode', field: 'fromLocationGroupCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '到库位组代码', label: '到库位组',
field: 'toLocationGroupCode', field: 'toLocationGroupCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '从库区代码', label: '从库区',
field: 'fromAreaCode', field: 'fromAreaCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '到库区代码', label: '到库区',
field: 'toAreaCode', field: 'toAreaCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '从货主代码', label: '从器具号',
field: 'fromOwnerCode', field: 'fromContainerNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '到货主代码', label: '到器具号',
field: 'toOwnerCode', field: 'toContainerNumber',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '项目代码', label: '库存状态',
field: 'projectCode', field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '单价', label: '从货主代码',
field: 'singlePrice', field: 'fromOwnerCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
form: { isTable: false,
component: 'InputNumber',
}
}, },
{ {
label: '金额', label: '到货主代码',
field: 'amount', field: 'toOwnerCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
form: { isTable: false,
component: 'InputNumber', },
} {
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: {
width: 150
},
isTable: false,
}, },
{ {
label: '备注', label: '备注',
@ -636,13 +700,14 @@ export const DeliverRecordDetail = 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
@ -659,6 +724,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -675,6 +741,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
// { // {
// label: '任务明细ID', // label: '任务明细ID',

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

@ -5,7 +5,8 @@ import { dateFormatter } from '@/utils/formatTime'
import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as getRequestsettingApi from '@/api/wms/requestsetting/index'
import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain' import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data' import * as DeliverPlanDetailApi from '@/api/wms/deliverPlanDetail'
import { DeliverPlanMain ,DeliverPlanDetail} from '../../deliverplan/deliverPlanMain/deliverPlanMain.data'
import * as CustomerItemApi from '@/api/wms/customeritem' import * as CustomerItemApi from '@/api/wms/customeritem'
import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data' import { Customeritem } from '@/views/wms/basicDataManage/customerManage/customeritem/customeritem.data'
@ -69,44 +70,6 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{
label: '发货计划单号',
field: 'deliverPlanNumber',
sort: 'custom',
table: {
width: 180
},
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: '发货计划信息', // 查询弹窗标题
searchAllSchemas: DeliverPlanMain.allSchemas, // 查询弹窗所需类
searchPage: DeliverPlanMainApi.getDeliverPlanMainPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '6',
isMainValue: false
}]
}
}
},
{
label: '客户发货单号',
field: 'customerDeliverNumber',
sort: 'custom',
table: {
width: 180
},
isForm: false,
},
{ {
label: '客户代码', label: '客户代码',
field: 'customerCode', field: 'customerCode',
@ -118,7 +81,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
form: { form: {
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
componentProps: { componentProps: {
disabled: true, enterSearch: true,
isSearchList: true, // 开启查询弹窗 isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择客户代码', // 输入框占位文本 searchListPlaceholder: '请选择客户代码', // 输入框占位文本
searchField: 'code', // 查询弹窗赋值字段 searchField: 'code', // 查询弹窗赋值字段
@ -134,7 +97,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
{ {
label: '客户月台代码', label: '客户月台',
field: 'customerDockCode', field: 'customerDockCode',
sort: 'custom', sort: 'custom',
table: { table: {
@ -174,6 +137,47 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
}, },
{
label: '发货计划单号',
field: 'deliverPlanNumber',
sort: 'custom',
table: {
width: 180
},
isTable:false,
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: '发货计划信息', // 查询弹窗标题
searchAllSchemas: DeliverPlanDetail.allSchemas, // 查询弹窗所需类
searchPage: DeliverPlanDetailApi.getDeliverPlanDetailPage, // 查询弹窗所需分页方法
searchCondition: [{
key: 'available',
value: 'TRUE',
isMainValue: false
},
{
key: 'status',
value: '6',
isMainValue: false
}]
}
}
},
{
label: '客户发货单号',
field: 'customerDeliverNumber',
sort: 'custom',
table: {
width: 180
},
isTable:false,
isForm: false,
},
{ {
label: '承运商', label: '承运商',
field: 'carrierCode', field: 'carrierCode',
@ -181,6 +185,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
form: { form: {
// labelMessage: '信息提示说明！！！', // labelMessage: '信息提示说明！！！',
componentProps: { componentProps: {
@ -207,6 +212,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
}, },
{ {
label: '车牌号', label: '车牌号',
@ -215,6 +221,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
}, },
{ {
label: '申请时间', label: '申请时间',
@ -227,6 +234,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable:false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -249,6 +257,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable:false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -266,6 +275,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
isForm: false, isForm: false,
}, },
{ {
@ -275,6 +285,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
isForm: false, isForm: false,
}, },
{ {
@ -282,7 +293,7 @@ export const DeliverRequestMain = 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
@ -294,7 +305,7 @@ export const DeliverRequestMain = 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',
table: { table: {
width: 150 width: 150
@ -308,6 +319,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
isForm: false, isForm: false,
}, },
{ {
@ -317,6 +329,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
isForm: false, isForm: false,
}, },
{ {
@ -326,6 +339,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
isForm: false, isForm: false,
}, },
{ {
@ -335,6 +349,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable:false,
form: { form: {
value: 'Deliver', value: 'Deliver',
componentProps: { componentProps: {
@ -351,6 +366,7 @@ export const DeliverRequestMain = 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
}, },
@ -372,7 +388,7 @@ export const DeliverRequestMain = 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: {
@ -393,7 +409,7 @@ export const DeliverRequestMain = 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: {
@ -414,7 +430,7 @@ export const DeliverRequestMain = 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: {
@ -471,6 +487,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -489,6 +506,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -502,6 +520,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -520,6 +539,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
}, },
{ {
@ -582,6 +602,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
isTableForm: false, isTableForm: false,
form: { form: {
componentProps: { componentProps: {
@ -671,6 +692,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
width: 150 width: 150
}, },
tableForm:{ tableForm:{
multiple:true,
isInpuFocusShow: true, // 开启查询弹窗 isInpuFocusShow: true, // 开启查询弹窗
searchListPlaceholder: '请选择物料代码', searchListPlaceholder: '请选择物料代码',
searchField: 'itemCode', searchField: 'itemCode',
@ -724,6 +746,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true,
isForm: false, isForm: false,
isTableForm: false isTableForm: false
}, },
@ -734,39 +757,10 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain:true,
isForm: false, isForm: false,
isTableForm: false isTableForm: false
}, },
{
label: '批次',
field: 'batch',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '包装号',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{
label: '器具号',
field: 'containerNumber',
sort: 'custom',
table: {
width: 150
},
isTableForm: false,
isForm: false,
},
{ {
label: '数量', label: '数量',
field: 'qty', field: 'qty',
@ -808,7 +802,34 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
{ {
label: '到库位代码', label: '承运商',
field: 'carrierCode',
sort: 'custom',
table: {
width: 150
},
},
{
label: '运输方式',
field: 'transferMode',
sort: 'custom',
dictType: DICT_TYPE.TRANSFER_MODE,
dictClass: 'string',
table: {
width: 150
},
},
{
label: '到仓库',
field: 'toWarehouseCode',
sort: 'custom',
table: {
width: 150
},
isForm: false,
},
{
label: '到库位',
field: 'toLocationCode', field: 'toLocationCode',
sort: 'custom', sort: 'custom',
table: { table: {
@ -866,6 +887,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
tableForm: { tableForm: {
type: 'Select' type: 'Select'
}, },
hiddenInMain: true,
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
}, },
@ -876,9 +898,44 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
isForm: false, isForm: false,
isTableForm: false isTableForm: false
}, },
{
label: '批次',
field: 'batch',
sort: 'custom',
table: {
width: 150
},
isTable: false,
isTableForm: false,
isForm: false,
},
{
label: '包装号',
field: 'packingNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false,
isTableForm: false,
isForm: false,
},
{
label: '器具号',
field: 'containerNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false,
isTableForm: false,
isForm: false,
},
{ {
label: '从货主代码', label: '从货主代码',
field: 'fromOwnerCode', field: 'fromOwnerCode',
@ -886,6 +943,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isForm: false, isForm: false,
isTableForm: false isTableForm: false
}, },
@ -896,6 +954,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
}, },
@ -906,6 +965,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '计划数量', label: '计划数量',
@ -914,6 +974,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
tableForm: { tableForm: {
disabled: true disabled: true
}, },
@ -926,6 +987,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
tableForm: { tableForm: {
disabled: true disabled: true
}, },
@ -942,6 +1004,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -961,6 +1024,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },
@ -975,6 +1039,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -994,6 +1059,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
table: { table: {
width: 150 width: 150
}, },
isTable: false,
isTableForm: false, isTableForm: false,
isForm: false isForm: false
}, },

109
src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
View File

@ -43,6 +43,8 @@
<!-- 表单弹窗：添加/修改 --> <!-- 表单弹窗：添加/修改 -->
<BasicForm <BasicForm
ref="formRef" ref="formRef"
:isOpenSearchTable="true"
fieldTableColumn="itemCode"
@success="getList" @success="getList"
:rules="DeliverRequestMainRules" :rules="DeliverRequestMainRules"
:formAllSchemas="DeliverRequestMain.allSchemas" :formAllSchemas="DeliverRequestMain.allSchemas"
@ -119,9 +121,18 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
nextTick(() => { nextTick(() => {
if (type == 'tableForm') { if (type == 'tableForm') {
if(formField == 'itemCode') { if(formField == 'itemCode') {
row['itemCode'] = val[0]['itemCode'] const tableFormKeys = {}
row['uom'] = val[0]['customerUom'] DeliverRequestDetail.allSchemas.tableFormColumns.forEach(item => {
}else { tableFormKeys[item.field] = item.default ? item.default : ''
})
console.log('tableData.value',tableData.value)
val.forEach(item=>{
if(tableData.value.find(item1=>item1['id'] == item['id'])) return
const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item}))
newRow['uom'] = item['customerUom']
tableData.value.push(newRow)
})
}else{
row[formField] = val[0][searchField] row[formField] = val[0][searchField]
} }
} else { } else {
@ -129,54 +140,54 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
setV[formField] = val[0][searchField] setV[formField] = val[0][searchField]
if(formField == 'deliverPlanNumber') { if(formField == 'deliverPlanNumber') {
setV['deliverPlanNumber'] = val[0]['number'] setV['deliverPlanNumber'] = val[0]['number']
if(setV['deliverPlanNumber'] != null){ // if(setV['deliverPlanNumber'] != null){
isShowButton.value = false // isShowButton.value = false
} // }
setV['customerCode'] = val[0]['customerCode'] setV['customerCode'] = val[0]['customerCode']
// 获取子表数据 getBomDisassemble // 获取子表数据 getBomDisassemble
DeliverPlanDetailApi.selectDetailByMasterID(val[0]['id']) // DeliverPlanDetailApi.selectDetailByMasterID(val[0]['id'])
.then(res => { // .then(res => {
res.forEach(item => { // res.forEach(item => {
item.qty = item.planQty // item.qty = item.planQty
}) // })
if (res) tableData.value = res // if (res) tableData.value = res
// 修改 tableform 属性 // // 修改 tableform 属性
DeliverRequestDetail.allSchemas.tableFormColumns.map(item => { // DeliverRequestDetail.allSchemas.tableFormColumns.map(item => {
if(item.field == 'itemCode') { // if(item.field == 'itemCode') {
item.isInpuFocusShow = false // item.isInpuFocusShow = false
item.tableForm.isInpuFocusShow = false // item.tableForm.isInpuFocusShow = false
item.tableForm.disabled = true // item.tableForm.disabled = true
} // }
if(item.field == 'uom') { // if(item.field == 'uom') {
item.tableForm.disabled = true // item.tableForm.disabled = true
} // }
}) // })
// 修改 tableform 属性 // // 修改 tableform 属性
if(formField == 'customerCode'){ // if(formField == 'customerCode'){
console.log(1111,val); // console.log(1111,val);
customerCode.value = val[0]['code'] // customerCode.value = val[0]['code']
console.log(11112,customerCode.value); // console.log(11112,customerCode.value);
} // }
DeliverRequestMain.allSchemas.tableFormColumns.map(item => { // DeliverRequestMain.allSchemas.tableFormColumns.map(item => {
if(item.field == 'customerDockCode') { // if(item.field == 'customerDockCode') {
item.tableForm.searchCondition = [ // item.tableForm.searchCondition = [
{ // {
key: 'customerCode', // key: 'customerCode',
value: customerCode.value , // value: customerCode.value ,
isMainValue: true // isMainValue: true
}] // }]
item.form.componentProps.searchCondition = [ // item.form.componentProps.searchCondition = [
{ // {
key: 'customerCode', // key: 'customerCode',
value: customerCode.value , // value: customerCode.value ,
isMainValue: true // isMainValue: true
}]} // }]}
else { // else {
delete item.tableForm.searchCondition // delete item.tableForm.searchCondition
delete item.form.componentProps.searchCondition // delete item.form.componentProps.searchCondition
} // }
}) // })
}) // })
if(formField == 'itemCode'){ if(formField == 'itemCode'){
console.log( val[0]); console.log( val[0]);
row['uom'] = val[0]['customerUom'] row['uom'] = val[0]['customerUom']

176
src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts
View File

@ -15,6 +15,26 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
}, },
isSearch: true isSearch: true
}, },
{
label: '状态',
field: 'status',
dictType: DICT_TYPE.REQUEST_STATUS,
dictClass: 'string',
isForm: false,
isTable: true,
sort: 'custom',
table: {
width: 150
},
},
{
label: '车间代码',
field: 'workshopCode',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '申请单号', label: '申请单号',
field: 'requestNumber', field: 'requestNumber',
@ -22,8 +42,10 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 180 width: 180
}, },
isTable: false,
isSearch: true isSearch: true
}, },
{ {
label: '任务单号', label: '任务单号',
field: 'jobNumber', field: 'jobNumber',
@ -31,16 +53,10 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 180 width: 180
}, },
isTable: false,
isSearch: true isSearch: true
}, },
{
label: '车间代码',
field: 'workshopCode',
sort: 'custom',
table: {
width: 150
},
},
{ {
label: '出库事务类型', label: '出库事务类型',
field: 'outTransactionType', field: 'outTransactionType',
@ -48,6 +64,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '入库事务类型', label: '入库事务类型',
@ -56,6 +73,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '执行时间', label: '执行时间',
@ -68,6 +86,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -88,6 +107,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -109,6 +129,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -129,6 +150,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -145,13 +167,14 @@ export const ProductionreturnRecordMain = 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
@ -164,6 +187,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '备注', label: '备注',
@ -172,6 +196,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建者', label: '创建者',
@ -180,6 +205,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '创建时间', label: '创建时间',
@ -192,6 +218,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 180 width: 180
}, },
isTable: false,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -216,13 +243,14 @@ export const ProductionreturnRecordMain = 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
@ -235,6 +263,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '到仓库代码', label: '到仓库代码',
@ -243,13 +272,14 @@ export const ProductionreturnRecordMain = 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
@ -262,6 +292,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
table: { table: {
width: 150 width: 150
}, },
isTable: false,
}, },
{ {
label: '是否可用', label: '是否可用',
@ -269,7 +300,7 @@ export const ProductionreturnRecordMain = 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,14 +388,6 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
width: 150 width: 150
}, },
}, },
{
label: '单据号',
field: 'number',
sort: 'custom',
table: {
width: 180
},
},
{ {
label: '物料代码', label: '物料代码',
field: 'itemCode', field: 'itemCode',
@ -385,6 +408,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
label: '物料描述1', label: '物料描述1',
field: 'itemDesc1', field: 'itemDesc1',
sort: 'custom', sort: 'custom',
hiddenInMain: true,
table: { table: {
width: 150 width: 150
}, },
@ -393,14 +417,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
label: '物料描述2', label: '物料描述2',
field: 'itemDesc2', field: 'itemDesc2',
sort: 'custom', sort: 'custom',
table: { hiddenInMain: true,
width: 150
},
},
{
label: '项目代码',
field: 'projectCode',
sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
@ -412,33 +429,29 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
form: { form: {
component: 'InputNumber', component: 'InputNumber',
} }
}, },
{ {
label: '计量单位', label: '从批次',
field: 'uom', field: 'fromBatch',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '库存状态', label: '到批次',
field: 'inventoryStatus', field: 'toBatch',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '从包装号', label: '从包装号',
field: 'fromPackingNumber', field: 'fromPackingNumber',
@ -446,6 +459,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '到包装号', label: '到包装号',
@ -454,34 +468,42 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '从器具号', label: '包装规格',
field: 'fromContainerNumber', field: 'packUnit',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '到器具号', label: '包装数量',
field: 'toContainerNumber', field: 'packQty',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '从批次', label: '计量单位',
field: 'fromBatch', field: 'uom',
dictType: DICT_TYPE.UOM,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{ {
label: '到批次', label: '库存状态',
field: 'toBatch', field: 'inventoryStatus',
dictType: DICT_TYPE.INVENTORY_STATUS,
dictClass: 'string',
isTable: true,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -510,6 +532,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '到库位组代码', label: '到库位组代码',
@ -518,6 +541,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '从库区代码', label: '从库区代码',
@ -526,6 +550,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '到库区代码', label: '到库区代码',
@ -534,6 +559,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '从货主代码', label: '从货主代码',
@ -542,6 +568,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '到货主代码', label: '到货主代码',
@ -550,25 +577,34 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '备注', label: '项目代码',
field: 'remark', field: 'projectCode',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '接口类型', label: '单据号',
field: 'interfaceType', field: 'number',
dictType: DICT_TYPE.INTERFACE_TYPE, sort: 'custom',
dictClass: 'string', table: {
isTable: true, width: 180
},
hiddenInMain: true,
},
{
label: '备注',
field: 'remark',
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '创建者', label: '创建者',
@ -577,6 +613,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 150 width: 150
}, },
hiddenInMain: true,
}, },
{ {
label: '创建时间', label: '创建时间',
@ -589,6 +626,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
table: { table: {
width: 180 width: 180
}, },
hiddenInMain: true,
form: { form: {
component: 'DatePicker', component: 'DatePicker',
componentProps: { componentProps: {
@ -598,6 +636,36 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
} }
}, },
}, },
{
label: '从器具号',
field: 'fromContainerNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false
},
{
label: '到器具号',
field: 'toContainerNumber',
sort: 'custom',
table: {
width: 150
},
isTable: false
},
{
label: '接口类型',
field: 'interfaceType',
dictType: DICT_TYPE.INTERFACE_TYPE,
dictClass: 'string',
isTable: false,
sort: 'custom',
table: {
width: 150
},
},
])) ]))
//表单校验 //表单校验

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

@ -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', sort: 'custom',
table: { table: {
width: 150 width: 150
}, },
}, },
{
label: '单价',
field: 'singlePrice',
sort: 'custom',
table: {
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',

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

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

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
View File

@ -231,6 +231,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
}else if (formField == 'packQty'){ }else if (formField == 'packQty'){
row['packQty'] = val[0]['packQty'] row['packQty'] = val[0]['packQty']
row['packUnit'] = val[0]['packUnit'] row['packUnit'] = val[0]['packUnit']
}else if(formField == 'defaultToLocationCode'){
row['defaultToLocationCode'] = val[0]['code']
} }
} else { } else {
const setV = {} const setV = {}

2
src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
View File

@ -186,6 +186,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
}else if (formField == 'packQty'){ }else if (formField == 'packQty'){
row['packQty'] = val[0]['packQty'] row['packQty'] = val[0]['packQty']
row['packUnit'] = val[0]['packUnit'] row['packUnit'] = val[0]['packUnit']
}else if(formField == 'defaultToLocationCode'){
row['defaultToLocationCode'] = val[0]['code']
} }
} else { } else {
const setV = {} const setV = {}

Write Preview
Loading…
Cancel
Save