From 828c3e090c9a08adc6ec0b6e8bcbe92aa6cd6465 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Fri, 21 Jul 2023 18:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/perms/admin.ts | 8 + src/views/company/index.vue | 33 +- src/views/company/subordinate.vue | 101 +- src/views/contract/contractDetil.vue | 109 +- src/views/permission/admin/edit.vue | 1488 ++++++++++++-------------- src/views/permission/admin/index.vue | 127 ++- 6 files changed, 896 insertions(+), 970 deletions(-) diff --git a/src/api/perms/admin.ts b/src/api/perms/admin.ts index 8b15305..6f82a55 100644 --- a/src/api/perms/admin.ts +++ b/src/api/perms/admin.ts @@ -27,3 +27,11 @@ export function adminDelete(params: any) { export function adminDetail(params: any) { return request.get({ url: '/auth.admin/detail', params }) } +// 生成合同 +export function generateGontract(params: any) { + return request.get({ url: '/auth.admin/Draftingcontracts', params }) +} +// 发送短信 +export function sendMsgApi(params: any) { + return request.get({ url: '/auth.admin/postsms', params }) +} diff --git a/src/views/company/index.vue b/src/views/company/index.vue index fb927a0..224108f 100644 --- a/src/views/company/index.vue +++ b/src/views/company/index.vue @@ -49,7 +49,7 @@ placeholder="请输入片区经理" /> - + 下属公司 - - 详情 - - - 下属公司 - import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' -import { apiCompanyLists, apiCompanyDelete, generateGontract, sendMsgApi } from '@/api/company' +import { apiCompanyLists, apiCompanyDelete } from '@/api/company' +import { generateGontract, sendMsgApi } from '@/api/perms/admin' import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import { dictDataLists } from '@/api/setting/dict' diff --git a/src/views/company/subordinate.vue b/src/views/company/subordinate.vue index 8810870..77a03f2 100644 --- a/src/views/company/subordinate.vue +++ b/src/views/company/subordinate.vue @@ -16,38 +16,70 @@ @@ -66,7 +98,9 @@ 确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约

- 确认创建 + 确认创建 确认 返回

@@ -77,8 +111,8 @@ \ No newline at end of file diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue index 3778252..0df978a 100644 --- a/src/views/permission/admin/edit.vue +++ b/src/views/permission/admin/edit.vue @@ -1,852 +1,774 @@ diff --git a/src/views/permission/admin/index.vue b/src/views/permission/admin/index.vue index 6847507..6c8d6e8 100644 --- a/src/views/permission/admin/index.vue +++ b/src/views/permission/admin/index.vue @@ -56,13 +56,10 @@ @click="handleEdit(row)">编辑
删除 - 生成合同 发送短信 + @click="showPop = true, showConctactPop = true, contractId = row.id">生成个人合同 + 发送短信 @@ -75,12 +72,8 @@

重要提醒

-
- 请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送. -
-
- 确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约 -
+
请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
+
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约

确认创建 确认 @@ -91,42 +84,47 @@