diff --git a/src/api/wms/itempackage/index.ts b/src/api/wms/itempackage/index.ts index 5270dbc2f..97eb8348e 100644 --- a/src/api/wms/itempackage/index.ts +++ b/src/api/wms/itempackage/index.ts @@ -41,6 +41,17 @@ export const getItempackagingPageBySupplierdeliver = async (params) => { } } +// 查询物料包装信息 列表--制品收货申请 +export const getItempackagingPageByProductreceipt = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.post({ url: '/wms/itempackage/seniorByProductreceipt', data }) + } else { + return await request.get({ url: `/wms/itempackage/pageByProductreceipt`, params }) + } +} + // 查询物料包装信息 详情 export const getItempackaging = async (id: number) => { diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts index 879b6f278..5775eec34 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts +++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts @@ -112,7 +112,7 @@ export const PackageunitCopy = useCrudSchemas(reactive([ label: '包装描述', field: 'desc', sort: 'custom', - isSearch: true, + isSearch: false, table: { width: 150 }, @@ -123,7 +123,7 @@ export const PackageunitCopy = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, form: { component: 'Switch', value: 'TRUE', @@ -142,7 +142,7 @@ export const PackageunitCopy = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, form: { component: 'Switch', value: 'TRUE', @@ -373,7 +373,7 @@ export const Packageunit = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.PACK_UNIT, dictClass: 'string', - isSearch: true, + isSearch: false, table: { width: 150 }, @@ -400,7 +400,7 @@ export const Packageunit = useCrudSchemas(reactive([ label: '包装描述', field: 'desc', sort: 'custom', - isSearch: true, + isSearch: false, table: { width: 150 }, @@ -411,7 +411,7 @@ export const Packageunit = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, form: { component: 'Switch', value: 'TRUE', @@ -430,7 +430,7 @@ export const Packageunit = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, + isSearch: false, form: { component: 'Switch', value: 'TRUE', diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts index 7bfa3a0d2..81f3fe3a7 100644 --- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts +++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts @@ -263,26 +263,26 @@ export const CountRequestMain = useCrudSchemas(([ width: 150 }, }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // }, - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + }, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index 42308b97e..1e27c9497 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -249,26 +249,26 @@ export const CountadjustRequestMain = useCrudSchemas(([ width: 150 }, }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // }, - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + }, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts index 515f1011a..833fec8bb 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts @@ -314,26 +314,26 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index b24a7391f..3e024dcc9 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -431,26 +431,26 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts index 57fd1d15b..07f3a3dae 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts @@ -260,26 +260,26 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index cd3e5fc2f..8d47784cd 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -418,26 +418,26 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '备注', field: 'remark', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue index a43277b5e..c1425e150 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue @@ -180,110 +180,17 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 - defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 - defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 - defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 + // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 + // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 + // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 + // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] } // 列表-操作按钮事件 const buttonTableClick = async (val, row) => {  if (val == 'mainJobExe') { // 执行 -    let aaa = { - "id": 6, - "requestNumber": "REQ4520240313-0003", - "deliverPlanNumber": null, - "fromWarehouseCode": "CKV", - "toWarehouseCode": "CKV", - "details": null, - "requestTime": null, - "requestDueTime": null, - "status": "1", - "expiredTime": null, - "concurrencyStamp": "1", - "jobStageStatus": null, - "priority": null, - "priorityincrement": null, - "departmentCode": null, - "userGroupCode": null, - "acceptUserId": null, - "acceptUserName": null, - "acceptTime": null, - "completeUserId": null, - "completeUserName": null, - "completeTime": null, - "fromAreaTypes": "FG", - "toAreaTypes": "CUST", - "number": "JOB3220240314-0006", - "businessType": "Stockup", - "remark": null, - "extraProperties": null, - "siteId": null, - "autoComplete": "FALSE", - "allowModifyLocation": "FALSE", - "allowModifyQty": "TRUE", - "allowBiggerQty": "TRUE", - "allowSmallerQty": "TRUE", - "allowModifyInventoryStatus": "TRUE", - "allowContinuousScanning": "TRUE", - "allowPartialComplete": "TRUE", - "ruleUserId": null, - "allowModifyBatch": "FALSE", - "allowModifyPackingNumber": "FALSE", - "fromAreaCodes": "KQV2", - "toAreaCodes": "CUST", - "serialNumber": "0", - "inInventoryStatuses": "OK", - "outInventoryStatuses": "OK", - "createTime": null, - "subList": [{ - "id": 1, - "packingNumber": null, - "batch": "2024021801", - "inventoryStatus": "OK", - "ownerCode": null, - "containerNumber": null, - "fromLocationCode": "FG", - "toLocationCode": "RAW", - "itemCode": "FOG-LAMP-RIGHT", - "itemName": "HL后雾灯(新)-右\r\n", - "itemDesc1": "HL后雾灯(新)-右\r\n", - "itemDesc2": "HL后雾灯(新)-右\r\n", - "projectCode": "PJ001", - "qty": 1, - "uom": "EA", - "masterId": 6, - "number": "JOB3220240314-0006", - "remark": null, - "siteId": "", - "createTime": null, - "toPackingNumber": null, - "toContainerNumber": null, - "toBatch": null, - "handleQty": null, - "toInventoryStatus": null, - recordList: [{ - handleQty: 10, - toPackingNumber: '12', - toContainerNumber: '001', - toBatch: '21', - toInventoryStatus: 'OK', - toLocationCode: 'WIP', - supplierCode: '31213', - },{ - handleQty: 22, - toPackingNumber: 'M20230421000005', - toContainerNumber: '001', - toBatch: '20230808', - toInventoryStatus: 'OK', - toLocationCode: 'FG', - supplierCode: '31213', - }] - }] -} - handleHandle(aaa) - console.log('列表-操作按钮事件-执行') + handleHandle } else if (val == 'mainJobAba') { // 放弃 StockupJobMainApi.abandonStockupMainJob(row.id) } else if (val == 'mainJobClo') { // 关闭 diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts index 9bb38ab9e..b1b118996 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts @@ -16,6 +16,15 @@ export const StockupMainJob = useCrudSchemas(reactive([ width: 180 }, }, + { + label: '发货记录单号', + field: 'deliverPlanNumber', + sort: 'custom', + isForm: false, + table: { + width: 180 + }, + }, { label: '申请单号', field: 'requestNumber', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts index 87ea3475c..0ea16712f 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts @@ -16,6 +16,15 @@ export const StockupMainRecord = useCrudSchemas(reactive([ width: 180 }, }, + { + label: '发货记录单号', + field: 'deliverPlanNumber', + sort: 'custom', + isForm: false, + table: { + width: 180 + }, + }, { label: '申请单号', field: 'requestNumber', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index 6f2281d3b..d6146359e 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -350,27 +350,26 @@ export const StockupMainRequest = useCrudSchemas(reactive([ } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, - + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '到库区类型范围', field: 'toAreaTypes', diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 2c1eb8ed1..4d49c8b98 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -233,26 +233,26 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '备注', field: 'remark', diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts index eaba5263d..4c8a5411a 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts @@ -302,26 +302,26 @@ export const PackageoverRequestMain = useCrudSchemas(reactive([ } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index c5cba29f8..da1f498d4 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -262,26 +262,26 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disable: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disable: true + } + } + }, { label: '备注', field: 'remark', diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index 3b715f341..a0bfbb3d1 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -390,26 +390,26 @@ export const TransferissueRequestMain = useCrudSchemas(reactive([ } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '备注', field: 'remark', diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts index faf50ed0a..95a051c46 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts @@ -288,26 +288,26 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive( } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index 461f78535..bb579b5f0 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -230,26 +230,26 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive([ } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '备注', field: 'remark', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index cef5aef6e..ae6a278b8 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -270,26 +270,26 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '备注', field: 'remark', diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 68e20f58d..6da200a2f 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -346,26 +346,26 @@ export const IssueRequestMain = useCrudSchemas(reactive([ } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts index ff38a7753..f35ade83e 100644 --- a/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts +++ b/src/views/wms/issueManage/onlinesettlement/onlinesettlementRequestMain/onlinesettlementRequestMain.data.ts @@ -286,26 +286,26 @@ export const OnlinesettlementRequestMain = useCrudSchemas(reactive } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts index 4e54d9cf0..fa550e33d 100644 --- a/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts +++ b/src/views/wms/issueManage/pick/pickRequestMain/pickRequestMain.data.ts @@ -317,26 +317,26 @@ export const PickRequestMain = useCrudSchemas(reactive([ } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 758234cd3..cbe054bdc 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -305,26 +305,26 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true, - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true, + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index ab80dd53e..25f1efbea 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -215,26 +215,26 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive( } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 401c0d175..f1739c2ed 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -303,26 +303,26 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '使用在途库', field: 'useOnTheWayLocation', diff --git a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts index 3fb298350..498011f55 100644 --- a/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts +++ b/src/views/wms/productionManage/offlinesettlement/offlinesettlementRequestMain/offlinesettlementRequestMain.data.ts @@ -271,26 +271,26 @@ export const OfflinesettlementRequestMain = useCrudSchemas(reactive } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts index 8490c6406..17c7587e1 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/productputawayRequestMain.data.ts @@ -339,26 +339,26 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive([ } } }, - // { - // label: '直接生成记录', - // field: 'directCreateRecord', - // dictType: DICT_TYPE.TRUE_FALSE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // form: { - // component: 'Switch', - // value: requestsettingData.directCreateRecord, - // componentProps: { - // inactiveValue: 'FALSE', - // activeValue: 'TRUE', - // disabled: true - // } - // } - // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: false, + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: requestsettingData.directCreateRecord, + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true + } + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 7c91ed6ed..69bb3cd76 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -78,7 +78,7 @@ ref="formLabelRef" @success="getList" :tableAllSchemas="detailListTableColumns" - :tableFormRules="ProductionreturnRequestDetailLabelRules" + :tableFormRules="ProductreceiptRequestLabelRules" :tableData="detatableData.tableList" :isBusiness="true" :isShowButton="false" @@ -117,8 +117,9 @@