From 930dc5048d05db62524aba6f934be1b71e6a0656 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Tue, 8 Aug 2023 15:13:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/company/dialog_index.vue | 158 +-- src/views/company/edit.vue | 1836 +++++++++++++++------------- src/views/company/index.vue | 715 ++++++----- src/views/task/taskCalendar.vue | 6 +- 4 files changed, 1428 insertions(+), 1287 deletions(-) diff --git a/src/views/company/dialog_index.vue b/src/views/company/dialog_index.vue index 9af4cf7..84b1fbf 100644 --- a/src/views/company/dialog_index.vue +++ b/src/views/company/dialog_index.vue @@ -1,91 +1,101 @@ diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue index 3987378..408eaa2 100644 --- a/src/views/company/edit.vue +++ b/src/views/company/edit.vue @@ -1,264 +1,269 @@ diff --git a/src/views/company/index.vue b/src/views/company/index.vue index 3b5a93a..6b1e409 100644 --- a/src/views/company/index.vue +++ b/src/views/company/index.vue @@ -1,94 +1,89 @@ From b4000adbe90f549b3ee808b2c7309966b0e9cf32 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 8 Aug 2023 18:07:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/company/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/company/index.vue b/src/views/company/index.vue index 6b1e409..27a9d64 100644 --- a/src/views/company/index.vue +++ b/src/views/company/index.vue @@ -291,7 +291,7 @@ 确认创建 - 返回 + 返回

@@ -348,8 +348,8 @@ const offPop = () => { const InitiateContractPop = ref(false) const showInitiateContractPop = ref(false) const offInitiateContractPop = () => { - showPop.value = false - showConctactPop.value = false + showInitiateContractPop.value = false + InitiateContractPop.value = false } // 创建合同的id const contractId = ref('') @@ -391,8 +391,8 @@ const getDetails = async (id: any) => { const showChangeCompany = (row: any) => { contractId.value = row.id getDetails(row.id) - showPop.value = true - // ShowInitiateContractPop(); + // showPop.value = true + ShowInitiateContractPop() } const ShowInitiateContractPop = () => {