diff --git a/src/api/company.ts b/src/api/company.ts index eb316b3..74fbeaa 100644 --- a/src/api/company.ts +++ b/src/api/company.ts @@ -1,31 +1,39 @@ -import request from '@/utils/request' +import request from "@/utils/request"; // 公司列表 export function apiCompanyLists(params: any) { - return request.get({ url: '/company/lists', params }) + return request.get({ url: "/company/lists", params }); } // 添加公司 export function apiCompanyAdd(params: any) { - return request.post({ url: '/company/add', params }) + return request.post({ url: "/company/add", params }); } // 编辑公司 export function apiCompanyEdit(params: any) { - return request.post({ url: '/company/edit', params }) + return request.post({ url: "/company/edit", params }); } // 删除公司 export function apiCompanyDelete(params: any) { - return request.post({ url: '/company/delete', params }) + return request.post({ url: "/company/delete", params }); } // 公司详情 export function apiCompanyDetail(params: any) { - return request.get({ url: '/company/detail', params }) + return request.get({ url: "/company/detail", params }); } // 下属公司详情 export function apiSubordinateList(params: any) { - return request.get({ url: '/company/subordinate', params }) + return request.get({ url: "/company/subordinate", params }); +} +// 生成合同 +export function generateGontract(params: any) { + return request.get({ url: "/company/Draftingcontracts", params }); +} +// 发送短信 +export function sendMsgApi(params: any) { + return request.get({ url: "/company/postsms", params }); } diff --git a/src/api/perms/admin.ts b/src/api/perms/admin.ts index b0c611e..8b15305 100644 --- a/src/api/perms/admin.ts +++ b/src/api/perms/admin.ts @@ -27,11 +27,3 @@ 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: '/company/Draftingcontracts', params }) -} -// 发送短信 -export function sendMsgApi(params: any) { - return request.get({ url: '/company/postsms', params }) -} diff --git a/src/views/company/index.vue b/src/views/company/index.vue index 224108f..fb927a0 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 } from '@/api/company' -import { generateGontract, sendMsgApi } from '@/api/perms/admin' +import { apiCompanyLists, apiCompanyDelete, generateGontract, sendMsgApi } from '@/api/company' 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 77a03f2..8810870 100644 --- a/src/views/company/subordinate.vue +++ b/src/views/company/subordinate.vue @@ -16,70 +16,38 @@ @@ -98,9 +66,7 @@ 确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约

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

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

重要提醒

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

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