diff --git a/src/api/base/company/index.js b/src/api/base/company/index.js index e6a4928..538be6a 100644 --- a/src/api/base/company/index.js +++ b/src/api/base/company/index.js @@ -94,3 +94,11 @@ export function getCompanyQualsPage(params) { params }) } + +// 获得租户下的所有企业 +export function getCompanyList(){ + return request({ + url: "/base/company/list", + method: 'get' + }) +} diff --git a/src/api/company/property/position.js b/src/api/company/property/position.js index ffe3bb8..282614d 100644 --- a/src/api/company/property/position.js +++ b/src/api/company/property/position.js @@ -60,3 +60,11 @@ export function exportPropertyPosExcel(params) { responseType: 'blob' }) } + +// 获得企业管理-资产存放位置列表 分企业 +export function getPositionListByCorpId(id) { + return request({ + url: '/company/property-pos/listByCorpId?id=' + id, + method: 'get' + }) +} diff --git a/src/api/company/property/propertydeal.js b/src/api/company/property/propertydeal.js index 46bd774..0c8250f 100644 --- a/src/api/company/property/propertydeal.js +++ b/src/api/company/property/propertydeal.js @@ -1,53 +1,62 @@ -import request from '@/utils/request' - -// 创建企业管理-资产处置单/变动单 -export function createPropertyDeal(data) { - return request({ - url: '/company/property-deal/create', - method: 'post', - data: data - }) -} - -// 更新企业管理-资产处置单/变动单 -export function updatePropertyDeal(data) { - return request({ - url: '/company/property-deal/update', - method: 'put', - data: data - }) -} - -// 删除企业管理-资产处置单/变动单 -export function deletePropertyDeal(id) { - return request({ - url: '/company/property-deal/delete?id=' + id, - method: 'delete' - }) -} - -// 获得企业管理-资产处置单/变动单 -export function getPropertyDeal(id) { - return request({ - url: '/company/property-deal/get?id=' + id, - method: 'get' - }) -} - -// 获得企业管理-资产处置单/变动单分页 -export function getPropertyDealPage(params) { - return request({ - url: '/company/property-deal/page', - method: 'get', - params - }) -} -// 导出企业管理-资产处置单/变动单 Excel -export function exportPropertyDealExcel(params) { - return request({ - url: '/company/property-deal/export-excel', - method: 'get', - params, - responseType: 'blob' - }) -} \ No newline at end of file +import request from '@/utils/request' + +// 创建企业管理-资产处置单 +export function createPropertyDeal(data) { + return request({ + url: '/company/property-deal/create', + method: 'post', + data: data + }) +} + +// 创建企业管理-资产变动单 +export function createPropertyDealChange(data) { + return request({ + url: '/company/property-deal/createChange', + method: 'post', + data: data + }) +} + +// 更新企业管理-资产处置单/变动单 +export function updatePropertyDeal(data) { + return request({ + url: '/company/property-deal/update', + method: 'put', + data: data + }) +} + +// 删除企业管理-资产处置单/变动单 +export function deletePropertyDeal(id) { + return request({ + url: '/company/property-deal/delete?id=' + id, + method: 'delete' + }) +} + +// 获得企业管理-资产处置单/变动单 +export function getPropertyDeal(id) { + return request({ + url: '/company/property-deal/get?id=' + id, + method: 'get' + }) +} + +// 获得企业管理-资产处置单/变动单分页 +export function getPropertyDealPage(params) { + return request({ + url: '/company/property-deal/page', + method: 'get', + params + }) +} +// 导出企业管理-资产处置单/变动单 Excel +export function exportPropertyDealExcel(params) { + return request({ + url: '/company/property-deal/export-excel', + method: 'get', + params, + responseType: 'blob' + }) +} diff --git a/src/api/company/staff/index.js b/src/api/company/staff/index.js index d8977eb..4b66933 100644 --- a/src/api/company/staff/index.js +++ b/src/api/company/staff/index.js @@ -34,6 +34,14 @@ export function getStaff(id) { }) } +// 获得企业管理-员工信息 +export function getStaffById(id) { + return request({ + url: '/company/staff/getById?id=' + id, + method: 'get' + }) +} + // 获得企业管理-员工信息分页 export function getStaffPage(params) { return request({ @@ -92,3 +100,11 @@ export function getRoleList(){ method: 'get' }) } + +// 获取当前登录用户部门下的员工信息 +export function getStaffListByCorpId(id){ + return request({ + url: '/company/staff/listByCorpId?id=' + id, + method: 'get' + }) +} diff --git a/src/utils/dict.js b/src/utils/dict.js index 2ca8a0c..ca722f7 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -140,6 +140,8 @@ export const DICT_TYPE = { CYCLE_DICT : 'cycle_dict', //资产分类 COMPANY_PROPERTY_CATG: 'company_property_catg', + // 资产取得方式 + PROPERTY_GET_WAY : 'property_get_way', COMPANY_COST_TYPE: 'company_cost_type', } diff --git a/src/views/company/property/property/form/PropertyForm.vue b/src/views/company/property/property/form/PropertyForm.vue index c6298fe..3b082e7 100644 --- a/src/views/company/property/property/form/PropertyForm.vue +++ b/src/views/company/property/property/form/PropertyForm.vue @@ -322,12 +322,11 @@ export default { const res = await PropertyApi.getProperty(id) this.formData = res.data this.formData.userId = parseInt(this.formData.userId) - this.dialogTitle = '修改企业管理-资产' } finally { this.formLoading = false } } - this.dialogTitle = '新增企业管理-资产' + this.dialogTitle = id ? '修改企业管理-资产' : '新增企业管理-资产' this.companyPropertyCatg = companyPropertyCatg this.staffList = staffList this.options = this.staffList diff --git a/src/views/company/property/propertyDealChange/form/PropertyDealChangeForm.vue b/src/views/company/property/propertyDealChange/form/PropertyDealChangeForm.vue new file mode 100644 index 0000000..c745eb5 --- /dev/null +++ b/src/views/company/property/propertyDealChange/form/PropertyDealChangeForm.vue @@ -0,0 +1,435 @@ + + + + + diff --git a/src/views/company/property/propertyDealChange/index.vue b/src/views/company/property/propertyDealChange/index.vue index 4d09f61..8a7c929 100644 --- a/src/views/company/property/propertyDealChange/index.vue +++ b/src/views/company/property/propertyDealChange/index.vue @@ -1,15 +1,250 @@ - diff --git a/src/views/company/property/propertyDealDisposal/form/PropertyDealDisposalForm.vue b/src/views/company/property/propertyDealDisposal/form/PropertyDealDisposalForm.vue index 25882b3..6de4d84 100644 --- a/src/views/company/property/propertyDealDisposal/form/PropertyDealDisposalForm.vue +++ b/src/views/company/property/propertyDealDisposal/form/PropertyDealDisposalForm.vue @@ -18,14 +18,17 @@ - - + @@ -38,7 +41,7 @@
资产信息 - 选择资产 + 选择资产
@@ -48,24 +51,34 @@ {{ $index + 1 }} - - - - - - - + + + + + + + + + + - + @@ -78,7 +91,7 @@
- + @@ -109,14 +122,14 @@ - + - + - - - + + + - - - + + + +