diff --git a/src/api/itemManagement/applicationExamine.js b/src/api/itemManagement/applicationExamine.js new file mode 100644 index 0000000..35c9ee8 --- /dev/null +++ b/src/api/itemManagement/applicationExamine.js @@ -0,0 +1,23 @@ +import request from '@/router/axios'; + +export const findPage = (params) => { + return request({ + url: '/api/blade-desk/goodsApply/findPage', + method: 'get', + params + }) +} +export const detail = (params) => { + return request({ + url: '/api/blade-desk/goodsApply/detail', + method: 'get', + params: params + }) +} +export const remove = (params) => { + return request({ + url: '/api/blade-desk/goodsApply/remove', + method: 'get', + params + }) +} \ No newline at end of file diff --git a/src/api/itemManagement/itemList.js b/src/api/itemManagement/itemList.js new file mode 100644 index 0000000..45d4469 --- /dev/null +++ b/src/api/itemManagement/itemList.js @@ -0,0 +1,44 @@ +import request from '@/router/axios'; + +export const findPage = (params) => { + return request({ + url: '/api/blade-desk/goods/findPage', + method: 'get', + params: params + }) +} +export const detail = (params) => { + return request({ + url: '/api/blade-desk/goods/detail', + method: 'get', + params: params + }) +} +export const save = (data) => { + return request({ + url: '/api/blade-desk/goods/save', + method: 'post', + data + }) +} +export const goodsApplySave = (data) => { + return request({ + url: '/api/blade-desk/goodsApply/save', + method: 'post', + data + }) +} +export const remove = (params) => { + return request({ + url: '/api/blade-desk/goods/remove', + method: 'get', + params + }) +} +export const historyDetail = (params) => { + return request({ + url: '/api/blade-desk/goods/historyDetail', + method: 'get', + params + }) +} \ No newline at end of file diff --git a/src/page/itemManagement/applicationExamine/index.vue b/src/page/itemManagement/applicationExamine/index.vue new file mode 100644 index 0000000..31d3272 --- /dev/null +++ b/src/page/itemManagement/applicationExamine/index.vue @@ -0,0 +1,916 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 批量删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ scope.row.status == '0' ? '待审核' : (scope.row.status == '1' ? '待领取' : (scope.row.status == '2' ? '已驳回' : '已领取')) }} + + + + + + + + + + + 查看 + 删除 + 审核 + 领取 + + 更多 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ dialogFormType == 'examine' ? '审核结果' : '申领结果' }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/page/itemManagement/itemList/index.vue b/src/page/itemManagement/itemList/index.vue new file mode 100644 index 0000000..c795ffa --- /dev/null +++ b/src/page/itemManagement/itemList/index.vue @@ -0,0 +1,1099 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + 登记入库 + 批量删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查看 + 编辑 + 库存变更 + 操作明细 + 删除 + 申领 + + 更多 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物品信息 + + + + 物品大类: + {{ registerForm.bigClass }} + + + 物品名称: + {{ registerForm.name }} + + + 物品编号: + {{ registerForm.code }} + + + 品牌: + {{ registerForm.brand }} + + + 型号: + {{ registerForm.model }} + + + 规格: + {{ registerForm.standard }} + + + + + 历史记录 + + + + + {{ item.createTime }} + {{ item.type }} + ({{ item.type == '申领出库' ? '-' : '+' }}{{ item.num }}) + + + 申领提交人:{{ item.applyName }} + 提交时间:{{ item.applyTime }} + 所属部门:{{ item.deptName }} + + + {{ item.type == '申领出库' ? '申领审核人' : '登记入库人' }}:{{ item.type == '申领出库' ? item.approveName : item.inName }} + 提交时间:{{ item.type == '申领出库' ? item.approveTime : item.inTime }} + + + + + + + + + + + \ No newline at end of file diff --git a/src/router/views/index.js b/src/router/views/index.js index 6f9f9a6..8c4d804 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -243,5 +243,30 @@ export default [{ component: () => import( /* webpackChunkName: "views" */ '@/views/system/systemSetting') }] -} +}, + { + path: '/itemManagement', + component: Layout, + redirect: '/itemManagement/itemList', + children: [ + { + path: 'itemList', + name: '物品列表', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/page/itemManagement/itemList') + }, + { + path: 'applicationExamine', + name: '申领审核', + meta: { + i18n: 'dashboard' + }, + component: () => + import( /* webpackChunkName: "views" */ '@/page/itemManagement/applicationExamine') + }, + ] + } ]