diff --git a/.env.development.example b/.env.development.example deleted file mode 100644 index 13bc5f8..0000000 --- a/.env.development.example +++ /dev/null @@ -1,4 +0,0 @@ - -NODE_ENV = 'production' -# Base API -VITE_APP_BASE_URL='https://ceshi-engineering.lihaink.cn' \ No newline at end of file diff --git a/src/api/common.ts b/src/api/common.ts index f0a1e7c..17c3082 100644 --- a/src/api/common.ts +++ b/src/api/common.ts @@ -37,4 +37,9 @@ export function getAllJobs(params: any) { //获取所有部门 export function getAllDept(params: any) { return request.get({ url: "/dept.dept/getAllDept", params }); -} \ No newline at end of file +} + +//某个项目下的项目合同列表 +export function projectcontracts(params: any) { + return request.get({ url: "/project.project/contracts", params }); +} diff --git a/src/api/project_salary.ts b/src/api/project_salary.ts index de13aaf..01e709f 100644 --- a/src/api/project_salary.ts +++ b/src/api/project_salary.ts @@ -2,26 +2,26 @@ import request from '@/utils/request' // 保险管理列表 export function insurancemanagementLists(params: any) { - return request.get({ url: '/project.project_insurance_management//lists', params }) + return request.get({ url: '/project.project_insurance_management/lists', params }) } // 添加保险管理 export function insurancemanagementAdd(params: any) { - return request.post({ url: '/project.project_insurance_management//add', params }) + return request.post({ url: '/project.project_insurance_management/add', params }) } // 编辑保险管理 export function insurancemanagementEdit(params: any) { - return request.post({ url: '/project.project_insurance_management//edit', params }) + return request.post({ url: '/project.project_insurance_management/edit', params }) } // 删除保险管理 export function insurancemanagementDelete(params: any) { - return request.post({ url: '/project.project_insurance_management//delete', params }) + return request.post({ url: '/project.project_insurance_management/delete', params }) } // 保险管理详情 export function insurancemanagementDetail(params: any) { - return request.get({ url: '/project.project_insurance_management//detail', params }) + return request.get({ url: '/project.project_insurance_management/detail', params }) } diff --git a/src/api/project_settlement.ts b/src/api/project_settlement.ts new file mode 100644 index 0000000..ac5ea5f --- /dev/null +++ b/src/api/project_settlement.ts @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +// 甲方结算列表 +export function apiprojectsettlementLists(params: any) { + return request.get({ url: '/project.project_settlement/lists', params }) +} + +// 添加甲方结算 +export function apiprojectsettlementAdd(params: any) { + return request.post({ url: '/project.project_settlement/add', params }) +} + +// 编辑甲方结算 +export function apiprojectsettlementEdit(params: any) { + return request.post({ url: '/project.project_settlement/edit', params }) +} + +// 删除甲方结算 +export function apiprojectsettlementDelete(params: any) { + return request.post({ url: '/project.project_settlement/delete', params }) +} + +// 甲方结算详情 +export function apiprojectsettlementDetail(params: any) { + return request.get({ url: '/project.project_settlement/detail', params }) +} + diff --git a/src/api/project_subcontract_settlement.ts b/src/api/project_subcontract_settlement.ts new file mode 100644 index 0000000..4976365 --- /dev/null +++ b/src/api/project_subcontract_settlement.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 分包结算表列表 +export function subcontractsettlementLists(params: any) { + return request.get({ url: '/project.project_subcontract_settlement/lists', params }) +} + +// 添加分包结算 +export function subcontractsettlementAdd(params: any) { + return request.post({ url: '/project.project_subcontract_settlement/add', params }) +} + +// 编辑分包结算 +export function subcontractsettlementEdit(params: any) { + return request.post({ url: '/project.project_subcontract_settlement/edit', params }) +} + +// 删除分包结算 +export function subcontractsettlementDelete(params: any) { + return request.post({ url: '/project.project_subcontract_settlement/delete', params }) +} + +// 分包结算详情 +export function subcontractsettlementDetail(params: any) { + return request.get({ url: '/project.project_subcontract_settlement/detail', params }) +} diff --git a/src/components/biddocument/index.vue b/src/components/biddocument/index.vue index 873fea4..d6ff304 100644 --- a/src/components/biddocument/index.vue +++ b/src/components/biddocument/index.vue @@ -14,8 +14,8 @@
- - + + diff --git a/src/components/project_contract/index.vue b/src/components/project_contract/index.vue new file mode 100644 index 0000000..aa013a1 --- /dev/null +++ b/src/components/project_contract/index.vue @@ -0,0 +1,117 @@ + + + \ No newline at end of file diff --git a/src/components/proontract/index.vue b/src/components/renyuan/index.vue similarity index 100% rename from src/components/proontract/index.vue rename to src/components/renyuan/index.vue diff --git a/src/components/supplier/index.vue b/src/components/supplier/index.vue index d4ea0d2..14dcb27 100644 --- a/src/components/supplier/index.vue +++ b/src/components/supplier/index.vue @@ -15,8 +15,8 @@
- - + + diff --git a/src/config/index.ts b/src/config/index.ts index 03bbc36..62be098 100644 --- a/src/config/index.ts +++ b/src/config/index.ts @@ -6,5 +6,5 @@ const config = { urlPrefix: "adminapi", //请求默认前缀 timeout: 10 * 1000, //请求超时时长 }; - +console.log(import.meta) export default config; diff --git a/src/views/InvoicingRequests/edit.vue b/src/views/InvoicingRequests/edit.vue index 1e495d0..152956a 100644 --- a/src/views/InvoicingRequests/edit.vue +++ b/src/views/InvoicingRequests/edit.vue @@ -314,7 +314,6 @@ const customEvent1 = (e: any) => { formData.contract_id = e.id; project_name.value = e.project_name; project_code.value = e.project_code; - contract_name.value = e.contract_name; contract_no.value = e.contract_code @@ -328,19 +327,19 @@ const popupTitle = computed(() => { // 表单数据 const formData = reactive({ id: '', - customer_id: 0, - contract_id: 0, - approve_id: 0, + customer_id: '', + contract_id: '', + approve_id: '', invoicing_date: "", period: "", - accumulate_amount: 0, - accumulated_payments_received: 0, + accumulate_amount: '', + accumulated_payments_received: '', tax_rate: "", invoice_type: '', - invoicing_amount: 0, + invoicing_amount: '', invoicing_amount_daxie: "", - tax: 0, - amount_including_tax: 0, + tax: '', + amount_including_tax: '', content: "", invoice_no: "", remark: "", diff --git a/src/views/InvoicingRequests/index.vue b/src/views/InvoicingRequests/index.vue index f13704c..efc1254 100644 --- a/src/views/InvoicingRequests/index.vue +++ b/src/views/InvoicingRequests/index.vue @@ -61,7 +61,7 @@ - + - - - - - - - - - - + + + + + + + +