diff --git a/src/api/resource/editPurchaseApplyApi.js b/src/api/resource/editPurchaseApplyApi.js new file mode 100644 index 0000000..71674c3 --- /dev/null +++ b/src/api/resource/editPurchaseApplyApi.js @@ -0,0 +1,97 @@ +import request from '@/utils/request' +import { getCommunityId } from '@/api/community/communityApi' + +// 获取采购申请列表 +export function listPurchaseApplys(params) { + return new Promise((resolve, reject) => { + request({ + url: '/purchaseApply.listPurchaseApplys', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 更新采购申请 +export function updatePurchaseApply(data) { + return new Promise((resolve, reject) => { + request({ + url: '/purchaseApply.updatePurchaseApply', + method: 'post', + data: { + ...data, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取仓库列表 +export function listStorehouses(params) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStore.listStorehouses', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取物品类型列表 +export function listResourceStoreTypes(params) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStoreType.listResourceStoreTypes', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取物品列表 +export function listResourceStores(params) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStore.listResourceStores', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/api/resource/myAuditOrdersApi.js b/src/api/resource/myAuditOrdersApi.js new file mode 100644 index 0000000..e376b39 --- /dev/null +++ b/src/api/resource/myAuditOrdersApi.js @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +// 获取待审核订单列表 +export function listAuditOrders(params) { + return new Promise((resolve, reject) => { + request({ + url: '/auditUser.listAuditOrders', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取工作流步骤人员 +export function listWorkflowStepStaffs(params) { + return new Promise((resolve, reject) => { + request({ + url: '/workflow.listWorkflowStepStaffs', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 审核订单 +export function auditOrderInfo(data) { + return new Promise((resolve, reject) => { + request({ + url: '/auditUser.notifyAudit', + method: 'post', + data + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/api/resource/resourceEnterManageApi.js b/src/api/resource/resourceEnterManageApi.js new file mode 100644 index 0000000..f1eb8fe --- /dev/null +++ b/src/api/resource/resourceEnterManageApi.js @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +// 获取采购申请列表 +export function listPurchaseApplys(params) { + return new Promise((resolve, reject) => { + request({ + url: '/purchaseApply.listPurchaseApplys', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取供应商列表 +export function listResourceSuppliers(params) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceSupplier.listResourceSuppliers', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 提交入库申请 +export function resourceEnter(data) { + return new Promise((resolve, reject) => { + request({ + url: '/purchase/resourceEnter', + method: 'post', + data + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/i18n/resourceI18n.js b/src/i18n/resourceI18n.js index 0f2d5b5..7817a98 100644 --- a/src/i18n/resourceI18n.js +++ b/src/i18n/resourceI18n.js @@ -30,6 +30,9 @@ import { messages as printAssetInventoryInStockMessages } from '../views/resourc import { messages as returnStorehouseApplyManageMessages } from '../views/resource/returnStorehouseApplyManageLang' import { messages as transferGoodsManageMessages } from '../views/resource/transferGoodsManageLang' import { messages as scrapGoodsStepMessages } from '../views/resource/scrapGoodsStepLang' +import { messages as myAuditOrdersMessages } from '../views/resource/myAuditOrdersLang' +import { messages as resourceEnterManageMessages } from '../views/resource/resourceEnterManageLang' +import { messages as editPurchaseApplyMessages } from '../views/resource/editPurchaseApplyLang' export const messages = { en: { @@ -64,6 +67,9 @@ export const messages = { ...returnStorehouseApplyManageMessages.en, ...transferGoodsManageMessages.en, ...scrapGoodsStepMessages.en, + ...myAuditOrdersMessages.en, + ...resourceEnterManageMessages.en, + ...editPurchaseApplyMessages.en, }, zh: { ...resourceAuditFlowMessages.zh, @@ -97,5 +103,8 @@ export const messages = { ...returnStorehouseApplyManageMessages.zh, ...transferGoodsManageMessages.zh, ...scrapGoodsStepMessages.zh, + ...myAuditOrdersMessages.zh, + ...resourceEnterManageMessages.zh, + ...editPurchaseApplyMessages.zh, } } \ No newline at end of file diff --git a/src/router/resourceRouter.js b/src/router/resourceRouter.js index 2ec9af3..516b94e 100644 --- a/src/router/resourceRouter.js +++ b/src/router/resourceRouter.js @@ -145,5 +145,20 @@ export default [ name: '/pages/common/scrapGoodsStep', component: () => import('@/views/resource/scrapGoodsStepList.vue') }, + { + path: '/pages/admin/myAuditOrders', + name: '/pages/admin/myAuditOrders', + component: () => import('@/views/resource/myAuditOrdersList.vue') + }, + { + path: '/views/resource/resourceEnterManage', + name: '/views/resource/resourceEnterManage', + component: () => import('@/views/resource/resourceEnterManageList.vue') + }, + { + path: '/pages/resource/editPurchaseApply', + name: '/pages/resource/editPurchaseApply', + component: () => import('@/views/resource/editPurchaseApplyList.vue') + }, ] \ No newline at end of file diff --git a/src/views/resource/editPurchaseApplyLang.js b/src/views/resource/editPurchaseApplyLang.js new file mode 100644 index 0000000..9256048 --- /dev/null +++ b/src/views/resource/editPurchaseApplyLang.js @@ -0,0 +1,62 @@ +export const messages = { + en: { + editPurchaseApply: { + title: 'Edit Purchase Apply', + back: 'Back', + contactPerson: 'Contact Person', + contactPersonPlaceholder: 'Required, please enter contact person', + contactPhone: 'Contact Phone', + contactPhonePlaceholder: 'Required, please enter contact phone', + applyDescription: 'Apply Description', + applyDescriptionPlaceholder: 'Required, please enter apply description', + purchaseItems: 'Purchase Items', + select: 'Select', + itemType: 'Item Type', + itemName: 'Item Name(Code)', + itemSpec: 'Item Specification', + price: 'Price', + selectPrice: 'Select Price', + itemStock: 'Item Stock', + applyQuantity: 'Apply Quantity', + applyQuantityPlaceholder: 'Required, please enter apply quantity', + remark: 'Remark', + remarkPlaceholder: 'Optional, please enter remark', + operation: 'Operation', + remove: 'Remove', + submit: 'Submit', + noItemsSelected: 'No items selected', + updateSuccess: 'Update success', + updateFailed: 'Update failed' + } + }, + zh: { + editPurchaseApply: { + title: '编辑采购申请', + back: '返回', + contactPerson: '联系人', + contactPersonPlaceholder: '必填,请填写联系人', + contactPhone: '联系电话', + contactPhonePlaceholder: '必填,请填写联系电话', + applyDescription: '申请说明', + applyDescriptionPlaceholder: '必填,请填写申请说明', + purchaseItems: '采购物品', + select: '选择', + itemType: '物品类型', + itemName: '物品名称(编码)', + itemSpec: '物品规格', + price: '价格', + selectPrice: '请选择价格', + itemStock: '物品库存', + applyQuantity: '申请数量', + applyQuantityPlaceholder: '必填,请填写申请数量', + remark: '备注', + remarkPlaceholder: '选填,请填写备注', + operation: '操作', + remove: '移除', + submit: '提交', + noItemsSelected: '未选择采购物品', + updateSuccess: '修改成功', + updateFailed: '修改失败' + } + } +} \ No newline at end of file diff --git a/src/views/resource/editPurchaseApplyList.vue b/src/views/resource/editPurchaseApplyList.vue new file mode 100644 index 0000000..b496973 --- /dev/null +++ b/src/views/resource/editPurchaseApplyList.vue @@ -0,0 +1,257 @@ + + + + + \ No newline at end of file diff --git a/src/views/resource/myAuditOrdersLang.js b/src/views/resource/myAuditOrdersLang.js new file mode 100644 index 0000000..860c1a5 --- /dev/null +++ b/src/views/resource/myAuditOrdersLang.js @@ -0,0 +1,36 @@ +export const messages = { + en: { + myAuditOrders: { + todoList: 'Todo List', + back: 'Back', + refresh: 'Refresh', + orderNumber: 'Order Number', + orderType: 'Order Type', + orderStatus: 'Order Status', + applicant: 'Applicant', + createTime: 'Create Time', + operation: 'Operation', + view: 'View', + edit: 'Edit', + procurement: 'Procurement', + audit: 'Audit' + } + }, + zh: { + myAuditOrders: { + todoList: '待办单', + back: '返回', + refresh: '刷新', + orderNumber: '订单号', + orderType: '订单类型', + orderStatus: '订单状态', + applicant: '申请人', + createTime: '创建时间', + operation: '操作', + view: '查看', + edit: '修改', + procurement: '采购入库', + audit: '审批' + } + } +} \ No newline at end of file diff --git a/src/views/resource/myAuditOrdersList.vue b/src/views/resource/myAuditOrdersList.vue new file mode 100644 index 0000000..e7b0b6d --- /dev/null +++ b/src/views/resource/myAuditOrdersList.vue @@ -0,0 +1,221 @@ + + + + + \ No newline at end of file diff --git a/src/views/resource/resourceEnterManageLang.js b/src/views/resource/resourceEnterManageLang.js new file mode 100644 index 0000000..b3fd1b4 --- /dev/null +++ b/src/views/resource/resourceEnterManageLang.js @@ -0,0 +1,54 @@ +export const messages = { + en: { + resourceEnterManage: { + orderId: 'Order ID', + itemType: 'Item Type', + itemName: 'Item Name', + itemSpec: 'Item Specification', + itemCode: 'Item Code', + itemStock: 'Item Stock', + referencePrice: 'Reference Price', + applyQuantity: 'Apply Quantity', + purchaseQuantity: 'Purchase Quantity', + purchaseQuantityPlaceholder: 'Required, please enter purchase quantity', + purchasePrice: 'Purchase Price', + purchasePricePlaceholder: 'Required, please enter purchase price', + supplier: 'Supplier', + selectSupplier: 'Please select', + remark: 'Remark', + remarkPlaceholder: 'Optional, please enter remark', + submit: 'Submit', + selectItemError: 'Please select items to enter', + purchaseQuantityError: 'Purchase quantity is required and must be positive', + purchasePriceError: 'Purchase price is required and must be positive', + submitSuccess: 'Operation successful', + submitError: 'Operation failed' + } + }, + zh: { + resourceEnterManage: { + orderId: '单号', + itemType: '物品类型', + itemName: '物品名称', + itemSpec: '物品规格', + itemCode: '物品编码', + itemStock: '物品库存', + referencePrice: '参考单价', + applyQuantity: '申请数量', + purchaseQuantity: '采购数量', + purchaseQuantityPlaceholder: '必填,请填写采购数量', + purchasePrice: '采购单价', + purchasePricePlaceholder: '必填,请填写采购单价', + supplier: '供应商', + selectSupplier: '请选择', + remark: '备注', + remarkPlaceholder: '可填,请填写备注', + submit: '提交', + selectItemError: '请选择入库物品', + purchaseQuantityError: '采购数量未填写或填写不正确', + purchasePriceError: '单价未填写或填写不正确', + submitSuccess: '操作成功', + submitError: '操作失败' + } + } +} \ No newline at end of file diff --git a/src/views/resource/resourceEnterManageList.vue b/src/views/resource/resourceEnterManageList.vue new file mode 100644 index 0000000..856f24a --- /dev/null +++ b/src/views/resource/resourceEnterManageList.vue @@ -0,0 +1,218 @@ + + + + + \ No newline at end of file