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

更新

Browse Source
This commit is contained in:
weipengfei 2023-08-08 21:11:51 +08:00
parent 05b985475f
commit 163825ab43
2 changed files with 524 additions and 440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,11 @@
placeholder="请输入镇" placeholder="请输入镇"
/> />
</el-form-item> </el-form-item>
<el-form-item label="公司类型" prop="company_type" v-show="company_type_show"> <el-form-item
label="公司类型"
prop="company_type"
v-show="company_type_show"
>
<el-select <el-select
v-model="queryParams.company_type" v-model="queryParams.company_type"
placeholder="请选择公司类型" placeholder="请选择公司类型"
@ -72,8 +76,8 @@
:to="{ :to="{
path: getRoutePath('company/add:edit'), path: getRoutePath('company/add:edit'),
query: { query: {
flag: true flag: true,
} },
}" }"
> >
<el-button type="primary" class="mb-4"> <el-button type="primary" class="mb-4">
@ -98,21 +102,57 @@
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column label="id" prop="id" show-overflow-tooltip width="60" /> <el-table-column
<el-table-column label="公司名称" prop="company_name" show-overflow-tooltip /> label="id"
<el-table-column label="公司类型" prop="company_type" show-overflow-tooltip /> prop="id"
show-overflow-tooltip
width="60"
/>
<el-table-column
label="公司名称"
prop="company_name"
show-overflow-tooltip
/>
<el-table-column
label="公司类型"
prop="company_type"
show-overflow-tooltip
/>
<el-table-column label="区县" prop="area" show-overflow-tooltip /> <el-table-column label="区县" prop="area" show-overflow-tooltip />
<el-table-column label="乡镇" prop="street" show-overflow-tooltip /> <el-table-column label="乡镇" prop="street" show-overflow-tooltip />
<el-table-column label="主联系人" prop="master_name" show-overflow-tooltip /> <el-table-column
<el-table-column label="联系方式" prop="master_phone" show-overflow-tooltip /> label="主联系人"
<el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip /> prop="master_name"
<el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip> show-overflow-tooltip
/>
<el-table-column
label="联系方式"
prop="master_phone"
show-overflow-tooltip
/>
<el-table-column
label="片区经理"
prop="area_manager"
show-overflow-tooltip
/>
<el-table-column
label="是否签约"
prop="is_contract"
show-overflow-tooltip
>
<template #default="{ row }"> <template #default="{ row }">
<span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span> <span v-if="row.is_contract == 1" style="color: #67c23a"
>已签约</span
>
<span v-else style="color: #fe0000">未签约</span> <span v-else style="color: #fe0000">未签约</span>
</template></el-table-column </template></el-table-column
> >
<el-table-column label="操作" align="center" width="500" fixed="right"> <el-table-column
label="操作"
align="center"
width="500"
fixed="right"
>
<template #default="{ row }"> <template #default="{ row }">
<div style="display: flex"> <div style="display: flex">
<el-button type="primary" link> <el-button type="primary" link>
@ -121,8 +161,8 @@
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
> >
@ -133,8 +173,8 @@
path: getRoutePath('company/subordinate/lists'), path: getRoutePath('company/subordinate/lists'),
query: { query: {
company_id: row.id, company_id: row.id,
read: true read: true,
} },
}" }"
>下属公司</router-link >下属公司</router-link
> >
@ -146,8 +186,8 @@
query: { query: {
id: row.id, id: row.id,
read: true, read: true,
isshow: true isshow: true,
} },
}" }"
>详情</router-link >详情</router-link
> >
@ -158,10 +198,10 @@
path: getRoutePath('company/add:edit'), path: getRoutePath('company/add:edit'),
query: { query: {
id: row.id, id: row.id,
edit: true edit: true,
} },
}" }"
>合同签约</router-link >编辑</router-link
> >
</el-button> </el-button>
<el-button <el-button
@ -198,7 +238,7 @@
v-perms="['company/postsms']" v-perms="['company/postsms']"
type="primary" type="primary"
link link
@click=";(showPop = true), (contractId = row.id)" @click="(showPop = true), (contractId = row.id)"
>发送短信</el-button >发送短信</el-button
> >
</template> </template>
@ -211,7 +251,10 @@
<pagination v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
</div> </div>
</el-card> </el-card>
<el-dialog v-model="showInitiateContractPop" @close="offInitiateContractPop"> <el-dialog
v-model="showInitiateContractPop"
@close="offInitiateContractPop"
>
<h1>重要提醒</h1> <h1>重要提醒</h1>
<div> <div>
<div class="content">请确认信息是否有误</div> <div class="content">请确认信息是否有误</div>
@ -219,7 +262,11 @@
<el-col :span="24" class="el-card pt-6"> <el-col :span="24" class="el-card pt-6">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label-width="100px" label="签约方" prop="field130"> <el-form-item
label-width="100px"
label="签约方"
prop="field130"
>
<el-select <el-select
v-model="contractFormData.party_a" v-model="contractFormData.party_a"
placeholder="请选择签约方" placeholder="请选择签约方"
@ -273,7 +320,11 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label-width="100px" label="合同编号" prop="field133"> <el-form-item
label-width="100px"
label="合同编号"
prop="field133"
>
<el-input <el-input
placeholder="系统自动生成" placeholder="系统自动生成"
v-model="contractFormData.contract_no" v-model="contractFormData.contract_no"
@ -291,7 +342,9 @@
<el-button type="primary" size="large" @click="InitiateContract" <el-button type="primary" size="large" @click="InitiateContract"
>确认创建</el-button >确认创建</el-button
> >
<el-button type="info" size="large" @click="offInitiateContractPop">返回</el-button> <el-button type="info" size="large" @click="offInitiateContractPop"
>返回</el-button
>
</p> </p>
</el-dialog> </el-dialog>
<el-dialog v-model="showPop" @close="offPop"> <el-dialog v-model="showPop" @close="offPop">
@ -303,10 +356,16 @@
确认签约短信将在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>
</el-dialog> </el-dialog>
@ -314,9 +373,9 @@
</template> </template>
<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 useUserStore from '@/stores/modules/user' import useUserStore from "@/stores/modules/user";
import { import {
apiCompanyLists, apiCompanyLists,
companyListTwo, companyListTwo,
@ -325,156 +384,159 @@ import {
sendMsgApi, sendMsgApi,
authentication, authentication,
apiCompanyDetail, apiCompanyDetail,
initiate_contract initiate_contract,
} from '@/api/company' } from "@/api/company";
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";
import { getRoutePath } from '@/router' import { getRoutePath } from "@/router";
import DialogIndex from './dialog_index.vue' import DialogIndex from "./dialog_index.vue";
const userStore = useUserStore() const userStore = useUserStore();
console.log(userStore.userInfo.company_id) console.log(userStore.userInfo.company_id);
const route = useRoute() const route = useRoute();
const company_type_show = ref(true) const company_type_show = ref(true);
// 创建合同与发送短信 // 创建合同与发送短信
//弹窗 //弹窗
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 InitiateContractPop = ref(false) const InitiateContractPop = ref(false);
const showInitiateContractPop = ref(false) const showInitiateContractPop = ref(false);
const offInitiateContractPop = () => { const offInitiateContractPop = () => {
showInitiateContractPop.value = false showInitiateContractPop.value = false;
InitiateContractPop.value = false InitiateContractPop.value = false;
} };
// 创建合同的id // 创建合同的id
const contractId = ref('') const contractId = ref("");
// 合同 // 合同
const contractFormData = ref({ const contractFormData = ref({
party_a: '', party_a: "",
party_a_name: '', party_a_name: "",
party_b: '', party_b: "",
party_b_name: '', party_b_name: "",
contract_type: '', contract_type: "",
contract_no: '' contract_no: "",
}) });
const company_list = ref([]) const company_list = ref([]);
const contract_type = ref([]) const contract_type = ref([]);
const getDetails = async (id: any) => { const getDetails = async (id: any) => {
const data = await apiCompanyDetail({ const data = await apiCompanyDetail({
id: id id: id,
}) });
companyListTwo().then((res) => { companyListTwo().then((res) => {
company_list.value = res company_list.value = res;
}) });
dictDataLists({ type_id: 7 }).then((res) => { dictDataLists({ type_id: 7 }).then((res) => {
contract_type.value = res.lists contract_type.value = res.lists;
}) });
contractFormData.value.party_b = data.id contractFormData.value.party_b = data.id;
contractFormData.value.party_b_name = data.company_name contractFormData.value.party_b_name = data.company_name;
if (userStore.userInfo.company.id) { if (userStore.userInfo.company.id) {
contractFormData.value.party_a = userStore.userInfo.company.id contractFormData.value.party_a = userStore.userInfo.company.id;
contractFormData.value.party_a_name = userStore.userInfo.company.company_name contractFormData.value.party_a_name =
userStore.userInfo.company.company_name;
} else { } else {
contractFormData.value.party_a = '' contractFormData.value.party_a = "";
contractFormData.value.party_a_name = '' contractFormData.value.party_a_name = "";
} }
} };
const showChangeCompany = (row: any) => { const showChangeCompany = (row: any) => {
contractId.value = row.id contractId.value = row.id;
getDetails(row.id) getDetails(row.id);
// showPop.value = true // showPop.value = true
ShowInitiateContractPop() ShowInitiateContractPop();
} };
const ShowInitiateContractPop = () => { const ShowInitiateContractPop = () => {
;(InitiateContractPop.value = true), (showInitiateContractPop.value = true) (InitiateContractPop.value = true), (showInitiateContractPop.value = true);
} };
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 InitiateContract = () => { const InitiateContract = () => {
initiate_contract({ initiate_contract({
id: contractId.value, id: contractId.value,
...contractFormData.value ...contractFormData.value,
}).catch((res) => { }).catch((res) => {
console.log(res) console.log(res);
}) });
offInitiateContractPop() offInitiateContractPop();
} };
const creContct = () => { const creContct = () => {
generateGontract({ id: contractId.value }).catch((res) => { generateGontract({ id: contractId.value }).catch((res) => {
console.log(res) console.log(res);
}) });
offPop() offPop();
} };
const sendMsg = () => { const sendMsg = () => {
sendMsgApi({ id: contractId.value }) sendMsgApi({ id: contractId.value });
offPop() offPop();
} };
// 创建合同与发送短信结束 // 创建合同与发送短信结束
// 查询条件 // 查询条件
const queryParams = reactive({ const queryParams = reactive({
company_name: '', company_name: "",
area: '', area: "",
street: '', street: "",
company_type: '', company_type: "",
area_manager: '', area_manager: "",
// 是否签约 // 是否签约
is_contract: '' is_contract: "",
}) });
if (route.query.company_type) { if (route.query.company_type) {
company_type_show.value = false company_type_show.value = false;
queryParams['company_type'] = route.query.company_type?.toString() || '' queryParams["company_type"] = route.query.company_type?.toString() || "";
} }
const datas = reactive({ const datas = reactive({
dictTypeLists: [] dictTypeLists: [],
}) });
const getdictTypeLists = async () => { const getdictTypeLists = async () => {
const data = await dictDataLists({ type_id: 6 }) const data = await dictDataLists({ type_id: 6 });
datas['dictTypeLists'] = data['lists'] datas["dictTypeLists"] = data["lists"];
} };
getdictTypeLists() getdictTypeLists();
// 选中数据 // 选中数据
const selectData = ref<any[]>([]) const selectData = ref<any[]>([]);
// 表格选择后回调事件 // 表格选择后回调事件
const handleSelectionChange = (val: any[]) => { const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id) selectData.value = val.map(({ id }) => id);
} };
// 获取字典数据 // 获取字典数据
const { dictData } = useDictData('') const { dictData } = useDictData("");
// 分页相关 // 分页相关
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiCompanyLists, fetchFun: apiCompanyLists,
params: queryParams params: queryParams,
}) });
// 删除 // 删除
const handleDelete = async (id: number | any[]) => { const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除？') await feedback.confirm("确定要删除？");
await apiCompanyDelete({ id }) await apiCompanyDelete({ id });
getLists() getLists();
} };
const handleAuthentication = async (id: number | any[]) => { const handleAuthentication = async (id: number | any[]) => {
await feedback.confirm('确定要认证？') await feedback.confirm("确定要认证？");
await authentication({ id }) await authentication({ id });
getLists() getLists();
} };
getLists() getLists();
</script> </script>
<style lang="scss"> <style lang="scss">
.btn { .btn {

40
src/views/user_informationg/index.vue
View File

@ -19,9 +19,9 @@
<div class="mt-4"> <div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange"> <el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column label="编号" prop="id" show-overflow-tooltip /> <el-table-column label="编号" prop="id" show-overflow-tooltip />
<el-table-column label="镇公司" show-overflow-tooltip > <el-table-column label="镇公司" show-overflow-tooltip>
<template #default="{ row }"> <template #default="{ row }">
{{row.extend?.company_name}} {{ row.extend?.company_name }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属地区" show-overflow-tooltip> <el-table-column label="所属地区" show-overflow-tooltip>
@ -38,19 +38,36 @@
</el-table-column> </el-table-column>
<el-table-column label="队长姓名" prop="phone" show-overflow-tooltip> <el-table-column label="队长姓名" prop="phone" show-overflow-tooltip>
<template #default="{ row }"> <template #default="{ row }">
{{row.extend?.nickname}} {{ row.extend?.nickname }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="档案名称" prop="name" show-overflow-tooltip /> <el-table-column label="档案名称" prop="name" show-overflow-tooltip />
<el-table-column label="联系电话" prop="phone" show-overflow-tooltip /> <el-table-column
<el-table-column label="更新时间" prop="update_time" show-overflow-tooltip /> label="联系电话"
<el-table-column label="建档时间" prop="create_time" show-overflow-tooltip /> prop="phone"
show-overflow-tooltip
/>
<el-table-column
label="更新时间"
prop="update_time"
show-overflow-tooltip
/>
<el-table-column
label="建档时间"
prop="create_time"
show-overflow-tooltip
/>
<!-- <el-table-column label="所属生产队队长" prop="type_name" show-overflow-tooltip /> <!-- <el-table-column label="所属生产队队长" prop="type_name" show-overflow-tooltip />
<el-table-column label="所属镇管理" prop="type_name" show-overflow-tooltip /> <el-table-column label="所属镇管理" prop="type_name" show-overflow-tooltip />
<el-table-column label="所属区域经理" prop="type_name" show-overflow-tooltip /> <el-table-column label="所属区域经理" prop="type_name" show-overflow-tooltip />
<el-table-column label="最近更新时间" prop="type_name" show-overflow-tooltip /> --> <el-table-column label="最近更新时间" prop="type_name" show-overflow-tooltip /> -->
<el-table-column label="操作" align="center" width="auto" fixed="right"> <el-table-column
label="操作"
align="center"
width="auto"
fixed="right"
>
<template #default="{ row }"> <template #default="{ row }">
<el-button v-perms="['flow/edit']" type="primary" link> <el-button v-perms="['flow/edit']" type="primary" link>
<router-link <router-link
@ -72,7 +89,13 @@
<pagination v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
</div> </div>
</el-card> </el-card>
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" /> <edit-popup
v-if="showEdit"
ref="editRef"
:dict-data="dictData"
@success="getLists"
@close="showEdit = false"
/>
</div> </div>
</template> </template>
@ -114,7 +137,6 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
params: queryParams, params: queryParams,
}); });
// 添加 // 添加
// const handleAdd = async () => { // const handleAdd = async () => {
// showEdit.value = true; // showEdit.value = true;