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

修复bug

Browse Source
This commit is contained in:
weipengfei 2023-08-18 12:04:14 +08:00
parent d05710a997
commit b21d4266d1
7 changed files with 1212 additions and 1010 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/components/map/MapContainer.vue
View File

@ -10,6 +10,8 @@ const map = shallowRef(null);
let AMap: any = null; let AMap: any = null;
let markerList: Array<any> = []; let markerList: Array<any> = [];
let m_index: Number = 0; let m_index: Number = 0;
let geocoder: any = null;
let autocomplete: any = null;
const emits = defineEmits("changeMaps"); const emits = defineEmits("changeMaps");
@ -20,10 +22,6 @@ const resetMap = () => {
emits("changeMaps", markerList); emits("changeMaps", markerList);
}; };
defineExpose({
resetMap,
});
const initMap = async () => { const initMap = async () => {
const loader = AMapLoader.load({ const loader = AMapLoader.load({
key: "4f8f55618010007147aab96fc72bb408", key: "4f8f55618010007147aab96fc72bb408",
@ -36,37 +34,23 @@ const initMap = async () => {
zoom: 13, zoom: 13,
}); });
AMap.plugin("AMap.Geocoder", function () {
geocoder = new AMap.Geocoder({
radius: 10, // 逆地理编码范围，默认值：1000，单位：米
extensions: "all", // 返回地址描述结果时是否包含引擎内置的POI，默认值：base，可选值：base、all
}); // 经纬度数组
});
// // 创建 Autocomplete 实例
// autocomplete = new AMap.Autocomplete({
// city: "全国", // 设置默认城市为全国
// });
map.value.on("click", (e: any) => { map.value.on("click", (e: any) => {
// console.log("点击", e.lnglat); // console.log("点击", e.lnglat);
if (m_index >= 3) return; if (m_index >= 3) return;
// 调用函数并传入经纬度 // 调用函数并传入经纬度
getDistrictName(e.lnglat.lng, e.lnglat.lat); getDistrictName(e.lnglat.lng, e.lnglat.lat, e);
// 获取地区名称
function getDistrictName(lng, lat) {
AMap.plugin("AMap.Geocoder", function () {
var geocoder = new AMap.Geocoder({
radius: 10, // 逆地理编码范围，默认值：1000，单位：米
extensions: "all", // 返回地址描述结果时是否包含引擎内置的POI，默认值：base，可选值：base、all
}); // 经纬度数组
geocoder.getAddress([lng, lat], function (status, result) {
if (status === "complete" && result.info === "OK") {
// 解析成功，提取地区名称
var district = result.regeocode.addressComponent.district;
// console.log(district, result.regeocode); // 输出地区名字
markerList.push({
lnglat: e.lnglat,
address: result.regeocode.formattedAddress,
});
emits("changeMaps", markerList);
} else {
// 解析失败
console.log("逆地理编码失败");
}
});
});
}
// 自定义 Marker 的图标 // 自定义 Marker 的图标
var customIcon = new AMap.Icon({ var customIcon = new AMap.Icon({
@ -107,6 +91,47 @@ const initMap = async () => {
}); });
}; };
const searchMap = (address: any) => {
console.log(address);
ElMessage.error("搜索功能开发中");
// autocomplete.search(address, function (status: any, result: any) {
// console.log(status, result);
// if (status === "complete" && result.info === "OK") {
// // 获取提示结果
// var tips = result.tips;
// // 更新搜索结果列表或下拉菜单等
// // ...
// }
// });
};
// 获取地区名称
const getDistrictName = (lng: any, lat: any, e: any) => {
geocoder.getAddress([lng, lat], function (status: any, result: any) {
if (status === "complete" && result.info === "OK") {
// 解析成功，提取地区名称
var district = result.regeocode.addressComponent.district;
// console.log(district, result.regeocode); // 输出地区名字
markerList.push({
lnglat: e.lnglat,
address: result.regeocode.formattedAddress,
});
emits("changeMaps", markerList);
} else {
// 解析失败
console.log("逆地理编码失败");
}
});
};
defineExpose({
resetMap,
searchMap,
});
onMounted(() => { onMounted(() => {
initMap(); initMap();
}); });

53
src/layout/default/components/header/user-drop-down.vue
View File

@ -1,34 +1,37 @@
<template> <template>
<el-dropdown class="px-2" @command="handleCommand"> <el-dropdown class="px-2" @command="handleCommand">
<div class="flex items-center"> <div class="flex items-center">
<el-avatar :size="34" :src="userInfo.avatar" /> <el-avatar :size="34" :src="userInfo.avatar" />
<div class="ml-3 mr-1">{{ userInfo.name }}</div> <div class="ml-3 mr-1">{{ userInfo.name }}</div>
<icon name="el-icon-ArrowDown" /> <icon name="el-icon-ArrowDown" />
</div> </div>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<router-link to="/user/setting"> <router-link to="/user/setting">
<el-dropdown-item>个人设置</el-dropdown-item> <el-dropdown-item>个人设置</el-dropdown-item>
</router-link> </router-link>
<el-dropdown-item command="logout">退出登录</el-dropdown-item> <el-dropdown-item command="logout">退出登录</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</template> </template>
</el-dropdown> </el-dropdown>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import useUserStore from '@/stores/modules/user' import useUserStore from "@/stores/modules/user";
import feedback from '@/utils/feedback' import feedback from "@/utils/feedback";
const userStore = useUserStore() import cache from "@/utils/cache";
import { ACCOUNT_KEY } from "@/enums/cacheEnums";
const userStore = useUserStore();
const userInfo = computed(() => userStore.userInfo) const userInfo = computed(() => userStore.userInfo);
const handleCommand = async (command: string) => { const handleCommand = async (command: string) => {
switch (command) { switch (command) {
case 'logout': case "logout":
await feedback.confirm('确定退出登录吗？') await feedback.confirm("确定退出登录吗？");
userStore.logout() cache.set("logout", cache.get(ACCOUNT_KEY).account);
} userStore.logout();
} }
};
</script> </script>

231
src/views/account/login.vue
View File

@ -1,130 +1,141 @@
<template> <template>
<div class="login flex flex-col"> <div class="login flex flex-col">
<div class="flex-1 flex items-center justify-center"> <div class="flex-1 flex items-center justify-center">
<div class="login-card flex rounded-md"> <div class="login-card flex rounded-md">
<div class="flex-1 h-full hidden md:inline-block"> <div class="flex-1 h-full hidden md:inline-block">
<image-contain :src="config.login_image" :width="400" height="100%" /> <image-contain :src="config.login_image" :width="400" height="100%" />
</div>
<div
class="login-form bg-body flex flex-col justify-center px-10 py-10 md:w-[400px] w-[375px] flex-none mx-auto"
>
<div class="text-center text-3xl font-medium mb-8">{{ config.web_name }}</div>
<el-form ref="formRef" :model="formData" size="large" :rules="rules">
<el-form-item prop="account">
<el-input
v-model="formData.account"
placeholder="请输入账号"
@keyup.enter="handleEnter"
>
<template #prepend>
<icon name="el-icon-User" />
</template>
</el-input>
</el-form-item>
<el-form-item prop="password">
<el-input
ref="passwordRef"
v-model="formData.password"
show-password
placeholder="请输入密码"
@keyup.enter="handleLogin"
>
<template #prepend>
<icon name="el-icon-Lock" />
</template>
</el-input>
</el-form-item>
</el-form>
<div class="mb-5">
<el-checkbox v-model="remAccount" label="记住账号"></el-checkbox>
</div>
<el-button type="primary" size="large" :loading="isLock" @click="lockLogin">
登录
</el-button>
</div>
</div>
</div> </div>
<layout-footer /> <div
class="login-form bg-body flex flex-col justify-center px-10 py-10 md:w-[400px] w-[375px] flex-none mx-auto"
>
<div class="text-center text-3xl font-medium mb-8">
{{ config.web_name }}
</div>
<el-form ref="formRef" :model="formData" size="large" :rules="rules">
<el-form-item prop="account">
<el-input
v-model="formData.account"
placeholder="请输入账号"
@keyup.enter="handleEnter"
>
<template #prepend>
<icon name="el-icon-User" />
</template>
</el-input>
</el-form-item>
<el-form-item prop="password">
<el-input
ref="passwordRef"
v-model="formData.password"
show-password
placeholder="请输入密码"
@keyup.enter="handleLogin"
>
<template #prepend>
<icon name="el-icon-Lock" />
</template>
</el-input>
</el-form-item>
</el-form>
<div class="mb-5">
<el-checkbox v-model="remAccount" label="记住账号"></el-checkbox>
</div>
<el-button
type="primary"
size="large"
:loading="isLock"
@click="lockLogin"
>
登录
</el-button>
</div>
</div>
</div> </div>
<layout-footer />
</div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { computed, onMounted, reactive, ref, shallowRef } from 'vue' import { computed, onMounted, reactive, ref, shallowRef } from "vue";
import type { InputInstance, FormInstance } from 'element-plus' import type { InputInstance, FormInstance } from "element-plus";
import LayoutFooter from '@/layout/components/footer.vue' import LayoutFooter from "@/layout/components/footer.vue";
import useAppStore from '@/stores/modules/app' import useAppStore from "@/stores/modules/app";
import useUserStore from '@/stores/modules/user' import useUserStore from "@/stores/modules/user";
import cache from '@/utils/cache' import cache from "@/utils/cache";
import { ACCOUNT_KEY } from '@/enums/cacheEnums' import { ACCOUNT_KEY } from "@/enums/cacheEnums";
import { PageEnum } from '@/enums/pageEnum' import { PageEnum } from "@/enums/pageEnum";
import { useLockFn } from '@/hooks/useLockFn' import { useLockFn } from "@/hooks/useLockFn";
const passwordRef = shallowRef<InputInstance>() const passwordRef = shallowRef<InputInstance>();
const formRef = shallowRef<FormInstance>() const formRef = shallowRef<FormInstance>();
const appStore = useAppStore() const appStore = useAppStore();
const userStore = useUserStore() const userStore = useUserStore();
const route = useRoute() const route = useRoute();
const router = useRouter() const router = useRouter();
const remAccount = ref(false) const remAccount = ref(false);
const config = computed(() => appStore.config) const config = computed(() => appStore.config);
const formData = reactive({ const formData = reactive({
account: '', account: "",
password: '' password: "",
}) });
const rules = { const rules = {
account: [ account: [
{ {
required: true, required: true,
message: '请输入账号', message: "请输入账号",
trigger: ['blur'] trigger: ["blur"],
} },
], ],
password: [ password: [
{ {
required: true, required: true,
message: '请输入密码', message: "请输入密码",
trigger: ['blur'] trigger: ["blur"],
} },
] ],
} };
// 回车按键监听 // 回车按键监听
const handleEnter = () => { const handleEnter = () => {
if (!formData.password) { if (!formData.password) {
return passwordRef.value?.focus() return passwordRef.value?.focus();
} }
handleLogin() handleLogin();
} };
// 登录处理 // 登录处理
const handleLogin = async () => { const handleLogin = async () => {
await formRef.value?.validate() await formRef.value?.validate();
// 记住账号，缓存 // 记住账号，缓存
cache.set(ACCOUNT_KEY, { cache.set(ACCOUNT_KEY, {
remember: remAccount.value, remember: remAccount.value,
account: remAccount.value ? formData.account : '' account: remAccount.value ? formData.account : "",
}) });
await userStore.login(formData) await userStore.login(formData);
const { const {
query: { redirect } query: { redirect },
} = route } = route;
const path = typeof redirect === 'string' ? redirect : PageEnum.INDEX const path = typeof redirect === "string" ? redirect : PageEnum.INDEX;
router.push(path) router.push(
} cache.get("logout") == formData.account || typeof redirect === "string"
const { isLock, lockFn: lockLogin } = useLockFn(handleLogin) ? path
: PageEnum.INDEX
);
};
const { isLock, lockFn: lockLogin } = useLockFn(handleLogin);
onMounted(() => { onMounted(() => {
const value = cache.get(ACCOUNT_KEY) const value = cache.get(ACCOUNT_KEY);
if (value?.remember) { if (value?.remember) {
remAccount.value = value.remember remAccount.value = value.remember;
formData.account = value.account formData.account = value.account;
} }
}) });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.login { .login {
background-image: url('./images/login_bg.png'); background-image: url("./images/login_bg.png");
@apply min-h-screen bg-no-repeat bg-center bg-cover; @apply min-h-screen bg-no-repeat bg-center bg-cover;
.login-card { .login-card {
height: 400px; height: 400px;
} }
} }
</style> </style>

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

File diff suppressed because it is too large Load Diff

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

@ -1,238 +1,320 @@
<template> <template>
<div> <div>
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> <el-card class="!border-none" v-loading="pager.loading" shadow="never">
<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"
<el-table-column label="区县" prop="area_name" show-overflow-tooltip /> show-overflow-tooltip
<el-table-column label="乡镇" prop="street_name" show-overflow-tooltip /> width="60"
<el-table-column label="主联系人" prop="master_name" show-overflow-tooltip /> />
<el-table-column label="联系方式" prop="master_phone" show-overflow-tooltip /> <el-table-column
<el-table-column label="公司名称"
label="片区经理" prop="company_name"
prop="area_manager_name" show-overflow-tooltip
show-overflow-tooltip />
/> <el-table-column
<el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip> label="公司类型"
<template #default="{ row }"> prop="company_type"
<span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span> show-overflow-tooltip
<span v-else style="color: #fe0000">未签约</span> />
</template> <el-table-column
</el-table-column> label="区县"
<el-table-column label="操作" align="center" width="450" fixed="right"> prop="area_name"
<template #default="{ row }"> show-overflow-tooltip
<div style="display: flex"> />
<el-button type="primary" link> <el-table-column
<router-link label="乡镇"
:to="{ prop="street_name"
path: getRoutePath('auth.admin/lists'), show-overflow-tooltip
query: { />
company_id: row.id, <el-table-column
read: true label="主联系人"
} prop="master_name"
}" show-overflow-tooltip
>查看成员</router-link />
> <el-table-column
</el-button> label="联系方式"
<el-button prop="master_phone"
v-perms="['company/edit', 'company/add']" show-overflow-tooltip
type="primary" />
link <el-table-column
> label="片区经理"
<router-link prop="area_manager_name"
:to="{ show-overflow-tooltip
path: getRoutePath('company/add:edit'), />
query: { <el-table-column
id: row.id, label="是否签约"
read: true prop="is_contract"
} show-overflow-tooltip
}" >
>详情</router-link <template #default="{ row }">
> <span v-if="row.is_contract == 1" style="color: #67c23a"
</el-button> >已签约</span
<el-button >
v-perms="['company/edit', 'company/add']" <span v-else style="color: #fe0000">未签约</span>
type="primary" </template>
link </el-table-column>
> <el-table-column
<router-link label="操作"
:to="{ align="center"
path: getRoutePath('company/add:edit'), width="300"
query: { fixed="right"
id: row.id, >
edit: true <template #default="{ row }">
} <div style="display: flex">
}" <el-button type="primary" link>
>编辑</router-link <router-link
> :to="{
</el-button> path: getRoutePath('auth.admin/lists'),
<el-button query: {
v-perms="['company/delete']" company_id: row.id,
type="danger" read: true,
link },
@click="handleDelete(row.id)" }"
>删除</el-button >查看成员</router-link
> >
<el-button </el-button>
v-perms="['company/edit', 'company/add']" <el-button
type="primary" v-perms="['company/edit', 'company/add']"
link type="primary"
@click="showCreateConctPop(row)" link
>生成合同</el-button
>
<el-button
v-perms="['company/edit', 'company/add']"
type="primary"
link
@click=";(showPop = true), (contractId = row.id)"
>发送短信</el-button
>
</div>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<el-dialog v-model="showPop" @close="offPop">
<h1>重要提醒</h1>
<div class="content" v-if="showConctactPop">
请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
</div>
<div class="content" v-else>
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div>
<p class="btn_menu">
<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> <router-link
<el-button type="info" size="large" @click="offPop">返回</el-button> :to="{
</p> path: getRoutePath('company/add:edit'),
</el-dialog> query: {
</div> id: row.id,
read: true,
},
}"
>详情</router-link
>
</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,
edit: true,
},
}"
>编辑</router-link
>
</el-button>
<el-button
v-perms="['company/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>删除</el-button
>
<el-button
v-if="row.is_authentication == 0"
v-perms="['company/authentication']"
type="primary"
link
@click="handleAuthentication(row.id)"
>企业认证</el-button
>
<template v-if="row.is_authentication && row.is_contract == 0">
<el-button
v-if="
Array.isArray(row.contract) && row.contract.length == 0
"
v-perms="['company/initiate_contract']"
type="primary"
link
@click="showChangeCompany(row)"
>生成合同</el-button
>
<el-button
v-else-if="row.contract?.check_status == 1"
v-perms="['company/initiate_contract']"
type="warning"
link
@click="auditing"
>审核中</el-button
>
<el-button
v-else-if="row.contract?.check_status == 2"
v-perms="['company/Draftingcontracts']"
type="primary"
link
@click="showCreateConctPop(row)"
>发送合同</el-button
>
<el-button
v-else-if="row.contract?.check_status == 3"
v-perms="['company/postsms']"
type="primary"
link
@click="(showPop = true), (contractId = row.id)"
>发送短信</el-button
>
</template>
</div>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<el-dialog v-model="showPop" @close="offPop">
<h1>重要提醒</h1>
<div class="content" v-if="showConctactPop">
请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
</div>
<div class="content" v-else>
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div>
<p class="btn_menu">
<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="info" size="large" @click="offPop">返回</el-button>
</p>
</el-dialog>
</div>
</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 { apiCompanyLists, apiCompanyDelete, apiSubordinateList } from '@/api/company' import {
import { generateGontract, sendMsgApi } from '@/api/perms/admin' apiCompanyLists,
import { timeFormat } from '@/utils/util' apiCompanyDelete,
import feedback from '@/utils/feedback' apiSubordinateList,
import { dictDataLists } from '@/api/setting/dict' } 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' import { getRoutePath } from "@/router";
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;
} };
// 创建合同的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 });
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: "",
company_id: '' company_id: "",
}) });
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() || "";
} }
if (route.query.company_id) { if (route.query.company_id) {
queryParams.company_id = route.query.company_id?.toString() || '' queryParams.company_id = route.query.company_id?.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: apiSubordinateList, fetchFun: apiSubordinateList,
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();
} };
getLists() getLists();
</script> </script>
<style lang="scss"> <style lang="scss">
.btn { .btn {
position: absolute; position: absolute;
} }
h1 { h1 {
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
font-size: 30px; font-size: 30px;
color: red; color: red;
margin-bottom: 10px; margin-bottom: 10px;
} }
.content { .content {
font-size: 20px; font-size: 20px;
} }
.info { .info {
color: red; color: red;
font-weight: bold; font-weight: bold;
font-size: 18px; font-size: 18px;
display: inline-block; display: inline-block;
margin: 0 5px; margin: 0 5px;
} }
.btn_menu { .btn_menu {
margin-top: 10vh; margin-top: 10vh;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
} }
</style> </style>

440
src/views/consumer/lists/index.vue
View File

@ -1,203 +1,229 @@
<template> <template>
<div> <div>
<el-card class="!border-none" shadow="never"> <el-card class="!border-none" shadow="never">
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true"> <el-form
<el-form-item label="用户信息"> ref="formRef"
<el-input class="mb-[-16px]"
class="w-[280px]" :model="queryParams"
v-model="queryParams.keyword" :inline="true"
placeholder="用户编号/昵称/手机号码" >
clearable <el-form-item label="用户信息">
@keyup.enter="resetPage" <el-input
/> class="w-[280px]"
</el-form-item> v-model="queryParams.keyword"
<el-form-item> placeholder="用户编号/昵称/手机号码"
<el-button type="primary" @click="resetPage">查询</el-button> clearable
<el-button @click="resetParams">重置</el-button> @keyup.enter="resetPage"
<export-data />
class="ml-2.5" </el-form-item>
:fetch-fun="getUserList" <el-form-item>
:params="queryParams" <el-button type="primary" @click="resetPage">查询</el-button>
:page-size="pager.size" <el-button @click="resetParams">重置</el-button>
/> <export-data
</el-form-item> class="ml-2.5"
</el-form> :fetch-fun="getUserList"
</el-card> :params="queryParams"
<el-card class="!border-none mt-4" shadow="never"> :page-size="pager.size"
<el-table size="large" v-loading="pager.loading" :data="pager.lists"> />
<el-table-column label="用户编号" prop="sn" min-width="120" /> </el-form-item>
<el-table-column label="头像" min-width="100"> </el-form>
<template #default="{ row }"> </el-card>
<el-avatar :src="row.avatar" :size="50" /> <el-card class="!border-none mt-4" shadow="never">
</template> <el-table size="large" v-loading="pager.loading" :data="pager.lists">
</el-table-column> <el-table-column label="ID" prop="id" min-width="100" />
<el-table-column label="账号" prop="account" min-width="120" /> <el-table-column label="用户编号" prop="sn" min-width="120" />
<el-table-column label="姓名" prop="nickname" min-width="100" /> <el-table-column label="头像" min-width="100">
<el-table-column label="联系方式" prop="mobile" min-width="100" /> <template #default="{ row }">
<el-table-column <el-avatar :src="row.avatar" :size="50" />
label="隶属公司" </template>
prop="company_name" </el-table-column>
min-width="180" <el-table-column label="账号" prop="account" min-width="120" />
align="center" <el-table-column label="姓名" prop="nickname" min-width="100" />
<el-table-column label="联系方式" prop="mobile" min-width="120" />
<el-table-column
label="隶属公司"
prop="company_name"
min-width="180"
align="center"
>
<template #default="{ row }">
{{ row.company?.company_name || "/" }}
</template>
</el-table-column>
<el-table-column label="所在乡镇" prop="street_name" min-width="120" />
<el-table-column label="授权身份" prop="role_name" min-width="120">
<template #default="{ row }">
<span
v-if="row.admin_id == row.company?.admin_id"
style="color: #67c23a"
>公司后台管理人员</span
>
<span v-else style="color: #fe0000">无</span>
</template>
</el-table-column>
<el-table-column
label="是否签约"
prop="is_contract"
align="center"
min-width="120"
>
<template #default="{ row }">
<span v-if="row.is_contract == 1" style="color: #67c23a"
>已签约</span
>
<span v-else style="color: #fe0000">未签约</span>
</template>
</el-table-column>
<el-table-column
label="操作"
min-width="300"
align="center"
fixed="right"
>
<template #default="{ row }">
<el-button v-perms="['user.user/detail']" type="primary" link>
<router-link
:to="{
path: getRoutePath('user.user/detail'),
query: {
id: row.id,
},
}"
>
详情
</router-link>
</el-button>
<template v-if="row.is_contract == 0">
<el-button
v-perms="['user.user/launch']"
type="primary"
link
v-if="!row.contract"
>
<router-link
:to="{
path: getRoutePath('user.user/detail'),
query: {
id: row.id,
mode: 'initiate',
},
}"
> >
<template #default="{ row }"> 发起合同
{{ row.company?.company_name || '/' }} </router-link>
</template> </el-button>
</el-table-column>
<el-table-column label="所在乡镇" prop="street_name" min-width="120" />
<el-table-column label="授权身份" prop="role_name" min-width="120">
<template #default="{ row }">
<span v-if="row.admin_id == row.company?.admin_id" style="color: #67c23a"
>公司后台管理人员</span
>
<span v-else style="color: #fe0000">无</span>
</template>
</el-table-column>
<el-table-column label="是否签约" prop="is_contract" align="center" min-width="120">
<template #default="{ row }">
<span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
<span v-else style="color: #fe0000">未签约</span>
</template>
</el-table-column>
<el-table-column label="操作" width="400" align="center" fixed="right">
<template #default="{ row }">
<el-button v-perms="['user.user/detail']" type="primary" link>
<router-link
:to="{
path: getRoutePath('user.user/detail'),
query: {
id: row.id
}
}"
>
详情
</router-link>
</el-button>
<template v-if="row.is_contract == 0">
<el-button
v-perms="['user.user/launch']"
type="primary"
link
v-if="!row.contract"
>
<router-link
:to="{
path: getRoutePath('user.user/detail'),
query: {
id: row.id,
mode: 'initiate'
}
}"
>
发起合同
</router-link>
</el-button>
<el-button <el-button
v-perms="['user.user/uplode']" v-perms="['user.user/uplode']"
type="primary" type="primary"
link link
v-if="row.contract?.check_status == 1" v-if="row.contract?.check_status == 1"
> >
<router-link <router-link
:to="{ :to="{
path: getRoutePath('user.user/detail'), path: getRoutePath('user.user/detail'),
query: { query: {
id: row.id, id: row.id,
mode: 'uplode', mode: 'uplode',
mdoeid: row.contract.id mdoeid: row.contract.id,
} },
}" }"
> >
上传合同 上传合同
</router-link> </router-link>
</el-button> </el-button>
<el-button <el-button
v-perms="['user.user/launch']" v-perms="['user.user/launch']"
type="primary" type="primary"
v-if="row.contract?.check_status == 2" v-if="row.contract?.check_status == 2"
link link
@click=" @click="
;(showPop = true), (showPop = true),
(showConctactPop = true), (showConctactPop = true),
(contractId = row.id) (contractId = row.id)
" "
>生成个人合同</el-button >生成个人合同</el-button
> >
<el-button <el-button
v-if="row.is_contract == 0 && row.contract?.check_status == 3" v-if="row.is_contract == 0 && row.contract?.check_status == 3"
v-perms="['user.user/launch']" v-perms="['user.user/launch']"
type="primary" type="primary"
link link
@click=";(showPop = true), (contractId = row.id)" @click="(showPop = true), (contractId = row.id)"
>重新短信</el-button >重新短信</el-button
> >
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<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 class="content" v-if="showConctactPop">
请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送. 请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
</div> </div>
<div class="content" v-else> <div class="content" v-else>
确认签约短信将在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
>确认创建</el-button type="primary"
> size="large"
<el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button> v-if="showConctactPop"
<el-button type="info" size="large" @click="offPop">返回</el-button> @click="creContct"
</p> >确认创建</el-button
</el-dialog> >
<div class="flex justify-end mt-4"> <el-button type="primary" size="large" v-else @click="sendMsg"
<pagination v-model="pager" @change="getLists" /> >确认</el-button
</div> >
</el-card> <el-button type="info" size="large" @click="offPop">返回</el-button>
</div> </p>
</el-dialog>
<div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
</div>
</template> </template>
<script lang="ts" setup name="consumerLists"> <script lang="ts" setup name="consumerLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from "@/hooks/usePaging";
import { getRoutePath } from '@/router' import { getRoutePath } from "@/router";
import { getUserList, creatContact, sendMsgApi } from '@/api/consumer' import { getUserList, creatContact, sendMsgApi } from "@/api/consumer";
import { ClientMap } from '@/enums/appEnums' import { ClientMap } from "@/enums/appEnums";
import feedback from '@/utils/feedback' import feedback from "@/utils/feedback";
const route = useRoute() const route = useRoute();
const queryParams = reactive({ const queryParams = reactive({
keyword: '', keyword: "",
channel: '', channel: "",
create_time_start: '', create_time_start: "",
create_time_end: '', create_time_end: "",
company_id: '' company_id: "",
}) });
if (route.query.company_id) { if (route.query.company_id) {
queryParams.company_id = route.query.company_id queryParams.company_id = route.query.company_id;
} }
const contractId = ref(0) const contractId = ref(0);
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 = () => {
console.log(contractId.value) console.log(contractId.value);
// feedback.msgSuccess("复制成功"); // feedback.msgSuccess("复制成功");
creatContact({ id: contractId.value }).then(() => { creatContact({ id: contractId.value }).then(() => {
feedback.msgSuccess('发送成功') feedback.msgSuccess("发送成功");
}) });
offPop() offPop();
} };
const sendMsg = () => { const sendMsg = () => {
sendMsgApi({ id: contractId.value }).then((res) => { sendMsgApi({ id: contractId.value }).then((res) => {
feedback.msgSuccess('发送成功') feedback.msgSuccess("发送成功");
}) });
offPop() offPop();
} };
// const handleDelete = async (id: number) => { // const handleDelete = async (id: number) => {
// await feedback.confirm('确定要删除？') // await feedback.confirm('确定要删除？')
// await adminDelete({ id }) // await adminDelete({ id })
@ -209,39 +235,39 @@ const sendMsg = () => {
// getLists() // getLists()
// } // }
const { pager, getLists, resetPage, resetParams } = usePaging({ const { pager, getLists, resetPage, resetParams } = usePaging({
fetchFun: getUserList, fetchFun: getUserList,
params: queryParams params: queryParams,
}) });
onActivated(() => { onActivated(() => {
getLists() getLists();
}) });
getLists() getLists();
</script> </script>
<style scoped> <style scoped>
h1 { h1 {
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
font-size: 30px; font-size: 30px;
color: red; color: red;
margin-bottom: 10px; margin-bottom: 10px;
} }
.content { .content {
font-size: 20px; font-size: 20px;
} }
.info { .info {
color: red; color: red;
font-weight: bold; font-weight: bold;
font-size: 18px; font-size: 18px;
display: inline-block; display: inline-block;
margin: 0 5px; margin: 0 5px;
} }
.btn_menu { .btn_menu {
margin-top: 10vh; margin-top: 10vh;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
} }
</style> </style>

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

@ -465,7 +465,7 @@ async function render() {
}); });
compeny.value = res.party_a_info; compeny.value = res.party_a_info;
basicdata.value = res; basicdata.value = res;
if (basicdata.value.status == 1) { if (basicdata.value.status == 1 || res.check_status == 3 || res.status == 1) {
isshow.value = false; isshow.value = false;
} }
try { try {