From 930cb649dceea439e0b1263926121f580ad836cf Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Sat, 27 Jan 2024 11:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 8 +- package.json | 2 +- src/views/competitor/edit.vue | 9 +- src/views/contract/edit.vue | 6 +- src/views/customer_demand/edit.vue | 9 +- src/views/customer_demand_solution/edit.vue | 9 +- src/views/project/components/Business.vue | 86 +- src/views/project/components/Collection.vue | 4 +- src/views/project/components/a.vue | 36 - src/views/project/detail.vue | 995 +------------------- src/views/project/edit.vue | 4 +- src/views/project_follow_up/edit.vue | 31 +- src/views/project_follow_up/index.vue | 22 +- yarn.lock | 8 +- 14 files changed, 108 insertions(+), 1121 deletions(-) delete mode 100644 src/views/project/components/a.vue diff --git a/package-lock.json b/package-lock.json index 2be07c7..9bc495e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,7 +34,7 @@ "@types/node": "^16.11.41", "@types/nprogress": "^0.2.0", "@vitejs/plugin-legacy": "^2.3.1", - "@vitejs/plugin-vue": "^3.0.0", + "@vitejs/plugin-vue": "^3.2.0", "@vitejs/plugin-vue-jsx": "^2.0.0", "@vue/eslint-config-prettier": "^7.0.0", "@vue/eslint-config-typescript": "^11.0.0", @@ -1342,9 +1342,9 @@ } }, "node_modules/@vitejs/plugin-vue": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-3.0.1.tgz", - "integrity": "sha512-Ll9JgxG7ONIz/XZv3dssfoMUDu9qAnlJ+km+pBA0teYSXzwPCIzS/e1bmwNYl5dcQGs677D21amgfYAnzMl17A==", + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-3.2.0.tgz", + "integrity": "sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==", "dev": true, "engines": { "node": "^14.18.0 || >=16.0.0" diff --git a/package.json b/package.json index 8a921bd..cdd3a9b 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@types/node": "^16.11.41", "@types/nprogress": "^0.2.0", "@vitejs/plugin-legacy": "^2.3.1", - "@vitejs/plugin-vue": "^3.0.0", + "@vitejs/plugin-vue": "^3.2.0", "@vitejs/plugin-vue-jsx": "^2.0.0", "@vue/eslint-config-prettier": "^7.0.0", "@vue/eslint-config-typescript": "^11.0.0", diff --git a/src/views/competitor/edit.vue b/src/views/competitor/edit.vue index f651e68..0d649c1 100644 --- a/src/views/competitor/edit.vue +++ b/src/views/competitor/edit.vue @@ -2,15 +2,14 @@
- - + + - - + + diff --git a/src/views/contract/edit.vue b/src/views/contract/edit.vue index 502c08b..a4c13a5 100644 --- a/src/views/contract/edit.vue +++ b/src/views/contract/edit.vue @@ -19,12 +19,12 @@ - - @@ -369,6 +369,7 @@ const customEvent1 = (e: any) => { }; const customEvent2 = (e: any) => { project_id.value = e.id; + formData.project_id = e.id project_name.value = e.name; project_code.value = e.project_code bidding_code.value = '' @@ -433,6 +434,7 @@ const formData = reactive({ party_a_phone: '', party_a_mobile: '', party_a_email: '', + project_id: "", party_b: '', party_b_contact_address: '', party_b_diretor: '', diff --git a/src/views/customer_demand/edit.vue b/src/views/customer_demand/edit.vue index b36a171..798d42f 100644 --- a/src/views/customer_demand/edit.vue +++ b/src/views/customer_demand/edit.vue @@ -2,15 +2,14 @@
- - + + - - + + diff --git a/src/views/customer_demand_solution/edit.vue b/src/views/customer_demand_solution/edit.vue index 6e67e7a..38406de 100644 --- a/src/views/customer_demand_solution/edit.vue +++ b/src/views/customer_demand_solution/edit.vue @@ -2,15 +2,14 @@
- - + + - - + + diff --git a/src/views/project/components/Business.vue b/src/views/project/components/Business.vue index a39abc8..126cee7 100644 --- a/src/views/project/components/Business.vue +++ b/src/views/project/components/Business.vue @@ -1,17 +1,41 @@ - - \ No newline at end of file diff --git a/src/views/project/detail.vue b/src/views/project/detail.vue index 11a56dc..b79724e 100644 --- a/src/views/project/detail.vue +++ b/src/views/project/detail.vue @@ -9,7 +9,7 @@ - + @@ -48,207 +48,6 @@ - - - - - - @@ -260,16 +59,8 @@ import type { FormInstance } from 'element-plus' import Popup from '@/components/popup/index.vue' import { apiCustomDetail } from '@/api/custom' -import { timeFormat } from '@/utils/util' import type { PropType } from 'vue' import type { TabsPaneContext } from 'element-plus' -import { apiCustomerDemandLists } from '@/api/customer_demand' -import { apiProjectFollowUpLists } from '@/api/project_follow_up' -import { apiCustomerDemandSolutionLists } from '@/api/customer_demand_solution' -import { apiProjectEstimateLists } from '@/api/project_estimate' -import { apiCompetitorLists } from '@/api/competitor' -import { apiCustomServiceLists } from '@/api/custom_service' -import { subpackagdetailLists } from '@/api/project_subpackage_budget_detail' import Overview from "./components/Overview.vue" import Business from "./components/Business.vue" import tender from "./components/tender.vue" @@ -281,12 +72,8 @@ import manpower from "./components/manpower.vue" import Collection from "./components/Collection.vue" import payment from "./components/payment.vue" import documentation from "./components/documentation.vue" -// import manpower from "./components/manpower.vue" - - -const active = ref('first-1') const activeName = ref('demo-1') const handleClick = (tab: TabsPaneContext, event: Event) => { // console.log(tab, event) @@ -300,800 +87,20 @@ defineProps({ const emit = defineEmits(['success', 'close']) const formRef = shallowRef() const popupRef = shallowRef>() -const formDataannex = reactive([]) -const datas = reactive({ - provinceOptions: [], - cityOptions: [], - areaOptions: [], -}); - -const pager12 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) -const pager13 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) -const pager14 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) - -const pager15 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) -const pager16 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) - -const pager17 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) -const pager18 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) - - - -const pager21 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) - - -const pager22 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) - - -const pager23 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) - - -const pager24 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) -const pager25 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) -const pager26 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) -const pager27 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) -const pager28 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) -const pager29 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) -const pager30 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) -const pager31 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) -const pager32 = reactive({ - page_size: 10, - page_no: 1, - project_id: "" -}) - - - - -const total12 = ref(0) -const total13 = ref(0) -const total14 = ref(0) -const total15 = ref(0) -const total16 = ref(0) -const total17 = ref(0) -const total18 = ref(0) - -const total21 = ref(0) - -const total22 = ref(0) -const total23 = ref(0) - -const total24 = ref(0) - -const total25 = ref(0) -const total26 = ref(0) -const total27 = ref(0) -const total28 = ref(0) -const total29 = ref(0) -const total30 = ref(0) -const total31 = ref(0) -const total32 = ref(0) -const total33 = ref(0) - -const tableData12 = ref([]) -const tableData13 = ref([]) -const tableData15 = ref([]) -const tableData16 = ref([]) -const tableData17 = ref([]) -const tableData18 = ref([]) - - -const tableData21 = ref([]) -const tableData22 = ref([]) - -const tableData23 = ref([]) - -const tableData24 = ref([]) -const tableData25 = ref([]) - -const tableData26 = ref([]) -const tableData27 = ref([]) -const tableData28 = ref([]) -const tableData29 = ref([]) -const tableData30 = ref([]) -const tableData31 = ref([]) -const tableData32 = ref([]) // 表单数据 const formData = reactive({ }) -//条数 - -const handleSizeChange7 = (val: number) => { - - pager7.page_size = val - buydocumentLists() -} -const handleSizeChange8 = (val: number) => { - - pager8.page_size = val - examinationLists() -} -const handleSizeChange9 = (val: number) => { - - pager9.page_size = val - bidResultLists() -} -const handleSizeChange10 = (val: number) => { - - pager10.page_size = val - applyLists() -} - -const handleSizeChange11 = (val: number) => { - - pager11.page_size = val - - refundLists() -} - -const handleSizeChange12 = (val: number) => { - - pager12.page_size = val - - personnelLists() -} - -const handleSizeChange13 = (val: number) => { - - pager13.page_size = val - - laborcontractLists() -} - -const handleSizeChange14 = (val: number) => { - - pager14.page_size = val - - insurancemanagementlists() -} - - -const handleSizeChange15 = (val: number) => { - - pager15.page_size = val - - attendanceRecord() -} - -const handleSizeChange16 = (val: number) => { - - pager16.page_size = val - - attendancedetail() - -} -const handleSizeChange17 = (val: number) => { - - pager16.page_size = val - - attendancedetail() - -} - - -const handleSizeChange18 = (val: number) => { - - pager18.page_size = val - - customServiceLists() - -} -const handleSizeChange19 = (val: number) => { - - pager19.page_size = val - - contractLists() -} - -const handleSizeChange20 = (val: number) => { - - pager20.page_size = val - contcractNegotiationLists() -} -const handleSizeChange21 = (val: number) => { - - pager21.page_size = val - - customServiceLists() -} - -const handleSizeChange22 = (val: number) => { - - pager22.page_size = val - - customServiceLists() -} -const handleSizeChange23 = (val: number) => { - - pager23.page_size = val - - customServiceLists() -} - -const handleSizeChange24 = (val: number) => { - - pager24.page_size = val - - customServiceLists() -} - -const handleSizeChange25 = (val: number) => { - - pager25.page_size = val - - customServiceLists() -} - -const handleSizeChange26 = (val: number) => { - - pager26.page_size = val - - customServiceLists() -} - - -const handleSizeChange27 = (val: number) => { - - pager27.page_size = val - - customServiceLists() -} - - -const handleSizeChange28 = (val: number) => { - - pager28.page_size = val - - customServiceLists() -} - - -const handleSizeChange29 = (val: number) => { - - pager29.page_size = val - - invoiceapplyLists() -} - - - - -const handleSizeChange30 = (val: number) => { - - pager30.page_size = val - - returnedLists() -} -const handleSizeChange31 = (val: number) => { - - pager30.page_size = val - - returnedrecordLists() -} -const handleSizeChange32 = (val: number) => { - - pager30.page_size = val - refundapplyLists() -} - - - -//分页 - -// const handleCurrentChange6 = (val: number) => { -// pager6.page_no = val -// console.log(`current page: ${val}`) -// decisionLists() -// } -// const handleCurrentChange7 = (val: number) => { -// pager7.page_no = val -// console.log(`current page: ${val}`) -// buydocumentLists() -// } -// const handleCurrentChange8 = (val: number) => { -// pager8.page_no = val -// console.log(`current page: ${val}`) -// examinationLists() -// } -// const handleCurrentChange9 = (val: number) => { -// pager9.page_no = val -// console.log(`current page: ${val}`) -// bidResultLists() -// } -// const handleCurrentChange10 = (val: number) => { -// pager10.page_no = val -// console.log(`current page: ${val}`) -// applyLists() -// } -// const handleCurrentChange11 = (val: number) => { -// pager11.page_no = val -// console.log(`current page: ${val}`) - -// refundLists() -// } - -const handleCurrentChange12 = (val: number) => { - pager12.page_no = val - console.log(`current page: ${val}`) - personnelLists() -} -const handleCurrentChange13 = (val: number) => { - pager13.page_no = val - console.log(`current page: ${val}`) - - laborcontractLists() -} - -const handleCurrentChange14 = (val: number) => { - pager14.page_no = val - console.log(`current page: ${val}`) - - insurancemanagementlists() -} - -const handleCurrentChange15 = (val: number) => { - pager15.page_no = val - console.log(`current page: ${val}`) - - attendanceRecord() -} -const handleCurrentChange16 = (val: number) => { - pager16.page_no = val - console.log(`current page: ${val}`) - - attendancedetail() -} - -const handleCurrentChange17 = (val: number) => { - pager17.page_no = val - console.log(`current page: ${val}`) - - salarypaymentLists() - -} - -const handleCurrentChange18 = (val: number) => { - pager18.page_no = val - console.log(`current page: ${val}`) - - customServiceLists() -} - -const handleCurrentChange19 = (val: number) => { - pager19.page_no = val - console.log(`current page: ${val}`) - - contractLists() -} - - -const handleCurrentChange20 = (val: number) => { - pager20.page_no = val - console.log(`current page: ${val}`) - - contcractNegotiationLists() -} - -const handleCurrentChange21 = (val: number) => { - pager21.page_no = val - console.log(`current page: ${val}`) - - customServiceLists() -} - - -const handleCurrentChange22 = (val: number) => { - pager22.page_no = val - console.log(`current page: ${val}`) - - customServiceLists() -} - - -const handleCurrentChange23 = (val: number) => { - pager23.page_no = val - console.log(`current page: ${val}`) - - customServiceLists() -} - -const handleCurrentChange24 = (val: number) => { - pager24.page_no = val - console.log(`current page: ${val}`) - - customServiceLists() -} - - -const handleCurrentChange25 = (val: number) => { - pager25.page_no = val - console.log(`current page: ${val}`) - - customServiceLists() -} -const handleCurrentChange26 = (val: number) => { - pager26.page_no = val - console.log(`current page: ${val}`) - - customServiceLists() -} - - -const handleCurrentChange27 = (val: number) => { - pager27.page_no = val - console.log(`current page: ${val}`) - - customServiceLists() -} - - -const handleCurrentChange28 = (val: number) => { - pager28.page_no = val - console.log(`current page: ${val}`) - - customServiceLists() -} - -const handleCurrentChange29 = (val: number) => { - pager29.page_no = val - console.log(`current page: ${val}`) - invoiceapplyLists() -} - - -const handleCurrentChange30 = (val: number) => { - pager30.page_no = val - console.log(`current page: ${val}`) - - returnedLists() -} - - -const handleCurrentChange31 = (val: number) => { - pager31.page_no = val - console.log(`current page: ${val}`) - - returnedrecordLists() -} -const handleCurrentChange32 = (val: number) => { - pager32.page_no = val - console.log(`current page: ${val}`) - - refundapplyLists() -} - - - - - - - - - - - - - - - - - - - - - - -//获取项目人员列表 - -const personnelLists = () => { - projectpersonnelLists(pager12).then((res) => { - tableData12.value = res.lists - total11.value = res.count - }) -} - - -//获取保险管理列表 - -const insurancemanagementlists = () => { - insurancemanagementLists(pager14).then((res) => { - tableData14.value = res.lists - total13.value = res.count - }) -} -//获取考勤记录列表 - -const attendanceRecord = () => { - attendanceRecordLists(pager15).then((res) => { - tableData15.value = res.lists - total14.value = res.count - }) -} - -//获取考勤明细列表 - -const attendancedetail = () => { - attendancedetailLists(pager16).then((res) => { - tableData16.value = res.lists - total15.value = res.count - }) -} -//获取工资付款列表 - -const salarypaymentLists = () => { - projectsalaryDetailLists(pager17).then((res) => { - tableData17.value = res.lists - total16.value = res.count - }) -} - -//售后信息 -const customServiceLists = () => { - apiCustomServiceLists(pager18).then((res) => { - tableData18.value = res.lists - total17.value = res.count - }) -} - - -//获取分包预算列表 -const subpackagList = () => { - subpackagdetailLists(pager21).then((res) => { - tableData21.value = res.lists - total20.value = res.count - }) -} - -// 获取收票记录列表 -const financereceiptLists = () => { - apifinancereceiptLists(pager22).then((res) => { - tableData22.value = res.lists - total21.value = res.count - }) -} - -// 获取付款计划列表 -const planLists = () => { - paymentplanLists(pager23).then((res) => { - tableData23.value = res.lists - total22.value = res.count - }) -} - -//获取付款记录 -const payapplyLists = () => { - paymentapplyLists(pager24).then((res) => { - tableData24.value = res.lists - total22.value = res.count - }) -} - - -//获取退款记录 -const financerefundLists = () => { - apiFinancerefundLists(pager25).then((res) => { - tableData25.value = res.lists - total24.value = res.count - }) -} - -//获取采购合同 - -const procurementContractLists = () => { - apiProcurementContractLists(pager26).then((res) => { - tableData26.value = res.lists - total25.value = res.count - }) -} -//获取分包合同 -const subcontractingContractLists = () => { - apiSubcontractingContractLists(pager27).then((res) => { - tableData27.value = res.lists - total26.value = res.count - }) -} - -//获取分包合同洽商 -const negotiationLists = () => { - apinegotiationLists(pager28).then((res) => { - tableData28.value = res.lists - total27.value = res.count - }) -} - -//获取开票申请 -const invoiceapplyLists = () => { - apiinvoiceapplyLists(pager29).then((res) => { - tableData29.value = res.lists - total28.value = res.count - }) -} - -//获取回款计划 -const returnedLists = () => { - apireturnedLists(pager30).then((res) => { - tableData30.value = res.lists - total29.value = res.count - }) -} - -//获取回款记录 -const returnedrecordLists = () => { - apireturnedrecordLists(pager31).then((res) => { - tableData31.value = res.lists - total30.value = res.count - }) -} - -//获取退款申请 -const refundapplyLists = () => { - apirefundapplyLists(pager32).then((res) => { - tableData32.value = res.lists - total31.value = res.count - }) -} - const project_id = ref(0) // 获取详情 const setFormData = async (data: Record) => { - - - - // for (const key in formData) { - // if (data[key] != null && data[key] != undefined) { - // //@ts-ignore - // formData[key] = data[key] - - // } - - // } project_id.value = data.id - - // pager11.project_id = data.id - // pager11.project_id = data.id - // pager12.project_id = data.id - // pager13.project_id = data.id - // pager14.project_id = data.id - // pager15.project_id = data.id - // pager16.project_id = data.id - // pager17.project_id = data.id - // pager18.project_id = data.id - // pager19.project_id = data.id - // pager20.project_id = data.id - // pager21.project_id = data.id - // pager22.project_id = data.id - // pager23.project_id = data.id - // pager24.project_id = data.id - // pager20.project_id = data.id - // pager25.project_id = data.id - // pager26.project_id = data.id - // pager27.project_id = data.id - // pager28.project_id = data.id - // pager29.project_id = data.id - // pager30.project_id = data.id - // pager31.project_id = data.id - // pager32.project_id = data.id Object.assign(formData, data) - - // if (data.annex && data.annex.length > 0) { - // const arry1 = data.annex.map((item: any, index: any) => { - // return { - // name: `文件${index + 1}`, - // uri: item - // }; - // }); - // Object.assign(formDataannex, arry1) - // } - // followUpLists() - // demandList() - // // competitorLists() - // solutionLists() - // estimateLists() - // decisionLists() - // buydocumentLists() - // examinationLists() - // bidResultLists() - // applyLists() - // refundLists() - // personnelLists() - // laborcontractLists() - // insurancemanagementlists() - // attendanceRecord() - // attendancedetail() - // salarypaymentLists() - // customServiceLists() - // contractLists() - // contcractNegotiationLists() - // subpackagList() - // financereceiptLists() - // planLists() - // payapplyLists() - // financerefundLists() - // procurementContractLists() - // subcontractingContractLists() - // negotiationLists() - // invoiceapplyLists() - // returnedLists() - // returnedrecordLists() - // refundapplyLists() } const getDetail = async (row: Record) => { diff --git a/src/views/project/edit.vue b/src/views/project/edit.vue index b109fe9..edaedbf 100644 --- a/src/views/project/edit.vue +++ b/src/views/project/edit.vue @@ -28,13 +28,13 @@ - - + + diff --git a/src/views/project_follow_up/edit.vue b/src/views/project_follow_up/edit.vue index b94fd6d..975e722 100644 --- a/src/views/project_follow_up/edit.vue +++ b/src/views/project_follow_up/edit.vue @@ -7,7 +7,7 @@ + placeholder="点击选择项目" :disabled="project" /> @@ -108,7 +108,6 @@ import type { FormInstance } from 'element-plus' import projectTable from "@/components/project/index.vue" import Popup from '@/components/popup/index.vue' -import feedback from '@/utils/feedback' import { apiProjectFollowUpAdd, apiProjectFollowUpEdit, apiProjectFollowUpDetail } from '@/api/project_follow_up' import type { PropType } from 'vue' @@ -120,14 +119,13 @@ const handleAvatarSuccess_four = (response: any) => { }; // 删除上传的文件 const delFileFn = (index: number) => { formData.annex.splice(index, 1) } -// -defineProps({ +const props = defineProps({ dictData: { type: Object as PropType>, default: () => ({}) - } + }, + project: Object }) const emit = defineEmits(['success', 'close']) const formRef = shallowRef() @@ -139,13 +137,8 @@ const custom_name = ref('') const formDataannex = reactive([]) // dialog const showDialog = ref(false) -const customEvent = (e: any) => { - formData.project_id = e.id; - project_name.value = e.name; - project_code.value = e.project_code; - custom_name.value = e.custom_name; - showDialog.value = false; -}; + + // 弹窗标题 const popupTitle = computed(() => { @@ -174,6 +167,18 @@ const formData = reactive({ annex: [] }) +const customEvent = (e: any) => { + formData.project_id = e.id; + project_name.value = e.name; + project_code.value = e.project_code; + custom_name.value = e.custom_name; + showDialog.value = false; +}; + + +if (props.project) { + customEvent(props.project) +} // 表单验证 const formRules = reactive({ diff --git a/src/views/project_follow_up/index.vue b/src/views/project_follow_up/index.vue index 26d1c22..3867583 100644 --- a/src/views/project_follow_up/index.vue +++ b/src/views/project_follow_up/index.vue @@ -9,28 +9,32 @@ - + - + - + - + @@ -75,7 +79,8 @@ 新增 - + 删除
@@ -121,13 +126,14 @@ '' }} -