diff --git a/src/api/bs/contractType.js b/src/api/bs/contractType.js new file mode 100644 index 0000000..c79d254 --- /dev/null +++ b/src/api/bs/contractType.js @@ -0,0 +1,10 @@ +import request from '@/plugin/axios' + +// 创建预算管理 +export function getCustomerContractTypeListAll(query) { + return request({ + url: '/bs/contract-type/listAll', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/bs/project.js b/src/api/bs/project.js new file mode 100644 index 0000000..41eb353 --- /dev/null +++ b/src/api/bs/project.js @@ -0,0 +1,53 @@ +import request from '@/plugin/axios' +// 创建项目管理 +export function createProject(data) { + return request({ + url: '/bs/project/create', + method: 'post', + data: data + }) +} + +// 更新项目管理 +export function updateProject(data) { + return request({ + url: '/bs/project/update', + method: 'put', + data: data + }) +} + +// 删除项目管理 +export function deleteProject(id) { + return request({ + url: '/bs/project/delete?id=' + id, + method: 'delete' + }) +} + +// 获得项目管理 +export function getProject(id) { + return request({ + url: '/bs/project/get?id=' + id, + method: 'get' + }) +} + +// 获得项目管理分页 +export function getProjectPage(query) { + return request({ + url: '/bs/project/page', + method: 'get', + params: query + }) +} + +// 导出项目管理 Excel +export function exportProjectExcel(query) { + return request({ + url: '/bs/project/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/views/company/claim/index.vue b/src/views/company/claim/index.vue index 4b034b1..dd5dd31 100644 --- a/src/views/company/claim/index.vue +++ b/src/views/company/claim/index.vue @@ -569,15 +569,15 @@ export default { // let nameArr = ((this.ieList.filter(item => arr.includes(item.id)) || []).map(item => item.invoiceCode)).join('、') this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'invoiceIds', arr) this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'show', false) - this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'invoiceName', '以关联发票，请点击查看') this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'invoiceCount', this.totalCount(arr)) + this.$set(this.form.expenseClaimTrips[index].expenseClaimDetails[nIndex], 'invoiceName', this.totalName(arr)) }, handleConfirmIe1(arr, nIndex) { // let nameArr = ((this.ieList.filter(item => arr.includes(item.id)) || []).map(item => item.invoiceCode)).join('、') this.$set(this.form.expenseClaimDetails[nIndex], 'invoiceIds', arr) this.$set(this.form.expenseClaimDetails[nIndex], 'show', false) - this.$set(this.form.expenseClaimDetails[nIndex], 'invoiceName', '以关联发票，请点击查看') this.$set(this.form.expenseClaimDetails[nIndex], 'invoiceCount', this.totalCount(arr)) + this.$set(this.form.expenseClaimDetails[nIndex], 'invoiceName', this.totalName(arr)) }, totalCount(obj) { @@ -590,6 +590,17 @@ export default { } return count; }, + totalName(obj) { + let count = ''; + for (let key in obj) { + if (Array.isArray(obj[key])) { + obj[key].forEach(function (item){ + count = !count?item:count+ `、${item}` + }) + } + } + return count; + }, handleAddAccount(pIndex, index) { this.form.expenseClaimTrips[pIndex].expenseClaimDetails.push({ diff --git a/src/views/contract/custom/index.vue b/src/views/contract/custom/index.vue index d23abae..524ee88 100644 --- a/src/views/contract/custom/index.vue +++ b/src/views/contract/custom/index.vue @@ -7,15 +7,13 @@
- - - + + - + +