From fc7cb95093e4cdf09d09509e77e2db28b387a794 Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Sun, 15 Jun 2025 16:39:59 +0800 Subject: [PATCH] 开发完成采购功能 --- src/api/resource/addItemOutApi.js | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/resource/allocationStorehouseApplyApi.js | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/resource/allocationStorehouseDetailedApi.js | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/resource/allocationStorehouseManageApi.js | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/resource/allocationUserStorehouseManageApi.js | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/resource/assetInventoryManageApi.js | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/resource/itemOutManageApi.js | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/resource/myResourceStoreManageApi.js | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/resource/purchaseApplyDetailManageApi.js | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/api/resource/resourceStoreUseRecordManageApi.js | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/car/searchOwner.vue | 2 +- src/components/fee/FeeConfigDetailDiscount.vue | 2 +- src/components/resource/allocationStorehouse.vue | 150 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/resource/cancelAssetInventory.vue | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/resource/chooseResourceStore.vue | 280 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/resource/deleteAssetInventory.vue | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/resource/deleteItemOut.vue | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/resource/deleteStorehouseManage.vue | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/components/resource/orgTreeShow.vue | 72 ------------------------------------------------------------------------ src/components/resource/selectStaff.vue | 2 +- src/components/work/visitOwnerRepair.vue | 2 +- src/i18n/index.js | 30 ++++++++++++++++++++++++++++++ src/router/index.js | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/addItemOutLang.js | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/addItemOutList.vue | 486 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/allocationStorehouseApplyLang.js | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/allocationStorehouseApplyList.vue | 401 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/allocationStorehouseDetailedLang.js | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/allocationStorehouseDetailedList.vue | 433 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/allocationStorehouseManageLang.js | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/allocationStorehouseManageList.vue | 358 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/allocationUserStorehouseManageLang.js | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/allocationUserStorehouseManageList.vue | 494 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/assetInventoryManageLang.js | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/assetInventoryManageList.vue | 319 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/itemOutManageLang.js | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/itemOutManageList.vue | 322 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/myResourceStoreManageLang.js | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/myResourceStoreManageList.vue | 445 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/purchaseApplyDetailManageLang.js | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/purchaseApplyDetailManageList.vue | 491 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/resourceStoreUseRecordManageLang.js | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/resource/resourceStoreUseRecordManageList.vue | 372 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/views/work/myRepairDispatchManageList.vue | 2 +- 44 files changed, 6786 insertions(+), 77 deletions(-) create mode 100644 src/api/resource/addItemOutApi.js create mode 100644 src/api/resource/allocationStorehouseApplyApi.js create mode 100644 src/api/resource/allocationStorehouseDetailedApi.js create mode 100644 src/api/resource/allocationStorehouseManageApi.js create mode 100644 src/api/resource/allocationUserStorehouseManageApi.js create mode 100644 src/api/resource/assetInventoryManageApi.js create mode 100644 src/api/resource/itemOutManageApi.js create mode 100644 src/api/resource/myResourceStoreManageApi.js create mode 100644 src/api/resource/purchaseApplyDetailManageApi.js create mode 100644 src/api/resource/resourceStoreUseRecordManageApi.js create mode 100644 src/components/resource/allocationStorehouse.vue create mode 100644 src/components/resource/cancelAssetInventory.vue create mode 100644 src/components/resource/chooseResourceStore.vue create mode 100644 src/components/resource/deleteAssetInventory.vue create mode 100644 src/components/resource/deleteItemOut.vue create mode 100644 src/components/resource/deleteStorehouseManage.vue delete mode 100644 src/components/resource/orgTreeShow.vue create mode 100644 src/views/resource/addItemOutLang.js create mode 100644 src/views/resource/addItemOutList.vue create mode 100644 src/views/resource/allocationStorehouseApplyLang.js create mode 100644 src/views/resource/allocationStorehouseApplyList.vue create mode 100644 src/views/resource/allocationStorehouseDetailedLang.js create mode 100644 src/views/resource/allocationStorehouseDetailedList.vue create mode 100644 src/views/resource/allocationStorehouseManageLang.js create mode 100644 src/views/resource/allocationStorehouseManageList.vue create mode 100644 src/views/resource/allocationUserStorehouseManageLang.js create mode 100644 src/views/resource/allocationUserStorehouseManageList.vue create mode 100644 src/views/resource/assetInventoryManageLang.js create mode 100644 src/views/resource/assetInventoryManageList.vue create mode 100644 src/views/resource/itemOutManageLang.js create mode 100644 src/views/resource/itemOutManageList.vue create mode 100644 src/views/resource/myResourceStoreManageLang.js create mode 100644 src/views/resource/myResourceStoreManageList.vue create mode 100644 src/views/resource/purchaseApplyDetailManageLang.js create mode 100644 src/views/resource/purchaseApplyDetailManageList.vue create mode 100644 src/views/resource/resourceStoreUseRecordManageLang.js create mode 100644 src/views/resource/resourceStoreUseRecordManageList.vue diff --git a/src/api/resource/addItemOutApi.js b/src/api/resource/addItemOutApi.js new file mode 100644 index 0000000..a23e7a6 --- /dev/null +++ b/src/api/resource/addItemOutApi.js @@ -0,0 +1,143 @@ +import request from '@/utils/request' +import { getCommunityId } from '@/api/community/communityApi' + +// 物品领用提交 +export function goodsCollection(data) { + return new Promise((resolve, reject) => { + request({ + url: '/collection/goodsCollection', + method: 'post', + data: { + ...data, + communityId: getCommunityId() + } + }).then(response => { + resolve(response.data) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取仓库列表 +export function listStorehouses(params = {}) { + return new Promise((resolve, reject) => { + const defaultParams = { + page: 1, + row: 100, + communityId: getCommunityId(), + allowUse: 'ON' + } + + request({ + url: '/resourceStore.listStorehouses', + method: 'get', + params: {...defaultParams, ...params} + }).then(response => { + resolve(response.data) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取物品类型列表 +export function listResourceStoreTypes(params = {}) { + return new Promise((resolve, reject) => { + const defaultParams = { + page: 1, + row: 100, + communityId: getCommunityId(), + parentId: params.parentId || '0' + } + + request({ + url: '/resourceStoreType.listResourceStoreTypes', + method: 'get', + params: {...defaultParams, ...params} + }).then(response => { + resolve(response.data) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取物品列表 +export function listResourceStores(params = {}) { + return new Promise((resolve, reject) => { + const defaultParams = { + page: 1, + row: 10, + communityId: getCommunityId(), + ...params + } + + request({ + url: '/resourceStore.listResourceStores', + method: 'get', + params: defaultParams + }).then(response => { + resolve(response.data) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取组织树 +export function listOrgTree(params = {}) { + return new Promise((resolve, reject) => { + request({ + url: '/org.listOrgTree', + method: 'get', + params: { + communityId: getCommunityId(), + ...params + } + }).then(response => { + resolve(response.data) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取员工信息列表 +export function listStaffInfos(params = {}) { + return new Promise((resolve, reject) => { + const defaultParams = { + page: 1, + rows: 50, + ...params + } + + request({ + url: '/query.staff.infos', + method: 'get', + params: defaultParams + }).then(response => { + resolve(response.data) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取流程审批人 +export function queryFirstAuditStaff(params = {}) { + return new Promise((resolve, reject) => { + request({ + url: '/oaWorkflow.queryFirstAuditStaff', + method: 'get', + params: { + communityId: getCommunityId(), + ...params + } + }).then(response => { + resolve(response.data) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/api/resource/allocationStorehouseApplyApi.js b/src/api/resource/allocationStorehouseApplyApi.js new file mode 100644 index 0000000..9f7f87b --- /dev/null +++ b/src/api/resource/allocationStorehouseApplyApi.js @@ -0,0 +1,135 @@ +import request from '@/utils/request' +import { getCommunityId } from '@/api/community/communityApi' + +// 获取仓库列表 +export function listStorehouses(params) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStore.listStorehouses', + method: 'get', + params: { + ...params, + communityId: 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: 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: params.communityId || getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 保存调拨申请 +export function saveAllocationStorehouse(data) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStore.saveAllocationStorehouse', + method: 'post', + data: { + ...data, + communityId: data.communityId || getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取审批人信息 +export function queryFirstAuditStaff(params) { + return new Promise((resolve, reject) => { + request({ + url: '/oaWorkflow.queryFirstAuditStaff', + method: 'get', + params: { + ...params, + communityId: params.communityId || getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取员工信息 +export function queryStaffInfos(params) { + return new Promise((resolve, reject) => { + request({ + url: '/query.staff.infos', + method: 'get', + params: { + ...params, + communityId: params.communityId || getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取组织树 +export function listOrgTree(params) { + return new Promise((resolve, reject) => { + request({ + url: '/org.listOrgTree', + method: 'get', + params: { + ...params, + communityId: 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/allocationStorehouseDetailedApi.js b/src/api/resource/allocationStorehouseDetailedApi.js new file mode 100644 index 0000000..15b14db --- /dev/null +++ b/src/api/resource/allocationStorehouseDetailedApi.js @@ -0,0 +1,81 @@ +import request from '@/utils/request' + +// 获取调拨明细列表 +export function listAllocationStorehouses(params) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStore.listAllocationStorehouses', + method: 'get', + params + }).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 + }).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 + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取物品规格列表 +export function listResourceStoreSpecifications(params) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStore.listResourceStoreSpecifications', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 导出数据 +export function exportData(params) { + return new Promise((resolve, reject) => { + request({ + url: '/export.exportData', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/api/resource/allocationStorehouseManageApi.js b/src/api/resource/allocationStorehouseManageApi.js new file mode 100644 index 0000000..26d939d --- /dev/null +++ b/src/api/resource/allocationStorehouseManageApi.js @@ -0,0 +1,116 @@ +import request from '@/utils/request' +import { getCommunityId } from '@/api/community/communityApi' + +// 获取调拨记录列表 +export function listAllocationStorehouseApplys(params) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStore.listAllocationStorehouseApplys', + method: 'get', + params: { + ...params, + communityId: params.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: params.communityId || getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 保存调拨申请 +export function saveAllocationStorehouse(data) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStore.saveAllocationStorehouse', + method: 'post', + data: { + ...data, + communityId: data.communityId || getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 删除调拨记录 +export function deleteAllocationStorehouse(data) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStore.deleteAllocationStorehouse', + method: 'post', + data: { + ...data, + communityId: data.communityId || getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取流程图 +export function listRunWorkflowImage(params) { + return new Promise((resolve, reject) => { + request({ + url: '/workflow.listRunWorkflowImage', + method: 'get', + params: { + ...params, + communityId: params.communityId || getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 导出数据 +export function exportData(params) { + return new Promise((resolve, reject) => { + request({ + url: '/export.exportData', + method: 'get', + params: { + ...params, + communityId: 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/allocationUserStorehouseManageApi.js b/src/api/resource/allocationUserStorehouseManageApi.js new file mode 100644 index 0000000..1ef8419 --- /dev/null +++ b/src/api/resource/allocationUserStorehouseManageApi.js @@ -0,0 +1,70 @@ +import request from '@/utils/request' +import { getCommunityId } from '@/api/community/communityApi' + +// 获取转赠记录列表 +export function listAllocationUserStorehouses(params) { + return new Promise((resolve, reject) => { + params.communityId = getCommunityId() + request({ + url: '/resourceStore.listAllocationUserStorehouses', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取物品类型列表 +export function listResourceStoreTypes(params) { + return new Promise((resolve, reject) => { + params.communityId = getCommunityId() + request({ + url: '/resourceStoreType.listResourceStoreTypes', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取物品规格列表 +export function listResourceStoreSpecifications(params) { + return new Promise((resolve, reject) => { + params.communityId = getCommunityId() + request({ + url: '/resourceStore.listResourceStoreSpecifications', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 导出数据 +export function exportData(params) { + return new Promise((resolve, reject) => { + params.communityId = getCommunityId() + request({ + url: '/export.exportData', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/api/resource/assetInventoryManageApi.js b/src/api/resource/assetInventoryManageApi.js new file mode 100644 index 0000000..77fec1f --- /dev/null +++ b/src/api/resource/assetInventoryManageApi.js @@ -0,0 +1,81 @@ +import request from '@/utils/request' + +// 获取资产盘点列表 +export function listAssetInventory(params) { + return new Promise((resolve, reject) => { + request({ + url: '/assetInventory.listAssetInventory', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 删除资产盘点 +export function deleteAssetInventory(data) { + return new Promise((resolve, reject) => { + request({ + url: '/assetInventory.deleteAssetInventory', + method: 'post', + data + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 更新资产盘点 +export function updateAssetInventory(data) { + return new Promise((resolve, reject) => { + request({ + url: '/assetInventory.updateAssetInventory', + method: 'post', + data + }).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 + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 导出资产盘点 +export function exportAssetInventory(params) { + return new Promise((resolve, reject) => { + request({ + url: '/export.exportData', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/api/resource/itemOutManageApi.js b/src/api/resource/itemOutManageApi.js new file mode 100644 index 0000000..e6119dc --- /dev/null +++ b/src/api/resource/itemOutManageApi.js @@ -0,0 +1,81 @@ +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({ + data: res.purchaseApplys, + total: res.total + }) + }).catch(error => { + reject(error) + }) + }) +} + +// 删除物品领用申请 +export function deletePurchaseApply(data) { + return new Promise((resolve, reject) => { + request({ + url: '/purchaseApply.deletePurchaseApply', + method: 'post', + data: { + ...data, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 导出数据 +export function exportData(params) { + return new Promise((resolve, reject) => { + request({ + url: '/export.exportData', + method: 'get', + params: { + ...params, + communityId: getCommunityId() + } + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取工作流图片 +export function listRunWorkflowImage(params) { + return new Promise((resolve, reject) => { + request({ + url: '/workflow.listRunWorkflowImage', + 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/myResourceStoreManageApi.js b/src/api/resource/myResourceStoreManageApi.js new file mode 100644 index 0000000..c0cd9b7 --- /dev/null +++ b/src/api/resource/myResourceStoreManageApi.js @@ -0,0 +1,65 @@ +import request from '@/utils/request' + +// 获取用户物品列表 +export function listUserStorehouses(params) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStore.listUserStorehouses', + method: 'get', + params + }).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 + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取物品规格列表 +export function listResourceStoreSpecifications(params) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStore.listResourceStoreSpecifications', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 导出数据 +export function exportData(params) { + return new Promise((resolve, reject) => { + request({ + url: '/export.exportData', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/api/resource/purchaseApplyDetailManageApi.js b/src/api/resource/purchaseApplyDetailManageApi.js new file mode 100644 index 0000000..220a0a2 --- /dev/null +++ b/src/api/resource/purchaseApplyDetailManageApi.js @@ -0,0 +1,115 @@ +import request from '@/utils/request' +import { getCommunityId } from '@/api/community/communityApi' + +// 获取采购申请明细列表 +export function listPurchaseApplyDetails(params) { + return new Promise((resolve, reject) => { + params.params.communityId = getCommunityId() + request({ + url: '/purchaseApplyDetail.listPurchaseApplyDetails', + method: 'get', + params: params.params + }).then(response => { + const res = response.data + resolve({ + data: res.purchaseApplyDetails, + total: res.total + }) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取物品类型列表 +export function listResourceStoreTypes(params) { + return new Promise((resolve, reject) => { + params.params.communityId = getCommunityId() + request({ + url: '/resourceStoreType.listResourceStoreTypes', + method: 'get', + params: params.params + }).then(response => { + const res = response.data + resolve({ + data: res.data + }) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取物品规格列表 +export function listResourceStoreSpecifications(params) { + return new Promise((resolve, reject) => { + params.params.communityId = getCommunityId() + request({ + url: '/resourceStore.listResourceStoreSpecifications', + method: 'get', + params: params.params + }).then(response => { + const res = response.data + resolve({ + data: res.data + }) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取供应商列表 +export function listResourceSuppliers(params) { + return new Promise((resolve, reject) => { + params.params.communityId = getCommunityId() + request({ + url: '/resourceSupplier.listResourceSuppliers', + method: 'get', + params: params.params + }).then(response => { + const res = response.data + resolve({ + data: res.data + }) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取仓库列表 +export function listStorehouses(params) { + return new Promise((resolve, reject) => { + params.params.communityId = getCommunityId() + request({ + url: '/resourceStore.listStorehouses', + method: 'get', + params: params.params + }).then(response => { + const res = response.data + resolve({ + data: res.data + }) + }).catch(error => { + reject(error) + }) + }) +} + +// 导出数据 +export function exportData(params) { + return new Promise((resolve, reject) => { + params.params.communityId = getCommunityId() + request({ + url: '/export.exportData', + method: 'get', + params: params.params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/api/resource/resourceStoreUseRecordManageApi.js b/src/api/resource/resourceStoreUseRecordManageApi.js new file mode 100644 index 0000000..9b9187a --- /dev/null +++ b/src/api/resource/resourceStoreUseRecordManageApi.js @@ -0,0 +1,65 @@ +import request from '@/utils/request' + +// 获取物品使用记录列表 +export function listResourceStoreUseRecords(params) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStore.listResourceStoreUseRecords', + method: 'get', + params + }).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 + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 获取物品规格列表 +export function listResourceStoreSpecifications(params) { + return new Promise((resolve, reject) => { + request({ + url: '/resourceStore.listResourceStoreSpecifications', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} + +// 导出数据 +export function exportData(params) { + return new Promise((resolve, reject) => { + request({ + url: '/export.exportData', + method: 'get', + params + }).then(response => { + const res = response.data + resolve(res) + }).catch(error => { + reject(error) + }) + }) +} \ No newline at end of file diff --git a/src/components/car/searchOwner.vue b/src/components/car/searchOwner.vue index 7f32ef8..b9e542b 100644 --- a/src/components/car/searchOwner.vue +++ b/src/components/car/searchOwner.vue @@ -139,7 +139,7 @@ export default { const params = { page: page, row: size, - communityId: this.$store.getters.communityId, + communityId: this.getCommunityId(), name: this.searchInfo._currentOwnerName.trim(), roomName: this.searchInfo.roomName.trim(), ownerTypeCd: this.searchInfo.ownerTypeCd diff --git a/src/components/fee/FeeConfigDetailDiscount.vue b/src/components/fee/FeeConfigDetailDiscount.vue index 4a8d9d2..ff7ad1b 100644 --- a/src/components/fee/FeeConfigDetailDiscount.vue +++ b/src/components/fee/FeeConfigDetailDiscount.vue @@ -103,7 +103,7 @@ export default { try { await deletePayFeeConfigDiscount({ configDiscountId: this.currentDiscount.configDiscountId, - communityId: this.$store.getters.communityId + communityId: this.getCommunityId() }) this.$message.success(this.$t('feeConfigDetail.deleteSuccess')) this.loadData() diff --git a/src/components/resource/allocationStorehouse.vue b/src/components/resource/allocationStorehouse.vue new file mode 100644 index 0000000..1d54d42 --- /dev/null +++ b/src/components/resource/allocationStorehouse.vue @@ -0,0 +1,150 @@ + + + + + \ No newline at end of file diff --git a/src/components/resource/cancelAssetInventory.vue b/src/components/resource/cancelAssetInventory.vue new file mode 100644 index 0000000..c5cf4fe --- /dev/null +++ b/src/components/resource/cancelAssetInventory.vue @@ -0,0 +1,59 @@ + + + \ No newline at end of file diff --git a/src/components/resource/chooseResourceStore.vue b/src/components/resource/chooseResourceStore.vue new file mode 100644 index 0000000..f1a9b41 --- /dev/null +++ b/src/components/resource/chooseResourceStore.vue @@ -0,0 +1,280 @@ + + + + + \ No newline at end of file diff --git a/src/components/resource/deleteAssetInventory.vue b/src/components/resource/deleteAssetInventory.vue new file mode 100644 index 0000000..0e8d14d --- /dev/null +++ b/src/components/resource/deleteAssetInventory.vue @@ -0,0 +1,57 @@ + + + \ No newline at end of file diff --git a/src/components/resource/deleteItemOut.vue b/src/components/resource/deleteItemOut.vue new file mode 100644 index 0000000..d4b3107 --- /dev/null +++ b/src/components/resource/deleteItemOut.vue @@ -0,0 +1,60 @@ + + + + + \ No newline at end of file diff --git a/src/components/resource/deleteStorehouseManage.vue b/src/components/resource/deleteStorehouseManage.vue new file mode 100644 index 0000000..3617603 --- /dev/null +++ b/src/components/resource/deleteStorehouseManage.vue @@ -0,0 +1,68 @@ + + + + + \ No newline at end of file diff --git a/src/components/resource/orgTreeShow.vue b/src/components/resource/orgTreeShow.vue deleted file mode 100644 index 079b966..0000000 --- a/src/components/resource/orgTreeShow.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/components/resource/selectStaff.vue b/src/components/resource/selectStaff.vue index ac7d358..e03a69f 100644 --- a/src/components/resource/selectStaff.vue +++ b/src/components/resource/selectStaff.vue @@ -47,7 +47,7 @@ + + \ No newline at end of file diff --git a/src/views/resource/allocationStorehouseApplyLang.js b/src/views/resource/allocationStorehouseApplyLang.js new file mode 100644 index 0000000..b4d0ba1 --- /dev/null +++ b/src/views/resource/allocationStorehouseApplyLang.js @@ -0,0 +1,126 @@ +export const messages = { + en: { + allocationStorehouseApply: { + title: 'Allocation Application', + back: 'Back', + warehouse: 'Warehouse', + warehousePlaceholder: 'Required, please select warehouse', + remark: 'Application Description', + remarkPlaceholder: 'Required, please fill in application description', + itemsTitle: 'Allocation Items', + selectItems: 'Select Items', + itemType: 'Item Type', + itemName: 'Item Name', + itemSpec: 'Item Specification', + fixedItem: 'Fixed Item', + sourceWarehouse: 'Source Warehouse', + referencePrice: 'Reference Price', + selectPrice: 'Please select price', + stock: 'Stock', + targetWarehouse: 'Target Warehouse', + selectTargetWarehouse: 'Required, please select target warehouse', + transferQuantity: 'Allocation Quantity', + operation: 'Operation', + cancelTransfer: 'Cancel Allocation', + approverTitle: 'Approver', + approver: 'Approver', + selectApprover: 'Required, please select approver', + select: 'Select', + submit: 'Submit', + selectWarehouseFirst: 'Please select warehouse first', + fillRemarkFirst: 'Please fill in application description first', + remarkRequired: 'Application description is required', + selectItemsFirst: 'Please select items first', + sameWarehouseRequired: 'Allocation items must come from the same warehouse', + selectPriceFirst: 'Please select price first', + stockNotEnough: 'Insufficient stock', + selectTargetWarehouseFirst: 'Please select target warehouse first', + fillQuantityFirst: 'Please fill in allocation quantity first', + submitSuccess: 'Allocation application submitted successfully' + }, + chooseResourceStore: { + title: 'Select Items for Allocation', + selectWarehouse: 'Please select warehouse', + selectItemType: 'Please select item type', + selectSubType: 'Please select sub type', + inputItemName: 'Enter item management name', + warehouseName: 'Warehouse Name', + itemType: 'Item Type', + itemName: 'Item Name', + itemSpec: 'Item Specification', + itemCode: 'Item Code', + isFixedItem: 'Is Fixed Item', + itemStock: 'Item Stock', + selectItemFirst: 'Please select items first' + }, + selectStaff: { + title: 'Select Staff', + orgInfo: 'Organization Information', + staffInfo: 'Staff Information', + submitter: 'Submitter', + dynamicAssign: 'Dynamic Assignment' + } + }, + zh: { + allocationStorehouseApply: { + title: '调拨申请', + back: '返回', + warehouse: '仓库', + warehousePlaceholder: '必填,请选择仓库', + remark: '申请说明', + remarkPlaceholder: '必填,请填写申请说明', + itemsTitle: '调拨物品', + selectItems: '选择物品', + itemType: '物品类型', + itemName: '物品名称', + itemSpec: '物品规格', + fixedItem: '固定物品', + sourceWarehouse: '源仓库', + referencePrice: '参考价格', + selectPrice: '请选择价格', + stock: '库存', + targetWarehouse: '目标仓库', + selectTargetWarehouse: '必填,请选择目标仓库', + transferQuantity: '调拨数量', + operation: '操作', + cancelTransfer: '取消调拨', + approverTitle: '审批人', + approver: '审批人', + selectApprover: '必填,请选择审批人', + select: '选择', + submit: '提交', + selectWarehouseFirst: '请先选择仓库', + fillRemarkFirst: '请先填写申请说明', + remarkRequired: '申请说明不能为空', + selectItemsFirst: '请先选择物品', + sameWarehouseRequired: '调拨商品需来自同一仓库', + selectPriceFirst: '请先选择价格', + stockNotEnough: '库存不足', + selectTargetWarehouseFirst: '请先选择目标仓库', + fillQuantityFirst: '请先填写调拨数量', + submitSuccess: '调拨申请提交成功' + }, + chooseResourceStore: { + title: '【调拨申请】选择物品', + selectWarehouse: '请选择仓库', + selectItemType: '请选择物品类型', + selectSubType: '请选择二级分类', + inputItemName: '输入物品管理名称', + warehouseName: '仓库名称', + itemType: '物品类型', + itemName: '物品名称', + itemSpec: '物品规格', + itemCode: '物品编码', + isFixedItem: '是否是固定物品', + itemStock: '物品库存', + selectItemFirst: '请先选择物品' + }, + selectStaff: { + title: '选择员工', + orgInfo: '组织信息', + staffInfo: '员工信息', + submitter: '提交者', + dynamicAssign: '动态指定' + } + } +} \ No newline at end of file diff --git a/src/views/resource/allocationStorehouseApplyList.vue b/src/views/resource/allocationStorehouseApplyList.vue new file mode 100644 index 0000000..d1981b1 --- /dev/null +++ b/src/views/resource/allocationStorehouseApplyList.vue @@ -0,0 +1,401 @@ + + + + + \ No newline at end of file diff --git a/src/views/resource/allocationStorehouseDetailedLang.js b/src/views/resource/allocationStorehouseDetailedLang.js new file mode 100644 index 0000000..8999c96 --- /dev/null +++ b/src/views/resource/allocationStorehouseDetailedLang.js @@ -0,0 +1,84 @@ +export const messages = { + en: { + allocationStorehouseDetailed: { + queryCondition: 'Query Condition', + allocationDetail: 'Allocation Detail', + query: 'Query', + reset: 'Reset', + more: 'More', + hide: 'Hide', + export: 'Export', + all: 'All', + resIdPlaceholder: 'Please input resource ID', + resNamePlaceholder: 'Please input resource name', + resTypePlaceholder: 'Please select resource type', + secondTypePlaceholder: 'Please select secondary type', + specPlaceholder: 'Please select specification', + applyIdPlaceholder: 'Please input allocation ID', + sourceStorePlaceholder: 'Required, please select source storehouse', + targetStorePlaceholder: 'Required, please select target storehouse', + startTimePlaceholder: 'Please select start time', + endTimePlaceholder: 'Please select end time', + statePlaceholder: 'Please select allocation state', + exportSuccess: 'Export success', + exportError: 'Export failed', + table: { + applyId: 'Allocation ID', + resId: 'Resource ID', + resType: 'Resource Type', + resName: 'Resource Name', + specName: 'Specification', + isFixedName: 'Fixed Resource', + originalStock: 'Original Stock', + stock: 'Allocation Quantity', + shaName: 'Source Storehouse', + shzName: 'Target Storehouse', + startUserName: 'Applicant', + remark: 'Allocation Remark', + state: 'Status', + createTime: 'Time' + } + } + }, + zh: { + allocationStorehouseDetailed: { + queryCondition: '查询条件', + allocationDetail: '调拨明细', + query: '查询', + reset: '重置', + more: '更多', + hide: '隐藏', + export: '导出', + all: '全部', + resIdPlaceholder: '请输入物品ID', + resNamePlaceholder: '请输入物品名称', + resTypePlaceholder: '请选择物品类型', + secondTypePlaceholder: '请选择二级分类', + specPlaceholder: '请选择物品规格', + applyIdPlaceholder: '请输入调拨申请ID', + sourceStorePlaceholder: '必填,请选择源仓库', + targetStorePlaceholder: '必填,请选择目标仓库', + startTimePlaceholder: '请选择开始时间', + endTimePlaceholder: '请选择结束时间', + statePlaceholder: '请选择调拨状态', + exportSuccess: '导出成功', + exportError: '导出失败', + table: { + applyId: '调拨单号', + resId: '物品ID', + resType: '物品类型', + resName: '物品名称', + specName: '物品规格', + isFixedName: '固定物品', + originalStock: '被调仓库原库存', + stock: '调拨数量', + shaName: '被调仓库', + shzName: '目标仓库', + startUserName: '申请人', + remark: '调拨备注', + state: '状态', + createTime: '时间' + } + } + } +} \ No newline at end of file diff --git a/src/views/resource/allocationStorehouseDetailedList.vue b/src/views/resource/allocationStorehouseDetailedList.vue new file mode 100644 index 0000000..3616098 --- /dev/null +++ b/src/views/resource/allocationStorehouseDetailedList.vue @@ -0,0 +1,433 @@ + + + + + \ No newline at end of file diff --git a/src/views/resource/allocationStorehouseManageLang.js b/src/views/resource/allocationStorehouseManageLang.js new file mode 100644 index 0000000..40cb078 --- /dev/null +++ b/src/views/resource/allocationStorehouseManageLang.js @@ -0,0 +1,106 @@ +export const messages = { + en: { + allocationStorehouseManage: { + search: { + title: 'Search Conditions', + startUserName: 'Please enter applicant name', + applyType: 'Please select type', + startTime: 'Please select allocation start time', + endTime: 'Please select allocation end time' + }, + list: { + title: 'Allocation Records', + allocation: 'Allocation' + }, + table: { + applyId: 'No.', + applyCount: 'Allocation/Return', + startUserName: 'Applicant', + stateName: 'Status', + applyTypeName: 'Type', + createTime: 'Time' + }, + operation: { + cancel: 'Cancel Allocation', + detail: 'Detail', + flowChart: 'Flow Chart' + } + }, + allocationStorehouse: { + title: 'Apply Allocation', + sourceWarehouse: 'Source Warehouse', + targetWarehouse: 'Target Warehouse', + itemName: 'Item Name', + stock: 'Stock', + allocationCount: 'Allocation Count', + remark: 'Remark', + requiredSourceWarehouse: 'Required, please select source warehouse', + requiredTargetWarehouse: 'Required, please select target warehouse', + requiredItemName: 'Required, please enter item name', + requiredStock: 'Required, please enter stock', + requiredAllocationCount: 'Required, please enter allocation count', + requiredRemark: 'Required, please enter remark', + positiveNumber: 'Must be positive integer', + remarkTooLong: 'Remark is too long' + }, + deleteStorehouseManage: { + title: 'Please confirm your operation', + confirmCancel: 'Confirm to cancel allocation?', + cancel: 'Cancel', + confirm: 'Confirm', + deleteError: 'Failed to cancel allocation' + } + }, + zh: { + allocationStorehouseManage: { + search: { + title: '查询条件', + startUserName: '请输入申请人姓名', + applyType: '请选择类型', + startTime: '请选择调拨开始时间', + endTime: '请选择调拨结束时间' + }, + list: { + title: '调拨记录', + allocation: '调拨' + }, + table: { + applyId: '编号', + applyCount: '调拨/退还', + startUserName: '申请人', + stateName: '状态', + applyTypeName: '类型', + createTime: '时间' + }, + operation: { + cancel: '取消调拨', + detail: '详情', + flowChart: '流程图' + } + }, + allocationStorehouse: { + title: '申请调拨', + sourceWarehouse: '源仓库', + targetWarehouse: '目标仓库', + itemName: '物品名称', + stock: '库存', + allocationCount: '调拨数量', + remark: '备注', + requiredSourceWarehouse: '必填,请选择源仓库', + requiredTargetWarehouse: '必填,请选择目标仓库', + requiredItemName: '必填,请填写物品名称', + requiredStock: '必填,请填写库存', + requiredAllocationCount: '必填,请填写调拨数量', + requiredRemark: '必填,请填写备注', + positiveNumber: '必须为正整数', + remarkTooLong: '备注太长' + }, + deleteStorehouseManage: { + title: '请确认您的操作', + confirmCancel: '确定取消调拨?', + cancel: '点错了', + confirm: '确认取消', + deleteError: '取消调拨失败' + } + } +} \ No newline at end of file diff --git a/src/views/resource/allocationStorehouseManageList.vue b/src/views/resource/allocationStorehouseManageList.vue new file mode 100644 index 0000000..5ac39cc --- /dev/null +++ b/src/views/resource/allocationStorehouseManageList.vue @@ -0,0 +1,358 @@ + + + + + \ No newline at end of file diff --git a/src/views/resource/allocationUserStorehouseManageLang.js b/src/views/resource/allocationUserStorehouseManageLang.js new file mode 100644 index 0000000..e95da5f --- /dev/null +++ b/src/views/resource/allocationUserStorehouseManageLang.js @@ -0,0 +1,92 @@ +export const messages = { + en: { + allocationUserStorehouseManage: { + search: { + title: 'Search Conditions', + ausId: 'Please enter allocation ID', + resId: 'Please enter resource ID', + resName: 'Please enter resource name', + parentRstId: 'Please select resource type', + rstId: 'Please select secondary category', + rssId: 'Please select specification', + startUserId: 'Please enter donor ID', + startUserName: 'Please enter donor name', + acceptUserId: 'Please enter recipient ID', + acceptUserName: 'Please enter recipient name', + startTime: 'Please select start time', + endTime: 'Please select end time' + }, + list: { + title: 'Allocation Records' + }, + table: { + ausId: 'Allocation ID', + resId: 'Resource ID', + resType: 'Resource Type', + resName: 'Resource Name', + specName: 'Specification', + isFixedName: 'Fixed Resource', + startUserId: 'Donor ID', + startUserName: 'Donor', + acceptUserId: 'Recipient ID', + acceptUserName: 'Recipient', + stock: 'Original Stock', + giveQuantity: 'Allocation Quantity', + createTime: 'Create Time', + remark: 'Remark' + }, + total: { + subTotal: 'Subtotal', + highTotal: 'Total', + quantity: 'Total Quantity:' + }, + exportSuccess: 'Export started successfully', + exportFailed: 'Export failed' + } + }, + zh: { + allocationUserStorehouseManage: { + search: { + title: '查询条件', + ausId: '请输入转增ID', + resId: '请输入物品资源ID', + resName: '请输入物品名称', + parentRstId: '请选择物品类型', + rstId: '请选择二级分类', + rssId: '请选择物品规格', + startUserId: '请输入转增人ID', + startUserName: '请输入转增人名称', + acceptUserId: '请输入转增对象ID', + acceptUserName: '请输入转增对象名称', + startTime: '请选择开始时间', + endTime: '请选择结束时间' + }, + list: { + title: '转赠记录' + }, + table: { + ausId: '转增ID', + resId: '物品资源ID', + resType: '物品类型', + resName: '物品名称', + specName: '物品规格', + isFixedName: '固定物品', + startUserId: '转赠人ID', + startUserName: '转赠人', + acceptUserId: '转赠对象ID', + acceptUserName: '转赠对象', + stock: '原有库存', + giveQuantity: '转赠数量', + createTime: '创建时间', + remark: '备注' + }, + total: { + subTotal: '小计', + highTotal: '大计', + quantity: '总数量:' + }, + exportSuccess: '导出开始成功', + exportFailed: '导出失败' + } + } +} \ No newline at end of file diff --git a/src/views/resource/allocationUserStorehouseManageList.vue b/src/views/resource/allocationUserStorehouseManageList.vue new file mode 100644 index 0000000..79619fc --- /dev/null +++ b/src/views/resource/allocationUserStorehouseManageList.vue @@ -0,0 +1,494 @@ + + + + + \ No newline at end of file diff --git a/src/views/resource/assetInventoryManageLang.js b/src/views/resource/assetInventoryManageLang.js new file mode 100644 index 0000000..00a7e81 --- /dev/null +++ b/src/views/resource/assetInventoryManageLang.js @@ -0,0 +1,74 @@ +export const messages = { + en: { + assetInventoryManage: { + search: { + title: 'Search Conditions', + staffName: 'Please enter inventory staff', + state: 'Please select status', + startTime: 'Please select start time', + endTime: 'Please select end time' + }, + list: { + title: 'Asset Inventory', + inventory: 'Inventory', + cancelApply: 'Cancel Application', + audit: 'Audit' + }, + table: { + aiId: 'Inventory No', + name: 'Inventory Name', + invTime: 'Inventory Time', + shName: 'Inventory Warehouse', + staffName: 'Inventory Staff', + state: 'Status', + createTime: 'Create Time' + }, + delete: { + title: 'Confirm Operation', + confirmText: 'Are you sure to delete this asset inventory?' + }, + cancel: { + title: 'Confirm Operation', + confirmText: 'Are you sure to cancel this asset inventory?', + success: 'Cancel successfully', + failed: 'Cancel failed' + } + } + }, + zh: { + assetInventoryManage: { + search: { + title: '查询条件', + staffName: '请输入盘点人', + state: '请选择状态', + startTime: '请选择开始时间', + endTime: '请选择结束时间' + }, + list: { + title: '资产盘点', + inventory: '盘点', + cancelApply: '取消申请', + audit: '审核' + }, + table: { + aiId: '盘点单号', + name: '盘点名称', + invTime: '盘点时间', + shName: '盘点仓库', + staffName: '盘点人', + state: '状态', + createTime: '创建时间' + }, + delete: { + title: '确认操作', + confirmText: '确定删除资产盘点?' + }, + cancel: { + title: '确认操作', + confirmText: '确定取消该次资产盘点?', + success: '取消成功', + failed: '取消失败' + } + } + } +} \ No newline at end of file diff --git a/src/views/resource/assetInventoryManageList.vue b/src/views/resource/assetInventoryManageList.vue new file mode 100644 index 0000000..0dd062a --- /dev/null +++ b/src/views/resource/assetInventoryManageList.vue @@ -0,0 +1,319 @@ + + + + + \ No newline at end of file diff --git a/src/views/resource/itemOutManageLang.js b/src/views/resource/itemOutManageLang.js new file mode 100644 index 0000000..4fc1be6 --- /dev/null +++ b/src/views/resource/itemOutManageLang.js @@ -0,0 +1,74 @@ +export const messages = { + en: { + itemOutManage: { + search: { + title: 'Search Conditions', + applyOrderId: 'Please enter order number', + applyUserName: 'Please enter applicant name', + resName: 'Please enter item name', + startTime: 'Please select start time', + endTime: 'Please select end time' + }, + list: { + title: 'Item Outbound Management', + apply: 'Apply for Outbound' + }, + table: { + applyOrderId: 'Order Number', + resourceNames: 'Item', + userName: 'Applicant', + createUserName: 'Operator', + createTime: 'Application Time', + stateName: 'Status', + warehousingWay: 'Outbound Method', + directOut: 'Direct Outbound', + auditOut: 'Audit Outbound', + flowChart: 'Flow Chart', + cancelApply: 'Cancel Application', + operation: 'Operation' + } + }, + deleteItemOut: { + title: 'Confirm Operation', + confirmText: 'Are you sure to cancel the outbound application?', + deleteSuccess: 'Cancel outbound application successfully', + cancelText: 'Cancel', + } + }, + zh: { + itemOutManage: { + search: { + title: '查询条件', + applyOrderId: '请输入单号', + applyUserName: '请填写申请人姓名', + resName: '请填写物品名称', + startTime: '请选择开始时间', + endTime: '请选择结束时间' + }, + list: { + title: '物品领用管理', + apply: '领用申请' + }, + table: { + applyOrderId: '单号', + resourceNames: '物品', + userName: '申请人', + createUserName: '操作人', + createTime: '申请时间', + stateName: '状态', + warehousingWay: '领用方式', + directOut: '直接出库', + auditOut: '审核出库', + flowChart: '流程图', + cancelApply: '取消领用', + operation: '操作' + } + }, + deleteItemOut: { + title: '确认操作', + confirmText: '确定取消领用吗?', + deleteSuccess: '取消领用成功', + cancelText: '点错了', + } + } +} \ No newline at end of file diff --git a/src/views/resource/itemOutManageList.vue b/src/views/resource/itemOutManageList.vue new file mode 100644 index 0000000..e294f6c --- /dev/null +++ b/src/views/resource/itemOutManageList.vue @@ -0,0 +1,322 @@ + + + + + \ No newline at end of file diff --git a/src/views/resource/myResourceStoreManageLang.js b/src/views/resource/myResourceStoreManageLang.js new file mode 100644 index 0000000..562a0a2 --- /dev/null +++ b/src/views/resource/myResourceStoreManageLang.js @@ -0,0 +1,72 @@ +export const messages = { + en: { + myResourceStoreManage: { + queryCondition: 'Query Conditions', + hide: 'Hide', + more: 'More', + enterResId: 'Please enter resource ID', + enterResName: 'Please enter resource name', + enterResCode: 'Please enter resource code', + search: 'Search', + reset: 'Reset', + selectResType: 'Please select resource type', + selectSecondType: 'Please select secondary type', + selectResSpec: 'Please select resource specification', + enterUserId: 'Please enter user ID', + enterUserName: 'Please enter user name', + selectIsFixed: 'Please select fixed status', + myResources: 'My Resources', + return: 'Return', + transfer: 'Transfer', + scrap: 'Scrap', + export: 'Export', + userId: 'User ID', + userName: 'User Name', + resId: 'Resource ID', + resType: 'Resource Type', + resName: 'Resource Name', + resSpec: 'Resource Specification', + resCode: 'Resource Code', + isFixed: 'Is Fixed', + stock: 'Stock', + miniStock: 'Minimum Stock', + miniUnit: 'Minimum Unit', + price: 'Price' + } + }, + zh: { + myResourceStoreManage: { + queryCondition: '查询条件', + hide: '隐藏', + more: '更多', + enterResId: '请输入物品ID', + enterResName: '请输入物品名称', + enterResCode: '请输入物品编码', + search: '查询', + reset: '重置', + selectResType: '请选择物品类型', + selectSecondType: '请选择二级分类', + selectResSpec: '请选择物品规格', + enterUserId: '请输入用户ID', + enterUserName: '请输入用户名称', + selectIsFixed: '请选择物品是否固定', + myResources: '我的物品', + return: '退还', + transfer: '转赠', + scrap: '损耗', + export: '导出', + userId: '用户ID', + userName: '用户名', + resId: '物品ID', + resType: '物品类型', + resName: '物品名称', + resSpec: '物品规格', + resCode: '物品编码', + isFixed: '是否是固定物品', + stock: '物品库存', + miniStock: '最小计量总数', + miniUnit: '最小计量', + price: '收费标准' + } + } +} \ No newline at end of file diff --git a/src/views/resource/myResourceStoreManageList.vue b/src/views/resource/myResourceStoreManageList.vue new file mode 100644 index 0000000..6c56443 --- /dev/null +++ b/src/views/resource/myResourceStoreManageList.vue @@ -0,0 +1,445 @@ + + + + + \ No newline at end of file diff --git a/src/views/resource/purchaseApplyDetailManageLang.js b/src/views/resource/purchaseApplyDetailManageLang.js new file mode 100644 index 0000000..63bdf03 --- /dev/null +++ b/src/views/resource/purchaseApplyDetailManageLang.js @@ -0,0 +1,92 @@ +export const messages = { + en: { + purchaseApplyDetailManage: { + search: { + title: 'Search Conditions', + applyOrderId: 'Please enter application order number', + state: 'Please select status', + name: 'Please enter applicant name', + endUserName: 'Please enter end user name', + resName: 'Please enter item name', + warehousingWay: 'Please select purchase method', + startTime: 'Please select creation start time', + endTime: 'Please select creation end time', + parentRstId: 'Please select item type', + rstId: 'Please select secondary category', + rssId: 'Please select item specification', + rsId: 'Please select supplier', + shId: 'Please select warehouse', + hide: 'Hide', + more: 'More' + }, + list: { + title: 'Inbound/Outbound Details' + }, + table: { + applyOrderId: 'Application Order No.', + userName: 'Applicant', + endUserName: 'End User', + resOrderTypeName: 'Inbound/Outbound Type', + rstName: 'Item Type', + resName: 'Item Name', + specName: 'Item Specification', + isFixedName: 'Fixed Item', + supplierName: 'Supplier', + shName: 'Item Warehouse', + warehousingWayName: 'Purchase/Outbound Method', + quantity: 'Application Quantity', + purchaseQuantity: 'Purchase/Outbound Quantity', + price: 'Purchase Price', + totalApplyPrice: 'Total Price', + remark: 'Application Remarks', + stateName: 'Status', + createTime: 'Creation Time' + } + } + }, + zh: { + purchaseApplyDetailManage: { + search: { + title: '查询条件', + applyOrderId: '请填写申请单号', + state: '请选择状态', + name: '请填写申请人姓名', + endUserName: '请填写使用人姓名', + resName: '请填写物品名称', + warehousingWay: '请选择采购方式', + startTime: '请选择创建开始时间', + endTime: '请选择创建结束时间', + parentRstId: '请选择物品类型', + rstId: '请选择二级分类', + rssId: '请选择物品规格', + rsId: '请选择供应商', + shId: '请选择仓库', + hide: '隐藏', + more: '更多' + }, + list: { + title: '出入库明细' + }, + table: { + applyOrderId: '申请单号', + userName: '申请人', + endUserName: '使用人', + resOrderTypeName: '出入库类型', + rstName: '物品类型', + resName: '物品名称', + specName: '物品规格', + isFixedName: '固定物品', + supplierName: '供应商', + shName: '物品仓库', + warehousingWayName: '采购/出库方式', + quantity: '申请数量', + purchaseQuantity: '采购/出库数量', + price: '采购价格', + totalApplyPrice: '总价', + remark: '申请备注', + stateName: '状态', + createTime: '创建时间' + } + } + } +} \ No newline at end of file diff --git a/src/views/resource/purchaseApplyDetailManageList.vue b/src/views/resource/purchaseApplyDetailManageList.vue new file mode 100644 index 0000000..f17e347 --- /dev/null +++ b/src/views/resource/purchaseApplyDetailManageList.vue @@ -0,0 +1,491 @@ + + + + + \ No newline at end of file diff --git a/src/views/resource/resourceStoreUseRecordManageLang.js b/src/views/resource/resourceStoreUseRecordManageLang.js new file mode 100644 index 0000000..1ef9611 --- /dev/null +++ b/src/views/resource/resourceStoreUseRecordManageLang.js @@ -0,0 +1,78 @@ +export const messages = { + en: { + resourceStoreUseRecordManage: { + search: { + title: 'Search Conditions', + rsurId: 'Please enter use record ID', + repairId: 'Please enter repair order code', + resId: 'Please enter resource ID', + createUserId: 'Please enter user ID', + createUserName: 'Please enter username', + resName: 'Please enter resource name', + parentRstId: 'Please select resource type', + rstId: 'Please select secondary category', + rssId: 'Please select resource specification', + state: 'Please select usage type', + startTime: 'Please select start time', + endTime: 'Please select end time' + }, + list: { + title: 'Usage Records' + }, + table: { + rsurId: 'Usage Record ID', + repairId: 'Repair Order Code', + resId: 'Resource ID', + resourceType: 'Resource Type', + resourceStoreName: 'Resource Name', + specName: 'Specification', + isFixedName: 'Fixed Resource', + stateName: 'Usage Type', + quantity: 'Quantity', + unitPrice: 'Price', + createUserId: 'User ID', + createUserName: 'User', + createTime: 'Create Time', + remark: 'Remark' + } + } + }, + zh: { + resourceStoreUseRecordManage: { + search: { + title: '查询条件', + rsurId: '请输入使用记录ID', + repairId: '请输入维修工单编码', + resId: '请输入物品资源编号', + createUserId: '请输入物品使用人ID', + createUserName: '请输入用户名', + resName: '请输入物品名称', + parentRstId: '请选择物品类型', + rstId: '请选择二级分类', + rssId: '请选择物品规格', + state: '请选择物品使用类型', + startTime: '请选择开始时间', + endTime: '请选择结束时间' + }, + list: { + title: '使用记录' + }, + table: { + rsurId: '使用记录ID', + repairId: '维修工单编号', + resId: '物品编号', + resourceType: '物品类型', + resourceStoreName: '物品名称', + specName: '物品规格', + isFixedName: '固定物品', + stateName: '使用类型', + quantity: '使用数量', + unitPrice: '物品价格', + createUserId: '使用人ID', + createUserName: '使用人', + createTime: '创建时间', + remark: '备注' + } + } + } +} \ No newline at end of file diff --git a/src/views/resource/resourceStoreUseRecordManageList.vue b/src/views/resource/resourceStoreUseRecordManageList.vue new file mode 100644 index 0000000..af387cb --- /dev/null +++ b/src/views/resource/resourceStoreUseRecordManageList.vue @@ -0,0 +1,372 @@ + + + + + \ No newline at end of file diff --git a/src/views/work/myRepairDispatchManageList.vue b/src/views/work/myRepairDispatchManageList.vue index 0880ad1..db12703 100644 --- a/src/views/work/myRepairDispatchManageList.vue +++ b/src/views/work/myRepairDispatchManageList.vue @@ -244,7 +244,7 @@ export default { const params = { repairId: this.myRepairDispatchInfo.currentRepairId, context: orderInfo.remark, - communityId: this.$store.getters.communityId, + communityId: this.getCommunityId(), state: orderInfo.state === '1100' ? '10002' : '10003' } -- libgit2 0.21.4