From 7acb298ca60cefd92a7139aab04a76082dcfc615 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Thu, 21 Mar 2024 10:35:42 +0800 Subject: [PATCH 1/3] update --- src/api/subcontracting_contract.ts | 33 ++++++++--- .../procurement_contract_detail/index.vue | 4 +- src/views/subcontracting_contract/detail.vue | 11 ++-- src/views/subcontracting_contract/edit.vue | 52 ----------------- src/views/subcontracting_contract/index.vue | 22 +++---- .../subcontracting_contract_detail/index.vue | 24 +++++--- .../edit.vue | 57 +------------------ .../index.vue | 28 ++++----- 8 files changed, 80 insertions(+), 151 deletions(-) diff --git a/src/api/subcontracting_contract.ts b/src/api/subcontracting_contract.ts index e03a676..f4130cb 100644 --- a/src/api/subcontracting_contract.ts +++ b/src/api/subcontracting_contract.ts @@ -1,26 +1,45 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 分包合同列表 export function apiSubcontractingContractLists(params: any) { - return request.get({ url: '/contract.subcontracting_contract/lists', params }) + return request.get({ + url: "/contract.subcontracting_contract/lists", + params, + }); } // 添加分包合同 export function apiSubcontractingContractAdd(params: any) { - return request.post({ url: '/contract.subcontracting_contract/add', params }) + return request.post({ url: "/contract.subcontracting_contract/add", params }); } // 编辑分包合同 export function apiSubcontractingContractEdit(params: any) { - return request.post({ url: '/contract.subcontracting_contract/edit', params }) + return request.post({ + url: "/contract.subcontracting_contract/edit", + params, + }); } // 删除分包合同 export function apiSubcontractingContractDelete(params: any) { - return request.post({ url: '/contract.subcontracting_contract/delete', params }) + return request.post({ + url: "/contract.subcontracting_contract/delete", + params, + }); } // 分包合同详情 export function apiSubcontractingContractDetail(params: any) { - return request.get({ url: '/contract.subcontracting_contract/detail', params }) -} \ No newline at end of file + return request.get({ + url: "/contract.subcontracting_contract/detail", + params, + }); +} + +export function apiSubcontractingContractSearch(params: any) { + return request.get({ + url: "/contract.subcontracting_contract/datas", + params, + }); +} diff --git a/src/views/procurement_contract_detail/index.vue b/src/views/procurement_contract_detail/index.vue index e8fa4dd..7ccb780 100644 --- a/src/views/procurement_contract_detail/index.vue +++ b/src/views/procurement_contract_detail/index.vue @@ -34,10 +34,10 @@ - - + + diff --git a/src/views/subcontracting_contract/detail.vue b/src/views/subcontracting_contract/detail.vue index 5b92668..b8f79b9 100644 --- a/src/views/subcontracting_contract/detail.vue +++ b/src/views/subcontracting_contract/detail.vue @@ -5,7 +5,10 @@ - + {{ formData.supplier_code }} + {{ formData.supplier_name }} @@ -17,10 +20,7 @@ label-class-name="my-label">{{ formData.contract_name }} {{ formData.contract_no }} - {{ formData.supplier_code }} - {{ formData.supplier_name }} + {{ formData.contract_type_text }} @@ -36,7 +36,6 @@ {{ formData.pay_type_text }} - {{ formData.account_period_text }} diff --git a/src/views/subcontracting_contract/edit.vue b/src/views/subcontracting_contract/edit.vue index 4c29b61..7ca53c5 100644 --- a/src/views/subcontracting_contract/edit.vue +++ b/src/views/subcontracting_contract/edit.vue @@ -3,18 +3,6 @@ -
- - - - - - - -
- { }) } - - -//获取所有组织 -const getlist = () => { - getAll().then((res) => { - Object.assign(list1, res) - if (res.length > 0 && !formData.org_id) { - formData.org_id = res[0].id - deptAll({ 'org_id': res[0].id }).then((res) => { - if (res.length > 0) { - Object.assign(list2, res) - formData.dept_id = res[0].id - } - - }) - } - }) -} -//获取部门 -const deptrmt = (e: any) => { - formData.dept_id = '' - getlist1(e) - -} -//获取所有部门 -const getlist1 = (id: any) => { - deptAll({ 'org_id': id }).then((res) => { - list2.splice(0, list2.length, ...res) - }) -} // 表单数据 const formData = reactive({ id: '', - dept_id: '', - org_id: '', supplier_id: '', project_id: '', contract_name: '', @@ -510,9 +462,6 @@ const setFormData = async (data: Record) => { }); Object.assign(formDataannex, arry1) } - if (data.dept_id) { - getlist1(data.org_id) - } for (const key in formData) { if (data[key] != null && data[key] != undefined) { //@ts-ignore @@ -573,7 +522,6 @@ const open = (type = 'add') => { mode.value = type popupRef.value?.open() - getlist() } // 关闭回调 diff --git a/src/views/subcontracting_contract/index.vue b/src/views/subcontracting_contract/index.vue index 7248a0b..a2b5510 100644 --- a/src/views/subcontracting_contract/index.vue +++ b/src/views/subcontracting_contract/index.vue @@ -2,11 +2,15 @@
- + + + + + + - 查询 重置 @@ -30,11 +34,10 @@ - + - @@ -80,9 +83,8 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' import { apiSubcontractingContractLists, apiSubcontractingContractDelete, apiSubcontractingContractDetail } from '@/api/subcontracting_contract' -import { timeFormat } from '@/utils/util' -import { apiProjectLists } from '@/api/project' -import { apisupplierLists } from '@/api/suppler_list' +import { apiProjectSearch } from '@/api/project' +import { apiSupplierSearch } from '@/api/suppler_list' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' import DetailPopup from './detail.vue' @@ -94,9 +96,9 @@ const showDtail = ref(false) // 查询条件 const queryParams = reactive({ - - contract_no: '', - + supplier_id: '', + project_id: '', + contract_no: '' }) // 选中数据 diff --git a/src/views/subcontracting_contract_detail/index.vue b/src/views/subcontracting_contract_detail/index.vue index 7b66bd9..f8558b3 100644 --- a/src/views/subcontracting_contract_detail/index.vue +++ b/src/views/subcontracting_contract_detail/index.vue @@ -1,6 +1,18 @@