diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 953bbd8..90b9ba1 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -1,5 +1,6 @@
import request from '../index'
const prefix = 'resource/supplier/consumableGoods'
+const prefixGoods = 'resource/supplier/goods'
/* -------------------------------- 供方评价表 -------------------------------- */
// 查询列表
@@ -273,3 +274,94 @@
data,
})
}
+
+/* -------------------------------- 验收记录单 -------------------------------- */
+// 查询列表
+export function getGoodsCheckList(data: any) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 详情
+export function detailGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 保存至草稿箱
+export function saveGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/save`,
+ method: 'post',
+ data,
+ })
+}
+
+// 提交流程
+export function submitGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/submit`,
+ method: 'post',
+ data,
+ })
+}
+
+// 草稿箱编辑(不走流程审批)
+export function updateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 未通过供方编辑(重走流程审批)
+export function failUpdateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/failUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除草稿箱
+export function draftDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftDelete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除已取消
+export function canceledApprDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 发起者撤回,表单状态更改为已取消
+export function revokeApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/revoke`,
+ method: 'post',
+ data,
+ })
+}
+
+// 设备供方审批-拒绝
+export function refuseApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/refuse`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 953bbd8..90b9ba1 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -1,5 +1,6 @@
import request from '../index'
const prefix = 'resource/supplier/consumableGoods'
+const prefixGoods = 'resource/supplier/goods'
/* -------------------------------- 供方评价表 -------------------------------- */
// 查询列表
@@ -273,3 +274,94 @@
data,
})
}
+
+/* -------------------------------- 验收记录单 -------------------------------- */
+// 查询列表
+export function getGoodsCheckList(data: any) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 详情
+export function detailGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 保存至草稿箱
+export function saveGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/save`,
+ method: 'post',
+ data,
+ })
+}
+
+// 提交流程
+export function submitGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/submit`,
+ method: 'post',
+ data,
+ })
+}
+
+// 草稿箱编辑(不走流程审批)
+export function updateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 未通过供方编辑(重走流程审批)
+export function failUpdateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/failUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除草稿箱
+export function draftDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftDelete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除已取消
+export function canceledApprDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 发起者撤回,表单状态更改为已取消
+export function revokeApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/revoke`,
+ method: 'post',
+ data,
+ })
+}
+
+// 设备供方审批-拒绝
+export function refuseApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/refuse`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index e4d804d..2208a60 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -689,6 +689,40 @@
},
},
{
+ path: 'consumableCheckList',
+ name: 'ConsumableCheckList',
+ component: () => import('@/views/resource/outsideService/consumable/checkList.vue'),
+ meta: {
+ title: '物资验收记录',
+ auth: '/resource/outsideService/consumableCheck',
+ icon: 'ep:key',
+ },
+ },
+ {
+ path: 'consumableCheck/:type/:id?/:status?',
+ name: 'ConsumableCheckDetail',
+ component: () => import('@/views/resource/outsideService/consumable/checkDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
+ path: 'consumableCheck/approved/:id?',
+ name: 'ConsumableCheckDetailApproved',
+ component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
path: 'consumableUseList',
name: 'ConsumableUseList',
component: () => import('@/views/resource/outsideService/consumable/useList.vue'),
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 953bbd8..90b9ba1 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -1,5 +1,6 @@
import request from '../index'
const prefix = 'resource/supplier/consumableGoods'
+const prefixGoods = 'resource/supplier/goods'
/* -------------------------------- 供方评价表 -------------------------------- */
// 查询列表
@@ -273,3 +274,94 @@
data,
})
}
+
+/* -------------------------------- 验收记录单 -------------------------------- */
+// 查询列表
+export function getGoodsCheckList(data: any) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 详情
+export function detailGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 保存至草稿箱
+export function saveGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/save`,
+ method: 'post',
+ data,
+ })
+}
+
+// 提交流程
+export function submitGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/submit`,
+ method: 'post',
+ data,
+ })
+}
+
+// 草稿箱编辑(不走流程审批)
+export function updateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 未通过供方编辑(重走流程审批)
+export function failUpdateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/failUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除草稿箱
+export function draftDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftDelete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除已取消
+export function canceledApprDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 发起者撤回,表单状态更改为已取消
+export function revokeApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/revoke`,
+ method: 'post',
+ data,
+ })
+}
+
+// 设备供方审批-拒绝
+export function refuseApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/refuse`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index e4d804d..2208a60 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -689,6 +689,40 @@
},
},
{
+ path: 'consumableCheckList',
+ name: 'ConsumableCheckList',
+ component: () => import('@/views/resource/outsideService/consumable/checkList.vue'),
+ meta: {
+ title: '物资验收记录',
+ auth: '/resource/outsideService/consumableCheck',
+ icon: 'ep:key',
+ },
+ },
+ {
+ path: 'consumableCheck/:type/:id?/:status?',
+ name: 'ConsumableCheckDetail',
+ component: () => import('@/views/resource/outsideService/consumable/checkDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
+ path: 'consumableCheck/approved/:id?',
+ name: 'ConsumableCheckDetailApproved',
+ component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
path: 'consumableUseList',
name: 'ConsumableUseList',
component: () => import('@/views/resource/outsideService/consumable/useList.vue'),
diff --git a/src/views/resource/common/common-interface.ts b/src/views/resource/common/common-interface.ts
index dfe7b52..c7c115f 100644
--- a/src/views/resource/common/common-interface.ts
+++ b/src/views/resource/common/common-interface.ts
@@ -21,3 +21,13 @@
offset: number
limit: number
}
+
+export interface IConsumableApplyFilter {
+ applyNo: string
+ createUserName: string
+ createDept: string
+ approvalStatus: string
+ formId: string
+ offset: number
+ limit: number
+}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 953bbd8..90b9ba1 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -1,5 +1,6 @@
import request from '../index'
const prefix = 'resource/supplier/consumableGoods'
+const prefixGoods = 'resource/supplier/goods'
/* -------------------------------- 供方评价表 -------------------------------- */
// 查询列表
@@ -273,3 +274,94 @@
data,
})
}
+
+/* -------------------------------- 验收记录单 -------------------------------- */
+// 查询列表
+export function getGoodsCheckList(data: any) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 详情
+export function detailGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 保存至草稿箱
+export function saveGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/save`,
+ method: 'post',
+ data,
+ })
+}
+
+// 提交流程
+export function submitGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/submit`,
+ method: 'post',
+ data,
+ })
+}
+
+// 草稿箱编辑(不走流程审批)
+export function updateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 未通过供方编辑(重走流程审批)
+export function failUpdateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/failUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除草稿箱
+export function draftDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftDelete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除已取消
+export function canceledApprDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 发起者撤回,表单状态更改为已取消
+export function revokeApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/revoke`,
+ method: 'post',
+ data,
+ })
+}
+
+// 设备供方审批-拒绝
+export function refuseApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/refuse`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index e4d804d..2208a60 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -689,6 +689,40 @@
},
},
{
+ path: 'consumableCheckList',
+ name: 'ConsumableCheckList',
+ component: () => import('@/views/resource/outsideService/consumable/checkList.vue'),
+ meta: {
+ title: '物资验收记录',
+ auth: '/resource/outsideService/consumableCheck',
+ icon: 'ep:key',
+ },
+ },
+ {
+ path: 'consumableCheck/:type/:id?/:status?',
+ name: 'ConsumableCheckDetail',
+ component: () => import('@/views/resource/outsideService/consumable/checkDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
+ path: 'consumableCheck/approved/:id?',
+ name: 'ConsumableCheckDetailApproved',
+ component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
path: 'consumableUseList',
name: 'ConsumableUseList',
component: () => import('@/views/resource/outsideService/consumable/useList.vue'),
diff --git a/src/views/resource/common/common-interface.ts b/src/views/resource/common/common-interface.ts
index dfe7b52..c7c115f 100644
--- a/src/views/resource/common/common-interface.ts
+++ b/src/views/resource/common/common-interface.ts
@@ -21,3 +21,13 @@
offset: number
limit: number
}
+
+export interface IConsumableApplyFilter {
+ applyNo: string
+ createUserName: string
+ createDept: string
+ approvalStatus: string
+ formId: string
+ offset: number
+ limit: number
+}
diff --git a/src/views/resource/common/filterConsumableApply.vue b/src/views/resource/common/filterConsumableApply.vue
new file mode 100644
index 0000000..0fd3ae7
--- /dev/null
+++ b/src/views/resource/common/filterConsumableApply.vue
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 展开物资
+
+
+ 收起展开
+
+
+
+ 选定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 953bbd8..90b9ba1 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -1,5 +1,6 @@
import request from '../index'
const prefix = 'resource/supplier/consumableGoods'
+const prefixGoods = 'resource/supplier/goods'
/* -------------------------------- 供方评价表 -------------------------------- */
// 查询列表
@@ -273,3 +274,94 @@
data,
})
}
+
+/* -------------------------------- 验收记录单 -------------------------------- */
+// 查询列表
+export function getGoodsCheckList(data: any) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 详情
+export function detailGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 保存至草稿箱
+export function saveGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/save`,
+ method: 'post',
+ data,
+ })
+}
+
+// 提交流程
+export function submitGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/submit`,
+ method: 'post',
+ data,
+ })
+}
+
+// 草稿箱编辑(不走流程审批)
+export function updateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 未通过供方编辑(重走流程审批)
+export function failUpdateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/failUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除草稿箱
+export function draftDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftDelete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除已取消
+export function canceledApprDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 发起者撤回,表单状态更改为已取消
+export function revokeApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/revoke`,
+ method: 'post',
+ data,
+ })
+}
+
+// 设备供方审批-拒绝
+export function refuseApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/refuse`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index e4d804d..2208a60 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -689,6 +689,40 @@
},
},
{
+ path: 'consumableCheckList',
+ name: 'ConsumableCheckList',
+ component: () => import('@/views/resource/outsideService/consumable/checkList.vue'),
+ meta: {
+ title: '物资验收记录',
+ auth: '/resource/outsideService/consumableCheck',
+ icon: 'ep:key',
+ },
+ },
+ {
+ path: 'consumableCheck/:type/:id?/:status?',
+ name: 'ConsumableCheckDetail',
+ component: () => import('@/views/resource/outsideService/consumable/checkDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
+ path: 'consumableCheck/approved/:id?',
+ name: 'ConsumableCheckDetailApproved',
+ component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
path: 'consumableUseList',
name: 'ConsumableUseList',
component: () => import('@/views/resource/outsideService/consumable/useList.vue'),
diff --git a/src/views/resource/common/common-interface.ts b/src/views/resource/common/common-interface.ts
index dfe7b52..c7c115f 100644
--- a/src/views/resource/common/common-interface.ts
+++ b/src/views/resource/common/common-interface.ts
@@ -21,3 +21,13 @@
offset: number
limit: number
}
+
+export interface IConsumableApplyFilter {
+ applyNo: string
+ createUserName: string
+ createDept: string
+ approvalStatus: string
+ formId: string
+ offset: number
+ limit: number
+}
diff --git a/src/views/resource/common/filterConsumableApply.vue b/src/views/resource/common/filterConsumableApply.vue
new file mode 100644
index 0000000..0fd3ae7
--- /dev/null
+++ b/src/views/resource/common/filterConsumableApply.vue
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 展开物资
+
+
+ 收起展开
+
+
+
+ 选定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/resource/outsideService/consumable/approvedDetail.vue b/src/views/resource/outsideService/consumable/approvedDetail.vue
index 4f5673c..603484d 100644
--- a/src/views/resource/outsideService/consumable/approvedDetail.vue
+++ b/src/views/resource/outsideService/consumable/approvedDetail.vue
@@ -49,6 +49,10 @@
case 'use':
title.value = '易耗物资使用记录'
break
+
+ case 'check':
+ title.value = '物资验收记录'
+ break
}
}
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 953bbd8..90b9ba1 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -1,5 +1,6 @@
import request from '../index'
const prefix = 'resource/supplier/consumableGoods'
+const prefixGoods = 'resource/supplier/goods'
/* -------------------------------- 供方评价表 -------------------------------- */
// 查询列表
@@ -273,3 +274,94 @@
data,
})
}
+
+/* -------------------------------- 验收记录单 -------------------------------- */
+// 查询列表
+export function getGoodsCheckList(data: any) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 详情
+export function detailGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 保存至草稿箱
+export function saveGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/save`,
+ method: 'post',
+ data,
+ })
+}
+
+// 提交流程
+export function submitGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/submit`,
+ method: 'post',
+ data,
+ })
+}
+
+// 草稿箱编辑(不走流程审批)
+export function updateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 未通过供方编辑(重走流程审批)
+export function failUpdateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/failUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除草稿箱
+export function draftDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftDelete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除已取消
+export function canceledApprDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 发起者撤回,表单状态更改为已取消
+export function revokeApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/revoke`,
+ method: 'post',
+ data,
+ })
+}
+
+// 设备供方审批-拒绝
+export function refuseApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/refuse`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index e4d804d..2208a60 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -689,6 +689,40 @@
},
},
{
+ path: 'consumableCheckList',
+ name: 'ConsumableCheckList',
+ component: () => import('@/views/resource/outsideService/consumable/checkList.vue'),
+ meta: {
+ title: '物资验收记录',
+ auth: '/resource/outsideService/consumableCheck',
+ icon: 'ep:key',
+ },
+ },
+ {
+ path: 'consumableCheck/:type/:id?/:status?',
+ name: 'ConsumableCheckDetail',
+ component: () => import('@/views/resource/outsideService/consumable/checkDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
+ path: 'consumableCheck/approved/:id?',
+ name: 'ConsumableCheckDetailApproved',
+ component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
path: 'consumableUseList',
name: 'ConsumableUseList',
component: () => import('@/views/resource/outsideService/consumable/useList.vue'),
diff --git a/src/views/resource/common/common-interface.ts b/src/views/resource/common/common-interface.ts
index dfe7b52..c7c115f 100644
--- a/src/views/resource/common/common-interface.ts
+++ b/src/views/resource/common/common-interface.ts
@@ -21,3 +21,13 @@
offset: number
limit: number
}
+
+export interface IConsumableApplyFilter {
+ applyNo: string
+ createUserName: string
+ createDept: string
+ approvalStatus: string
+ formId: string
+ offset: number
+ limit: number
+}
diff --git a/src/views/resource/common/filterConsumableApply.vue b/src/views/resource/common/filterConsumableApply.vue
new file mode 100644
index 0000000..0fd3ae7
--- /dev/null
+++ b/src/views/resource/common/filterConsumableApply.vue
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 展开物资
+
+
+ 收起展开
+
+
+
+ 选定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/resource/outsideService/consumable/approvedDetail.vue b/src/views/resource/outsideService/consumable/approvedDetail.vue
index 4f5673c..603484d 100644
--- a/src/views/resource/outsideService/consumable/approvedDetail.vue
+++ b/src/views/resource/outsideService/consumable/approvedDetail.vue
@@ -49,6 +49,10 @@
case 'use':
title.value = '易耗物资使用记录'
break
+
+ case 'check':
+ title.value = '物资验收记录'
+ break
}
}
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
new file mode 100644
index 0000000..c2e67a9
--- /dev/null
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -0,0 +1,626 @@
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+ 同意
+
+
+ 拒绝
+
+
+
+
+ 提交
+
+
+ 保存
+
+
+
+ 删除
+
+
+ 取消
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 953bbd8..90b9ba1 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -1,5 +1,6 @@
import request from '../index'
const prefix = 'resource/supplier/consumableGoods'
+const prefixGoods = 'resource/supplier/goods'
/* -------------------------------- 供方评价表 -------------------------------- */
// 查询列表
@@ -273,3 +274,94 @@
data,
})
}
+
+/* -------------------------------- 验收记录单 -------------------------------- */
+// 查询列表
+export function getGoodsCheckList(data: any) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 详情
+export function detailGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 保存至草稿箱
+export function saveGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/save`,
+ method: 'post',
+ data,
+ })
+}
+
+// 提交流程
+export function submitGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/submit`,
+ method: 'post',
+ data,
+ })
+}
+
+// 草稿箱编辑(不走流程审批)
+export function updateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 未通过供方编辑(重走流程审批)
+export function failUpdateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/failUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除草稿箱
+export function draftDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftDelete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除已取消
+export function canceledApprDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 发起者撤回,表单状态更改为已取消
+export function revokeApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/revoke`,
+ method: 'post',
+ data,
+ })
+}
+
+// 设备供方审批-拒绝
+export function refuseApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/refuse`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index e4d804d..2208a60 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -689,6 +689,40 @@
},
},
{
+ path: 'consumableCheckList',
+ name: 'ConsumableCheckList',
+ component: () => import('@/views/resource/outsideService/consumable/checkList.vue'),
+ meta: {
+ title: '物资验收记录',
+ auth: '/resource/outsideService/consumableCheck',
+ icon: 'ep:key',
+ },
+ },
+ {
+ path: 'consumableCheck/:type/:id?/:status?',
+ name: 'ConsumableCheckDetail',
+ component: () => import('@/views/resource/outsideService/consumable/checkDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
+ path: 'consumableCheck/approved/:id?',
+ name: 'ConsumableCheckDetailApproved',
+ component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
path: 'consumableUseList',
name: 'ConsumableUseList',
component: () => import('@/views/resource/outsideService/consumable/useList.vue'),
diff --git a/src/views/resource/common/common-interface.ts b/src/views/resource/common/common-interface.ts
index dfe7b52..c7c115f 100644
--- a/src/views/resource/common/common-interface.ts
+++ b/src/views/resource/common/common-interface.ts
@@ -21,3 +21,13 @@
offset: number
limit: number
}
+
+export interface IConsumableApplyFilter {
+ applyNo: string
+ createUserName: string
+ createDept: string
+ approvalStatus: string
+ formId: string
+ offset: number
+ limit: number
+}
diff --git a/src/views/resource/common/filterConsumableApply.vue b/src/views/resource/common/filterConsumableApply.vue
new file mode 100644
index 0000000..0fd3ae7
--- /dev/null
+++ b/src/views/resource/common/filterConsumableApply.vue
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 展开物资
+
+
+ 收起展开
+
+
+
+ 选定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/resource/outsideService/consumable/approvedDetail.vue b/src/views/resource/outsideService/consumable/approvedDetail.vue
index 4f5673c..603484d 100644
--- a/src/views/resource/outsideService/consumable/approvedDetail.vue
+++ b/src/views/resource/outsideService/consumable/approvedDetail.vue
@@ -49,6 +49,10 @@
case 'use':
title.value = '易耗物资使用记录'
break
+
+ case 'check':
+ title.value = '物资验收记录'
+ break
}
}
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
new file mode 100644
index 0000000..c2e67a9
--- /dev/null
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -0,0 +1,626 @@
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+ 同意
+
+
+ 拒绝
+
+
+
+
+ 提交
+
+
+ 保存
+
+
+
+ 删除
+
+
+ 取消
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/resource/outsideService/consumable/checkList.vue b/src/views/resource/outsideService/consumable/checkList.vue
new file mode 100644
index 0000000..1d6c396
--- /dev/null
+++ b/src/views/resource/outsideService/consumable/checkList.vue
@@ -0,0 +1,422 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+ 删除
+
+
+
+
+ 同意
+
+
+ 拒绝
+
+
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/api/resource/supplierConsumable.ts b/src/api/resource/supplierConsumable.ts
index 953bbd8..90b9ba1 100644
--- a/src/api/resource/supplierConsumable.ts
+++ b/src/api/resource/supplierConsumable.ts
@@ -1,5 +1,6 @@
import request from '../index'
const prefix = 'resource/supplier/consumableGoods'
+const prefixGoods = 'resource/supplier/goods'
/* -------------------------------- 供方评价表 -------------------------------- */
// 查询列表
@@ -273,3 +274,94 @@
data,
})
}
+
+/* -------------------------------- 验收记录单 -------------------------------- */
+// 查询列表
+export function getGoodsCheckList(data: any) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
+ method: 'post',
+ data,
+ })
+}
+
+// 详情
+export function detailGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/detail`,
+ method: 'post',
+ data,
+ })
+}
+
+// 保存至草稿箱
+export function saveGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/save`,
+ method: 'post',
+ data,
+ })
+}
+
+// 提交流程
+export function submitGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/submit`,
+ method: 'post',
+ data,
+ })
+}
+
+// 草稿箱编辑(不走流程审批)
+export function updateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 未通过供方编辑(重走流程审批)
+export function failUpdateGoodsCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/failUpdate`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除草稿箱
+export function draftDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/draftDelete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 删除已取消
+export function canceledApprDeleteCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/delete`,
+ method: 'post',
+ data,
+ })
+}
+
+// 发起者撤回,表单状态更改为已取消
+export function revokeApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/revoke`,
+ method: 'post',
+ data,
+ })
+}
+
+// 设备供方审批-拒绝
+export function refuseApprovalCheck(data: object) {
+ return request({
+ url: `${prefixGoods}AcceptanceRecord/approval/refuse`,
+ method: 'post',
+ data,
+ })
+}
diff --git a/src/router/modules/resource.ts b/src/router/modules/resource.ts
index e4d804d..2208a60 100644
--- a/src/router/modules/resource.ts
+++ b/src/router/modules/resource.ts
@@ -689,6 +689,40 @@
},
},
{
+ path: 'consumableCheckList',
+ name: 'ConsumableCheckList',
+ component: () => import('@/views/resource/outsideService/consumable/checkList.vue'),
+ meta: {
+ title: '物资验收记录',
+ auth: '/resource/outsideService/consumableCheck',
+ icon: 'ep:key',
+ },
+ },
+ {
+ path: 'consumableCheck/:type/:id?/:status?',
+ name: 'ConsumableCheckDetail',
+ component: () => import('@/views/resource/outsideService/consumable/checkDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
+ path: 'consumableCheck/approved/:id?',
+ name: 'ConsumableCheckDetailApproved',
+ component: () => import('@/views/resource/outsideService/consumable/approvedDetail.vue'),
+ meta: {
+ title: '物资验收记录详情',
+ icon: 'ep:key',
+ sidebar: false,
+ breadcrumb: true,
+ activeMenu: '/outsideService/consumableCheckList',
+ },
+ },
+ {
path: 'consumableUseList',
name: 'ConsumableUseList',
component: () => import('@/views/resource/outsideService/consumable/useList.vue'),
diff --git a/src/views/resource/common/common-interface.ts b/src/views/resource/common/common-interface.ts
index dfe7b52..c7c115f 100644
--- a/src/views/resource/common/common-interface.ts
+++ b/src/views/resource/common/common-interface.ts
@@ -21,3 +21,13 @@
offset: number
limit: number
}
+
+export interface IConsumableApplyFilter {
+ applyNo: string
+ createUserName: string
+ createDept: string
+ approvalStatus: string
+ formId: string
+ offset: number
+ limit: number
+}
diff --git a/src/views/resource/common/filterConsumableApply.vue b/src/views/resource/common/filterConsumableApply.vue
new file mode 100644
index 0000000..0fd3ae7
--- /dev/null
+++ b/src/views/resource/common/filterConsumableApply.vue
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 展开物资
+
+
+ 收起展开
+
+
+
+ 选定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/resource/outsideService/consumable/approvedDetail.vue b/src/views/resource/outsideService/consumable/approvedDetail.vue
index 4f5673c..603484d 100644
--- a/src/views/resource/outsideService/consumable/approvedDetail.vue
+++ b/src/views/resource/outsideService/consumable/approvedDetail.vue
@@ -49,6 +49,10 @@
case 'use':
title.value = '易耗物资使用记录'
break
+
+ case 'check':
+ title.value = '物资验收记录'
+ break
}
}
diff --git a/src/views/resource/outsideService/consumable/checkDetail.vue b/src/views/resource/outsideService/consumable/checkDetail.vue
new file mode 100644
index 0000000..c2e67a9
--- /dev/null
+++ b/src/views/resource/outsideService/consumable/checkDetail.vue
@@ -0,0 +1,626 @@
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+ 同意
+
+
+ 拒绝
+
+
+
+
+ 提交
+
+
+ 保存
+
+
+
+ 删除
+
+
+ 取消
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 选择
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/resource/outsideService/consumable/checkList.vue b/src/views/resource/outsideService/consumable/checkList.vue
new file mode 100644
index 0000000..1d6c396
--- /dev/null
+++ b/src/views/resource/outsideService/consumable/checkList.vue
@@ -0,0 +1,422 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+ 删除
+
+
+
+
+ 同意
+
+
+ 拒绝
+
+
+
+
+ 取消
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/resource/outsideService/consumable/consumable-interface.ts b/src/views/resource/outsideService/consumable/consumable-interface.ts
index 5437aa7..145614b 100644
--- a/src/views/resource/outsideService/consumable/consumable-interface.ts
+++ b/src/views/resource/outsideService/consumable/consumable-interface.ts
@@ -148,3 +148,47 @@
createTime?: string
decisionItem?: number
}
+
+/* -------------------------------- 验收记录 -------------------------------- */
+export interface ICheckListQuery {
+ recordNo: string
+ createDept: string
+ createUserName: string
+ acceptTimeStart: string
+ acceptTimeEnd: string
+ approvalStatus: string
+ formId: string
+ offset: number
+ limit: number
+ sort?: string
+ order?: string
+}
+
+export interface IGoodsCheckRecord {
+ id: string
+ labCode: string
+ labCodeName?: string
+ groupCode: string
+ groupCodeName?: string
+ recordNo: string
+ recordName: string
+ createDeptId: string
+ createDept: string
+ goodsName: string
+ goodsModel: string
+ goodsSupplier: string
+ goodsWorth: string
+ goodsApplyId: string
+ goodsApply?: string
+ goodsApplyNo?: string
+ acceptTime: string
+ performance: string
+ approvalStatus?: string
+ approvalStatusName?: string
+ processId?: string
+ taskId?: string
+ createUserId?: string
+ createUserName?: string
+ createTime?: string
+ decisionItem?: number
+}