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 745ba34..20e249f 100644
--- a/src/views/company/index.vue
+++ b/src/views/company/index.vue
@@ -1,390 +1,443 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 重置
-
-
-
-
-
-
-
-
-
- 创建
-
-
-
-
- 我的公司
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+ 创建
+
+
+
+
+
+ 我的公司
+
-
-
-
-
-
-
-
-
-
-
-
-
- 已签约
- 未签约
-
-
-
-
-
- 查看成员
-
-
- 下属公司
-
-
- 详情
-
-
- 编辑
-
- 删除
- 企业认证
-
- 生成合同
- 发送合同
- 发送短信
-
-
-
-
-
-
-
-
-
- 重要提醒
- 请确认信息是否有误
-
+
+
+
+
+
+
+
+ 重要提醒
+ 请确认信息是否有误
+
+
+
+ 重要提醒
+
+ 请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
+
+
+ 确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
+
+
+
+
diff --git a/src/views/task/taskCalendar.vue b/src/views/task/taskCalendar.vue
index f72ae89..d672f12 100644
--- a/src/views/task/taskCalendar.vue
+++ b/src/views/task/taskCalendar.vue
@@ -69,10 +69,6 @@ watch(
{ deep: true }
);
-const test = (e: any) => {
- console.log(e);
-};
-
// 加载
const loading = ref(true);
@@ -125,7 +121,7 @@ const initShowDate = (dateStr = "") => {
initShowDate();
// 获取字典数据
-const { dictData } = useDictData("");
+// const { dictData } = useDictData("");
// 添加
const handleAdd = async () => {
From 12c3facf770750516c12fcf6bfcde5f8142533ac Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 8 Aug 2023 17:21:30 +0800
Subject: [PATCH 2/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/api/company.ts | 5 ++
src/views/company/edit.vue | 4 +-
src/views/company/index.vue | 143 ++++++++++++++++++++++++++++++++++--
3 files changed, 142 insertions(+), 10 deletions(-)
diff --git a/src/api/company.ts b/src/api/company.ts
index ca99e62..89b5e75 100644
--- a/src/api/company.ts
+++ b/src/api/company.ts
@@ -44,3 +44,8 @@ export function generateGontract(params: any) {
export function authentication(params: any) {
return request.get({ url: '/company/authentication', params })
}
+
+// 平台公司
+export function companyListTwo(params: any) {
+ return request.get({ url: '/company/list_two', params })
+}
\ No newline at end of file
diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index 408eaa2..44d9203 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -429,7 +429,7 @@
placeholder="请选择签约方"
clearable
:style="{ width: '100%' }"
- :disabled="partyDisabled"
+ :disabled="!partyDisabled || isDisabled"
@click="openCompany"
>
-
- 公司基本信息创建
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 主要联系人
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 公司基本信息创建
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 主要联系人
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- 其他联系人
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 其他联系人
-
-
- 其他联系人
-
-
-
-
-
-
- 资质信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 电子合同
+
+
+ 其他联系人
+
+
+
+
+
+
+ 资质信息
-
-
-
-
-
+
+ 电子合同
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- 完成
- 创建
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 完成
+ 创建
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 重置
-
-
-
-
-
-
-
-
-
- 创建
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
+ 创建
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- 已签约
- 未签约
-
-
-
-
-
- 查看成员
-
-
- 下属公司
-
-
- 详情
-
-
- 合同签约
-
- 删除
- 企业认证
-
- 生成合同
- 发送合同
- 发送短信
-
-
-
-
-
-
-
-
-
- 重要提醒
-
-
请确认信息是否有误
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ 已签约
+ 未签约
+
+
+
+
+
+ 查看成员
+
+
+ 下属公司
+
+
+ 详情
+
+
+ 合同签约
+
+ 删除
+ 企业认证
+
+ 生成合同
+ 发送合同
+ 发送短信
+
+
+
+
+
+
+
-
-
-
-
- 重要提醒
-
- 请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
-
-
- 确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
-
-
-
-
+
+ 重要提醒
+
+
请确认信息是否有误
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 重要提醒
+
+ 请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
+
+
+ 确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
+
+
+
+
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 = () => {