From 9beb2d3fca1a5cfb05a7b791a6e626b2ad9ba876 Mon Sep 17 00:00:00 2001 From: THK3121 Date: Thu, 20 Jul 2023 15:20:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/perms/admin.ts | 8 + src/views/company/dialog.vue | 42 +- src/views/company/edit.vue | 1404 ++++++++--------- src/views/company/index.vue | 96 +- src/views/contract/index.vue | 25 +- src/views/permission/admin/dialog_index.vue | 93 ++ src/views/permission/admin/edit.vue | 1524 ++++++++++--------- src/views/permission/admin/index.vue | 113 +- 8 files changed, 1833 insertions(+), 1472 deletions(-) create mode 100644 src/views/permission/admin/dialog_index.vue diff --git a/src/api/perms/admin.ts b/src/api/perms/admin.ts index 8b15305..d1d0e7f 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: '/company/Draftingcontracts', params }) +} +// 发送短信 +export function sendMsgApi(params: any) { + return request.get({ url: '/company/postsms', params }) +} \ No newline at end of file diff --git a/src/views/company/dialog.vue b/src/views/company/dialog.vue index c38d0ad..5353f51 100644 --- a/src/views/company/dialog.vue +++ b/src/views/company/dialog.vue @@ -1,27 +1,10 @@ diff --git a/src/views/company/index.vue b/src/views/company/index.vue index fc171d3..4b5d218 100644 --- a/src/views/company/index.vue +++ b/src/views/company/index.vue @@ -98,9 +98,10 @@ - + @@ -152,13 +169,20 @@ - + +

重要提醒

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

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

+
@@ -166,18 +190,41 @@ import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' 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' -import EditPopup from './edit.vue' +// import EditPopup from './edit.vue' import { getRoutePath } from '@/router' + const editRef = shallowRef>() const route = useRoute() const company_type_show = ref(true) -// 是否显示编辑框 -const showEdit = ref(false) - +// 创建合同与发送短信 +//弹窗 +const showPop = ref(false) +const showConctactPop=ref(false) +const offPop=()=>{ + showPop.value=false + showConctactPop.value=false +} +// 创建合同的id +const contractId=ref('') +const showCreateConctPop=(row)=>{ + showPop.value=true, + showConctactPop.value=true, + contractId.value=row.id +} +const creContct=()=>{ + generateGontract({id:contractId.value}) + offPop() +} +const sendMsg=()=>{ + sendMsgApi({id:contractId.value}) + offPop() +} +// 创建合同与发送短信结束 // 查询条件 const queryParams = reactive({ company_name: '', @@ -232,4 +279,29 @@ getLists() .btn { position: absolute; } +h1 { + text-align: center; + font-weight: bold; + font-size: 30px; + color: red; + margin-bottom: 10px; +} + +.content { + font-size: 20px; +} + +.info { + color: red; + font-weight: bold; + font-size: 18px; + display: inline-block; + margin: 0 5px; +} + +.btn_menu { + margin-top: 10vh; + display: flex; + justify-content: space-around; +} diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue index 7f3921c..9b37873 100644 --- a/src/views/contract/index.vue +++ b/src/views/contract/index.vue @@ -87,6 +87,16 @@ > 编辑 --> + + + 查看 + + import { usePaging } from '@/hooks/usePaging' import { useDictData } from '@/hooks/useDictOptions' -import { apiContractLists, apiContractDelete } from '@/api/contract' +import { apiContractLists, apiContractDelete,apiContractDetail } from '@/api/contract' import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import { ElMessage } from 'element-plus' + const editRef = shallowRef>() // 是否显示编辑框 @@ -152,6 +164,17 @@ const { pager, getLists, resetParams, resetPage } = usePaging({ fetchFun: apiContractLists, params: queryParams }) +// 查看合同 +const checkContcat=(id)=>{ + // console.log(pager) + apiContractDetail({id}).then(res=>{ + res.file? window.open(res.file): ElMessage.error ("暂无合同可以查看") + // console.log(res) + // if(res.file) + }) + + // window.open('https://www.zhihu.com/signin?next=%2F') +} // 添加 const handleAdd = async () => { diff --git a/src/views/permission/admin/dialog_index.vue b/src/views/permission/admin/dialog_index.vue new file mode 100644 index 0000000..ed316d7 --- /dev/null +++ b/src/views/permission/admin/dialog_index.vue @@ -0,0 +1,93 @@ + + + diff --git a/src/views/permission/admin/edit.vue b/src/views/permission/admin/edit.vue index 53a8e71..4081c19 100644 --- a/src/views/permission/admin/edit.vue +++ b/src/views/permission/admin/edit.vue @@ -1,787 +1,859 @@ - diff --git a/src/views/permission/admin/index.vue b/src/views/permission/admin/index.vue index d0cc828..9ed561a 100644 --- a/src/views/permission/admin/index.vue +++ b/src/views/permission/admin/index.vue @@ -2,14 +2,6 @@
- - - - + @@ -111,12 +129,26 @@
- + + +

重要提醒

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

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

+
+ \ No newline at end of file