diff --git a/src/api/build/build_plan.ts b/src/api/build/build_plan.ts index 3cdfd78..1ab566c 100644 --- a/src/api/build/build_plan.ts +++ b/src/api/build/build_plan.ts @@ -24,4 +24,17 @@ export function buildplanDelete(params: any) { // 施工计划详情 export function buildplanDetail(params: any) { return request.get({ url: '/build.build_plan/detail', params }) -} \ No newline at end of file +} + + +//某个施工计划下的施工汇报列表 +export function buildreportsDetail(params: any) { + return request.get({ url: '/build.build_plan/reports', params }) +} + + + +//某个施工计划下的人工明细列表 +export function buildpersonsDetail(params: any) { + return request.get({ url: '/build.build_plan/persons', params }) +} diff --git a/src/api/project_personnel.ts b/src/api/project_personnel.ts index 602e3b5..96e0b88 100644 --- a/src/api/project_personnel.ts +++ b/src/api/project_personnel.ts @@ -28,4 +28,21 @@ export function projectpersonnelDetail(params: any) { //获取某个项目下的所有人员 export function personneToProject(params: any) { return request.get({ url: '/project.project_personnel/listToProject', params }) -} \ No newline at end of file +} +//某个人员下的劳动合同列表 +export function personnelaborContracts(params: any) { + return request.get({ url: '/project.project_personnel/laborContracts', params }) +} +//某个人员下的保险列表 +export function personneinsurances(params: any) { + return request.get({ url: '/project.project_personnel/insurances', params }) +} +//某个人员下的考勤明细列表 +export function personnelattendances(params: any) { + return request.get({ url: '/project.project_personnel/attendances', params }) +} +//某个人员下的施工记录列表 +export function personnelbuildworks(params: any) { + return request.get({ url: '/project.project_personnel/buildworks', params }) +} + diff --git a/src/api/project_salary.ts b/src/api/project_salary.ts new file mode 100644 index 0000000..de13aaf --- /dev/null +++ b/src/api/project_salary.ts @@ -0,0 +1,27 @@ +import request from '@/utils/request' + +// 保险管理列表 +export function insurancemanagementLists(params: any) { + 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 }) +} + +// 编辑保险管理 +export function insurancemanagementEdit(params: any) { + 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 }) +} + +// 保险管理详情 +export function insurancemanagementDetail(params: any) { + return request.get({ url: '/project.project_insurance_management//detail', params }) +} + diff --git a/src/components/build_plan/index.vue b/src/components/build_plan/index.vue index b3f25cc..c2d2590 100644 --- a/src/components/build_plan/index.vue +++ b/src/components/build_plan/index.vue @@ -2,8 +2,8 @@
- - + + 查询 @@ -31,7 +31,6 @@
暂无文件
- @@ -54,7 +53,7 @@ import { defineEmits } from "vue" // 查询条件 const queryParams = reactive({ - process_step: '' + zy_code: '' }); diff --git a/src/views/administrativeContracts/detail.vue b/src/views/administrativeContracts/detail.vue index 88dded3..ba3c498 100644 --- a/src/views/administrativeContracts/detail.vue +++ b/src/views/administrativeContracts/detail.vue @@ -72,12 +72,13 @@ -
+ +
暂无附件
diff --git a/src/views/administrativeContracts/edit.vue b/src/views/administrativeContracts/edit.vue index 44684a5..2aa585d 100644 --- a/src/views/administrativeContracts/edit.vue +++ b/src/views/administrativeContracts/edit.vue @@ -1,6 +1,16 @@ - \ No newline at end of file diff --git a/src/views/financialManagement/bankAccount/bankAccount/detail.vue b/src/views/financialManagement/bankAccount/bankAccount/detail.vue new file mode 100644 index 0000000..ba3c498 --- /dev/null +++ b/src/views/financialManagement/bankAccount/bankAccount/detail.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/src/views/financialManagement/bankAccount/bankAccount/edit.vue b/src/views/financialManagement/bankAccount/bankAccount/edit.vue new file mode 100644 index 0000000..814f13d --- /dev/null +++ b/src/views/financialManagement/bankAccount/bankAccount/edit.vue @@ -0,0 +1,209 @@ + + + diff --git a/src/views/financialManagement/bankAccount/bankAccount/index.vue b/src/views/financialManagement/bankAccount/bankAccount/index.vue new file mode 100644 index 0000000..b862681 --- /dev/null +++ b/src/views/financialManagement/bankAccount/bankAccount/index.vue @@ -0,0 +1,156 @@ + + + + diff --git a/src/views/financialManagement/bankAccount/interestRate.vue b/src/views/financialManagement/bankAccount/interestRate.vue deleted file mode 100644 index 9098216..0000000 --- a/src/views/financialManagement/bankAccount/interestRate.vue +++ /dev/null @@ -1,72 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/financialManagement/bankAccount/interestRate/detail.vue b/src/views/financialManagement/bankAccount/interestRate/detail.vue new file mode 100644 index 0000000..9c7a010 --- /dev/null +++ b/src/views/financialManagement/bankAccount/interestRate/detail.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/src/views/financialManagement/bankAccount/interestRate/edit.vue b/src/views/financialManagement/bankAccount/interestRate/edit.vue new file mode 100644 index 0000000..42cf73d --- /dev/null +++ b/src/views/financialManagement/bankAccount/interestRate/edit.vue @@ -0,0 +1,155 @@ + + + diff --git a/src/views/financialManagement/bankAccount/interestRate/index.vue b/src/views/financialManagement/bankAccount/interestRate/index.vue new file mode 100644 index 0000000..49e9be2 --- /dev/null +++ b/src/views/financialManagement/bankAccount/interestRate/index.vue @@ -0,0 +1,169 @@ + + + + diff --git a/src/views/financialManagement/bankAccount/revenueWater.vue b/src/views/financialManagement/bankAccount/revenueWater.vue deleted file mode 100644 index 1bf36db..0000000 --- a/src/views/financialManagement/bankAccount/revenueWater.vue +++ /dev/null @@ -1,147 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/financialManagement/bankAccount/revenueWater/detail.vue b/src/views/financialManagement/bankAccount/revenueWater/detail.vue new file mode 100644 index 0000000..c2a2870 --- /dev/null +++ b/src/views/financialManagement/bankAccount/revenueWater/detail.vue @@ -0,0 +1,185 @@ + + + + + diff --git a/src/views/financialManagement/bankAccount/revenueWater/edit.vue b/src/views/financialManagement/bankAccount/revenueWater/edit.vue new file mode 100644 index 0000000..7f05946 --- /dev/null +++ b/src/views/financialManagement/bankAccount/revenueWater/edit.vue @@ -0,0 +1,299 @@ + + + diff --git a/src/views/financialManagement/bankAccount/revenueWater/index.vue b/src/views/financialManagement/bankAccount/revenueWater/index.vue new file mode 100644 index 0000000..77de419 --- /dev/null +++ b/src/views/financialManagement/bankAccount/revenueWater/index.vue @@ -0,0 +1,169 @@ + + + + diff --git a/src/views/financialManagement/draft/MoneyOrderTransfer/edit.vue b/src/views/financialManagement/draft/MoneyOrderTransfer/edit.vue index 091d625..895fff0 100644 --- a/src/views/financialManagement/draft/MoneyOrderTransfer/edit.vue +++ b/src/views/financialManagement/draft/MoneyOrderTransfer/edit.vue @@ -19,14 +19,14 @@ - - + + - + diff --git a/src/views/paymentplan/edit.vue b/src/views/paymentplan/edit.vue index 389aab3..8a381ee 100644 --- a/src/views/paymentplan/edit.vue +++ b/src/views/paymentplan/edit.vue @@ -6,13 +6,13 @@ - - + + - + diff --git a/src/views/paymentrequest/edit.vue b/src/views/paymentrequest/edit.vue index 43266af..b564b04 100644 --- a/src/views/paymentrequest/edit.vue +++ b/src/views/paymentrequest/edit.vue @@ -13,13 +13,13 @@ - - + + - + @@ -206,6 +206,8 @@ const formDataannex = reactive([]) const contract_name = ref('') const project_name = ref('') const project_code = ref('') +const supplier_name = ref('') +const supplier_code = ref('') const project_amount = ref('') const contract_no = ref('') const custom_name = ref('') @@ -271,7 +273,9 @@ const showDialog1 = ref(false) const showDialog2 = ref(false) const customEvent = (e: any) => { formData.supplier_id = e.id; - custom_name.value = e.name; + + supplier_code.value = e.supplier_code + supplier_name.value = e.supplier_name showDialog.value = false; }; const customEvent1 = (e: any) => { diff --git a/src/views/procurement_contract/edit.vue b/src/views/procurement_contract/edit.vue index 366bdf0..0bb12fd 100644 --- a/src/views/procurement_contract/edit.vue +++ b/src/views/procurement_contract/edit.vue @@ -14,29 +14,29 @@ - - + + - - + + - - + + - - + + - + @@ -242,6 +242,8 @@ const showDialog = ref(false) const showDialog1 = ref(false) const project_name = ref('') const project_code = ref('') +const supplier_name = ref('') +const supplier_code = ref('') const supplier_contract_no = ref('') const formDataannex = reactive([]) import feedback from '@/utils/feedback' @@ -365,7 +367,9 @@ const customEvent = (e: any) => { }; const customEvent1 = (e: any) => { - + formData.supplier_id = e.id; + supplier_code.value = e.supplier_code + supplier_name.value = e.supplier_name showDialog1.value = false; }; diff --git a/src/views/procurement_contract/index.vue b/src/views/procurement_contract/index.vue index 7f53735..0c1121a 100644 --- a/src/views/procurement_contract/index.vue +++ b/src/views/procurement_contract/index.vue @@ -2,12 +2,14 @@
- - + + + + - + @@ -101,15 +103,16 @@ import { apiProcurementContractLists, apiProcurementContractDelete, apiProcureme import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import { apiProjectLists } from '@/api/project' +import { apisupplierLists } from '@/api/suppler_list' import EditPopup from './edit.vue' import DetailPopup from './detail.vue' const detailRef = shallowRef>() const editRef = shallowRef>() // 是否显示编辑框 const showEdit = ref(false) - const showDtail = ref(false) -const projects = ref([]) +const projectList = ref([]) +const supplierList = ref([]) // 查询条件 const queryParams = reactive({ supplier_id: '', @@ -164,14 +167,22 @@ const handleDetail = async (data: any) => { detailRef.value?.setFormData(res) } -//获取项目列表 +//获取项目 -const projectList = async () => { - let res = await apiProjectLists() - projects.value = res.lists +const projectlist = async () => { + let res = await apiProjectLists({ page_no: 1, page_size: 9999 }) + projectList.value = res.lists } -projectList() +//获取供应商 +const supplierlist = async () => { + let res = await apisupplierLists({ page_no: 1, page_size: 9999 }) + supplierList.value = res.lists + +} + +projectlist() +supplierlist() getLists() diff --git a/src/views/procurement_contract_detail/index.vue b/src/views/procurement_contract_detail/index.vue index f8b97f0..d0d1f73 100644 --- a/src/views/procurement_contract_detail/index.vue +++ b/src/views/procurement_contract_detail/index.vue @@ -27,17 +27,30 @@
- - - - + + + + + + + + + - - + + + + + + + +