From 84beca2864c5aedff981006c793e448d6eb295f8 Mon Sep 17 00:00:00 2001 From: chenfang Date: Fri, 1 Dec 2023 17:23:59 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7/?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E6=8C=89=E9=92=AE=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/customerreturnRequestMain/index.ts | 12 +- .../wms/customersettleRequestMain/index.ts | 30 ++++ src/api/wms/deliverJobMain/index.ts | 14 +- src/api/wms/deliverRequestMain/index.ts | 29 ++++ .../customerreturnRequestMain/index.vue | 49 +++++- .../customersettleRequestMain/index.vue | 63 ++++++-- .../deliver/deliverJobMain/index.vue | 142 +++++++++--------- .../deliver/deliverRequestMain/index.vue | 65 ++++++-- .../deliverPlanMain/deliverPlanMain.data.ts | 44 ++---- .../deliverplan/deliverPlanMain/index.vue | 5 + 10 files changed, 303 insertions(+), 150 deletions(-) diff --git a/src/api/wms/customerreturnRequestMain/index.ts b/src/api/wms/customerreturnRequestMain/index.ts index 89c850dca..6f42a5662 100644 --- a/src/api/wms/customerreturnRequestMain/index.ts +++ b/src/api/wms/customerreturnRequestMain/index.ts @@ -80,31 +80,31 @@ export const importTemplate = () => { } // 关闭客户退货申请主 Excel -export const closeProductreceiptRequestMain = async (id) => { +export const close = async (id) => { return await request.put({ url: `/wms/customerreturn-request-main/close?id=` + id }) } // 重新添加客户退货申请主 Excel -export const reAddProductreceiptRequestMain = async (id) => { +export const reAdd = async (id) => { return await request.put({ url: `/wms/customerreturn-request-main/reAdd?id=` + id }) } // 提交客户退货申请主 Excel -export const submitProductreceiptRequestMain = async (id) => { +export const submit = async (id) => { return await request.put({ url: `/wms/customerreturn-request-main/submit?id=` + id }) } // 审批通过客户退货申请主 Excel -export const agreeProductreceiptRequestMain = async (id) => { +export const agree = async (id) => { return await request.put({ url: `/wms/customerreturn-request-main/agree?id=` + id }) } // 审批驳回客户退货申请主 Excel -export const refusedProductreceiptRequestMain = async (id) => { +export const refused = async (id) => { return await request.put({ url: `/wms/customerreturn-request-main/refused?id=` + id }) } // 处理驳回客户退货申请主 Excel -export const handleProductreceiptRequestMain = async (id) => { +export const handle = async (id) => { return await request.put({ url: `/wms/customerreturn-request-main/handle?id=` + id }) } \ No newline at end of file diff --git a/src/api/wms/customersettleRequestMain/index.ts b/src/api/wms/customersettleRequestMain/index.ts index 34cd74875..5b9a042e4 100644 --- a/src/api/wms/customersettleRequestMain/index.ts +++ b/src/api/wms/customersettleRequestMain/index.ts @@ -63,4 +63,34 @@ export const exportCustomersettleRequestMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/customersettle-request-main/get-import-template' }) +} + +// 关闭 +export const close = (id) => { + return request.put({ url: '/wms/customersettle-request-main/close?id=' + id }) +} + +// 重新添加 +export const reAdd = (id) => { + return request.put({ url: '/wms/customersettle-request-main/reAdd?id=' + id }) +} + +// 提交审批 +export const submit = (id) => { + return request.put({ url: '/wms/customersettle-request-main/submit?id=' + id }) +} + +// 驳回 +export const refused = (id) => { + return request.put({ url: '/wms/customersettle-request-main/refused?id=' + id }) +} + +// 审批通过 +export const agree = (id) => { + return request.put({ url: '/wms/customersettle-request-main/agree?id=' + id }) +} + +// 处理 +export const handle = (id) => { + return request.put({ url: '/wms/customersettle-request-main/handle?id=' + id }) } \ No newline at end of file diff --git a/src/api/wms/deliverJobMain/index.ts b/src/api/wms/deliverJobMain/index.ts index 04d2f938c..a539279c8 100644 --- a/src/api/wms/deliverJobMain/index.ts +++ b/src/api/wms/deliverJobMain/index.ts @@ -94,22 +94,22 @@ export const importTemplate = () => { return request.download({ url: '/wms/deliver-job-main/get-import-template' }) } -// 承接客户退货任务主 Excel -export const submitDeliverJobMain = async (id) => { +// 承接发货任务 Excel +export const acceptDeliverJobMain = async (id) => { return await request.put({ url: `/wms/deliver-job-main/accept?id=` + id }) } -// 取消承接客户退货任务主 Excel -export const agreeDeliverJobMain = async (id) => { +// 取消承接发货任务 Excel +export const abandonDeliverJobMain = async (id) => { return await request.put({ url: `/wms/deliver-job-main/abandon?id=` + id }) } -// 取消客户退货任务主 Excel -export const refusedDeliverJobMain = async (id) => { +// 关闭发货任务主 Excel +export const closeDeliverJobMain = async (id) => { return await request.put({ url: `/wms/deliver-job-main/close?id=` + id }) } -// 执行客户退货任务主 +// 执行发货任务主 export const executeDeliverJobMain = async (data: DeliverJobMainVO) => { return await request.put({ url: `/wms/deliver-job-main/execute`, data }) } \ No newline at end of file diff --git a/src/api/wms/deliverRequestMain/index.ts b/src/api/wms/deliverRequestMain/index.ts index 5beecf02e..47ae568e6 100644 --- a/src/api/wms/deliverRequestMain/index.ts +++ b/src/api/wms/deliverRequestMain/index.ts @@ -71,4 +71,33 @@ export const exportDeliverRequestMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/deliver-request-main/get-import-template' }) +} +// 关闭 +export const close = (id) => { + return request.put({ url: '/wms/deliver-request-main/close?id=' + id }) +} + +// 重新添加 +export const reAdd = (id) => { + return request.put({ url: '/wms/deliver-request-main/reAdd?id=' + id }) +} + +// 提交审批 +export const submit = (id) => { + return request.put({ url: '/wms/deliver-request-main/submit?id=' + id }) +} + +// 驳回 +export const refused = (id) => { + return request.put({ url: '/wms/deliver-request-main/refused?id=' + id }) +} + +// 审批通过 +export const agree = (id) => { + return request.put({ url: '/wms/deliver-request-main/agree?id=' + id }) +} + +// 处理 +export const handle = (id) => { + return request.put({ url: '/wms/deliver-request-main/handle?id=' + id }) } \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index c01a86a85..732c3b615 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -219,16 +219,51 @@ const butttondata = (row) => { // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainClose') { // 关闭 - console.log('列表-操作按钮事件-关闭') - } else if (val == 'mainReAdd') { // 重新添加 - console.log('列表-操作按钮事件-重新添加') + await message.confirm('确认要关闭吗？') + CustomerreturnRequestMainApi.close(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainReAdd') { // 重新添加 + await message.confirm('确认要重新添加吗？') + CustomerreturnRequestMainApi.reAdd(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainSubmit') { // 提交审批 - console.log('列表-操作按钮事件-提交审批') + await message.confirm('确认要提交审批吗？') + CustomerreturnRequestMainApi.submit(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainTurnDown') { // 驳回 - console.log('列表-操作按钮事件-驳回') + await message.confirm('确认要重新添加吗？') + CustomerreturnRequestMainApi.refused(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainApprove') { // 审批通过 - console.log('列表-操作按钮事件-审批通过') - } else if (val == 'edit') { // 编辑 + CustomerreturnRequestMainApi.agree(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) + } else if (val == 'mainHandle') { // 处理 + CustomerreturnRequestMainApi.handle(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue index 2c2af5e95..9bd481c89 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue @@ -189,13 +189,13 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:customersettle-request-main:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:customersettle-request-main:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customersettle-request-main:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:customersettle-request-main:reAdd'}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customersettle-request-main:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customersettle-request-main:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customersettle-request-main:agree'}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:customersettle-request-main:handle'}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customersettle-request-main:update'}), // 编辑 ] } @@ -204,16 +204,51 @@ const butttondata = (row) => { // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainClose') { // 关闭 - console.log('列表-操作按钮事件-关闭') - } else if (val == 'mainReAdd') { // 重新添加 - console.log('列表-操作按钮事件-重新添加') + await message.confirm('确认要关闭吗？') + CustomersettleRequestMainApi.close(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainReAdd') { // 重新添加 + await message.confirm('确认要重新添加吗？') + CustomersettleRequestMainApi.reAdd(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainSubmit') { // 提交审批 - console.log('列表-操作按钮事件-提交审批') + await message.confirm('确认要提交审批吗？') + CustomersettleRequestMainApi.submit(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainTurnDown') { // 驳回 - console.log('列表-操作按钮事件-驳回') + await message.confirm('确认要重新添加吗？') + CustomersettleRequestMainApi.refused(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainApprove') { // 审批通过 - console.log('列表-操作按钮事件-审批通过') - } else if (val == 'edit') { // 编辑 + CustomersettleRequestMainApi.agree(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) + } else if (val == 'mainHandle') { // 处理 + CustomersettleRequestMainApi.handle(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue index e26ce7c3b..2f9bdab4b 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue @@ -183,75 +183,77 @@ const butttondata = (row) => { // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { - if (val == 'mainJobExe') { // 执行 - let aaa = { - "id": "1809190002130023642", - "requestNumber": "REQ1720231128-0001", - "deliverPlanNumber": "REQ0120231116-0001", - "customerDeliverNumber": null, - "customerCode": "customer01", - "customerDockCode": "测试", - "deliverDock": null, - "carrierCode": "cys-001", - "transferMode": "", - "vehiclePlateNumber": "", - "fromWarehouseCode": null, - "toWarehouseCode": null, - "requestTime": 1701137233000, - "requestDueTime": 0, - "status": "2", - "expiredTime": null, - "updateTime": 1701137233000, - "updater": "1", - "jobStageStatus": null, - "priority": null, - "priorityincrement": null, - "departmentCode": "研发部门", - "acceptUserId": null, - "acceptTime": null, - "completeUserId": "1", - "completeTime": 1701137339000, - "fromLocationTypes": "FG", - "toLocationTypes": "CUST", - "number": "JOB2420231128-0001", - "businessType": "DeliverJob", - "remark": "", - "createTime": 1701137233000, - "creator": "1", - "ruleUserId": null, - "fromAreaCodes": "采购在途库", - "toAreaCodes": "采购在途库", - "fromDockCode": null, - "autoComplete": "FALSE", - "allowModifyLocation": "TRUE", - "allowModifyQty": "TRUE", - "allowBiggerQty": "TRUE", - "allowSmallerQty": "TRUE", - "allowModifyInventoryStatus": "TRUE", - "allowContinuousScanning": "TRUE", - "allowPartialComplete": "TRUE", - "allowModifyBatch": "FALSE", - "allowModifyPackingNumber": "FALSE", - "subList": [{ - "id": "1809190001245559365", - "soNumber": "222", - "soLine": "1", - "packingNumber": "PN20230112300001", - "batch": "20231123", - "inventoryStatus": null, - "ownerCode": null, - "containerNumber": null, - "fromLocationCode": "INSPECT", - "toLocationCode": null, - "itemCode": "THILDD0A701AG", - "itemName": "HL后雾灯（新）-右\r\n", - "itemDesc1": "HL后雾灯（新）-右\r\n", - "itemDesc2": "", - "projectCode": "P0001", - "qty": 1, - "uom": "EA", - "number": "JOB2420231128-0001", - "remark": "", +  if (val == 'mainJobExe') { // 执行 +    let aaa = { +    "id": "1809190002130023675", +    "requestNumber": "REQ1720231201-0002", +    "deliverPlanNumber": "DP20231130-0001", +    "customerDeliverNumber": null, +    "customerCode": "CF", +    "customerDockCode": "CFCKYT", +    "deliverDock": null, +    "carrierCode": "cys-001", +    "transferMode": "", +    "vehiclePlateNumber": "", +    "fromWarehouseCode": null, +    "toWarehouseCode": "CFCK", +    "requestTime": 1701420156000, +    "requestDueTime": 0, +    "status": "1", +    "expiredTime": null, +    "updateTime": 1701420722000, +    "updater": "1", +    "jobStageStatus": null, +    "priority": null, +    "priorityincrement": null, +    "departmentCode": "研发部门", +    "acceptUserId": null, +    "acceptTime": null, +    "completeUserId": null, +    "completeTime": null, +    "fromLocationTypes": "FG", +    "toLocationTypes": "CUST", +    "number": "JOB2420231201-0018", +    "businessType": "DeliverJob", +    "remark": "测试用的！！！！！！", +    "createTime": 1701420722000, +    "creator": "1", +    "ruleUserId": null, +    "fromAreaCodes": "采购在途库", +    "toAreaCodes": "采购在途库", +    "fromDockCode": null, +    "autoComplete": "FALSE", +    "allowModifyLocation": "FALSE", +    "allowModifyQty": "TRUE", +    "allowBiggerQty": "TRUE", +    "allowSmallerQty": "TRUE", +    "allowModifyInventoryStatus": "TRUE", +    "allowContinuousScanning": "TRUE", +    "allowPartialComplete": "TRUE", +    "allowModifyBatch": "FALSE", +    "allowModifyPackingNumber": "FALSE", +    "inInventoryStatuses": "OK", +    "outInventoryStatuses": "OK", +    "subList": [{ +      "id": "1809190001245559376", +    "soNumber": "", +    "soLine": "", +    "packingNumber": null, +    "batch": "20231130", +    "inventoryStatus": "OK", +    "ownerCode": null, +    "containerNumber": null, +    "fromLocationCode": "Loc_testCF", +    "toLocationCode": "CUST", +    "itemCode": "testCF", +    "itemName": "陈放测试物品", +    "itemDesc1": "测试用", +    "itemDesc2": "测试用", +    "projectCode": "5", +    "qty": 1, +    "uom": "EA", +    "number": "JOB2420231201-0018", +    "remark": "", "createTime": 1701137234000, "creator": "1", "toPackingNumber": null, @@ -259,7 +261,7 @@ const buttonTableClick = async (val, row) => { "toBatch": null, "handleQty": null, "toInventoryStatus": null, - recordLst: [{ + recordList: [{ handleQty: 10, toPackingNumber: '12', toContainerNumber: '001', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 16a592699..7865509f9 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -184,13 +184,14 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过 - defaultButtons.mainListEditBtn({hasPermi:'wms:deliver-request-main:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:deliver-request-main:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:deliver-request-main:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:deliver-request-main:reAdd'}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-request-main:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-request-main:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:deliver-request-main:agree'}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:deliver-request-main:handle'}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:deliver-request-main:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:deliver-request-main:delete'}), // 删除 ] } @@ -199,16 +200,54 @@ const butttondata = (row) => { // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainClose') { // 关闭 - console.log('列表-操作按钮事件-关闭') + await message.confirm('确认要关闭吗？') + DeliverRequestMainApi.close(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainReAdd') { // 重新添加 - console.log('列表-操作按钮事件-重新添加') + await message.confirm('确认要重新添加吗？') + DeliverRequestMainApi.reAdd(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainSubmit') { // 提交审批 - console.log('列表-操作按钮事件-提交审批') + await message.confirm('确认要重新添加吗？') + DeliverRequestMainApi.submit(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainTurnDown') { // 驳回 - console.log('列表-操作按钮事件-驳回') + await message.confirm('确认要重新添加吗？') + DeliverRequestMainApi.refused(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainApprove') { // 审批通过 - console.log('列表-操作按钮事件-审批通过') - } else if (val == 'edit') { // 编辑 + await message.confirm('确认要审批通过吗？') + DeliverRequestMainApi.agree(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) + } else if (val == 'mainHandle') { // 处理 + await message.confirm('确认要 处理吗？') + DeliverRequestMainApi.handle(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) + } else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index 4593ed317..672bbf825 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -272,8 +272,8 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ searchListPlaceholder: '请选择销售订单号', searchField: 'number', searchTitle: '销售订单信息', - searchAllSchemas: SaleMain.allSchemas, - searchPage: SaleMainApi.getSaleMainPage, + searchAllSchemas: SaleDetail.allSchemas, + searchPage: SaleDetailApi.getSaleDetailPage, searchCondition: [{ key: 'available', value: 'TRUE', @@ -283,12 +283,12 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { - isInpuFocusShow: true, + isSearchList: true, searchListPlaceholder: '请选择销售订单号', searchField: 'number', searchTitle: '销售订单信息', - searchAllSchemas: SaleMain.allSchemas, - searchPage: SaleMainApi.getSaleMainPage, + searchAllSchemas: SaleDetail.allSchemas, + searchPage: SaleDetailApi.getSaleDetailPage, searchCondition: [{ key: 'available', value: 'TRUE', @@ -304,33 +304,12 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择销售订单行', - searchField: 'lineNumber', - searchTitle: '销售订单信息', - searchAllSchemas: SaleDetail.allSchemas, - searchPage: SaleDetailApi.getSaleDetailPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] + tableForm: { + disabled: true }, form: { - // labelMessage: '信息提示说明！！！', componentProps: { - isInpuFocusShow: true, - searchListPlaceholder: '请选择销售订单行', - searchField: 'lineNumber', - searchTitle: '销售订单信息', - searchAllSchemas: SaleDetail.allSchemas, - searchPage: SaleDetailApi.getSaleDetailPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] + disabled: true } } }, @@ -389,7 +368,6 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ }] }, form: { - // labelMessage: '信息提示说明！！！', componentProps: { isInpuFocusShow: true, searchListPlaceholder: '请选择物品代码', @@ -561,7 +539,7 @@ export const DeliverPlanDetailRules = reactive({ planQty: [ { required: true, message: '请输入计划数量', trigger: 'blur' } ], - soNumber: [ - { required: true, message: '请选择销售订单号', trigger: 'change' } - ], + // soNumber: [ + // { required: true, message: '请选择销售订单号', trigger: 'change' } + // ], }) \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index c344e9c91..7e64e22ee 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -116,6 +116,11 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] + // setV['soLine'] = val[0]['lineNumber'] + // setV['lineNumber'] = val[0]['lineNumber'] + // setV['itemCode'] = val[0]['itemCode'] + // setV['remark'] = val[0]['remark'] + // setV['uom'] = val[0]['uom'] formRef.setValues(setV) }) } From 29e53a8811d6fddbd70863b30565bf481c8a3087 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Dec 2023 08:48:19 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E7=9B=98=E7=82=B9=EF=BC=8C=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/purchasereceiptRecordMain/index.ts | 7 ++++++- src/components/TableForm/src/TableForm.vue | 2 +- src/utils/dict.ts | 1 + .../purchasereceiptJobMain/purchasereceiptJobMain.data.ts | 4 ++-- .../purchasereceipt/purchasereceiptRecordMain/index.vue | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/api/wms/purchasereceiptRecordMain/index.ts b/src/api/wms/purchasereceiptRecordMain/index.ts index ea0c4c832..7c61327e9 100644 --- a/src/api/wms/purchasereceiptRecordMain/index.ts +++ b/src/api/wms/purchasereceiptRecordMain/index.ts @@ -66,7 +66,12 @@ export const deletePurchasereceiptRecordMain = async (id: number) => { // 导出采购收货记录主 Excel export const exportPurchasereceiptRecordMain = async (params) => { - return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-record-main/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/purchasereceipt-record-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 93e8260b4..f194382c8 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -112,7 +112,7 @@ :allow-create="headerItem?.tableForm.allowCreate" style="width: 100%" :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label" - @change="formSelectChange(row[headerItem.field], $event)"> + @change="formSelectChange(headerItem.field, $event)"> ([ }, { label: '承接人', - field: 'acceptUserId', + field: 'acceptUserName', sort: 'custom', table: { width: 150 @@ -247,7 +247,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ }, { label: '完成人', - field: 'completeUserId', + field: 'completeUserName', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 6b9f776c5..add12c4f8 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -138,7 +138,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(setSearchParams) + const data = await PurchasereceiptRecordMainApi.exportPurchasereceiptRecordMain(tableObject.params) download.excel(data, '采购收货记录主.xlsx') } catch { } finally { From 5bc86701a011cebc093fd337b51883c551fab8b0 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 4 Dec 2023 17:01:08 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E6=88=90=E5=93=81=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7/=E4=BB=BB=E5=8A=A1/=E8=AE=B0=E5=BD=95=20=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=8F=B7?= =?UTF-8?q?/=E8=A1=8C=20=20=20=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverJobMain/deliverJobMain.data.ts | 38 ++--- .../deliverRecordMain.data.ts | 38 ++--- .../deliverRequestMain.data.ts | 148 +++++++++--------- 3 files changed, 112 insertions(+), 112 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts index 1e0521c4c..469507c22 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts @@ -666,22 +666,22 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '销售订单号', - field: 'soNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '销售订单行', - field: 'soLine', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '销售订单号', + // field: 'soNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '销售订单行', + // field: 'soLine', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '物品代码', field: 'itemCode', @@ -843,9 +843,9 @@ export const DeliverJobDetail = useCrudSchemas(reactive([ //表单校验 export const DeliverJobDetailRules = reactive({ - soNumber: [ - { required: true, message: '请选择销售订单号', trigger: 'change' } - ], + // soNumber: [ + // { required: true, message: '请选择销售订单号', trigger: 'change' } + // ], packingNumber: [ { required: true, message: '请选择包装号', trigger: 'change' } ], diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index 760683832..a47595ebd 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -413,22 +413,22 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '销售订单号', - field: 'soNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '销售订单行', - field: 'soLine', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '销售订单号', + // field: 'soNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '销售订单行', + // field: 'soLine', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '物品代码', field: 'itemCode', @@ -687,9 +687,9 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ //表单校验 export const DeliverRecordDetailRules = reactive({ - soNumber: [ - { required: true, message: '请选择销售订单号', trigger: 'change' } - ], + // soNumber: [ + // { required: true, message: '请选择销售订单号', trigger: 'change' } + // ], packingNumber: [ { required: true, message: '请选择包装号', trigger: 'change' } ], diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index ab0973b28..9ce8b17b5 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -563,80 +563,80 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ } } }, - { - label: '销售订单号', - field: 'soNumber', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择销售订单号', - searchField: 'number', - searchTitle: '销售订单信息', - searchAllSchemas: SaleMain.allSchemas, - searchPage: SaleMainApi.getSaleMainPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择销售订单号', - searchField: 'number', - searchTitle: '销售订单信息', - searchAllSchemas: SaleMain.allSchemas, - searchPage: SaleMainApi.getSaleMainPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - } - }, - { - label: '销售订单行', - field: 'soLine', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择销售订单行', - searchField: 'lineNumber', - searchTitle: '销售订单信息', - searchAllSchemas: SaleDetail.allSchemas, - searchPage: SaleDetailApi.getSaleDetailPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择销售订单行', - searchField: 'lineNumber', - searchTitle: '销售订单信息', - searchAllSchemas: SaleDetail.allSchemas, - searchPage: SaleDetailApi.getSaleDetailPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - } - }, + // { + // label: '销售订单号', + // field: 'soNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择销售订单号', + // searchField: 'number', + // searchTitle: '销售订单信息', + // searchAllSchemas: SaleMain.allSchemas, + // searchPage: SaleMainApi.getSaleMainPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }] + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, + // searchListPlaceholder: '请选择销售订单号', + // searchField: 'number', + // searchTitle: '销售订单信息', + // searchAllSchemas: SaleMain.allSchemas, + // searchPage: SaleMainApi.getSaleMainPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }] + // } + // } + // }, + // { + // label: '销售订单行', + // field: 'soLine', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择销售订单行', + // searchField: 'lineNumber', + // searchTitle: '销售订单信息', + // searchAllSchemas: SaleDetail.allSchemas, + // searchPage: SaleDetailApi.getSaleDetailPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }] + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, + // searchListPlaceholder: '请选择销售订单行', + // searchField: 'lineNumber', + // searchTitle: '销售订单信息', + // searchAllSchemas: SaleDetail.allSchemas, + // searchPage: SaleDetailApi.getSaleDetailPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }] + // } + // } + // }, { label: '物品代码', field: 'itemCode', From 8a0426afd5a484bcf1f8da9b024597fc4537ff6f Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 4 Dec 2023 17:11:03 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E7=94=B1=E4=BA=8E=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=BB=9E=E5=90=8E=EF=BC=8C=E7=8E=B0=E5=B0=86?= =?UTF-8?q?"=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=86=85=E6=89=80=E6=9C=89=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=8F=B7/=E8=A1=8C=20=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=9A=90=E8=97=8F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreceiptRecordMain.data.ts | 38 ++--- .../customerreceiptRequestMain.data.ts | 36 ++-- .../customerreturnJobMain.data.ts | 38 ++--- .../customerreturnRecordMain.data.ts | 38 ++--- .../customerreturnRequestMain.data.ts | 154 +++++++++--------- .../customersettleRequestMain.data.ts | 92 +++++------ 6 files changed, 198 insertions(+), 198 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts index ff8e7a8f7..960f0268d 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts @@ -396,22 +396,22 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive width: 150 }, }, - { - label: '销售订单号', - field: 'soNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '销售订单行', - field: 'soLine', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '销售订单号', + // field: 'soNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '销售订单行', + // field: 'soLine', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '物品代码', field: 'itemCode', @@ -694,9 +694,9 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive //表单校验 export const CustomerreceiptRecordDetailRules = reactive({ - soNumber: [ - { required: true, message: '请选择销售订单号', trigger: 'blur' } - ], + // soNumber: [ + // { required: true, message: '请选择销售订单号', trigger: 'blur' } + // ], fromPackingNumber: [ { required: true, message: '请选择从包装号', trigger: 'blur' } ], diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts index ab8ee6664..e643e4d0e 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts @@ -461,24 +461,24 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '销售订单号', - field: 'soNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '销售订单行', - field: 'soLine', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '销售订单号', + // field: 'soNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '销售订单行', + // field: 'soLine', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '物品代码', field: 'itemCode', @@ -847,9 +847,9 @@ export const CustomerreturnJobDetail = useCrudSchemas(reactive([ //表单校验 export const CustomerreturnJobDetailRules = reactive({ - soNumber: [ - { required: true, message: '请选择销售订单号', trigger: 'change' } - ], + // soNumber: [ + // { required: true, message: '请选择销售订单号', trigger: 'change' } + // ], packingNumber: [ { required: true, message: '请选择包装号', trigger: 'change' } ], diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts index 5b750ec96..0970331ed 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts @@ -416,22 +416,22 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( width: 150 }, }, - { - label: '销售订单号', - field: 'soNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '销售订单行', - field: 'soLine', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '销售订单号', + // field: 'soNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '销售订单行', + // field: 'soLine', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '物品代码', field: 'itemCode', @@ -714,9 +714,9 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( //表单校验 export const CustomerreturnRecordDetailRules = reactive({ - soNumber: [ - { required: true, message: '请选择销售订单号', trigger: 'change' } - ], + // soNumber: [ + // { required: true, message: '请选择销售订单号', trigger: 'change' } + // ], fromPackingNumber: [ { required: true, message: '请选择从包装号', trigger: 'change' } ], diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index b8e44fea6..ba5f13d91 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -505,80 +505,80 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive } } }, - { - label: '销售订单号', - field: 'soNumber', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择销售订单号', - searchField: 'number', - searchTitle: '销售订单信息', - searchAllSchemas: SaleMain.allSchemas, - searchPage: SaleMainApi.getSaleMainPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择销售订单号', - searchField: 'number', - searchTitle: '销售订单信息', - searchAllSchemas: SaleMain.allSchemas, - searchPage: SaleMainApi.getSaleMainPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - } - }, - { - label: '销售订单行', - field: 'soLine', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择销售订单行', - searchField: 'lineNumber', - searchTitle: '销售订单信息', - searchAllSchemas: SaleDetail.allSchemas, - searchPage: SaleDetailApi.getSaleDetailPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择销售订单行', - searchField: 'lineNumber', - searchTitle: '销售订单信息', - searchAllSchemas: SaleDetail.allSchemas, - searchPage: SaleDetailApi.getSaleDetailPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - } - }, + // { + // label: '销售订单号', + // field: 'soNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择销售订单号', + // searchField: 'number', + // searchTitle: '销售订单信息', + // searchAllSchemas: SaleMain.allSchemas, + // searchPage: SaleMainApi.getSaleMainPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }] + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, + // searchListPlaceholder: '请选择销售订单号', + // searchField: 'number', + // searchTitle: '销售订单信息', + // searchAllSchemas: SaleMain.allSchemas, + // searchPage: SaleMainApi.getSaleMainPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }] + // } + // } + // }, + // { + // label: '销售订单行', + // field: 'soLine', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择销售订单行', + // searchField: 'lineNumber', + // searchTitle: '销售订单信息', + // searchAllSchemas: SaleDetail.allSchemas, + // searchPage: SaleDetailApi.getSaleDetailPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }] + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, + // searchListPlaceholder: '请选择销售订单行', + // searchField: 'lineNumber', + // searchTitle: '销售订单信息', + // searchAllSchemas: SaleDetail.allSchemas, + // searchPage: SaleDetailApi.getSaleDetailPage, + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // isMainValue: false + // }] + // } + // } + // }, { label: '物品代码', field: 'itemCode', @@ -911,9 +911,9 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive //表单校验 export const CustomerreturnRequestDetailRules = reactive({ - soNumber: [ - { required: true, message: '请选择销售订单号', trigger: 'change' } - ], + // soNumber: [ + // { required: true, message: '请选择销售订单号', trigger: 'change' } + // ], // packingNumber: [ // { required: true, message: '请选择包装号', trigger: 'change' } // ], diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts index 7f18d28e9..8d3a84cf7 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts @@ -418,49 +418,49 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive } } }, - { - label: '销售订单号', - field: 'soNumber', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择销售订单号', - searchField: 'soNumber', - searchTitle: '发货记录信息', - searchAllSchemas: DeliverRecordDetail.allSchemas, - searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择销售订单号', - searchField: 'soNumber', - searchTitle: '发货记录信息', - searchAllSchemas: DeliverRecordDetail.allSchemas, - searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage - } - } - }, - { - label: '销售订单行', - field: 'soLine', - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, + // { + // label: '销售订单号', + // field: 'soNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm:{ + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择销售订单号', + // searchField: 'soNumber', + // searchTitle: '发货记录信息', + // searchAllSchemas: DeliverRecordDetail.allSchemas, + // searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage + // }, + // form: { + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // isSearchList: true, + // searchListPlaceholder: '请选择销售订单号', + // searchField: 'soNumber', + // searchTitle: '发货记录信息', + // searchAllSchemas: DeliverRecordDetail.allSchemas, + // searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage + // } + // } + // }, + // { + // label: '销售订单行', + // field: 'soLine', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm: { + // disabled: true + // }, + // form: { + // componentProps: { + // disabled: true + // } + // } + // }, { label: '物品代码', field: 'itemCode', @@ -713,9 +713,9 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive //表单校验 export const CustomersettleRequestDetailRules = reactive({ - soNumber: [ - { required: true, message: '请选择销售订单号', trigger: 'change' } - ], + // soNumber: [ + // { required: true, message: '请选择销售订单号', trigger: 'change' } + // ], // packingNumber: [ // { required: true, message: '请选择包装号', trigger: 'change' } // ], From 4823f9731d9203feb406a2a9762df33d59da79f5 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Dec 2023 17:23:42 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=AD=90=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/itembasic/index.ts | 5 +- src/api/wms/owner/index.ts | 5 +- src/components/BasicForm/src/BasicForm.vue | 9 +- src/components/TableForm/src/TableForm.vue | 38 +- .../count/countPlanMain/countPlanMain.data.ts | 351 +++++++++-------- .../countManage/count/countPlanMain/index.vue | 370 +++++++++++++----- 6 files changed, 514 insertions(+), 264 deletions(-) diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts index 64b06710f..1575fd5c7 100644 --- a/src/api/wms/itembasic/index.ts +++ b/src/api/wms/itembasic/index.ts @@ -38,7 +38,10 @@ export const getItembasicPage = async (params) => { return await request.get({ url: `/wms/itembasic/page`, params }) } } - +// 查询物品基本信息列表 +export const getItembasicList = async (params) => { + return await request.get({ url: `/wms/itembasic/list`, params }) +} // 查询物品基本信息详情 export const getItembasic = async (id: number) => { return await request.get({ url: `/wms/itembasic/get?id=` + id }) diff --git a/src/api/wms/owner/index.ts b/src/api/wms/owner/index.ts index 9c4260ea0..64ccb4470 100644 --- a/src/api/wms/owner/index.ts +++ b/src/api/wms/owner/index.ts @@ -31,7 +31,10 @@ export const getOwnerPage = async (params) => { return await request.get({ url: `/wms/owner/page`, params }) } } - +// 查询所有货主列表 +export const getOwnerList = async (params) => { + return await request.get({ url: `/wms/owner/list`, params }) +} // 查询货主详情 export const getOwner = async (id: number) => { return await request.get({ url: `/wms/owner/get?id=` + id }) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 4dc22efb4..01f94218b 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -35,6 +35,7 @@ @tableSelectionChange="tableSelectionChange" @extendedButtonsClick="extendedButtonsClick" @formSelectChange="formSelectChange" + @formSelectvVisibleChange = 'formSelectvVisibleChange' @tableSortChange="tableSortChange" @selectCallback="selectCallback" @handleTableSelect="handleTableSelect" @@ -337,6 +338,7 @@ const emit = defineEmits([ 'tableSelectionChange', 'extendedButtonsClick', 'formSelectChange', + 'formSelectvVisibleChange', 'tableSortChange', 'selectCallback', 'handleTableSelect', @@ -349,8 +351,11 @@ const emit = defineEmits([ 'selectChange' ]) //普通下拉改变事件 -const formSelectChange = (field, val) => { - emit('formSelectChange', field, val) +const formSelectChange = (field, val,row) => { + emit('formSelectChange', field, val,row) +} +const formSelectvVisibleChange = (field, val,row) => { + emit('formSelectvVisibleChange', field, val,row) } // 点击selection框 const tableSelectionChange = (val) => { diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index f194382c8..b729e12c0 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -97,7 +97,7 @@ + @change="formSelectChange(headerItem.field, $event,row)" + @visible-change="formSelectvVisibleChange(headerItem.field, $event,row)"> + { return item.dictType ? getStrDictOptions(item.dictType) : item.tableForm.initOptions } //普通下拉改变事件 -const formSelectChange = (field, val) => { - emit('formSelectChange', field, val) +const formSelectChange = (field, val,row) => { + emit('formSelectChange', field, val,row) +} +const formSelectvVisibleChange = (field, val,row) => { + emit('formSelectvVisibleChange', field, val,row) } // 点击selection框 const tableSelectionChange = (val) => { diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 69a2b2eb5..92dd2e5d5 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -434,179 +434,222 @@ export const CountPlanMainRules = reactive({ /** * @returns {Array} 盘点计划子表 */ +// export const CountPlanDetail = useCrudSchemas(([ +// { +// label: '盘点范围类型', +// field: 'type', +// dictType: DICT_TYPE.COUNT_TYPE, +// dictClass: 'string', +// isTable: true, +// sort: 'custom', +// table: { +// width: 150 +// }, +// tableForm: { +// type: 'Select' +// } +// }, +// { +// label: '盘点范围值', +// field: 'value', +// sort: 'custom', +// table: { +// width: 150 +// }, +// }, +// { +// label: '单据号', +// field: 'number', +// sort: 'custom', +// table: { +// width: 150, +// }, +// isTableForm: false, +// form: { +// componentProps: { +// disabled: true +// } +// } +// }, +// { +// label: '物品代码', +// field: 'itemCode', +// sort: 'custom', +// table: { +// width: 150 +// }, +// }, +// { +// label: '备注', +// field: 'remark', +// sort: 'custom', +// table: { +// width: 150 +// }, +// }, +// { +// label: '创建者', +// field: 'creator', +// sort: 'custom', +// table: { +// width: 150 +// }, +// isTableForm: false, +// isForm: false, +// }, +// { +// label: '创建时间', +// field: 'createTime', +// formatter: dateFormatter, +// detail: { +// dateFormat: 'YYYY-MM-DD HH:mm:ss' +// }, +// sort: 'custom', +// table: { +// width: 180 +// }, +// form: { +// component: 'DatePicker', +// componentProps: { +// style: {width:'100%'}, +// type: 'datetime', +// dateFormat: 'YYYY-MM-DD HH:mm:ss', +// valueFormat: 'x', +// } +// }, +// isTableForm: false, +// isForm: false, +// }, +// { +// label: '最后更新时间', +// field: 'updateTime', +// formatter: dateFormatter, +// detail: { +// dateFormat: 'YYYY-MM-DD HH:mm:ss' +// }, +// sort: 'custom', +// table: { +// width: 180 +// }, +// form: { +// component: 'DatePicker', +// componentProps: { +// style: {width:'100%'}, +// type: 'datetime', +// dateFormat: 'YYYY-MM-DD HH:mm:ss', +// valueFormat: 'x', +// } +// }, +// isTableForm: false, +// isForm: false, +// }, +// { +// label: '最后更新者', +// field: 'updater', +// sort: 'custom', +// table: { +// width: 150 +// }, +// isTableForm: false, +// isForm: false, +// }, +// { +// label: '计划数量', +// field: 'planQty', +// sort: 'custom', +// table: { +// width: 150 +// }, +// form: { +// component: 'InputNumber', +// componentProps: { +// min: 1, +// precision: 6 +// } +// }, +// tableForm: { +// type: 'InputNumber', +// min: 1, +// precision: 6 +// } +// }, +// { +// label: '计量单位', +// field: 'uom', +// dictType: DICT_TYPE.UOM, +// dictClass: 'string', +// isTable: true, +// sort: 'custom', +// table: { +// width: 150 +// }, +// tableForm: { +// type: 'Select' +// } +// }, +// { +// label: '是否可用', +// field: 'available', +// dictType: DICT_TYPE.TRUE_FALSE, +// dictClass: 'string', +// isTable: true, +// form: { +// component: 'Switch', +// value: 'TRUE', +// componentProps: { +// inactiveValue: 'FALSE', +// activeValue: 'TRUE' +// } +// }, +// sort: 'custom', +// table: { +// width: 150 +// }, +// tableForm: { +// type: 'Select' +// } +// }, +// { +// label: '操作', +// field: 'action', +// isDetail: false, +// isForm: false , +// table: { +// width: 150, +// fixed: 'right' +// }, +// isTableForm:false, +// } +// ])) + +//表单校验 export const CountPlanDetail = useCrudSchemas(([ { label: '盘点范围类型', field: 'type', - dictType: DICT_TYPE.COUNT_TYPE, + dictType: DICT_TYPE.COUNT_SCOPE_TYPE, dictClass: 'string', isTable: true, sort: 'custom', table: { - width: 150 + width: 300 }, tableForm: { - type: 'Select' + type: 'Select', + width: '300' } }, { label: '盘点范围值', field: 'value', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150, - }, - isTableForm: false, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物品代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isTableForm: false, - isForm: false, - }, - { - label: '最后更新时间', - field: 'updateTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isTableForm: false, - isForm: false, - }, - { - label: '最后更新者', - field: 'updater', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '计划数量', - field: 'planQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - componentProps: { - min: 1, - precision: 6 - } - }, - tableForm: { - type: 'InputNumber', - min: 1, - precision: 6 - } - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - type: 'Select' - } - }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', isTable: true, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, sort: 'custom', table: { - width: 150 + width: 300 }, tableForm: { - type: 'Select' + type: 'InputString', + width: '300', } }, { @@ -621,8 +664,6 @@ export const CountPlanDetail = useCrudSchemas(([ isTableForm:false, } ])) - -//表单校验 export const CountPlanDetailRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index 347151989..ab9350ad8 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -37,7 +37,10 @@ @@ -53,13 +56,13 @@ :tableData="tableData" :apiUpdate="CountPlanMainApi.updateCountPlanMain" :apiCreate="CountPlanMainApi.createCountPlanMain" - :isBusiness="false" fromeWhere="countPlan" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" @formSelectChange="formSelectChange" + @formSelectvVisibleChange="formSelectvVisibleChange" @selectChange="selectChange" /> @@ -89,12 +92,26 @@ \ No newline at end of file From 1dcf78a31b83b8b585315078069be0933fa1da3c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 5 Dec 2023 08:25:43 +0800 Subject: [PATCH 07/13] =?UTF-8?q?tableForm=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableForm/src/TableForm.vue | 27 +--------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index b729e12c0..527d2ad9e 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -97,31 +97,6 @@ - - - - - + Date: Tue, 5 Dec 2023 10:34:42 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreceiptRequestMain.data.ts | 4 +- .../customerreturnRequestMain.data.ts | 8 + .../deliverJobMain/deliverJobMain.data.ts | 1 + .../deliver/deliverJobMain/index.vue | 148 +++++++++--------- .../deliverRequestMain.data.ts | 5 + .../deliver/deliverRequestMain/index.vue | 1 + 6 files changed, 91 insertions(+), 76 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts index e643e4d0e..33be24a9f 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts @@ -51,8 +51,8 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( } }, { - label: '发货申请单号', - field: 'deliverRequestNumber', + label: '发货记录单号', + field: 'deliverRecordNumber', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index ba5f13d91..74cafcc82 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -3,7 +3,9 @@ import { dateFormatter } from '@/utils/formatTime' import * as getRequestsettingApi from '@/api/wms/requestsetting/index' import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain' +import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain' import { DeliverRecordMain } from '../../deliver/deliverRecordMain/deliverRecordMain.data' +import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data' import * as SaleMainApi from '@/api/wms/saleMain' import * as SaleDetailApi from '@/api/wms/saleDetail' @@ -95,6 +97,12 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isSearch: true, + form: { + componentProps: { + disabled: true + } + } }, { label: '客户代码', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts index 469507c22..953d056e3 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts @@ -87,6 +87,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue index 2f9bdab4b..ee5df0ad5 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue @@ -185,76 +185,76 @@ const butttondata = (row) => { const buttonTableClick = async (val, row) => {  if (val == 'mainJobExe') { // 执行     let aaa = { -    "id": "1809190002130023675", -    "requestNumber": "REQ1720231201-0002", -    "deliverPlanNumber": "DP20231130-0001", -    "customerDeliverNumber": null, -    "customerCode": "CF", -    "customerDockCode": "CFCKYT", -    "deliverDock": null, -    "carrierCode": "cys-001", -    "transferMode": "", -    "vehiclePlateNumber": "", -    "fromWarehouseCode": null, -    "toWarehouseCode": "CFCK", -    "requestTime": 1701420156000, -    "requestDueTime": 0, -    "status": "1", -    "expiredTime": null, -    "updateTime": 1701420722000, -    "updater": "1", -    "jobStageStatus": null, -    "priority": null, -    "priorityincrement": null, -    "departmentCode": "研发部门", -    "acceptUserId": null, -    "acceptTime": null, -    "completeUserId": null, -    "completeTime": null, -    "fromLocationTypes": "FG", -    "toLocationTypes": "CUST", -    "number": "JOB2420231201-0018", -    "businessType": "DeliverJob", -    "remark": "测试用的！！！！！！", -    "createTime": 1701420722000, -    "creator": "1", -    "ruleUserId": null, -    "fromAreaCodes": "采购在途库", -    "toAreaCodes": "采购在途库", -    "fromDockCode": null, -    "autoComplete": "FALSE", -    "allowModifyLocation": "FALSE", -    "allowModifyQty": "TRUE", -    "allowBiggerQty": "TRUE", -    "allowSmallerQty": "TRUE", -    "allowModifyInventoryStatus": "TRUE", -    "allowContinuousScanning": "TRUE", -    "allowPartialComplete": "TRUE", -    "allowModifyBatch": "FALSE", -    "allowModifyPackingNumber": "FALSE", -    "inInventoryStatuses": "OK", -    "outInventoryStatuses": "OK", -    "subList": [{ -      "id": "1809190001245559376", -    "soNumber": "", -    "soLine": "", -    "packingNumber": null, -    "batch": "20231130", -    "inventoryStatus": "OK", -    "ownerCode": null, -    "containerNumber": null, -    "fromLocationCode": "Loc_testCF", -    "toLocationCode": "CUST", -    "itemCode": "testCF", -    "itemName": "陈放测试物品", -    "itemDesc1": "测试用", -    "itemDesc2": "测试用", -    "projectCode": "5", -    "qty": 1, -    "uom": "EA", -    "number": "JOB2420231201-0018", -    "remark": "", - "createTime": 1701137234000, + "id": "1809190002130023676", + "requestNumber": "REQ1720231205-0001", + "deliverPlanNumber": "DP20231205-0002", + "customerDeliverNumber": "CUST20231205-00000001", + "customerCode": "CF", + "customerDockCode": "CFCKYT", + "deliverDock": null, + "carrierCode": "cys-001", + "transferMode": "LOAD", + "vehiclePlateNumber": "车牌号", + "fromWarehouseCode": null, + "toWarehouseCode": "CFCK", + "requestTime": 1701740774000, + "requestDueTime": 1704470400000, + "status": "2", + "expiredTime": null, + "updateTime": 1701740969000, + "updater": "1", + "jobStageStatus": null, + "priority": null, + "priorityincrement": null, + "departmentCode": "研发部门", + "acceptUserId": "1", + "acceptTime": 1701742448000, + "completeUserId": null, + "completeTime": null, + "fromLocationTypes": "FG", + "toLocationTypes": "CUST", + "number": "JOB2420231205-0001", + "businessType": "DeliverJob", + "remark": "主表备注", + "createTime": 1701740969000, + "creator": "1", + "ruleUserId": null, + "fromAreaCodes": "采购在途库", + "toAreaCodes": "采购在途库", + "fromDockCode": null, + "autoComplete": "FALSE", + "allowModifyLocation": "FALSE", + "allowModifyQty": "TRUE", + "allowBiggerQty": "TRUE", + "allowSmallerQty": "TRUE", + "allowModifyInventoryStatus": "TRUE", + "allowContinuousScanning": "TRUE", + "allowPartialComplete": "TRUE", + "allowModifyBatch": "FALSE", + "allowModifyPackingNumber": "FALSE", + "inInventoryStatuses": "OK", + "outInventoryStatuses": "OK", + "subList": [{ + "id": "1809190001245559377", + "soNumber": null, + "soLine": null, + "packingNumber": null, + "batch": "20231130", + "inventoryStatus": "OK", + "ownerCode": null, + "containerNumber": null, + "fromLocationCode": "Loc_testCF", + "toLocationCode": "CUST", + "itemCode": "testCF", + "itemName": "陈放测试物品", + "itemDesc1": "测试用", + "itemDesc2": "测试用", + "projectCode": "5", + "qty": 1, + "uom": "EA", + "number": "JOB2420231205-0001", + "remark": "子表备注", + "createTime": 1701740970000, "creator": "1", "toPackingNumber": null, "toContainerNumber": null, @@ -283,11 +283,11 @@ const buttonTableClick = async (val, row) => { handleHandle(aaa) console.log('列表-操作按钮事件-执行') } else if (val == 'mainJobAba') { // 放弃 - console.log('列表-操作按钮事件-放弃') + DeliverJobMainApi.abandonDeliverJobMain(row.id) } else if (val == 'mainJobClo') { // 关闭 - console.log('列表-操作按钮事件-关闭') - } else if (val == 'mainJobAcc') { // 承接 - console.log('列表-操作按钮事件-承接') + DeliverJobMainApi.closeDeliverJobMain(row.id) + } else if (val == 'mainJobAcc') { // 执行 + DeliverJobMainApi.executeDeliverJobMain(row.id) } } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 9ce8b17b5..7087f3eb8 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -90,6 +90,11 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'status', + value: '6', + isMainValue: false }] } } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 7865509f9..1bdac4a75 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -31,6 +31,7 @@ {{ row.number }} + 关闭 + 生成标签 + 打印 @@ -155,8 +157,6 @@ } else if (val == 'refresh') { // 刷新 getList() } else if (val == 'filtrate') { // 筛选 - } else { // 其他按钮 - console.log('其他按钮', item) } } @@ -173,7 +173,7 @@ const butttondata = (row) => { return [ defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['5']) }), // 打开 - defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1','2','3','4']) }), // 关闭 + defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1', '2', '3', '4']) }), // 关闭 defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批 defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过 defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮 @@ -184,8 +184,6 @@ ] } - - // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainPurPlanOpe') { // 打开 @@ -300,8 +298,6 @@ } catch { } } - - /** 导出按钮操作 */ const exportLoading = ref(false) // 导出的加载中 const handleExport = async () => { @@ -335,8 +331,24 @@ isShow.value = false } + /** 生成标签按钮操作 */ + const genLabel = async () => { + try { + // 生成标签的二次确认 + await message.confirm('是否为此数据生成标签？') + // 发起生成标签 + await SupplierdeliverRequestMainApi.genLabel(genLabelId.value) + dialogVisible.value = false + isShow.value = false + message.success(t('生成标签成功!')) + // 刷新列表 + await getList() + } catch { } + } + const BASE_URL = 'http://dev.ccwin-in.com:25110' const src = ref(BASE_URL + '/jmreport/view/881303562245316608?token=' + getAccessToken()) + const genLabelId=ref(); // 标签打印 const handlePoint = async (row) => { tableObject.params = { @@ -345,6 +357,7 @@ await getDetailList() dialogVisible.value = true dialogTitle.value = row.number + '单据号' + genLabelId.value = row.number } const print = async () => { From 41f9667eecdd288245203799baf634d56c023d36 Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Tue, 5 Dec 2023 17:22:46 +0800 Subject: [PATCH 11/13] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 4c55bfd09..fb672c6b2 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -451,6 +451,7 @@ */ const tableFormKeys = {} SupplierdeliverRequestDetail.allSchemas.tableFormColumns.forEach(item => { + tableFormKeys[item.field] = item.default ? item.default : '' }) const tableData = ref([]) From 35c02b30e93f74196bb234d5e03f17e93d3b5e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 5 Dec 2023 17:44:10 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=20=E6=96=87=E6=A1=A3=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 887 +++++++++--------- 1 file changed, 442 insertions(+), 445 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index fb672c6b2..41d0eed8a 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -13,16 +13,16 @@ -
+ @@ -180,7 +181,13 @@ const props = defineProps({ type: Function, required: false, default: null - } + }, + // 来源 countPlan盘点计划进入 + fromeWhere: { + type: String, + required: false, + default: '' + }, }) const isShowDrawer = ref(false) const detailLoading = ref(false) diff --git a/src/components/DetailCountPlan/index.ts b/src/components/DetailCountPlan/index.ts new file mode 100644 index 000000000..2acd32a21 --- /dev/null +++ b/src/components/DetailCountPlan/index.ts @@ -0,0 +1,3 @@ +import DetailCountPlan from './src/DetailCountPlan.vue' + +export { DetailCountPlan } diff --git a/src/components/DetailCountPlan/src/DetailCountPlan.vue b/src/components/DetailCountPlan/src/DetailCountPlan.vue new file mode 100644 index 000000000..80a59f6e2 --- /dev/null +++ b/src/components/DetailCountPlan/src/DetailCountPlan.vue @@ -0,0 +1,499 @@ + + + + + diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 527d2ad9e..2fbdd83eb 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -112,8 +112,7 @@ :allow-create="headerItem?.tableForm.allowCreate" style="width: 100%" :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label" - @change="formSelectChange(headerItem.field, $event,row)" - @visible-change="formSelectvVisibleChange(headerItem.field, $event,row)"> + @change="formSelectChange(headerItem.field, $event,row)"> { const formSelectChange = (field, val,row) => { emit('formSelectChange', field, val,row) } -const formSelectvVisibleChange = (field, val,row) => { - emit('formSelectvVisibleChange', field, val,row) -} + // 点击selection框 const tableSelectionChange = (val) => { emit('tableSelectionChange', val) @@ -381,6 +377,7 @@ const TableBaseForm_Ref = ref() */ const validateForm = () => { + console.log(TableBaseForm_Ref.value) let _lists = TableBaseForm_Ref.value?.map(v => v.validate()) return Promise.all(_lists).then(() => { return true diff --git a/src/components/TableFormCountPlan/index.ts b/src/components/TableFormCountPlan/index.ts new file mode 100644 index 000000000..2f51d1abc --- /dev/null +++ b/src/components/TableFormCountPlan/index.ts @@ -0,0 +1,3 @@ +import TableFormCountPlan from './src/TableFormCountPlan.vue' + +export { TableFormCountPlan } diff --git a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue new file mode 100644 index 000000000..12bc0bf5a --- /dev/null +++ b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 92dd2e5d5..22be31675 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -648,7 +648,6 @@ export const CountPlanDetail = useCrudSchemas(([ width: 300 }, tableForm: { - type: 'InputString', width: '300', } }, @@ -665,19 +664,10 @@ export const CountPlanDetail = useCrudSchemas(([ } ])) export const CountPlanDetailRules = reactive({ - available: [ - { required: true, message: '请选择是否可用', trigger: 'change' } - ], - uom: [ - { required: true, message: '请选择计量单位', trigger: 'change' } - ], - planQty: [ - { required: true, message: '请输入计划数量', trigger: 'blur' } - ], - number: [ - { required: true, message: '请输入单据号', trigger: 'blur' } + type: [ + { required: true, message: '请选择盘点范围类型', trigger: 'change' } ], - itemCode: [ - { required: true, message: '请选择物品代码', trigger: 'change' } + value: [ + { required: true, message: '请选择盘点范围值', trigger: 'change' } ], }) \ No newline at end of file diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index ab9350ad8..c5363524f 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -57,6 +57,7 @@ :apiUpdate="CountPlanMainApi.updateCountPlanMain" :apiCreate="CountPlanMainApi.createCountPlanMain" fromeWhere="countPlan" + :countScopeType="getStrDictOptions(DICT_TYPE.COUNT_SCOPE_TYPE)" @handleAddTable="handleAddTable" @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @@ -64,6 +65,7 @@ @formSelectChange="formSelectChange" @formSelectvVisibleChange="formSelectvVisibleChange" @selectChange="selectChange" + @tableFormChange="tableFormChange" /> @@ -79,6 +81,7 @@ :apiPage="CountPlanDetailApi.getCountPlanDetailPage" :apiDelete="CountPlanDetailApi.deleteCountPlanDetail" :Echo="Echo" + fromeWhere="countPlan" /> @@ -112,6 +115,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as ItembasicApi from '@/api/wms/itembasic' import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict' +console.log('CountPlanDetail.allSchemas', CountPlanDetail.allSchemas) // 盘点计划主 defineOptions({ name: 'CountPlanMain' }) @@ -290,7 +294,10 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const formRef = ref() const openForm = async (type: string, row?: number) => { - tableData.value = [] // 重置明细数据 + tableData.value = [ { + type: '', + value: '' + }] // 重置明细数据 formRef.value.open(type, row) getOwnerAllList() @@ -341,16 +348,22 @@ const handleExport = async () => { /** * tableForm方法 */ -const tableFormKeys = {} +let tableFormKeys = {} CountPlanDetail.allSchemas.tableFormColumns.forEach((item) => { tableFormKeys[item.field] = item.default ? item.default : '' }) -const tableData = ref([]) +const tableData = ref([{ + type: '', + value: '' + }]) // 添加明细 const handleAddTable = () => { - console.log(tableFormKeys) - tableFormKeys.formType = 'Select' + // tableFormKeys.formType='' + tableFormKeys = { + type: '', + value: '' + } tableData.value.push(JSON.parse(JSON.stringify(tableFormKeys))) } // 删除明细 @@ -360,7 +373,13 @@ const handleDeleteTable = (item, index) => { // 主子数据 提交 const submitForm = async (formType, data) => { - data.subList = tableData.value // 拼接子表数据参数 + data.subList = tableData.value.map(item=>{ + return{ + type:item.type, + value:item.value, + } + }) // 拼接子表数据参数 + console.log(tableData.value) try { if (formType === 'create') { await CountPlanMainApi.createCountPlanMain(data) @@ -404,7 +423,6 @@ const searchFormClick = (searchData) => { } // 选择盘点类型的时候针对限值的操作 const selectChange = (field, val) => { - console.log(val) if (field == 'type') { if (val == 'DYNAMIC') { CountPlanMain.allSchemas.formSchema[3].label = '限值（%）' @@ -421,74 +439,71 @@ const selectChange = (field, val) => { } } } -let valueList = [] // 选择盘点范围类型 -const formSelectChange = async (field, val, row) => { - console.log(row[field]) +const tableFormChange = async (field, val, row) => { console.log(field) console.log(val) if (field == 'type') { row.value = '' - if (row.type == 'OWNER' || row.type == 'SUPPLIER'|| row.type == 'CUSTOMER'|| row.type == 'ABC'|| row.type == 'ITEMS_TYPE'|| row.type == 'ITEMS_GROUP'||row.type == 'ITEMS_CODE'||row.type == 'WAREHOUSE_CODE'||row.type == 'AREABASIC_CODE'||row.type == 'LOCATIONGROUP_CODE'||row.type == 'LOCATION_CODE') { + if ( + row.type == 'OWNER' || + row.type == 'SUPPLIER' || + row.type == 'CUSTOMER' || + row.type == 'ABC' || + row.type == 'ITEMS_TYPE' || + row.type == 'ITEMS_GROUP' || + row.type == 'ITEMS_CODE' || + row.type == 'WAREHOUSE_CODE' || + row.type == 'AREABASIC_CODE' || + row.type == 'LOCATIONGROUP_CODE' || + row.type == 'LOCATION_CODE' + ) { + row.formType = 'Select' + switch (row.type) { + case 'OWNER': + row.initOptions = ownerAllList.value + break + case 'SUPPLIER': + row.initOptions = supplierAllList.value + break + case 'CUSTOMER': + row.initOptions = customerAllList.value + break + case 'ABC': + row.initOptions = getStrDictOptions(DICT_TYPE.ABC_CLASS) + break + case 'ITEMS_TYPE': + row.initOptions = getStrDictOptions(DICT_TYPE.ITEM_TYPE) + break + case 'ITEMS_GROUP': + row.initOptions = getStrDictOptions(DICT_TYPE.ITEM_GROUP) + break + case 'ITEMS_CODE': + row.initOptions = itembasicAllList.value + break + case 'WAREHOUSE_CODE': + row.initOptions = warehouseAllList.value + break + case 'AREABASIC_CODE': + row.initOptions = areaAllList.value + break + case 'LOCATIONGROUP_CODE': + row.initOptions = locationgroupAllList.value + break + case 'LOCATION_CODE': + row.initOptions = locationAllList.value + break + } + } else if (row.type == 'PROJECT') { row.formType = 'InputString' - // row.initOptions = valueList - }else if(row.type == 'PROJECT'){ - // row = { - // type: 'InputString', - // width: '300', - // initOptions: valueList - // } } } } -const formSelectvVisibleChange = async (field, val, row) => { - console.log(getStrDictOptions(DICT_TYPE.ABC_CLASS)) - switch (row.type) { - case 'OWNER': - valueList = ownerAllList.value - break; - case 'SUPPLIER': - valueList = supplierAllList.value - break; - case 'CUSTOMER': - valueList = customerAllList.value - break; - case 'ABC': - valueList = getStrDictOptions(DICT_TYPE.ABC_CLASS) - break; - case 'ITEMS_TYPE': - valueList = getStrDictOptions(DICT_TYPE.ITEM_TYPE) - break; - case 'ITEMS_GROUP': - valueList = getStrDictOptions(DICT_TYPE.ITEM_GROUP) - break; - case 'ITEMS_CODE': - valueList = itembasicAllList.value - break; - case 'WAREHOUSE_CODE': - valueList = warehouseAllList.value - break - case 'AREABASIC_CODE': - valueList = areaAllList.value - break - case 'LOCATIONGROUP_CODE': - valueList = locationgroupAllList.value - break - case 'LOCATION_CODE': - valueList = locationAllList.value - break - } - CountPlanDetail.allSchemas.tableFormColumns[1].tableForm = { - type: 'Select', - width: '300', - initOptions: valueList - } -} const ownerAllList = ref() const supplierAllList = ref() const customerAllList = ref() -const itembasicAllList = ref() +const itembasicAllList = ref() const warehouseAllList = ref() const areaAllList = ref() const locationgroupAllList = ref() @@ -535,7 +550,7 @@ const getItembasicAllList = async () => { } // 获取仓库列表 const getWarehouseAllList = async () => { - await WarehouseApi.getWarehouseList({available:'TRUE'}).then((res) => { + await WarehouseApi.getWarehouseList({ available: 'TRUE' }).then((res) => { res.forEach((element) => { element.value = element.code element.label = element.name @@ -545,7 +560,7 @@ const getWarehouseAllList = async () => { } // 获取库区列表 const getAreaAllList = async () => { - await AreaApi.getAreaList({available:'TRUE'}).then((res) => { + await AreaApi.getAreaList({ available: 'TRUE' }).then((res) => { res.forEach((element) => { element.value = element.code element.label = element.name @@ -555,7 +570,7 @@ const getAreaAllList = async () => { } // 获取库位组列表 const getLocationgroupAllList = async () => { - await LocationgroupApi.getLocationgroupList({available:'TRUE'}).then((res) => { + await LocationgroupApi.getLocationgroupList({ available: 'TRUE' }).then((res) => { res.forEach((element) => { element.value = element.code element.label = element.name @@ -565,7 +580,7 @@ const getLocationgroupAllList = async () => { } // 获取库位列表 const getLocationAllList = async () => { - await LocationpApi.getLocationList({available:'TRUE'}).then((res) => { + await LocationpApi.getLocationList({ available: 'TRUE' }).then((res) => { res.forEach((element) => { element.value = element.code element.label = element.name