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