This commit is contained in:
mkm 2023-08-18 14:20:28 +08:00
commit 459983d848
11 changed files with 1293 additions and 1060 deletions

View File

@ -10,6 +10,8 @@ const map = shallowRef(null);
let AMap: any = null;
let markerList: Array<any> = [];
let m_index: Number = 0;
let geocoder: any = null;
let autocomplete: any = null;
const emits = defineEmits("changeMaps");
@ -20,10 +22,6 @@ const resetMap = () => {
emits("changeMaps", markerList);
};
defineExpose({
resetMap,
});
const initMap = async () => {
const loader = AMapLoader.load({
key: "4f8f55618010007147aab96fc72bb408",
@ -36,37 +34,23 @@ const initMap = async () => {
zoom: 13,
});
AMap.plugin("AMap.Geocoder", function () {
geocoder = new AMap.Geocoder({
radius: 10, // 1000
extensions: "all", // POIbasebaseall
}); //
});
// // Autocomplete
// autocomplete = new AMap.Autocomplete({
// city: "", //
// });
map.value.on("click", (e: any) => {
// console.log("", e.lnglat);
if (m_index >= 3) return;
if (m_index >= 1) return;
//
getDistrictName(e.lnglat.lng, e.lnglat.lat);
//
function getDistrictName(lng, lat) {
AMap.plugin("AMap.Geocoder", function () {
var geocoder = new AMap.Geocoder({
radius: 10, // 1000
extensions: "all", // POIbasebaseall
}); //
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("逆地理编码失败");
}
});
});
}
getDistrictName(e.lnglat.lng, e.lnglat.lat, e);
// Marker
var customIcon = new AMap.Icon({
@ -92,21 +76,62 @@ const initMap = async () => {
m_index++;
//
// marker.on("click", (event: any) => {
// console.log("", event);
// markerList = markerList.filter((item: any) => {
// item[0] == marker._position.pos[0] &&
// item[0] == marker._position.pos[0];
// });
// emits("changeMaps", markerList);
// //
// map.value.remove(marker);
// m_index--;
// marker = null;
// });
marker.on("click", (event: any) => {
console.log("删除", event);
markerList = markerList.filter((item: any) => {
item[0] == marker._position.pos[0] &&
item[0] == marker._position.pos[0];
});
emits("changeMaps", markerList);
//
map.value.remove(marker);
m_index--;
marker = null;
});
});
};
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(() => {
initMap();
});

View File

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

View File

@ -1,130 +1,141 @@
<template>
<div class="login flex flex-col">
<div class="flex-1 flex items-center justify-center">
<div class="login-card flex rounded-md">
<div class="flex-1 h-full hidden md:inline-block">
<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 class="login flex flex-col">
<div class="flex-1 flex items-center justify-center">
<div class="login-card flex rounded-md">
<div class="flex-1 h-full hidden md:inline-block">
<image-contain :src="config.login_image" :width="400" height="100%" />
</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>
<layout-footer />
</div>
</template>
<script lang="ts" setup>
import { computed, onMounted, reactive, ref, shallowRef } from 'vue'
import type { InputInstance, FormInstance } from 'element-plus'
import LayoutFooter from '@/layout/components/footer.vue'
import useAppStore from '@/stores/modules/app'
import useUserStore from '@/stores/modules/user'
import cache from '@/utils/cache'
import { ACCOUNT_KEY } from '@/enums/cacheEnums'
import { PageEnum } from '@/enums/pageEnum'
import { useLockFn } from '@/hooks/useLockFn'
const passwordRef = shallowRef<InputInstance>()
const formRef = shallowRef<FormInstance>()
const appStore = useAppStore()
const userStore = useUserStore()
const route = useRoute()
const router = useRouter()
const remAccount = ref(false)
const config = computed(() => appStore.config)
import { computed, onMounted, reactive, ref, shallowRef } from "vue";
import type { InputInstance, FormInstance } from "element-plus";
import LayoutFooter from "@/layout/components/footer.vue";
import useAppStore from "@/stores/modules/app";
import useUserStore from "@/stores/modules/user";
import cache from "@/utils/cache";
import { ACCOUNT_KEY } from "@/enums/cacheEnums";
import { PageEnum } from "@/enums/pageEnum";
import { useLockFn } from "@/hooks/useLockFn";
const passwordRef = shallowRef<InputInstance>();
const formRef = shallowRef<FormInstance>();
const appStore = useAppStore();
const userStore = useUserStore();
const route = useRoute();
const router = useRouter();
const remAccount = ref(false);
const config = computed(() => appStore.config);
const formData = reactive({
account: '',
password: ''
})
account: "",
password: "",
});
const rules = {
account: [
{
required: true,
message: '请输入账号',
trigger: ['blur']
}
],
password: [
{
required: true,
message: '请输入密码',
trigger: ['blur']
}
]
}
account: [
{
required: true,
message: "请输入账号",
trigger: ["blur"],
},
],
password: [
{
required: true,
message: "请输入密码",
trigger: ["blur"],
},
],
};
//
const handleEnter = () => {
if (!formData.password) {
return passwordRef.value?.focus()
}
handleLogin()
}
if (!formData.password) {
return passwordRef.value?.focus();
}
handleLogin();
};
//
const handleLogin = async () => {
await formRef.value?.validate()
//
cache.set(ACCOUNT_KEY, {
remember: remAccount.value,
account: remAccount.value ? formData.account : ''
})
await userStore.login(formData)
const {
query: { redirect }
} = route
const path = typeof redirect === 'string' ? redirect : PageEnum.INDEX
router.push(path)
}
const { isLock, lockFn: lockLogin } = useLockFn(handleLogin)
await formRef.value?.validate();
//
cache.set(ACCOUNT_KEY, {
remember: remAccount.value,
account: remAccount.value ? formData.account : "",
});
await userStore.login(formData);
const {
query: { redirect },
} = route;
const path = typeof redirect === "string" ? redirect : PageEnum.INDEX;
router.push(
cache.get("logout") == formData.account || typeof redirect === "string"
? path
: PageEnum.INDEX
);
};
const { isLock, lockFn: lockLogin } = useLockFn(handleLogin);
onMounted(() => {
const value = cache.get(ACCOUNT_KEY)
if (value?.remember) {
remAccount.value = value.remember
formData.account = value.account
}
})
const value = cache.get(ACCOUNT_KEY);
if (value?.remember) {
remAccount.value = value.remember;
formData.account = value.account;
}
});
</script>
<style lang="scss" scoped>
.login {
background-image: url('./images/login_bg.png');
@apply min-h-screen bg-no-repeat bg-center bg-cover;
.login-card {
height: 400px;
}
background-image: url("./images/login_bg.png");
@apply min-h-screen bg-no-repeat bg-center bg-cover;
.login-card {
height: 400px;
}
}
</style>

File diff suppressed because it is too large Load Diff

View File

@ -1,238 +1,320 @@
<template>
<div>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column label="id" 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_name" show-overflow-tooltip />
<el-table-column label="乡镇" prop="street_name" show-overflow-tooltip />
<el-table-column label="主联系人" prop="master_name" show-overflow-tooltip />
<el-table-column label="联系方式" prop="master_phone" show-overflow-tooltip />
<el-table-column
label="片区经理"
prop="area_manager_name"
show-overflow-tooltip
/>
<el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip>
<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="操作" align="center" width="450" fixed="right">
<template #default="{ row }">
<div style="display: flex">
<el-button type="primary" link>
<router-link
:to="{
path: getRoutePath('auth.admin/lists'),
query: {
company_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,
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-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>
</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
<div>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column
label="id"
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_name"
show-overflow-tooltip
/>
<el-table-column
label="乡镇"
prop="street_name"
show-overflow-tooltip
/>
<el-table-column
label="主联系人"
prop="master_name"
show-overflow-tooltip
/>
<el-table-column
label="联系方式"
prop="master_phone"
show-overflow-tooltip
/>
<el-table-column
label="片区经理"
prop="area_manager_name"
show-overflow-tooltip
/>
<el-table-column
label="是否签约"
prop="is_contract"
show-overflow-tooltip
>
<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="操作"
align="center"
width="300"
fixed="right"
>
<template #default="{ row }">
<div style="display: flex">
<el-button type="primary" link>
<router-link
:to="{
path: getRoutePath('auth.admin/lists'),
query: {
company_id: row.id,
read: true,
},
}"
>查看成员</router-link
>
</el-button>
<el-button
v-perms="['company/edit', 'company/add']"
type="primary"
link
>
<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>
<router-link
:to="{
path: getRoutePath('company/add:edit'),
query: {
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>
<script lang="ts" setup name="companyLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiCompanyLists, apiCompanyDelete, apiSubordinateList } 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 { usePaging } from "@/hooks/usePaging";
import { useDictData } from "@/hooks/useDictOptions";
import {
apiCompanyLists,
apiCompanyDelete,
apiSubordinateList,
} 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 { getRoutePath } from '@/router'
import { getRoutePath } from "@/router";
const route = useRoute()
const company_type_show = ref(true)
const route = useRoute();
const company_type_show = ref(true);
//
//
const showPop = ref(false)
const showConctactPop = ref(false)
const showPop = ref(false);
const showConctactPop = ref(false);
const offPop = () => {
showPop.value = false
showConctactPop.value = false
}
showPop.value = false;
showConctactPop.value = false;
};
// id
const contractId = ref('')
const contractId = ref("");
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 = () => {
generateGontract({ id: contractId.value })
offPop()
}
generateGontract({ id: contractId.value });
offPop();
};
const sendMsg = () => {
sendMsgApi({ id: contractId.value })
offPop()
}
sendMsgApi({ id: contractId.value });
offPop();
};
//
//
const queryParams = reactive({
company_name: '',
area: '',
street: '',
company_type: '',
area_manager: '',
//
is_contract: '',
company_id: ''
})
company_name: "",
area: "",
street: "",
company_type: "",
area_manager: "",
//
is_contract: "",
company_id: "",
});
if (route.query.company_type) {
company_type_show.value = false
queryParams['company_type'] = route.query.company_type?.toString() || ''
company_type_show.value = false;
queryParams["company_type"] = route.query.company_type?.toString() || "";
}
if (route.query.company_id) {
queryParams.company_id = route.query.company_id?.toString() || ''
queryParams.company_id = route.query.company_id?.toString() || "";
}
const datas = reactive({
dictTypeLists: []
})
dictTypeLists: [],
});
const getdictTypeLists = async () => {
const data = await dictDataLists({ type_id: 6 })
datas['dictTypeLists'] = data['lists']
}
getdictTypeLists()
const data = await dictDataLists({ type_id: 6 });
datas["dictTypeLists"] = data["lists"];
};
getdictTypeLists();
//
const selectData = ref<any[]>([])
const selectData = ref<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({
fetchFun: apiSubordinateList,
params: queryParams
})
fetchFun: apiSubordinateList,
params: queryParams,
});
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?')
await apiCompanyDelete({ id })
getLists()
}
await feedback.confirm("确定要删除?");
await apiCompanyDelete({ id });
getLists();
};
getLists()
getLists();
</script>
<style lang="scss">
.btn {
position: absolute;
position: absolute;
}
h1 {
text-align: center;
font-weight: bold;
font-size: 30px;
color: red;
margin-bottom: 10px;
text-align: center;
font-weight: bold;
font-size: 30px;
color: red;
margin-bottom: 10px;
}
.content {
font-size: 20px;
font-size: 20px;
}
.info {
color: red;
font-weight: bold;
font-size: 18px;
display: inline-block;
margin: 0 5px;
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;
margin-top: 10vh;
display: flex;
justify-content: space-around;
}
</style>

View File

@ -1,203 +1,229 @@
<template>
<div>
<el-card class="!border-none" shadow="never">
<el-form ref="formRef" class="mb-[-16px]" :model="queryParams" :inline="true">
<el-form-item label="用户信息">
<el-input
class="w-[280px]"
v-model="queryParams.keyword"
placeholder="用户编号/昵称/手机号码"
clearable
@keyup.enter="resetPage"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
<export-data
class="ml-2.5"
:fetch-fun="getUserList"
:params="queryParams"
:page-size="pager.size"
/>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none mt-4" shadow="never">
<el-table size="large" v-loading="pager.loading" :data="pager.lists">
<el-table-column label="用户编号" prop="sn" min-width="120" />
<el-table-column label="头像" min-width="100">
<template #default="{ row }">
<el-avatar :src="row.avatar" :size="50" />
</template>
</el-table-column>
<el-table-column label="账号" prop="account" min-width="120" />
<el-table-column label="姓名" prop="nickname" min-width="100" />
<el-table-column label="联系方式" prop="mobile" min-width="100" />
<el-table-column
label="隶属公司"
prop="company_name"
min-width="180"
align="center"
<div>
<el-card class="!border-none" shadow="never">
<el-form
ref="formRef"
class="mb-[-16px]"
:model="queryParams"
:inline="true"
>
<el-form-item label="用户信息">
<el-input
class="w-[280px]"
v-model="queryParams.keyword"
placeholder="用户编号/昵称/手机号码"
clearable
@keyup.enter="resetPage"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
<export-data
class="ml-2.5"
:fetch-fun="getUserList"
:params="queryParams"
:page-size="pager.size"
/>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none mt-4" shadow="never">
<el-table size="large" v-loading="pager.loading" :data="pager.lists">
<el-table-column label="ID" prop="id" min-width="100" />
<el-table-column label="用户编号" prop="sn" min-width="120" />
<el-table-column label="头像" min-width="100">
<template #default="{ row }">
<el-avatar :src="row.avatar" :size="50" />
</template>
</el-table-column>
<el-table-column label="账号" prop="account" min-width="120" />
<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 || '/' }}
</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="操作" 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>
发起合同
</router-link>
</el-button>
<el-button
v-perms="['user.user/uplode']"
type="primary"
link
v-if="row.contract?.check_status == 1"
>
<router-link
:to="{
path: getRoutePath('user.user/detail'),
query: {
id: row.id,
mode: 'uplode',
mdoeid: row.contract.id
}
}"
>
上传合同
</router-link>
</el-button>
<el-button
v-perms="['user.user/launch']"
type="primary"
v-if="row.contract?.check_status == 2"
link
@click="
;(showPop = true),
(showConctactPop = true),
(contractId = row.id)
"
>生成个人合同</el-button
>
<el-button
v-if="row.is_contract == 0 && row.contract?.check_status == 3"
v-perms="['user.user/launch']"
type="primary"
link
@click=";(showPop = true), (contractId = row.id)"
>重新短信</el-button
>
</template>
</template>
</el-table-column>
</el-table>
<el-button
v-perms="['user.user/uplode']"
type="primary"
link
v-if="row.contract?.check_status == 1"
>
<router-link
:to="{
path: getRoutePath('user.user/detail'),
query: {
id: row.id,
mode: 'uplode',
mdoeid: row.contract.id,
},
}"
>
上传合同
</router-link>
</el-button>
<el-button
v-perms="['user.user/launch']"
type="primary"
v-if="row.contract?.check_status == 2"
link
@click="
(showPop = true),
(showConctactPop = true),
(contractId = row.id)
"
>生成个人合同</el-button
>
<el-button
v-if="row.is_contract == 0 && row.contract?.check_status == 3"
v-perms="['user.user/launch']"
type="primary"
link
@click="(showPop = true), (contractId = row.id)"
>重新短信</el-button
>
</template>
</template>
</el-table-column>
</el-table>
<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 class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
</div>
<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 class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
</div>
</template>
<script lang="ts" setup name="consumerLists">
import { usePaging } from '@/hooks/usePaging'
import { getRoutePath } from '@/router'
import { getUserList, creatContact, sendMsgApi } from '@/api/consumer'
import { ClientMap } from '@/enums/appEnums'
import feedback from '@/utils/feedback'
const route = useRoute()
import { usePaging } from "@/hooks/usePaging";
import { getRoutePath } from "@/router";
import { getUserList, creatContact, sendMsgApi } from "@/api/consumer";
import { ClientMap } from "@/enums/appEnums";
import feedback from "@/utils/feedback";
const route = useRoute();
const queryParams = reactive({
keyword: '',
channel: '',
create_time_start: '',
create_time_end: '',
company_id: ''
})
keyword: "",
channel: "",
create_time_start: "",
create_time_end: "",
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 showPop = ref(false)
const showConctactPop = ref(false)
const contractId = ref(0);
const showPop = ref(false);
const showConctactPop = ref(false);
const offPop = () => {
showPop.value = false
showConctactPop.value = false
}
showPop.value = false;
showConctactPop.value = false;
};
const creContct = () => {
console.log(contractId.value)
// feedback.msgSuccess("");
creatContact({ id: contractId.value }).then(() => {
feedback.msgSuccess('发送成功')
})
offPop()
}
console.log(contractId.value);
// feedback.msgSuccess("");
creatContact({ id: contractId.value }).then(() => {
feedback.msgSuccess("发送成功");
});
offPop();
};
const sendMsg = () => {
sendMsgApi({ id: contractId.value }).then((res) => {
feedback.msgSuccess('发送成功')
})
offPop()
}
sendMsgApi({ id: contractId.value }).then((res) => {
feedback.msgSuccess("发送成功");
});
offPop();
};
// const handleDelete = async (id: number) => {
// await feedback.confirm('')
// await adminDelete({ id })
@ -209,39 +235,39 @@ const sendMsg = () => {
// getLists()
// }
const { pager, getLists, resetPage, resetParams } = usePaging({
fetchFun: getUserList,
params: queryParams
})
fetchFun: getUserList,
params: queryParams,
});
onActivated(() => {
getLists()
})
getLists();
});
getLists()
getLists();
</script>
<style scoped>
h1 {
text-align: center;
font-weight: bold;
font-size: 30px;
color: red;
margin-bottom: 10px;
text-align: center;
font-weight: bold;
font-size: 30px;
color: red;
margin-bottom: 10px;
}
.content {
font-size: 20px;
font-size: 20px;
}
.info {
color: red;
font-weight: bold;
font-size: 18px;
display: inline-block;
margin: 0 5px;
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;
margin-top: 10vh;
display: flex;
justify-content: space-around;
}
</style>

View File

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

View File

@ -54,10 +54,10 @@
placeholder="没有任务描述"
/>
</el-form-item>
<el-form-item v-if="mode == 'show'" label="">
<!-- <el-form-item v-if="mode == 'show'" label="">
<el-button type="primary" @click="clickUpdate"> 修改 </el-button>
<el-button type="danger" @click="clickDelete"> 删除 </el-button>
</el-form-item>
</el-form-item> -->
</el-form>
</popup>
<el-dialog v-model="isShow" title="选择任务模板" width="60%">

View File

@ -1,7 +1,7 @@
<template>
<div>
<el-card class="!border-none" v-loading="loading" shadow="never">
<div style="display: flex; justify-content: space-between">
<!-- <div style="display: flex; justify-content: space-between">
<el-button
v-perms="['task.taskCalendar/add']"
type="primary"
@ -12,11 +12,7 @@
</template>
新增
</el-button>
<!-- <div class="btn">
<div :class="{ active: nowType == 0 }" @click="nowType = 0">日历</div>
<div :class="{ active: nowType == 1 }" @click="nowType = 1">列表</div>
</div> -->
</div>
</div> -->
<calendar
:list="taskList"
@clickItem="clickTask"

View File

@ -92,25 +92,25 @@
/>
</el-select>
</el-form-item>
<el-form-item v-if="formData.type == 32" label="起点">
<el-form-item v-if="formData.type == 32" label="起点" @click="changeMap(0)">
<el-input
placeholder="请点击上方地图选择地点"
readonly
:value="formData.extend[0]?.address"
:value="formData.extend?.origin?.address"
/>
</el-form-item>
<el-form-item v-if="formData.type == 32" label="中转点">
<el-form-item v-if="formData.type == 32" label="中转点" @click="changeMap(1)">
<el-input
placeholder="请点击上方地图选择地点"
readonly
:value="formData.extend[1]?.address"
:value="formData.extend?.transfer?.address"
/>
</el-form-item>
<el-form-item v-if="formData.type == 32" label="终点">
<el-form-item v-if="formData.type == 32" label="终点" @click="changeMap(2)">
<el-input
placeholder="请点击上方地图选择地点"
readonly
:value="formData.extend[2]?.address"
:value="formData.extend?.terminus?.address"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
@ -123,12 +123,7 @@
<el-input v-model="formData.content" clearable placeholder="请输入任务描述" />
</el-form-item>
</el-form>
<taskMap
v-if="mapShow"
ref="mapRef"
@success="setMap"
@close="mapShow = false"
></taskMap>
<taskMap v-if="mapShow" ref="mapRef" @success="setMap" @close=""></taskMap>
</popup>
</div>
</template>
@ -173,12 +168,13 @@ const formData = reactive({
money_two: 0, //
money_three: 0, //
types: '', //
extend: {},
task_scheduling: 0
extend: {
origin: {}, //
transfer: {}, //
terminus: {} //
}
})
if (route.query.id) {
formData.task_scheduling = route.query.id
}
//
dictDataLists({ type_id: 10 }).then((res) => {
datalist.value = res.lists
@ -241,14 +237,35 @@ const mapRef = shallowRef<InstanceType<typeof taskMap>>()
const changeTaskType = async (e: any) => {
if (e == 32) {
mapShow.value = true //
await nextTick()
console.log(mapRef.value)
mapRef.value?.open()
// await nextTick();
// mapRef.value?.open();
}
}
// (,,)
const mapType = ref('')
const changeMap = async (e: number) => {
let map_title = ''
switch (e) {
case 0:
mapType.value = 'origin'
map_title = '起点'
break
case 1:
mapType.value = 'transfer'
map_title = '中转点'
break
case 2:
mapType.value = 'terminus'
map_title = '终点'
break
}
await nextTick()
mapRef.value?.open(map_title)
}
const setMap = (e: any) => {
formData.extend = e
formData.extend[mapType.value] = e[0]
console.log('选择了地区', formData.extend)
}

View File

@ -2,7 +2,7 @@
<div class="edit-popup">
<popup
ref="popupRef"
title="选择地点"
:title="title"
:async="true"
width="550px"
@confirm="handleSubmit"
@ -13,14 +13,24 @@
<el-input
style="width: 300px; margin-right: 16px"
placeholder="请输入要搜索的地址"
v-model="searchText"
clearable
/>
<el-button type="primary">搜索</el-button>
<el-button @click="resetMap()">重置</el-button>
<el-button type="primary" @click="serach()">搜索</el-button>
<!-- <el-button @click="resetMap()">重置</el-button> -->
</el-form-item>
<el-form-item label-width="80px" label="地图">
<MapContainer ref="mapRef" @changeMaps="changeMaps"></MapContainer>
</el-form-item>
<el-form-item label-width="80px" label="起点">
<el-form-item label-width="80px" label="已选地点">
<el-input
style="width: 350px; margin-right: 16px"
placeholder="请点击上方地图选择地点"
readonly
:value="address[0]?.address"
/>
</el-form-item>
<!-- <el-form-item label-width="80px" label="起点">
<el-input
style="width: 350px; margin-right: 16px"
placeholder="请点击上方地图选择地点"
@ -43,7 +53,7 @@
readonly
:value="address[2]?.address"
/>
</el-form-item>
</el-form-item> -->
</el-form>
</popup>
</div>
@ -72,6 +82,7 @@ const formRef = shallowRef<FormInstance>();
const popupRef = shallowRef<InstanceType<typeof Popup>>();
const mode = ref("add");
const datalist = ref([]);
const title = ref("");
//
const setFormData = async (data: Record<any, any>) => {
@ -98,6 +109,12 @@ const resetMap = () => {
mapRef.value.resetMap();
};
//
const searchText = ref("");
const serach = () => {
mapRef.value.searchMap(searchText.value);
};
const address = ref([]);
const changeMaps = (e: any) => {
address.value = JSON.parse(JSON.stringify(e));
@ -106,15 +123,16 @@ const changeMaps = (e: any) => {
//
const handleSubmit = async () => {
if (address.value.length < 3) return ElMessage.error("请先选择三个地点");
// if (address.value.length < 3) return ElMessage.error("");
popupRef.value?.close();
emit("success", address.value);
};
//
const open = (type = "add") => {
mode.value = type;
const open = (type = "地点") => {
title.value = "选择" + type;
popupRef.value?.open();
resetMap();
};
//