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-08-18 14:20:28 +08:00
commit 459983d848
11 changed files with 1293 additions and 1060 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
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,
}); });
map.value.on("click", (e: any) => {
// console.log("点击", e.lnglat);
if (m_index >= 3) return;
// 调用函数并传入经纬度
getDistrictName(e.lnglat.lng, e.lnglat.lat);
// 获取地区名称
function getDistrictName(lng, lat) {
AMap.plugin("AMap.Geocoder", function () { AMap.plugin("AMap.Geocoder", function () {
var geocoder = new AMap.Geocoder({ geocoder = new AMap.Geocoder({
radius: 10, // 逆地理编码范围，默认值：1000，单位：米 radius: 10, // 逆地理编码范围，默认值：1000，单位：米
extensions: "all", // 返回地址描述结果时是否包含引擎内置的POI，默认值：base，可选值：base、all extensions: "all", // 返回地址描述结果时是否包含引擎内置的POI，默认值：base，可选值：base、all
}); // 经纬度数组 }); // 经纬度数组
});
geocoder.getAddress([lng, lat], function (status, result) { // // 创建 Autocomplete 实例
if (status === "complete" && result.info === "OK") { // autocomplete = new AMap.Autocomplete({
// 解析成功，提取地区名称 // city: "全国", // 设置默认城市为全国
var district = result.regeocode.addressComponent.district; // });
// console.log(district, result.regeocode); // 输出地区名字
markerList.push({ map.value.on("click", (e: any) => {
lnglat: e.lnglat, // console.log("点击", e.lnglat);
address: result.regeocode.formattedAddress, if (m_index >= 1) return;
}); // 调用函数并传入经纬度
emits("changeMaps", markerList); getDistrictName(e.lnglat.lng, e.lnglat.lat, e);
} else {
// 解析失败
console.log("逆地理编码失败");
}
});
});
}
// 自定义 Marker 的图标 // 自定义 Marker 的图标
var customIcon = new AMap.Icon({ var customIcon = new AMap.Icon({
@ -92,21 +76,62 @@ const initMap = async () => {
m_index++; m_index++;
// 添加标记点击事件监听器 // 添加标记点击事件监听器
// marker.on("click", (event: any) => { marker.on("click", (event: any) => {
// console.log("删除", event); console.log("删除", event);
// markerList = markerList.filter((item: any) => { markerList = markerList.filter((item: any) => {
// item[0] == marker._position.pos[0] && item[0] == marker._position.pos[0] &&
// item[0] == marker._position.pos[0]; item[0] == marker._position.pos[0];
// }); });
// emits("changeMaps", markerList); emits("changeMaps", markerList);
// // 在这里可以进行其他自定义逻辑操作 // 在这里可以进行其他自定义逻辑操作
// map.value.remove(marker); map.value.remove(marker);
// m_index--; m_index--;
// marker = null; 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(() => { onMounted(() => {
initMap(); initMap();
}); });

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

@ -18,17 +18,20 @@
</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>

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

@ -8,7 +8,9 @@
<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" 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> <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 ref="formRef" :model="formData" size="large" :rules="rules">
<el-form-item prop="account"> <el-form-item prop="account">
<el-input <el-input
@ -38,7 +40,12 @@
<div class="mb-5"> <div class="mb-5">
<el-checkbox v-model="remAccount" label="记住账号"></el-checkbox> <el-checkbox v-model="remAccount" label="记住账号"></el-checkbox>
</div> </div>
<el-button type="primary" size="large" :loading="isLock" @click="lockLogin"> <el-button
type="primary"
size="large"
:loading="isLock"
@click="lockLogin"
>
登录 登录
</el-button> </el-button>
</div> </div>
@ -49,79 +56,83 @@
</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;

325
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="510" fixed="right"> <el-table-column
label="操作"
align="center"
width="510"
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('user.user/lists'), path: getRoutePath('user.user/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,8 +198,8 @@
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
> >
@ -211,7 +251,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>
@ -224,12 +264,14 @@
<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>
<el-card> <el-card>
<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">
@ -286,7 +328,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"
@ -297,14 +343,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-col>
</el-card> </el-card>
</div> </div>
<p class="btn_menu"> <p class="btn_menu">
<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">
@ -316,10 +363,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
>确认创建</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>
<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>
@ -327,9 +380,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,
@ -338,161 +391,163 @@ 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),
const InitiateContract = () => { (contractId.value = row.id);
initiate_contract({ };
const InitiateContract = async () => {
await initiate_contract({
id: contractId.value, id: contractId.value,
...contractFormData.value ...contractFormData.value,
}).catch((res) => { });
console.log(res) getLists();
}) offInitiateContractPop();
offInitiateContractPop() };
} const creContct = async () => {
const creContct = () => { await generateGontract({ id: contractId.value });
generateGontract({ id: contractId.value }).catch((res) => { getLists();
console.log(res) offPop();
}) };
offPop() const sendMsg = async () => {
} await sendMsgApi({ id: contractId.value });
const sendMsg = () => { getLists();
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();
} };
// 审核中 // 审核中
const auditing = () => { const auditing = () => {
ElMessage.warning('请等待合同审核完成!') ElMessage.warning("请等待合同审核完成!");
} };
getLists() getLists();
</script> </script>
<style lang="scss"> <style lang="scss">
.btn { .btn {

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

@ -3,25 +3,65 @@
<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
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 <el-table-column
label="片区经理" label="片区经理"
prop="area_manager_name" prop="area_manager_name"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column label="是否签约" prop="is_contract" 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> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="450" fixed="right"> <el-table-column
label="操作"
align="center"
width="300"
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>
@ -30,8 +70,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
> >
@ -46,8 +86,8 @@
path: getRoutePath('company/add:edit'), path: getRoutePath('company/add:edit'),
query: { query: {
id: row.id, id: row.id,
read: true read: true,
} },
}" }"
>详情</router-link >详情</router-link
> >
@ -62,8 +102,8 @@
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
> >
@ -76,19 +116,49 @@
>删除</el-button >删除</el-button
> >
<el-button <el-button
v-perms="['company/edit', 'company/add']" v-if="row.is_authentication == 0"
v-perms="['company/authentication']"
type="primary" type="primary"
link link
@click="showCreateConctPop(row)" @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
> >
<el-button <el-button
v-perms="['company/edit', 'company/add']" 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" type="primary"
link link
@click=";(showPop = true), (contractId = row.id)" @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 >发送短信</el-button
> >
</template>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@ -107,10 +177,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>
@ -118,93 +194,99 @@
</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 {

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

@ -1,7 +1,12 @@
<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
ref="formRef"
class="mb-[-16px]"
:model="queryParams"
:inline="true"
>
<el-form-item label="用户信息"> <el-form-item label="用户信息">
<el-input <el-input
class="w-[280px]" class="w-[280px]"
@ -25,6 +30,7 @@
</el-card> </el-card>
<el-card class="!border-none mt-4" shadow="never"> <el-card class="!border-none mt-4" shadow="never">
<el-table size="large" v-loading="pager.loading" :data="pager.lists"> <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="用户编号" prop="sn" min-width="120" />
<el-table-column label="头像" min-width="100"> <el-table-column label="头像" min-width="100">
<template #default="{ row }"> <template #default="{ row }">
@ -33,7 +39,7 @@
</el-table-column> </el-table-column>
<el-table-column label="账号" prop="account" min-width="120" /> <el-table-column label="账号" prop="account" min-width="120" />
<el-table-column label="姓名" prop="nickname" min-width="100" /> <el-table-column label="姓名" prop="nickname" min-width="100" />
<el-table-column label="联系方式" prop="mobile" min-width="100" /> <el-table-column label="联系方式" prop="mobile" min-width="120" />
<el-table-column <el-table-column
label="隶属公司" label="隶属公司"
prop="company_name" prop="company_name"
@ -41,33 +47,47 @@
align="center" align="center"
> >
<template #default="{ row }"> <template #default="{ row }">
{{ row.company?.company_name || '/' }} {{ row.company?.company_name || "/" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所在乡镇" prop="street_name" min-width="120" /> <el-table-column label="所在乡镇" prop="street_name" min-width="120" />
<el-table-column label="授权身份" prop="role_name" min-width="120"> <el-table-column label="授权身份" prop="role_name" min-width="120">
<template #default="{ row }"> <template #default="{ row }">
<span v-if="row.admin_id == row.company?.admin_id" style="color: #67c23a" <span
v-if="row.admin_id == row.company?.admin_id"
style="color: #67c23a"
>公司后台管理人员</span >公司后台管理人员</span
> >
<span v-else style="color: #fe0000">无</span> <span v-else style="color: #fe0000">无</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否签约" prop="is_contract" align="center" min-width="120"> <el-table-column
label="是否签约"
prop="is_contract"
align="center"
min-width="120"
>
<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> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="400" align="center" fixed="right"> <el-table-column
label="操作"
min-width="300"
align="center"
fixed="right"
>
<template #default="{ row }"> <template #default="{ row }">
<el-button v-perms="['user.user/detail']" type="primary" link> <el-button v-perms="['user.user/detail']" type="primary" link>
<router-link <router-link
:to="{ :to="{
path: getRoutePath('user.user/detail'), path: getRoutePath('user.user/detail'),
query: { query: {
id: row.id id: row.id,
} },
}" }"
> >
详情 详情
@ -85,8 +105,8 @@
path: getRoutePath('user.user/detail'), path: getRoutePath('user.user/detail'),
query: { query: {
id: row.id, id: row.id,
mode: 'initiate' mode: 'initiate',
} },
}" }"
> >
发起合同 发起合同
@ -105,8 +125,8 @@
query: { query: {
id: row.id, id: row.id,
mode: 'uplode', mode: 'uplode',
mdoeid: row.contract.id mdoeid: row.contract.id,
} },
}" }"
> >
上传合同 上传合同
@ -118,7 +138,7 @@
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)
" "
@ -129,7 +149,7 @@
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>
@ -146,10 +166,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>
@ -160,44 +186,44 @@
</div> </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 })
@ -210,13 +236,13 @@ const sendMsg = () => {
// } // }
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 {

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 {

4
src/views/task/editTow.vue
View File

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

6
src/views/task/taskCalendar.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-card class="!border-none" v-loading="loading" shadow="never"> <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 <el-button
v-perms="['task.taskCalendar/add']" v-perms="['task.taskCalendar/add']"
type="primary" type="primary"
@ -12,11 +12,7 @@
</template> </template>
新增 新增
</el-button> </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 <calendar
:list="taskList" :list="taskList"
@clickItem="clickTask" @clickItem="clickTask"

59
src/views/task_template/edit.vue
View File

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

34
src/views/task_template/map.vue
View File

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