mkm/TaskSystem-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem-admin

Browse Source
This commit is contained in:
mkm 2023-07-21 18:20:23 +08:00
commit 2cfd4ab76e
7 changed files with 985 additions and 903 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/api/company.ts
View File

@ -1,31 +1,39 @@
import request from '@/utils/request' import request from "@/utils/request";
// 公司列表 // 公司列表
export function apiCompanyLists(params: any) { export function apiCompanyLists(params: any) {
return request.get({ url: '/company/lists', params }) return request.get({ url: "/company/lists", params });
} }
// 添加公司 // 添加公司
export function apiCompanyAdd(params: any) { export function apiCompanyAdd(params: any) {
return request.post({ url: '/company/add', params }) return request.post({ url: "/company/add", params });
} }
// 编辑公司 // 编辑公司
export function apiCompanyEdit(params: any) { export function apiCompanyEdit(params: any) {
return request.post({ url: '/company/edit', params }) return request.post({ url: "/company/edit", params });
} }
// 删除公司 // 删除公司
export function apiCompanyDelete(params: any) { export function apiCompanyDelete(params: any) {
return request.post({ url: '/company/delete', params }) return request.post({ url: "/company/delete", params });
} }
// 公司详情 // 公司详情
export function apiCompanyDetail(params: any) { export function apiCompanyDetail(params: any) {
return request.get({ url: '/company/detail', params }) return request.get({ url: "/company/detail", params });
} }
// 下属公司详情 // 下属公司详情
export function apiSubordinateList(params: any) { 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 });
} }

8
src/api/perms/admin.ts
View File

@ -27,11 +27,3 @@ export function adminDelete(params: any) {
export function adminDetail(params: any) { export function adminDetail(params: any) {
return request.get({ url: '/auth.admin/detail', params }) 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 })
}

33
src/views/company/index.vue
View File

@ -49,7 +49,7 @@
placeholder="请输入片区经理" placeholder="请输入片区经理"
/> />
</el-form-item> </el-form-item>
<el-form-item label="是否签约" prop="is_contract"> <el-form-item label="是否签约" class="w-[308px]" prop="is_contract">
<el-select <el-select
v-model="queryParams.is_contract" v-model="queryParams.is_contract"
placeholder="是否签约" placeholder="是否签约"
@ -118,6 +118,34 @@
>下属公司</router-link >下属公司</router-link
> >
</el-button> </el-button>
<el-button
v-perms="['company/edit', 'company/add']"
type="primary"
link
>
<router-link
:to="{
path: getRoutePath('company/add:edit'),
query: {
id: row.id,
read: true
}
}"
>详情</router-link
>
</el-button>
<el-button type="primary" link>
<router-link
:to="{
path: getRoutePath('company/subordinate/lists'),
query: {
company_id: row.id,
read: true
}
}"
>下属公司</router-link
>
</el-button>
<el-button v-perms="['company/add:edit']" type="primary" link> <el-button v-perms="['company/add:edit']" type="primary" link>
<router-link <router-link
:to="{ :to="{
@ -194,8 +222,7 @@
<script lang="ts" setup name="companyLists"> <script lang="ts" setup name="companyLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from '@/hooks/useDictOptions'
import { apiCompanyLists, apiCompanyDelete } from '@/api/company' import { apiCompanyLists, apiCompanyDelete, generateGontract, sendMsgApi } from '@/api/company'
import { generateGontract, sendMsgApi } from '@/api/perms/admin'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
import { dictDataLists } from '@/api/setting/dict' import { dictDataLists } from '@/api/setting/dict'

101
src/views/company/subordinate.vue
View File

@ -16,70 +16,38 @@
<template #default="{ row }"> <template #default="{ row }">
<div style="display: flex"> <div style="display: flex">
<el-button type="primary" link> <el-button type="primary" link>
<router-link <router-link :to="{
:to="{ path: getRoutePath('auth.admin/lists'),
path: getRoutePath('auth.admin/lists'), query: {
query: { company_id: row.id,
company_id: row.id, read: true
read: true }
} }">查看成员</router-link>
}"
>查看成员</router-link
>
</el-button> </el-button>
<el-button <el-button v-perms="['company/edit', 'company/add']" type="primary" link>
v-perms="['company/edit', 'company/add']" <router-link :to="{
type="primary" path: getRoutePath('company/add:edit'),
link query: {
> id: row.id,
<router-link read: true
:to="{ }
path: getRoutePath('company/add:edit'), }">详情</router-link>
query: {
id: row.id,
read: true
}
}"
>详情</router-link
>
</el-button> </el-button>
<el-button <el-button v-perms="['company/edit', 'company/add']" type="primary" link>
v-perms="['company/edit', 'company/add']" <router-link :to="{
type="primary" path: getRoutePath('company/add:edit'),
link query: {
> id: row.id,
<router-link edit: true
:to="{ }
path: getRoutePath('company/add:edit'), }">编辑</router-link>
query: {
id: row.id,
edit: true
}
}"
>编辑</router-link
>
</el-button> </el-button>
<el-button <el-button v-perms="['company/delete']" type="danger" link
v-perms="['company/delete']" @click="handleDelete(row.id)">删除</el-button>
type="danger" <el-button v-perms="['company/edit', 'company/add']" type="primary" link
link @click="showCreateConctPop(row)">生成合同</el-button>
@click="handleDelete(row.id)" <el-button v-perms="['company/edit', 'company/add']" type="primary" link
>删除</el-button @click="; (showPop = true), (contractId = row.id)">发送短信</el-button>
>
<el-button
v-perms="['company/edit', 'company/add']"
type="primary"
link
@click="showCreateConctPop(row)"
>生成合同</el-button
>
<el-button
v-perms="['company/edit', 'company/add']"
type="primary"
link
@click=";(showPop = true), (contractId = row.id)"
>发送短信</el-button
>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -98,9 +66,7 @@
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约 确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div> </div>
<p class="btn_menu"> <p class="btn_menu">
<el-button type="primary" size="large" v-if="showConctactPop" @click="creContct" <el-button type="primary" size="large" v-if="showConctactPop" @click="creContct">确认创建</el-button>
>确认创建</el-button
>
<el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button> <el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button>
<el-button type="info" size="large" @click="offPop">返回</el-button> <el-button type="info" size="large" @click="offPop">返回</el-button>
</p> </p>
@ -111,8 +77,8 @@
<script lang="ts" setup name="companyLists"> <script lang="ts" setup name="companyLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from '@/hooks/useDictOptions'
import { apiCompanyLists, apiCompanyDelete, apiSubordinateList } from '@/api/company' import { apiCompanyLists, apiCompanyDelete, apiSubordinateList, generateGontract, sendMsgApi } from '@/api/company'
import { generateGontract, sendMsgApi } from '@/api/perms/admin'
import { timeFormat } from '@/utils/util' import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback' import feedback from '@/utils/feedback'
import { dictDataLists } from '@/api/setting/dict' import { dictDataLists } from '@/api/setting/dict'
@ -132,7 +98,7 @@ const offPop = () => {
// 创建合同的id // 创建合同的id
const contractId = ref('') const contractId = ref('')
const showCreateConctPop = (row) => { const showCreateConctPop = (row) => {
;(showPop.value = true), (showConctactPop.value = true), (contractId.value = row.id) ; (showPop.value = true), (showConctactPop.value = true), (contractId.value = row.id)
} }
const creContct = () => { const creContct = () => {
generateGontract({ id: contractId.value }) generateGontract({ id: contractId.value })
@ -201,6 +167,7 @@ getLists()
.btn { .btn {
position: absolute; position: absolute;
} }
h1 { h1 {
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;

109
src/views/contract/contractDetil.vue
View File

@ -1,76 +1,79 @@
<template> <template>
<el-dialog @confirm="handleSubmit" title="合同详情" v-model="show"> <el-dialog @confirm="handleSubmit" title="合同详情" v-model="show">
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules"> <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="公司" prop="company_id"> <el-form-item label="公司" prop="company_id">
<el-input v-model="formData.company_id" :disabled="true" clearable placeholder="请输入公司" /> <el-input v-model="formData.company_id" :disabled="true" clearable placeholder="请输入公司" />
</el-form-item> </el-form-item>
<el-form-item label="合同类型" prop="contract_type"> <el-form-item label="合同类型" prop="contract_type">
<el-input v-model="formData.contract_type" :disabled="true" clearable placeholder="请输入合同类型" />
</el-form-item>
<el-form-item label="合同编号" prop="contract_no"> <el-input v-model="formData.contract_type" :disabled="true" clearable placeholder="请输入合同类型" />
<el-input v-model="formData.contract_no" :disabled="true" clearable placeholder="暂无合同编号" /> </el-form-item>
</el-form-item> <el-form-item label="合同编号" prop="contract_no">
<el-form-item label="文件" prop="file"> <el-input v-model="formData.contract_no" :disabled="true" clearable placeholder="暂无合同编号" />
<el-input v-model="formData.file" :disabled="true" clearable placeholder="暂无文件" /> </el-form-item>
</el-form-item> <el-form-item label="文件" prop="file">
<el-form-item label="状态" prop="status"> <el-input v-model="formData.file" :disabled="true" clearable placeholder="暂无文件" />
<el-input v-model="formData.status" :disabled="true" clearable placeholder="暂无状态" /> </el-form-item>
</el-form-item> <el-form-item label="状态" prop="status">
<el-form-item label="甲方" prop="party_a"> <el-input v-model="formData.status" :disabled="true" clearable placeholder="暂无状态" />
<el-input v-model="formData.party_a" :disabled="true" clearable placeholder="暂无甲方" /> </el-form-item>
</el-form-item> <el-form-item label="甲方" prop="party_a">
<el-form-item label="乙方" prop="party_b"> <el-input v-model="formData.party_a" :disabled="true" clearable placeholder="暂无甲方" />
<el-input v-model="formData.party_b" :disabled="true" clearable placeholder="暂无乙方" /> </el-form-item>
</el-form-item> <el-form-item label="乙方" prop="party_b">
<el-form-item label="片区经理" prop="area_manager"> <el-input v-model="formData.party_b" :disabled="true" clearable placeholder="暂无乙方" />
<el-input v-model="formData.area_manager" :disabled="true" clearable placeholder="暂无经理" /> </el-form-item>
</el-form-item> <el-form-item label="片区经理" prop="area_manager">
<el-form-item label="状态" prop="type"> <el-input v-model="formData.area_manager" :disabled="true" clearable placeholder="暂无经理" />
<el-input v-model="formData.type" :disabled="true" clearable placeholder="暂无状态" /> </el-form-item>
</el-form-item> <el-form-item label="状态" prop="type">
</el-form> <el-input v-model="formData.type" :disabled="true" clearable placeholder="暂无状态" />
<div class="btn_men"> </el-form-item>
<el-button @click="show=false">取消</el-button> </el-form>
<el-button type="primary" @click="show=false" >确定</el-button> <div class="btn_men">
</div> <el-button @click="show = false">取消</el-button>
</el-dialog> <el-button type="primary" @click="show = false">确定</el-button>
</div>
</el-dialog>
</template> </template>
<script setup> <script setup>
import { ref, reactive, defineExpose } from "vue"; import { ref, reactive, defineExpose } from "vue";
const formData = reactive({ const formData = reactive({
id: "", id: "",
company_id: "", company_id: "",
contract_type: "", contract_type: "",
contract_no: "", contract_no: "",
file: "", file: "",
status: "", status: "",
party_a: "", party_a: "",
party_b: "", party_b: "",
area_manager: "", area_manager: "",
}); });
const show = ref(false); const show = ref(false);
const shoeEditFn = (flag) => { const shoeEditFn = (flag) => {
show.value = flag; show.value = flag;
}; };
// 传值赋值 // 传值赋值
const setFormData = async (data) => { const setFormData = async (data) => {
for (const key in formData) { for (const key in formData) {
if (data[key] != null && data[key] != undefined) { if (data[key] != null && data[key] != undefined) {
//@ts-ignore //@ts-ignore
formData[key] = data[key]; formData[key] = data[key];
}
} }
} console.log(formData)
}; };
defineExpose({ defineExpose({
shoeEditFn, shoeEditFn,
setFormData, setFormData,
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.btn_men { .btn_men {
text-align: right; text-align: right;
} }
</style> </style>

1488
src/views/permission/admin/edit.vue
View File

File diff suppressed because it is too large Load Diff

127
src/views/permission/admin/index.vue
View File

@ -56,10 +56,13 @@
@click="handleEdit(row)">编辑</el-button> @click="handleEdit(row)">编辑</el-button>
<el-button v-if="row.root != 1" v-perms="['auth.admin/delete']" type="danger" link <el-button v-if="row.root != 1" v-perms="['auth.admin/delete']" type="danger" link
@click="handleDelete(row.id)">删除</el-button> @click="handleDelete(row.id)">删除</el-button>
<el-button v-perms="['company/edit', 'company/add']" type="primary" link @click="
; (showPop = true),
(showConctactPop = true),
(contractId = row.id)
">生成合同</el-button>
<el-button v-perms="['company/edit', 'company/add']" type="primary" link <el-button v-perms="['company/edit', 'company/add']" type="primary" link
@click="showPop = true, showConctactPop = true, contractId = row.id">生成个人合同</el-button> @click="; (showPop = true), (contractId = row.id)">发送短信</el-button>
<el-button v-perms="['company/edit', 'company/add']" type="primary" link
@click=" showPop = true, contractId = row.id">发送短信</el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -72,8 +75,12 @@
<edit-popup v-if="showEdit" ref="editRef" :isCheck="isCheck" @success="getLists" @close="showEdit = false" /> <edit-popup v-if="showEdit" ref="editRef" :isCheck="isCheck" @success="getLists" @close="showEdit = false" />
<el-dialog v-model="showPop" @close="offPop"> <el-dialog v-model="showPop" @close="offPop">
<h1>重要提醒</h1> <h1>重要提醒</h1>
<div class="content" v-if="showConctactPop">请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.</div> <div class="content" v-if="showConctactPop">
<div class="content" v-else>确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约</div> 请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
</div>
<div class="content" v-else>
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div>
<p class="btn_menu"> <p class="btn_menu">
<el-button type="primary" size="large" v-if="showConctactPop" @click="creContct">确认创建</el-button> <el-button type="primary" size="large" v-if="showConctactPop" @click="creContct">确认创建</el-button>
<el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button> <el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button>
@ -84,47 +91,42 @@
</template> </template>
<script lang="ts" setup name="admin"> <script lang="ts" setup name="admin">
import { import { adminEdit, adminLists, adminDelete } from '@/api/perms/admin'
adminEdit, import { generateGontract, sendMsgApi } from '@/api/company'
adminLists, import { roleAll } from '@/api/perms/role'
adminDelete, import { useDictOptions } from '@/hooks/useDictOptions'
generateGontract, import { usePaging } from '@/hooks/usePaging'
sendMsgApi, import feedback from '@/utils/feedback'
} from "@/api/perms/admin"; import EditPopup from './edit.vue'
import { roleAll } from "@/api/perms/role"; const editRef = shallowRef<InstanceType<typeof EditPopup>>()
import { useDictOptions } from "@/hooks/useDictOptions"; const route = useRoute()
import { usePaging } from "@/hooks/usePaging";
import feedback from "@/utils/feedback";
import EditPopup from "./edit.vue";
const editRef = shallowRef<InstanceType<typeof EditPopup>>();
// 表单数据 // 表单数据
const formData = reactive({ const formData = reactive({
name: "", name: '',
role_id: "", role_id: '',
}); company_id: route.query.company_id || ''
const contractId = ref(""); })
const contractId = ref('')
// 弹窗 // 弹窗
const showPop = ref(false); const showPop = ref(false)
const showConctactPop = ref(false); const showConctactPop = ref(false)
const offPop = () => { const offPop = () => {
showPop.value = false; showPop.value = false
showConctactPop.value = false; showConctactPop.value = false
}; }
const creContct = () => { const creContct = () => {
// feedback.msgSuccess("复制成功"); generateGontract({ id: contractId.value })
generateGontract({ id: contractId.value }).then(() => { offPop()
feedback.msgSuccess("发送成功"); }
});
offPop();
};
const sendMsg = () => { const sendMsg = () => {
sendMsgApi({ id: contractId.value }).then((res) => { sendMsgApi({ id: contractId.value }).then((res) => {
feedback.msgSuccess("发送成功"); console.log(res)
}); })
offPop(); offPop()
}; }
// //
const showEdit = ref(false); const showEdit = ref(false)
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: adminLists, fetchFun: adminLists,
params: formData, params: formData,
@ -143,34 +145,39 @@ const changeStatus = (data: any) => {
}); });
}; };
// 查看 // 查看
const isCheck = ref(false); const isCheck = ref(false)
const handleCheck = async (data: any) => { const handleCheck = async (data: any) => {
isCheck.value = true; isCheck.value = true
showEdit.value = true; showEdit.value = true
await nextTick(); await nextTick()
editRef.value?.open("edit"); editRef.value?.open('edit')
editRef.value?.setFormData(data); editRef.value?.setFormData(data)
}; editRef.value?.isCheckFn(true)
}
const handleAdd = async () => { const handleAdd = async () => {
isCheck.value = false; isCheck.value = false
showEdit.value = true; showEdit.value = true
await nextTick(); await nextTick()
editRef.value?.open("add"); editRef.value?.open('add')
}; editRef.value?.isCheckFn(false)
}
const handleEdit = async (data: any) => { const handleEdit = async (data: any) => {
isCheck.value = false; isCheck.value = false
showEdit.value = true; showEdit.value = true
await nextTick(); await nextTick()
editRef.value?.open("edit"); editRef.value?.open('edit')
editRef.value?.setFormData(data); editRef.value?.setFormData(data)
}; editRef.value?.isCheckFn(false)
}
const handleDelete = async (id: number) => { const handleDelete = async (id: number) => {
await feedback.confirm("确定要删除？"); await feedback.confirm('确定要删除？')
await adminDelete({ id }); await adminDelete({ id })
getLists(); getLists()
}; }
const { optionsData } = useDictOptions<{ const { optionsData } = useDictOptions<{
role: any[]; role: any[];