diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts index a0936cc..1143e9c 100644 --- a/src/api/resource/supplierConsumable.ts +++ b/src/api/resource/supplierConsumable.ts @@ -1,13 +1,14 @@ import request from '../index' -const prefix = 'resource/supplier/consumableGoods' -const prefixGoods = 'resource/supplier/goods' +const prefix = 'resource/supplier' +const prefixCons = `${prefix}/consumableGoods` +const prefixGoods = `${prefix}/goods` /* -------------------------------- 供方评价表 -------------------------------- */ // 查询列表 export function getConsumableEvaluateList(data: any) { return request({ - url: `${prefix}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -16,7 +17,7 @@ // 详情 export function detailConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/detail`, + url: `${prefixCons}Evaluate/detail`, method: 'post', data, }) @@ -25,7 +26,7 @@ // 保存至草稿箱 export function saveConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/save`, + url: `${prefixCons}Evaluate/save`, method: 'post', data, }) @@ -34,7 +35,7 @@ // 提交流程 export function submitConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/submit`, + url: `${prefixCons}Evaluate/submit`, method: 'post', data, }) @@ -43,7 +44,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/draftUpdate`, + url: `${prefixCons}Evaluate/draftUpdate`, method: 'post', data, }) @@ -52,7 +53,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/failUpdate`, + url: `${prefixCons}Evaluate/failUpdate`, method: 'post', data, }) @@ -61,7 +62,7 @@ // 删除草稿箱 export function draftDelete(data: object) { return request({ - url: `${prefix}Evaluate/draftDelete`, + url: `${prefixCons}Evaluate/draftDelete`, method: 'post', data, }) @@ -70,7 +71,7 @@ // 删除已取消 export function canceledApprDelete(data: object) { return request({ - url: `${prefix}Evaluate/approval/delete`, + url: `${prefixCons}Evaluate/approval/delete`, method: 'post', data, }) @@ -79,7 +80,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/revoke`, + url: `${prefixCons}Evaluate/approval/revoke`, method: 'post', data, }) @@ -88,7 +89,7 @@ // 设备供方审批-拒绝 export function refuseApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/refuse`, + url: `${prefixCons}Evaluate/approval/refuse`, method: 'post', data, }) @@ -98,7 +99,7 @@ // 查询申请单列表 export function getConsumableApplyList(data: any) { return request({ - url: `${prefix}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -107,7 +108,7 @@ // 详情 export function detailConsumableApply(data: object) { return request({ - url: `${prefix}Apply/detail`, + url: `${prefixCons}Apply/detail`, method: 'post', data, }) @@ -116,7 +117,7 @@ // 保存至草稿箱 export function saveConsumableApply(data: object) { return request({ - url: `${prefix}Apply/save`, + url: `${prefixCons}Apply/save`, method: 'post', data, }) @@ -125,7 +126,7 @@ // 提交流程 export function submitConsumableApply(data: object) { return request({ - url: `${prefix}Apply/submit`, + url: `${prefixCons}Apply/submit`, method: 'post', data, }) @@ -134,7 +135,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/draftUpdate`, + url: `${prefixCons}Apply/draftUpdate`, method: 'post', data, }) @@ -143,7 +144,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/failUpdate`, + url: `${prefixCons}Apply/failUpdate`, method: 'post', data, }) @@ -152,7 +153,7 @@ // 删除草稿箱 export function draftDeleteApply(data: object) { return request({ - url: `${prefix}Apply/draftDelete`, + url: `${prefixCons}Apply/draftDelete`, method: 'post', data, }) @@ -161,7 +162,7 @@ // 删除已取消 export function canceledApprDeleteApply(data: object) { return request({ - url: `${prefix}Apply/approval/delete`, + url: `${prefixCons}Apply/approval/delete`, method: 'post', data, }) @@ -170,7 +171,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/revoke`, + url: `${prefixCons}Apply/approval/revoke`, method: 'post', data, }) @@ -179,7 +180,7 @@ // 设备供方审批-拒绝 export function refuseApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/refuse`, + url: `${prefixCons}Apply/approval/refuse`, method: 'post', data, }) @@ -189,7 +190,7 @@ // 查询列表 export function getConsumableUseList(data: any) { return request({ - url: `${prefix}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -198,7 +199,7 @@ // 详情 export function detailConsumableUse(data: object) { return request({ - url: `${prefix}Use/detail`, + url: `${prefixCons}Use/detail`, method: 'post', data, }) @@ -207,7 +208,7 @@ // 保存至草稿箱 export function saveConsumableUse(data: object) { return request({ - url: `${prefix}Use/save`, + url: `${prefixCons}Use/save`, method: 'post', data, }) @@ -216,7 +217,7 @@ // 提交流程 export function submitConsumableUse(data: object) { return request({ - url: `${prefix}Use/submit`, + url: `${prefixCons}Use/submit`, method: 'post', data, }) @@ -225,7 +226,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableUse(data: object) { return request({ - url: `${prefix}Use/draftUpdate`, + url: `${prefixCons}Use/draftUpdate`, method: 'post', data, }) @@ -234,7 +235,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableUse(data: object) { return request({ - url: `${prefix}Use/failUpdate`, + url: `${prefixCons}Use/failUpdate`, method: 'post', data, }) @@ -243,7 +244,7 @@ // 删除草稿箱 export function draftDeleteUse(data: object) { return request({ - url: `${prefix}Use/draftDelete`, + url: `${prefixCons}Use/draftDelete`, method: 'post', data, }) @@ -252,7 +253,7 @@ // 删除已取消 export function canceledApprDeleteUse(data: object) { return request({ - url: `${prefix}Use/approval/delete`, + url: `${prefixCons}Use/approval/delete`, method: 'post', data, }) @@ -261,7 +262,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/revoke`, + url: `${prefixCons}Use/approval/revoke`, method: 'post', data, }) @@ -270,7 +271,7 @@ // 设备供方审批-拒绝 export function refuseApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/refuse`, + url: `${prefixCons}Use/approval/refuse`, method: 'post', data, }) @@ -458,3 +459,48 @@ }) } +/* -------------------------------- 交接单 -------------------------------- */ +// 查询申请单列表 +export function getConsumableHandoverList(data: any) { + return request({ + url: `${prefix}/abandonGoodsHandle/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 详情 +export function detailConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/detail`, + method: 'post', + data, + }) +} + +// 保存 +export function saveConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/save`, + method: 'post', + data, + }) +} + +// 编辑 +export function updateConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} + +// 编辑 +export function deleteConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts index a0936cc..1143e9c 100644 --- a/src/api/resource/supplierConsumable.ts +++ b/src/api/resource/supplierConsumable.ts @@ -1,13 +1,14 @@ import request from '../index' -const prefix = 'resource/supplier/consumableGoods' -const prefixGoods = 'resource/supplier/goods' +const prefix = 'resource/supplier' +const prefixCons = `${prefix}/consumableGoods` +const prefixGoods = `${prefix}/goods` /* -------------------------------- 供方评价表 -------------------------------- */ // 查询列表 export function getConsumableEvaluateList(data: any) { return request({ - url: `${prefix}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -16,7 +17,7 @@ // 详情 export function detailConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/detail`, + url: `${prefixCons}Evaluate/detail`, method: 'post', data, }) @@ -25,7 +26,7 @@ // 保存至草稿箱 export function saveConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/save`, + url: `${prefixCons}Evaluate/save`, method: 'post', data, }) @@ -34,7 +35,7 @@ // 提交流程 export function submitConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/submit`, + url: `${prefixCons}Evaluate/submit`, method: 'post', data, }) @@ -43,7 +44,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/draftUpdate`, + url: `${prefixCons}Evaluate/draftUpdate`, method: 'post', data, }) @@ -52,7 +53,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/failUpdate`, + url: `${prefixCons}Evaluate/failUpdate`, method: 'post', data, }) @@ -61,7 +62,7 @@ // 删除草稿箱 export function draftDelete(data: object) { return request({ - url: `${prefix}Evaluate/draftDelete`, + url: `${prefixCons}Evaluate/draftDelete`, method: 'post', data, }) @@ -70,7 +71,7 @@ // 删除已取消 export function canceledApprDelete(data: object) { return request({ - url: `${prefix}Evaluate/approval/delete`, + url: `${prefixCons}Evaluate/approval/delete`, method: 'post', data, }) @@ -79,7 +80,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/revoke`, + url: `${prefixCons}Evaluate/approval/revoke`, method: 'post', data, }) @@ -88,7 +89,7 @@ // 设备供方审批-拒绝 export function refuseApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/refuse`, + url: `${prefixCons}Evaluate/approval/refuse`, method: 'post', data, }) @@ -98,7 +99,7 @@ // 查询申请单列表 export function getConsumableApplyList(data: any) { return request({ - url: `${prefix}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -107,7 +108,7 @@ // 详情 export function detailConsumableApply(data: object) { return request({ - url: `${prefix}Apply/detail`, + url: `${prefixCons}Apply/detail`, method: 'post', data, }) @@ -116,7 +117,7 @@ // 保存至草稿箱 export function saveConsumableApply(data: object) { return request({ - url: `${prefix}Apply/save`, + url: `${prefixCons}Apply/save`, method: 'post', data, }) @@ -125,7 +126,7 @@ // 提交流程 export function submitConsumableApply(data: object) { return request({ - url: `${prefix}Apply/submit`, + url: `${prefixCons}Apply/submit`, method: 'post', data, }) @@ -134,7 +135,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/draftUpdate`, + url: `${prefixCons}Apply/draftUpdate`, method: 'post', data, }) @@ -143,7 +144,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/failUpdate`, + url: `${prefixCons}Apply/failUpdate`, method: 'post', data, }) @@ -152,7 +153,7 @@ // 删除草稿箱 export function draftDeleteApply(data: object) { return request({ - url: `${prefix}Apply/draftDelete`, + url: `${prefixCons}Apply/draftDelete`, method: 'post', data, }) @@ -161,7 +162,7 @@ // 删除已取消 export function canceledApprDeleteApply(data: object) { return request({ - url: `${prefix}Apply/approval/delete`, + url: `${prefixCons}Apply/approval/delete`, method: 'post', data, }) @@ -170,7 +171,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/revoke`, + url: `${prefixCons}Apply/approval/revoke`, method: 'post', data, }) @@ -179,7 +180,7 @@ // 设备供方审批-拒绝 export function refuseApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/refuse`, + url: `${prefixCons}Apply/approval/refuse`, method: 'post', data, }) @@ -189,7 +190,7 @@ // 查询列表 export function getConsumableUseList(data: any) { return request({ - url: `${prefix}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -198,7 +199,7 @@ // 详情 export function detailConsumableUse(data: object) { return request({ - url: `${prefix}Use/detail`, + url: `${prefixCons}Use/detail`, method: 'post', data, }) @@ -207,7 +208,7 @@ // 保存至草稿箱 export function saveConsumableUse(data: object) { return request({ - url: `${prefix}Use/save`, + url: `${prefixCons}Use/save`, method: 'post', data, }) @@ -216,7 +217,7 @@ // 提交流程 export function submitConsumableUse(data: object) { return request({ - url: `${prefix}Use/submit`, + url: `${prefixCons}Use/submit`, method: 'post', data, }) @@ -225,7 +226,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableUse(data: object) { return request({ - url: `${prefix}Use/draftUpdate`, + url: `${prefixCons}Use/draftUpdate`, method: 'post', data, }) @@ -234,7 +235,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableUse(data: object) { return request({ - url: `${prefix}Use/failUpdate`, + url: `${prefixCons}Use/failUpdate`, method: 'post', data, }) @@ -243,7 +244,7 @@ // 删除草稿箱 export function draftDeleteUse(data: object) { return request({ - url: `${prefix}Use/draftDelete`, + url: `${prefixCons}Use/draftDelete`, method: 'post', data, }) @@ -252,7 +253,7 @@ // 删除已取消 export function canceledApprDeleteUse(data: object) { return request({ - url: `${prefix}Use/approval/delete`, + url: `${prefixCons}Use/approval/delete`, method: 'post', data, }) @@ -261,7 +262,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/revoke`, + url: `${prefixCons}Use/approval/revoke`, method: 'post', data, }) @@ -270,7 +271,7 @@ // 设备供方审批-拒绝 export function refuseApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/refuse`, + url: `${prefixCons}Use/approval/refuse`, method: 'post', data, }) @@ -458,3 +459,48 @@ }) } +/* -------------------------------- 交接单 -------------------------------- */ +// 查询申请单列表 +export function getConsumableHandoverList(data: any) { + return request({ + url: `${prefix}/abandonGoodsHandle/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 详情 +export function detailConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/detail`, + method: 'post', + data, + }) +} + +// 保存 +export function saveConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/save`, + method: 'post', + data, + }) +} + +// 编辑 +export function updateConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} + +// 编辑 +export function deleteConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index 76ff20d..e57baaf 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -791,6 +791,28 @@ }, }, { + path: 'consumableHandoverList', + name: 'ConsumableHandoverList', + component: () => import('@/views/resource/outsideService/consumable/handoverList.vue'), + meta: { + title: '废弃物资处理交接记录', + auth: '/resource/outsideService/consumableHandover', + icon: 'ep:key', + }, + }, + { + path: 'consumableHandover/:type/:id?', + name: 'ConsumableHandoverDetail', + component: () => import('@/views/resource/outsideService/consumable/handoverDetail.vue'), + meta: { + title: '废弃物资处理交接记录详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/outsideService/consumableHandoverList', + }, + }, + { path: 'consumableEvaluateList', name: 'ConsumableEvaluateList', component: () => import('@/views/resource/outsideService/consumable/evaluateList.vue'), diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts index a0936cc..1143e9c 100644 --- a/src/api/resource/supplierConsumable.ts +++ b/src/api/resource/supplierConsumable.ts @@ -1,13 +1,14 @@ import request from '../index' -const prefix = 'resource/supplier/consumableGoods' -const prefixGoods = 'resource/supplier/goods' +const prefix = 'resource/supplier' +const prefixCons = `${prefix}/consumableGoods` +const prefixGoods = `${prefix}/goods` /* -------------------------------- 供方评价表 -------------------------------- */ // 查询列表 export function getConsumableEvaluateList(data: any) { return request({ - url: `${prefix}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -16,7 +17,7 @@ // 详情 export function detailConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/detail`, + url: `${prefixCons}Evaluate/detail`, method: 'post', data, }) @@ -25,7 +26,7 @@ // 保存至草稿箱 export function saveConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/save`, + url: `${prefixCons}Evaluate/save`, method: 'post', data, }) @@ -34,7 +35,7 @@ // 提交流程 export function submitConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/submit`, + url: `${prefixCons}Evaluate/submit`, method: 'post', data, }) @@ -43,7 +44,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/draftUpdate`, + url: `${prefixCons}Evaluate/draftUpdate`, method: 'post', data, }) @@ -52,7 +53,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/failUpdate`, + url: `${prefixCons}Evaluate/failUpdate`, method: 'post', data, }) @@ -61,7 +62,7 @@ // 删除草稿箱 export function draftDelete(data: object) { return request({ - url: `${prefix}Evaluate/draftDelete`, + url: `${prefixCons}Evaluate/draftDelete`, method: 'post', data, }) @@ -70,7 +71,7 @@ // 删除已取消 export function canceledApprDelete(data: object) { return request({ - url: `${prefix}Evaluate/approval/delete`, + url: `${prefixCons}Evaluate/approval/delete`, method: 'post', data, }) @@ -79,7 +80,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/revoke`, + url: `${prefixCons}Evaluate/approval/revoke`, method: 'post', data, }) @@ -88,7 +89,7 @@ // 设备供方审批-拒绝 export function refuseApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/refuse`, + url: `${prefixCons}Evaluate/approval/refuse`, method: 'post', data, }) @@ -98,7 +99,7 @@ // 查询申请单列表 export function getConsumableApplyList(data: any) { return request({ - url: `${prefix}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -107,7 +108,7 @@ // 详情 export function detailConsumableApply(data: object) { return request({ - url: `${prefix}Apply/detail`, + url: `${prefixCons}Apply/detail`, method: 'post', data, }) @@ -116,7 +117,7 @@ // 保存至草稿箱 export function saveConsumableApply(data: object) { return request({ - url: `${prefix}Apply/save`, + url: `${prefixCons}Apply/save`, method: 'post', data, }) @@ -125,7 +126,7 @@ // 提交流程 export function submitConsumableApply(data: object) { return request({ - url: `${prefix}Apply/submit`, + url: `${prefixCons}Apply/submit`, method: 'post', data, }) @@ -134,7 +135,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/draftUpdate`, + url: `${prefixCons}Apply/draftUpdate`, method: 'post', data, }) @@ -143,7 +144,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/failUpdate`, + url: `${prefixCons}Apply/failUpdate`, method: 'post', data, }) @@ -152,7 +153,7 @@ // 删除草稿箱 export function draftDeleteApply(data: object) { return request({ - url: `${prefix}Apply/draftDelete`, + url: `${prefixCons}Apply/draftDelete`, method: 'post', data, }) @@ -161,7 +162,7 @@ // 删除已取消 export function canceledApprDeleteApply(data: object) { return request({ - url: `${prefix}Apply/approval/delete`, + url: `${prefixCons}Apply/approval/delete`, method: 'post', data, }) @@ -170,7 +171,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/revoke`, + url: `${prefixCons}Apply/approval/revoke`, method: 'post', data, }) @@ -179,7 +180,7 @@ // 设备供方审批-拒绝 export function refuseApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/refuse`, + url: `${prefixCons}Apply/approval/refuse`, method: 'post', data, }) @@ -189,7 +190,7 @@ // 查询列表 export function getConsumableUseList(data: any) { return request({ - url: `${prefix}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -198,7 +199,7 @@ // 详情 export function detailConsumableUse(data: object) { return request({ - url: `${prefix}Use/detail`, + url: `${prefixCons}Use/detail`, method: 'post', data, }) @@ -207,7 +208,7 @@ // 保存至草稿箱 export function saveConsumableUse(data: object) { return request({ - url: `${prefix}Use/save`, + url: `${prefixCons}Use/save`, method: 'post', data, }) @@ -216,7 +217,7 @@ // 提交流程 export function submitConsumableUse(data: object) { return request({ - url: `${prefix}Use/submit`, + url: `${prefixCons}Use/submit`, method: 'post', data, }) @@ -225,7 +226,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableUse(data: object) { return request({ - url: `${prefix}Use/draftUpdate`, + url: `${prefixCons}Use/draftUpdate`, method: 'post', data, }) @@ -234,7 +235,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableUse(data: object) { return request({ - url: `${prefix}Use/failUpdate`, + url: `${prefixCons}Use/failUpdate`, method: 'post', data, }) @@ -243,7 +244,7 @@ // 删除草稿箱 export function draftDeleteUse(data: object) { return request({ - url: `${prefix}Use/draftDelete`, + url: `${prefixCons}Use/draftDelete`, method: 'post', data, }) @@ -252,7 +253,7 @@ // 删除已取消 export function canceledApprDeleteUse(data: object) { return request({ - url: `${prefix}Use/approval/delete`, + url: `${prefixCons}Use/approval/delete`, method: 'post', data, }) @@ -261,7 +262,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/revoke`, + url: `${prefixCons}Use/approval/revoke`, method: 'post', data, }) @@ -270,7 +271,7 @@ // 设备供方审批-拒绝 export function refuseApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/refuse`, + url: `${prefixCons}Use/approval/refuse`, method: 'post', data, }) @@ -458,3 +459,48 @@ }) } +/* -------------------------------- 交接单 -------------------------------- */ +// 查询申请单列表 +export function getConsumableHandoverList(data: any) { + return request({ + url: `${prefix}/abandonGoodsHandle/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 详情 +export function detailConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/detail`, + method: 'post', + data, + }) +} + +// 保存 +export function saveConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/save`, + method: 'post', + data, + }) +} + +// 编辑 +export function updateConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} + +// 编辑 +export function deleteConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index 76ff20d..e57baaf 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -791,6 +791,28 @@ }, }, { + path: 'consumableHandoverList', + name: 'ConsumableHandoverList', + component: () => import('@/views/resource/outsideService/consumable/handoverList.vue'), + meta: { + title: '废弃物资处理交接记录', + auth: '/resource/outsideService/consumableHandover', + icon: 'ep:key', + }, + }, + { + path: 'consumableHandover/:type/:id?', + name: 'ConsumableHandoverDetail', + component: () => import('@/views/resource/outsideService/consumable/handoverDetail.vue'), + meta: { + title: '废弃物资处理交接记录详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/outsideService/consumableHandoverList', + }, + }, + { path: 'consumableEvaluateList', name: 'ConsumableEvaluateList', component: () => import('@/views/resource/outsideService/consumable/evaluateList.vue'), diff --git a/src/views/resource/outsideService/consumable/consumable-interface.ts b/src/views/resource/outsideService/consumable/consumable-interface.ts index 1cc817f..ce1c2c7 100644 --- a/src/views/resource/outsideService/consumable/consumable-interface.ts +++ b/src/views/resource/outsideService/consumable/consumable-interface.ts @@ -240,3 +240,44 @@ createTime?: string decisionItem?: number } + +/* -------------------------------- 交接单 -------------------------------- */ +export interface IHandoverListQuery { + recordNo: string + createUserName: string + createTimeStart: string + createTimeEnd: string + offset: number + limit: number + sort?: string + order?: string +} + +export interface IConsumableHandoverGoods { + id?: string + recordId?: string + goodsName: string + handoverTime: string + handoverAmount: string + company: string + handoverUserId: string + handoverUserName: string + receiver: string +} + +export interface IConsumableHandover { + id: string + labCode: string + labCodeName?: string + groupCode: string + groupCodeName?: string + recordNo: string + recordName: string + goodsHandleDetailList: Array + goodsName?: string + handoverTime?: string + amount?: string + createUserId?: string + createUserName?: string + createTime?: string +} diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts index a0936cc..1143e9c 100644 --- a/src/api/resource/supplierConsumable.ts +++ b/src/api/resource/supplierConsumable.ts @@ -1,13 +1,14 @@ import request from '../index' -const prefix = 'resource/supplier/consumableGoods' -const prefixGoods = 'resource/supplier/goods' +const prefix = 'resource/supplier' +const prefixCons = `${prefix}/consumableGoods` +const prefixGoods = `${prefix}/goods` /* -------------------------------- 供方评价表 -------------------------------- */ // 查询列表 export function getConsumableEvaluateList(data: any) { return request({ - url: `${prefix}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -16,7 +17,7 @@ // 详情 export function detailConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/detail`, + url: `${prefixCons}Evaluate/detail`, method: 'post', data, }) @@ -25,7 +26,7 @@ // 保存至草稿箱 export function saveConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/save`, + url: `${prefixCons}Evaluate/save`, method: 'post', data, }) @@ -34,7 +35,7 @@ // 提交流程 export function submitConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/submit`, + url: `${prefixCons}Evaluate/submit`, method: 'post', data, }) @@ -43,7 +44,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/draftUpdate`, + url: `${prefixCons}Evaluate/draftUpdate`, method: 'post', data, }) @@ -52,7 +53,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/failUpdate`, + url: `${prefixCons}Evaluate/failUpdate`, method: 'post', data, }) @@ -61,7 +62,7 @@ // 删除草稿箱 export function draftDelete(data: object) { return request({ - url: `${prefix}Evaluate/draftDelete`, + url: `${prefixCons}Evaluate/draftDelete`, method: 'post', data, }) @@ -70,7 +71,7 @@ // 删除已取消 export function canceledApprDelete(data: object) { return request({ - url: `${prefix}Evaluate/approval/delete`, + url: `${prefixCons}Evaluate/approval/delete`, method: 'post', data, }) @@ -79,7 +80,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/revoke`, + url: `${prefixCons}Evaluate/approval/revoke`, method: 'post', data, }) @@ -88,7 +89,7 @@ // 设备供方审批-拒绝 export function refuseApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/refuse`, + url: `${prefixCons}Evaluate/approval/refuse`, method: 'post', data, }) @@ -98,7 +99,7 @@ // 查询申请单列表 export function getConsumableApplyList(data: any) { return request({ - url: `${prefix}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -107,7 +108,7 @@ // 详情 export function detailConsumableApply(data: object) { return request({ - url: `${prefix}Apply/detail`, + url: `${prefixCons}Apply/detail`, method: 'post', data, }) @@ -116,7 +117,7 @@ // 保存至草稿箱 export function saveConsumableApply(data: object) { return request({ - url: `${prefix}Apply/save`, + url: `${prefixCons}Apply/save`, method: 'post', data, }) @@ -125,7 +126,7 @@ // 提交流程 export function submitConsumableApply(data: object) { return request({ - url: `${prefix}Apply/submit`, + url: `${prefixCons}Apply/submit`, method: 'post', data, }) @@ -134,7 +135,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/draftUpdate`, + url: `${prefixCons}Apply/draftUpdate`, method: 'post', data, }) @@ -143,7 +144,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/failUpdate`, + url: `${prefixCons}Apply/failUpdate`, method: 'post', data, }) @@ -152,7 +153,7 @@ // 删除草稿箱 export function draftDeleteApply(data: object) { return request({ - url: `${prefix}Apply/draftDelete`, + url: `${prefixCons}Apply/draftDelete`, method: 'post', data, }) @@ -161,7 +162,7 @@ // 删除已取消 export function canceledApprDeleteApply(data: object) { return request({ - url: `${prefix}Apply/approval/delete`, + url: `${prefixCons}Apply/approval/delete`, method: 'post', data, }) @@ -170,7 +171,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/revoke`, + url: `${prefixCons}Apply/approval/revoke`, method: 'post', data, }) @@ -179,7 +180,7 @@ // 设备供方审批-拒绝 export function refuseApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/refuse`, + url: `${prefixCons}Apply/approval/refuse`, method: 'post', data, }) @@ -189,7 +190,7 @@ // 查询列表 export function getConsumableUseList(data: any) { return request({ - url: `${prefix}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -198,7 +199,7 @@ // 详情 export function detailConsumableUse(data: object) { return request({ - url: `${prefix}Use/detail`, + url: `${prefixCons}Use/detail`, method: 'post', data, }) @@ -207,7 +208,7 @@ // 保存至草稿箱 export function saveConsumableUse(data: object) { return request({ - url: `${prefix}Use/save`, + url: `${prefixCons}Use/save`, method: 'post', data, }) @@ -216,7 +217,7 @@ // 提交流程 export function submitConsumableUse(data: object) { return request({ - url: `${prefix}Use/submit`, + url: `${prefixCons}Use/submit`, method: 'post', data, }) @@ -225,7 +226,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableUse(data: object) { return request({ - url: `${prefix}Use/draftUpdate`, + url: `${prefixCons}Use/draftUpdate`, method: 'post', data, }) @@ -234,7 +235,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableUse(data: object) { return request({ - url: `${prefix}Use/failUpdate`, + url: `${prefixCons}Use/failUpdate`, method: 'post', data, }) @@ -243,7 +244,7 @@ // 删除草稿箱 export function draftDeleteUse(data: object) { return request({ - url: `${prefix}Use/draftDelete`, + url: `${prefixCons}Use/draftDelete`, method: 'post', data, }) @@ -252,7 +253,7 @@ // 删除已取消 export function canceledApprDeleteUse(data: object) { return request({ - url: `${prefix}Use/approval/delete`, + url: `${prefixCons}Use/approval/delete`, method: 'post', data, }) @@ -261,7 +262,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/revoke`, + url: `${prefixCons}Use/approval/revoke`, method: 'post', data, }) @@ -270,7 +271,7 @@ // 设备供方审批-拒绝 export function refuseApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/refuse`, + url: `${prefixCons}Use/approval/refuse`, method: 'post', data, }) @@ -458,3 +459,48 @@ }) } +/* -------------------------------- 交接单 -------------------------------- */ +// 查询申请单列表 +export function getConsumableHandoverList(data: any) { + return request({ + url: `${prefix}/abandonGoodsHandle/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 详情 +export function detailConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/detail`, + method: 'post', + data, + }) +} + +// 保存 +export function saveConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/save`, + method: 'post', + data, + }) +} + +// 编辑 +export function updateConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} + +// 编辑 +export function deleteConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index 76ff20d..e57baaf 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -791,6 +791,28 @@ }, }, { + path: 'consumableHandoverList', + name: 'ConsumableHandoverList', + component: () => import('@/views/resource/outsideService/consumable/handoverList.vue'), + meta: { + title: '废弃物资处理交接记录', + auth: '/resource/outsideService/consumableHandover', + icon: 'ep:key', + }, + }, + { + path: 'consumableHandover/:type/:id?', + name: 'ConsumableHandoverDetail', + component: () => import('@/views/resource/outsideService/consumable/handoverDetail.vue'), + meta: { + title: '废弃物资处理交接记录详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/outsideService/consumableHandoverList', + }, + }, + { path: 'consumableEvaluateList', name: 'ConsumableEvaluateList', component: () => import('@/views/resource/outsideService/consumable/evaluateList.vue'), diff --git a/src/views/resource/outsideService/consumable/consumable-interface.ts b/src/views/resource/outsideService/consumable/consumable-interface.ts index 1cc817f..ce1c2c7 100644 --- a/src/views/resource/outsideService/consumable/consumable-interface.ts +++ b/src/views/resource/outsideService/consumable/consumable-interface.ts @@ -240,3 +240,44 @@ createTime?: string decisionItem?: number } + +/* -------------------------------- 交接单 -------------------------------- */ +export interface IHandoverListQuery { + recordNo: string + createUserName: string + createTimeStart: string + createTimeEnd: string + offset: number + limit: number + sort?: string + order?: string +} + +export interface IConsumableHandoverGoods { + id?: string + recordId?: string + goodsName: string + handoverTime: string + handoverAmount: string + company: string + handoverUserId: string + handoverUserName: string + receiver: string +} + +export interface IConsumableHandover { + id: string + labCode: string + labCodeName?: string + groupCode: string + groupCodeName?: string + recordNo: string + recordName: string + goodsHandleDetailList: Array + goodsName?: string + handoverTime?: string + amount?: string + createUserId?: string + createUserName?: string + createTime?: string +} diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue new file mode 100644 index 0000000..7b7e81c --- /dev/null +++ b/src/views/resource/outsideService/consumable/handoverDetail.vue @@ -0,0 +1,360 @@ + + + + diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts index a0936cc..1143e9c 100644 --- a/src/api/resource/supplierConsumable.ts +++ b/src/api/resource/supplierConsumable.ts @@ -1,13 +1,14 @@ import request from '../index' -const prefix = 'resource/supplier/consumableGoods' -const prefixGoods = 'resource/supplier/goods' +const prefix = 'resource/supplier' +const prefixCons = `${prefix}/consumableGoods` +const prefixGoods = `${prefix}/goods` /* -------------------------------- 供方评价表 -------------------------------- */ // 查询列表 export function getConsumableEvaluateList(data: any) { return request({ - url: `${prefix}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -16,7 +17,7 @@ // 详情 export function detailConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/detail`, + url: `${prefixCons}Evaluate/detail`, method: 'post', data, }) @@ -25,7 +26,7 @@ // 保存至草稿箱 export function saveConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/save`, + url: `${prefixCons}Evaluate/save`, method: 'post', data, }) @@ -34,7 +35,7 @@ // 提交流程 export function submitConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/submit`, + url: `${prefixCons}Evaluate/submit`, method: 'post', data, }) @@ -43,7 +44,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/draftUpdate`, + url: `${prefixCons}Evaluate/draftUpdate`, method: 'post', data, }) @@ -52,7 +53,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/failUpdate`, + url: `${prefixCons}Evaluate/failUpdate`, method: 'post', data, }) @@ -61,7 +62,7 @@ // 删除草稿箱 export function draftDelete(data: object) { return request({ - url: `${prefix}Evaluate/draftDelete`, + url: `${prefixCons}Evaluate/draftDelete`, method: 'post', data, }) @@ -70,7 +71,7 @@ // 删除已取消 export function canceledApprDelete(data: object) { return request({ - url: `${prefix}Evaluate/approval/delete`, + url: `${prefixCons}Evaluate/approval/delete`, method: 'post', data, }) @@ -79,7 +80,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/revoke`, + url: `${prefixCons}Evaluate/approval/revoke`, method: 'post', data, }) @@ -88,7 +89,7 @@ // 设备供方审批-拒绝 export function refuseApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/refuse`, + url: `${prefixCons}Evaluate/approval/refuse`, method: 'post', data, }) @@ -98,7 +99,7 @@ // 查询申请单列表 export function getConsumableApplyList(data: any) { return request({ - url: `${prefix}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -107,7 +108,7 @@ // 详情 export function detailConsumableApply(data: object) { return request({ - url: `${prefix}Apply/detail`, + url: `${prefixCons}Apply/detail`, method: 'post', data, }) @@ -116,7 +117,7 @@ // 保存至草稿箱 export function saveConsumableApply(data: object) { return request({ - url: `${prefix}Apply/save`, + url: `${prefixCons}Apply/save`, method: 'post', data, }) @@ -125,7 +126,7 @@ // 提交流程 export function submitConsumableApply(data: object) { return request({ - url: `${prefix}Apply/submit`, + url: `${prefixCons}Apply/submit`, method: 'post', data, }) @@ -134,7 +135,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/draftUpdate`, + url: `${prefixCons}Apply/draftUpdate`, method: 'post', data, }) @@ -143,7 +144,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/failUpdate`, + url: `${prefixCons}Apply/failUpdate`, method: 'post', data, }) @@ -152,7 +153,7 @@ // 删除草稿箱 export function draftDeleteApply(data: object) { return request({ - url: `${prefix}Apply/draftDelete`, + url: `${prefixCons}Apply/draftDelete`, method: 'post', data, }) @@ -161,7 +162,7 @@ // 删除已取消 export function canceledApprDeleteApply(data: object) { return request({ - url: `${prefix}Apply/approval/delete`, + url: `${prefixCons}Apply/approval/delete`, method: 'post', data, }) @@ -170,7 +171,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/revoke`, + url: `${prefixCons}Apply/approval/revoke`, method: 'post', data, }) @@ -179,7 +180,7 @@ // 设备供方审批-拒绝 export function refuseApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/refuse`, + url: `${prefixCons}Apply/approval/refuse`, method: 'post', data, }) @@ -189,7 +190,7 @@ // 查询列表 export function getConsumableUseList(data: any) { return request({ - url: `${prefix}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -198,7 +199,7 @@ // 详情 export function detailConsumableUse(data: object) { return request({ - url: `${prefix}Use/detail`, + url: `${prefixCons}Use/detail`, method: 'post', data, }) @@ -207,7 +208,7 @@ // 保存至草稿箱 export function saveConsumableUse(data: object) { return request({ - url: `${prefix}Use/save`, + url: `${prefixCons}Use/save`, method: 'post', data, }) @@ -216,7 +217,7 @@ // 提交流程 export function submitConsumableUse(data: object) { return request({ - url: `${prefix}Use/submit`, + url: `${prefixCons}Use/submit`, method: 'post', data, }) @@ -225,7 +226,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableUse(data: object) { return request({ - url: `${prefix}Use/draftUpdate`, + url: `${prefixCons}Use/draftUpdate`, method: 'post', data, }) @@ -234,7 +235,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableUse(data: object) { return request({ - url: `${prefix}Use/failUpdate`, + url: `${prefixCons}Use/failUpdate`, method: 'post', data, }) @@ -243,7 +244,7 @@ // 删除草稿箱 export function draftDeleteUse(data: object) { return request({ - url: `${prefix}Use/draftDelete`, + url: `${prefixCons}Use/draftDelete`, method: 'post', data, }) @@ -252,7 +253,7 @@ // 删除已取消 export function canceledApprDeleteUse(data: object) { return request({ - url: `${prefix}Use/approval/delete`, + url: `${prefixCons}Use/approval/delete`, method: 'post', data, }) @@ -261,7 +262,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/revoke`, + url: `${prefixCons}Use/approval/revoke`, method: 'post', data, }) @@ -270,7 +271,7 @@ // 设备供方审批-拒绝 export function refuseApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/refuse`, + url: `${prefixCons}Use/approval/refuse`, method: 'post', data, }) @@ -458,3 +459,48 @@ }) } +/* -------------------------------- 交接单 -------------------------------- */ +// 查询申请单列表 +export function getConsumableHandoverList(data: any) { + return request({ + url: `${prefix}/abandonGoodsHandle/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 详情 +export function detailConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/detail`, + method: 'post', + data, + }) +} + +// 保存 +export function saveConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/save`, + method: 'post', + data, + }) +} + +// 编辑 +export function updateConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} + +// 编辑 +export function deleteConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index 76ff20d..e57baaf 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -791,6 +791,28 @@ }, }, { + path: 'consumableHandoverList', + name: 'ConsumableHandoverList', + component: () => import('@/views/resource/outsideService/consumable/handoverList.vue'), + meta: { + title: '废弃物资处理交接记录', + auth: '/resource/outsideService/consumableHandover', + icon: 'ep:key', + }, + }, + { + path: 'consumableHandover/:type/:id?', + name: 'ConsumableHandoverDetail', + component: () => import('@/views/resource/outsideService/consumable/handoverDetail.vue'), + meta: { + title: '废弃物资处理交接记录详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/outsideService/consumableHandoverList', + }, + }, + { path: 'consumableEvaluateList', name: 'ConsumableEvaluateList', component: () => import('@/views/resource/outsideService/consumable/evaluateList.vue'), diff --git a/src/views/resource/outsideService/consumable/consumable-interface.ts b/src/views/resource/outsideService/consumable/consumable-interface.ts index 1cc817f..ce1c2c7 100644 --- a/src/views/resource/outsideService/consumable/consumable-interface.ts +++ b/src/views/resource/outsideService/consumable/consumable-interface.ts @@ -240,3 +240,44 @@ createTime?: string decisionItem?: number } + +/* -------------------------------- 交接单 -------------------------------- */ +export interface IHandoverListQuery { + recordNo: string + createUserName: string + createTimeStart: string + createTimeEnd: string + offset: number + limit: number + sort?: string + order?: string +} + +export interface IConsumableHandoverGoods { + id?: string + recordId?: string + goodsName: string + handoverTime: string + handoverAmount: string + company: string + handoverUserId: string + handoverUserName: string + receiver: string +} + +export interface IConsumableHandover { + id: string + labCode: string + labCodeName?: string + groupCode: string + groupCodeName?: string + recordNo: string + recordName: string + goodsHandleDetailList: Array + goodsName?: string + handoverTime?: string + amount?: string + createUserId?: string + createUserName?: string + createTime?: string +} diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue new file mode 100644 index 0000000..7b7e81c --- /dev/null +++ b/src/views/resource/outsideService/consumable/handoverDetail.vue @@ -0,0 +1,360 @@ + + + + diff --git a/src/views/resource/outsideService/consumable/handoverDetailDialog.vue b/src/views/resource/outsideService/consumable/handoverDetailDialog.vue new file mode 100644 index 0000000..569276d --- /dev/null +++ b/src/views/resource/outsideService/consumable/handoverDetailDialog.vue @@ -0,0 +1,162 @@ + + + + diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts index a0936cc..1143e9c 100644 --- a/src/api/resource/supplierConsumable.ts +++ b/src/api/resource/supplierConsumable.ts @@ -1,13 +1,14 @@ import request from '../index' -const prefix = 'resource/supplier/consumableGoods' -const prefixGoods = 'resource/supplier/goods' +const prefix = 'resource/supplier' +const prefixCons = `${prefix}/consumableGoods` +const prefixGoods = `${prefix}/goods` /* -------------------------------- 供方评价表 -------------------------------- */ // 查询列表 export function getConsumableEvaluateList(data: any) { return request({ - url: `${prefix}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -16,7 +17,7 @@ // 详情 export function detailConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/detail`, + url: `${prefixCons}Evaluate/detail`, method: 'post', data, }) @@ -25,7 +26,7 @@ // 保存至草稿箱 export function saveConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/save`, + url: `${prefixCons}Evaluate/save`, method: 'post', data, }) @@ -34,7 +35,7 @@ // 提交流程 export function submitConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/submit`, + url: `${prefixCons}Evaluate/submit`, method: 'post', data, }) @@ -43,7 +44,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/draftUpdate`, + url: `${prefixCons}Evaluate/draftUpdate`, method: 'post', data, }) @@ -52,7 +53,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/failUpdate`, + url: `${prefixCons}Evaluate/failUpdate`, method: 'post', data, }) @@ -61,7 +62,7 @@ // 删除草稿箱 export function draftDelete(data: object) { return request({ - url: `${prefix}Evaluate/draftDelete`, + url: `${prefixCons}Evaluate/draftDelete`, method: 'post', data, }) @@ -70,7 +71,7 @@ // 删除已取消 export function canceledApprDelete(data: object) { return request({ - url: `${prefix}Evaluate/approval/delete`, + url: `${prefixCons}Evaluate/approval/delete`, method: 'post', data, }) @@ -79,7 +80,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/revoke`, + url: `${prefixCons}Evaluate/approval/revoke`, method: 'post', data, }) @@ -88,7 +89,7 @@ // 设备供方审批-拒绝 export function refuseApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/refuse`, + url: `${prefixCons}Evaluate/approval/refuse`, method: 'post', data, }) @@ -98,7 +99,7 @@ // 查询申请单列表 export function getConsumableApplyList(data: any) { return request({ - url: `${prefix}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -107,7 +108,7 @@ // 详情 export function detailConsumableApply(data: object) { return request({ - url: `${prefix}Apply/detail`, + url: `${prefixCons}Apply/detail`, method: 'post', data, }) @@ -116,7 +117,7 @@ // 保存至草稿箱 export function saveConsumableApply(data: object) { return request({ - url: `${prefix}Apply/save`, + url: `${prefixCons}Apply/save`, method: 'post', data, }) @@ -125,7 +126,7 @@ // 提交流程 export function submitConsumableApply(data: object) { return request({ - url: `${prefix}Apply/submit`, + url: `${prefixCons}Apply/submit`, method: 'post', data, }) @@ -134,7 +135,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/draftUpdate`, + url: `${prefixCons}Apply/draftUpdate`, method: 'post', data, }) @@ -143,7 +144,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/failUpdate`, + url: `${prefixCons}Apply/failUpdate`, method: 'post', data, }) @@ -152,7 +153,7 @@ // 删除草稿箱 export function draftDeleteApply(data: object) { return request({ - url: `${prefix}Apply/draftDelete`, + url: `${prefixCons}Apply/draftDelete`, method: 'post', data, }) @@ -161,7 +162,7 @@ // 删除已取消 export function canceledApprDeleteApply(data: object) { return request({ - url: `${prefix}Apply/approval/delete`, + url: `${prefixCons}Apply/approval/delete`, method: 'post', data, }) @@ -170,7 +171,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/revoke`, + url: `${prefixCons}Apply/approval/revoke`, method: 'post', data, }) @@ -179,7 +180,7 @@ // 设备供方审批-拒绝 export function refuseApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/refuse`, + url: `${prefixCons}Apply/approval/refuse`, method: 'post', data, }) @@ -189,7 +190,7 @@ // 查询列表 export function getConsumableUseList(data: any) { return request({ - url: `${prefix}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -198,7 +199,7 @@ // 详情 export function detailConsumableUse(data: object) { return request({ - url: `${prefix}Use/detail`, + url: `${prefixCons}Use/detail`, method: 'post', data, }) @@ -207,7 +208,7 @@ // 保存至草稿箱 export function saveConsumableUse(data: object) { return request({ - url: `${prefix}Use/save`, + url: `${prefixCons}Use/save`, method: 'post', data, }) @@ -216,7 +217,7 @@ // 提交流程 export function submitConsumableUse(data: object) { return request({ - url: `${prefix}Use/submit`, + url: `${prefixCons}Use/submit`, method: 'post', data, }) @@ -225,7 +226,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableUse(data: object) { return request({ - url: `${prefix}Use/draftUpdate`, + url: `${prefixCons}Use/draftUpdate`, method: 'post', data, }) @@ -234,7 +235,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableUse(data: object) { return request({ - url: `${prefix}Use/failUpdate`, + url: `${prefixCons}Use/failUpdate`, method: 'post', data, }) @@ -243,7 +244,7 @@ // 删除草稿箱 export function draftDeleteUse(data: object) { return request({ - url: `${prefix}Use/draftDelete`, + url: `${prefixCons}Use/draftDelete`, method: 'post', data, }) @@ -252,7 +253,7 @@ // 删除已取消 export function canceledApprDeleteUse(data: object) { return request({ - url: `${prefix}Use/approval/delete`, + url: `${prefixCons}Use/approval/delete`, method: 'post', data, }) @@ -261,7 +262,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/revoke`, + url: `${prefixCons}Use/approval/revoke`, method: 'post', data, }) @@ -270,7 +271,7 @@ // 设备供方审批-拒绝 export function refuseApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/refuse`, + url: `${prefixCons}Use/approval/refuse`, method: 'post', data, }) @@ -458,3 +459,48 @@ }) } +/* -------------------------------- 交接单 -------------------------------- */ +// 查询申请单列表 +export function getConsumableHandoverList(data: any) { + return request({ + url: `${prefix}/abandonGoodsHandle/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 详情 +export function detailConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/detail`, + method: 'post', + data, + }) +} + +// 保存 +export function saveConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/save`, + method: 'post', + data, + }) +} + +// 编辑 +export function updateConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} + +// 编辑 +export function deleteConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index 76ff20d..e57baaf 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -791,6 +791,28 @@ }, }, { + path: 'consumableHandoverList', + name: 'ConsumableHandoverList', + component: () => import('@/views/resource/outsideService/consumable/handoverList.vue'), + meta: { + title: '废弃物资处理交接记录', + auth: '/resource/outsideService/consumableHandover', + icon: 'ep:key', + }, + }, + { + path: 'consumableHandover/:type/:id?', + name: 'ConsumableHandoverDetail', + component: () => import('@/views/resource/outsideService/consumable/handoverDetail.vue'), + meta: { + title: '废弃物资处理交接记录详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/outsideService/consumableHandoverList', + }, + }, + { path: 'consumableEvaluateList', name: 'ConsumableEvaluateList', component: () => import('@/views/resource/outsideService/consumable/evaluateList.vue'), diff --git a/src/views/resource/outsideService/consumable/consumable-interface.ts b/src/views/resource/outsideService/consumable/consumable-interface.ts index 1cc817f..ce1c2c7 100644 --- a/src/views/resource/outsideService/consumable/consumable-interface.ts +++ b/src/views/resource/outsideService/consumable/consumable-interface.ts @@ -240,3 +240,44 @@ createTime?: string decisionItem?: number } + +/* -------------------------------- 交接单 -------------------------------- */ +export interface IHandoverListQuery { + recordNo: string + createUserName: string + createTimeStart: string + createTimeEnd: string + offset: number + limit: number + sort?: string + order?: string +} + +export interface IConsumableHandoverGoods { + id?: string + recordId?: string + goodsName: string + handoverTime: string + handoverAmount: string + company: string + handoverUserId: string + handoverUserName: string + receiver: string +} + +export interface IConsumableHandover { + id: string + labCode: string + labCodeName?: string + groupCode: string + groupCodeName?: string + recordNo: string + recordName: string + goodsHandleDetailList: Array + goodsName?: string + handoverTime?: string + amount?: string + createUserId?: string + createUserName?: string + createTime?: string +} diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue new file mode 100644 index 0000000..7b7e81c --- /dev/null +++ b/src/views/resource/outsideService/consumable/handoverDetail.vue @@ -0,0 +1,360 @@ + + + + diff --git a/src/views/resource/outsideService/consumable/handoverDetailDialog.vue b/src/views/resource/outsideService/consumable/handoverDetailDialog.vue new file mode 100644 index 0000000..569276d --- /dev/null +++ b/src/views/resource/outsideService/consumable/handoverDetailDialog.vue @@ -0,0 +1,162 @@ + + + + diff --git a/src/views/resource/outsideService/consumable/handoverList.vue b/src/views/resource/outsideService/consumable/handoverList.vue new file mode 100644 index 0000000..80a8393 --- /dev/null +++ b/src/views/resource/outsideService/consumable/handoverList.vue @@ -0,0 +1,350 @@ + + + + + + diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts index a0936cc..1143e9c 100644 --- a/src/api/resource/supplierConsumable.ts +++ b/src/api/resource/supplierConsumable.ts @@ -1,13 +1,14 @@ import request from '../index' -const prefix = 'resource/supplier/consumableGoods' -const prefixGoods = 'resource/supplier/goods' +const prefix = 'resource/supplier' +const prefixCons = `${prefix}/consumableGoods` +const prefixGoods = `${prefix}/goods` /* -------------------------------- 供方评价表 -------------------------------- */ // 查询列表 export function getConsumableEvaluateList(data: any) { return request({ - url: `${prefix}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Evaluate/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -16,7 +17,7 @@ // 详情 export function detailConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/detail`, + url: `${prefixCons}Evaluate/detail`, method: 'post', data, }) @@ -25,7 +26,7 @@ // 保存至草稿箱 export function saveConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/save`, + url: `${prefixCons}Evaluate/save`, method: 'post', data, }) @@ -34,7 +35,7 @@ // 提交流程 export function submitConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/submit`, + url: `${prefixCons}Evaluate/submit`, method: 'post', data, }) @@ -43,7 +44,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/draftUpdate`, + url: `${prefixCons}Evaluate/draftUpdate`, method: 'post', data, }) @@ -52,7 +53,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableEvaluate(data: object) { return request({ - url: `${prefix}Evaluate/failUpdate`, + url: `${prefixCons}Evaluate/failUpdate`, method: 'post', data, }) @@ -61,7 +62,7 @@ // 删除草稿箱 export function draftDelete(data: object) { return request({ - url: `${prefix}Evaluate/draftDelete`, + url: `${prefixCons}Evaluate/draftDelete`, method: 'post', data, }) @@ -70,7 +71,7 @@ // 删除已取消 export function canceledApprDelete(data: object) { return request({ - url: `${prefix}Evaluate/approval/delete`, + url: `${prefixCons}Evaluate/approval/delete`, method: 'post', data, }) @@ -79,7 +80,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/revoke`, + url: `${prefixCons}Evaluate/approval/revoke`, method: 'post', data, }) @@ -88,7 +89,7 @@ // 设备供方审批-拒绝 export function refuseApproval(data: object) { return request({ - url: `${prefix}Evaluate/approval/refuse`, + url: `${prefixCons}Evaluate/approval/refuse`, method: 'post', data, }) @@ -98,7 +99,7 @@ // 查询申请单列表 export function getConsumableApplyList(data: any) { return request({ - url: `${prefix}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Apply/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -107,7 +108,7 @@ // 详情 export function detailConsumableApply(data: object) { return request({ - url: `${prefix}Apply/detail`, + url: `${prefixCons}Apply/detail`, method: 'post', data, }) @@ -116,7 +117,7 @@ // 保存至草稿箱 export function saveConsumableApply(data: object) { return request({ - url: `${prefix}Apply/save`, + url: `${prefixCons}Apply/save`, method: 'post', data, }) @@ -125,7 +126,7 @@ // 提交流程 export function submitConsumableApply(data: object) { return request({ - url: `${prefix}Apply/submit`, + url: `${prefixCons}Apply/submit`, method: 'post', data, }) @@ -134,7 +135,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/draftUpdate`, + url: `${prefixCons}Apply/draftUpdate`, method: 'post', data, }) @@ -143,7 +144,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableApply(data: object) { return request({ - url: `${prefix}Apply/failUpdate`, + url: `${prefixCons}Apply/failUpdate`, method: 'post', data, }) @@ -152,7 +153,7 @@ // 删除草稿箱 export function draftDeleteApply(data: object) { return request({ - url: `${prefix}Apply/draftDelete`, + url: `${prefixCons}Apply/draftDelete`, method: 'post', data, }) @@ -161,7 +162,7 @@ // 删除已取消 export function canceledApprDeleteApply(data: object) { return request({ - url: `${prefix}Apply/approval/delete`, + url: `${prefixCons}Apply/approval/delete`, method: 'post', data, }) @@ -170,7 +171,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/revoke`, + url: `${prefixCons}Apply/approval/revoke`, method: 'post', data, }) @@ -179,7 +180,7 @@ // 设备供方审批-拒绝 export function refuseApprovalApply(data: object) { return request({ - url: `${prefix}Apply/approval/refuse`, + url: `${prefixCons}Apply/approval/refuse`, method: 'post', data, }) @@ -189,7 +190,7 @@ // 查询列表 export function getConsumableUseList(data: any) { return request({ - url: `${prefix}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, + url: `${prefixCons}Use/approval/listPage?limit=${data.limit}&offset=${data.offset}`, method: 'post', data, }) @@ -198,7 +199,7 @@ // 详情 export function detailConsumableUse(data: object) { return request({ - url: `${prefix}Use/detail`, + url: `${prefixCons}Use/detail`, method: 'post', data, }) @@ -207,7 +208,7 @@ // 保存至草稿箱 export function saveConsumableUse(data: object) { return request({ - url: `${prefix}Use/save`, + url: `${prefixCons}Use/save`, method: 'post', data, }) @@ -216,7 +217,7 @@ // 提交流程 export function submitConsumableUse(data: object) { return request({ - url: `${prefix}Use/submit`, + url: `${prefixCons}Use/submit`, method: 'post', data, }) @@ -225,7 +226,7 @@ // 草稿箱编辑(不走流程审批) export function updateConsumableUse(data: object) { return request({ - url: `${prefix}Use/draftUpdate`, + url: `${prefixCons}Use/draftUpdate`, method: 'post', data, }) @@ -234,7 +235,7 @@ // 未通过供方编辑(重走流程审批) export function failUpdateConsumableUse(data: object) { return request({ - url: `${prefix}Use/failUpdate`, + url: `${prefixCons}Use/failUpdate`, method: 'post', data, }) @@ -243,7 +244,7 @@ // 删除草稿箱 export function draftDeleteUse(data: object) { return request({ - url: `${prefix}Use/draftDelete`, + url: `${prefixCons}Use/draftDelete`, method: 'post', data, }) @@ -252,7 +253,7 @@ // 删除已取消 export function canceledApprDeleteUse(data: object) { return request({ - url: `${prefix}Use/approval/delete`, + url: `${prefixCons}Use/approval/delete`, method: 'post', data, }) @@ -261,7 +262,7 @@ // 发起者撤回,表单状态更改为已取消 export function revokeApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/revoke`, + url: `${prefixCons}Use/approval/revoke`, method: 'post', data, }) @@ -270,7 +271,7 @@ // 设备供方审批-拒绝 export function refuseApprovalUse(data: object) { return request({ - url: `${prefix}Use/approval/refuse`, + url: `${prefixCons}Use/approval/refuse`, method: 'post', data, }) @@ -458,3 +459,48 @@ }) } +/* -------------------------------- 交接单 -------------------------------- */ +// 查询申请单列表 +export function getConsumableHandoverList(data: any) { + return request({ + url: `${prefix}/abandonGoodsHandle/listPage?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 详情 +export function detailConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/detail`, + method: 'post', + data, + }) +} + +// 保存 +export function saveConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/save`, + method: 'post', + data, + }) +} + +// 编辑 +export function updateConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} + +// 编辑 +export function deleteConsumableHandover(data: object) { + return request({ + url: `${prefix}/abandonGoodsHandle/update`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts index 76ff20d..e57baaf 100644 --- a/src/router/modules/resource.ts +++ b/src/router/modules/resource.ts @@ -791,6 +791,28 @@ }, }, { + path: 'consumableHandoverList', + name: 'ConsumableHandoverList', + component: () => import('@/views/resource/outsideService/consumable/handoverList.vue'), + meta: { + title: '废弃物资处理交接记录', + auth: '/resource/outsideService/consumableHandover', + icon: 'ep:key', + }, + }, + { + path: 'consumableHandover/:type/:id?', + name: 'ConsumableHandoverDetail', + component: () => import('@/views/resource/outsideService/consumable/handoverDetail.vue'), + meta: { + title: '废弃物资处理交接记录详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/outsideService/consumableHandoverList', + }, + }, + { path: 'consumableEvaluateList', name: 'ConsumableEvaluateList', component: () => import('@/views/resource/outsideService/consumable/evaluateList.vue'), diff --git a/src/views/resource/outsideService/consumable/consumable-interface.ts b/src/views/resource/outsideService/consumable/consumable-interface.ts index 1cc817f..ce1c2c7 100644 --- a/src/views/resource/outsideService/consumable/consumable-interface.ts +++ b/src/views/resource/outsideService/consumable/consumable-interface.ts @@ -240,3 +240,44 @@ createTime?: string decisionItem?: number } + +/* -------------------------------- 交接单 -------------------------------- */ +export interface IHandoverListQuery { + recordNo: string + createUserName: string + createTimeStart: string + createTimeEnd: string + offset: number + limit: number + sort?: string + order?: string +} + +export interface IConsumableHandoverGoods { + id?: string + recordId?: string + goodsName: string + handoverTime: string + handoverAmount: string + company: string + handoverUserId: string + handoverUserName: string + receiver: string +} + +export interface IConsumableHandover { + id: string + labCode: string + labCodeName?: string + groupCode: string + groupCodeName?: string + recordNo: string + recordName: string + goodsHandleDetailList: Array + goodsName?: string + handoverTime?: string + amount?: string + createUserId?: string + createUserName?: string + createTime?: string +} diff --git a/src/views/resource/outsideService/consumable/handoverDetail.vue b/src/views/resource/outsideService/consumable/handoverDetail.vue new file mode 100644 index 0000000..7b7e81c --- /dev/null +++ b/src/views/resource/outsideService/consumable/handoverDetail.vue @@ -0,0 +1,360 @@ + + + + diff --git a/src/views/resource/outsideService/consumable/handoverDetailDialog.vue b/src/views/resource/outsideService/consumable/handoverDetailDialog.vue new file mode 100644 index 0000000..569276d --- /dev/null +++ b/src/views/resource/outsideService/consumable/handoverDetailDialog.vue @@ -0,0 +1,162 @@ + + + + diff --git a/src/views/resource/outsideService/consumable/handoverList.vue b/src/views/resource/outsideService/consumable/handoverList.vue new file mode 100644 index 0000000..80a8393 --- /dev/null +++ b/src/views/resource/outsideService/consumable/handoverList.vue @@ -0,0 +1,350 @@ + + + + + + diff --git a/src/views/resource/outsideService/consumable/useDetailDialog.vue b/src/views/resource/outsideService/consumable/useDetailDialog.vue index ab1ca8c..3eac3e3 100644 --- a/src/views/resource/outsideService/consumable/useDetailDialog.vue +++ b/src/views/resource/outsideService/consumable/useDetailDialog.vue @@ -1,14 +1,9 @@