diff --git a/src/api/wms/customerreturnJobMain/index.ts b/src/api/wms/customerreturnJobMain/index.ts index 7151aea2d..ae00479d0 100644 --- a/src/api/wms/customerreturnJobMain/index.ts +++ b/src/api/wms/customerreturnJobMain/index.ts @@ -95,17 +95,17 @@ export const importTemplate = () => { } // 承接客户退货任务主 Excel -export const submitCustomerreturnJobMain = async (id) => { +export const acceptCustomerreturnJobMain = async (id) => { return await request.put({ url: `/wms/customerreturn-job-main/accept?id=` + id }) } // 取消承接客户退货任务主 Excel -export const agreeCustomerreturnJobMain = async (id) => { +export const abandonCustomerreturnJobMain = async (id) => { return await request.put({ url: `/wms/customerreturn-job-main/abandon?id=` + id }) } -// 取消客户退货任务主 Excel -export const refusedCustomerreturnJobMain = async (id) => { +// 关闭客户退货任务主 Excel +export const closeCustomerreturnJobMain = async (id) => { return await request.put({ url: `/wms/customerreturn-job-main/close?id=` + id }) } diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts index 6db63b468..b3e6cf65e 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts @@ -88,6 +88,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ label: '运输方式', field: 'transferMode', sort: 'custom', + dictType: DICT_TYPE.TRANSFER_MODE, table: { width: 150 }, diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue index e98d74d97..e10c534ea 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue @@ -184,45 +184,46 @@ const butttondata = (row) => { // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainJobExe') { // 执行 + let aaa = { - "id": "1809200001805505470", - "requestNumber": "REQ1820231124-0007", - "deliverRecordNumber": "D001", - "deliverPlanNumber": "F001", - "customerCode": "K001", - "customerDockCode": "CD001", + "id": "1809200001805505476", + "requestNumber": "REQ1820231205-0005", + "deliverRecordNumber": "JOB2420231205-0002", + "deliverPlanNumber": "DP20231205-0002", + "customerCode": "CF", + "customerDockCode": "CFCKYT", "receiptDock": null, - "carrierCode": "", - "transferMode": "", - "vehiclePlateNumber": "", + "carrierCode": "cys-001", + "transferMode": "AIR", + "vehiclePlateNumber": "车牌号", "fromWarehouseCode": null, "toWarehouseCode": null, - "requestTime": null, - "requestDueTime": null, + "requestTime": 1701756307000, + "requestDueTime": 1704470400000, "status": "2", "expiredTime": null, - "updateTime": 1700788390000, + "updateTime": 1701764165000, "updater": "1", "jobStageStatus": null, "priority": null, "priorityIncrement": null, "departmentCode": "研发部门", - "acceptUserId": null, - "acceptTime": null, + "acceptUserId": "1", + "acceptTime": 1701764178000, "completeUserId": null, "completeTime": null, - "fromLocationTypes": "INSP", - "toLocationTypes": "HOLD", - "number": "JOB2520231124-0007", + "fromLocationTypes": "INSP,HOLD", + "toLocationTypes": "HOLD,INSP", + "number": "JOB2520231205-0014", "businessType": "CustomerRejectJob", - "remark": "", - "createTime": 1700788390000, + "remark": "主表备注", + "createTime": 1701764165000, "creator": "1", "fromAreaCodes": "采购在途库", "toAreaCodes": "采购在途库", "toDockCode": null, "autoComplete": "FALSE", - "allowModifyLocation": "TRUE", + "allowModifyLocation": "FALSE", "allowModifyQty": "TRUE", "allowBiggerQty": "TRUE", "allowSmallerQty": "TRUE", @@ -231,43 +232,72 @@ const buttonTableClick = async (val, row) => { "allowPartialComplete": "TRUE", "allowModifyBatch": "FALSE", "allowModifyPackingNumber": "FALSE", - - "subList": [{"id": "1809200000441442033", - "soNumber": "222", - "soLine": "22", - "packingNumber": "P20230427000026", - "batch": "20231120001", + "subList": [{ + "id": "1809200000441442039", + "soNumber": null, + "soLine": null, + "packingNumber": "M20230421000005", + "batch": "20230808", "inventoryStatus": "OK", "ownerCode": null, - "containerNumber": "", - "fromLocationCode": "INSPECT", - "toLocationCode": "CF1111", - "itemCode": "CE115F11161AG", + "containerNumber": null, + "fromLocationCode": "Loc_testCF", + "toLocationCode": "INSPECT", + "itemCode": "testCF", "itemName": null, "itemDesc1": null, "itemDesc2": null, "projectCode": null, - "qty": 5, - "uom": null, - "number": null, - "remark": "", + "qty": 22, + "uom": "EA", + "number": "REQ1820231205-0005", + "remark": "子表备注", "createtime": null, "creator": "1", - handleQty: 10, - toPackingNumber: '12', + "handleQty": null, + "toPackingNumber": null, + "toContainerNumber": null, + "toBatch": null, + "toInventoryStatus": null, + recordList: [{ + handleQty: 22, + toPackingNumber: 'M20230421000005', toContainerNumber: '001', - toBatch: '21', + toBatch: '20230808', toInventoryStatus: 'OK', + toLocationCode: 'SFG', supplierCode: '31213', -}] + }] + }] } handleHandle(aaa) } else if (val == 'mainJobAba') { // 放弃 + await message.confirm('确认要放弃吗？') console.log('列表-操作按钮事件-放弃') + CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainJobClo') { // 关闭 + await message.confirm('确认要关闭吗？') console.log('列表-操作按钮事件-关闭') + CustomerreturnJobMainApi.closeCustomerreturnJobMain(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } else if (val == 'mainJobAcc') { // 承接 + await message.confirm('确认要承接吗？') console.log('列表-操作按钮事件-承接') + CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.id).then(() => { + message.success(t('common.updateSuccess')) + getList() + }).catch(err => { + console.log(err) + }) } } diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 74cafcc82..d2d52748b 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -14,9 +14,15 @@ import { SaleDetail, SaleMain } from '../../deliverplan/saleMain/saleMain.data' import * as BalanceApi from '@/api/wms/balance' import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' +import * as CarrierApi from '@/api/wms/carrier' +import { Carrier } from '@/views/wms/basicDataManage/orderManage/carrier/carrier.data' + import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' +import * as ItembasicApi from '@/api/wms/itembasic' +import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' + const { t } = useI18n() // 国际化 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 @@ -128,10 +134,27 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择承运商', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '承运商信息', // 查询弹窗标题 + searchAllSchemas: Carrier.allSchemas, // 查询弹窗所需类 + searchPage: CarrierApi.getCarrierPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + } }, { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 @@ -594,12 +617,33 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm: { - disabled: true + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物品代码', + searchField: 'code', + searchTitle: '物品基础信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.getItembasicPage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] }, form: { + // labelMessage: '信息提示说明！！！', componentProps: { - disabled: true + isSearchList: true, + searchListPlaceholder: '请选择物品代码', + searchField: 'code', + searchTitle: '物品基础信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.getItembasicPage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] } } }, diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 732c3b615..ad51814e4 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -117,11 +117,14 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } } else { const setV = {} - setV[formField] = val[0][searchField] + if(formField == 'deliverRecordNumber') { setV['deliverRecordNumber'] = val[0]['number'] setV['deliverPlanNumber'] = val[0]['deliverPlanNumber'] setV['customerCode'] = val[0]['customerCode'] setV['customerDockCode'] = val[0]['customerDockCode'] + } else { + setV[formField] = val[0][searchField] + } formRef.setValues(setV) } }) @@ -204,13 +207,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:customerreturn-request-main:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreturn-request-main:delete'}), // 删除 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:customerreturn-request-main:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:customerreturn-request-main:reAdd'}), // 重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customerreturn-request-main:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customerreturn-request-main:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:customerreturn-request-main:agree'}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:customerreturn-request-main:handle'}), // 处理 + defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:customerreturn-request-main:update'}), // 编辑 + // defaultButtons.mainListDeleteBtn({hasPermi:'wms:customerreturn-request-main:delete'}), // 删除 ] } @@ -242,7 +246,7 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainTurnDown') { // 驳回 - await message.confirm('确认要重新添加吗？') + await message.confirm('确认要驳回审批吗？') CustomerreturnRequestMainApi.refused(row.id).then(() => { message.success(t('common.updateSuccess')) getList() @@ -250,6 +254,7 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainApprove') { // 审批通过 + await message.confirm('确认要审批通过吗？') CustomerreturnRequestMainApi.agree(row.id).then(() => { message.success(t('common.updateSuccess')) getList() @@ -257,6 +262,7 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainHandle') { // 处理 + await message.confirm('确认要处理吗？') CustomerreturnRequestMainApi.handle(row.id).then(() => { message.success(t('common.updateSuccess')) getList()