This commit is contained in:
weipengfei 2023-09-25 18:11:51 +08:00
commit ae923ec83c
47 changed files with 2530 additions and 2079 deletions

View File

@ -0,0 +1,26 @@
import request from '@/utils/request'
// 投诉反馈列表
export function apiCompanyComplaintFeedbackLists(params: any) {
return request.get({ url: '/company_complaint_feedback/lists', params })
}
// 添加投诉反馈
export function apiCompanyComplaintFeedbackAdd(params: any) {
return request.post({ url: '/company_complaint_feedback/add', params })
}
// 编辑投诉反馈
export function apiCompanyComplaintFeedbackEdit(params: any) {
return request.post({ url: '/company_complaint_feedback/edit', params })
}
// 删除投诉反馈
export function apiCompanyComplaintFeedbackDelete(params: any) {
return request.post({ url: '/company_complaint_feedback/delete', params })
}
// 投诉反馈详情
export function apiCompanyComplaintFeedbackDetail(params: any) {
return request.get({ url: '/company_complaint_feedback/detail', params })
}

View File

@ -28,3 +28,14 @@ export function apiFlowStatus(params: any) {
export function apiFlowDetil(params: any) { export function apiFlowDetil(params: any) {
return request.get({ url: "/flow/view", params }); return request.get({ url: "/flow/view", params });
} }
// 任务
// 任务审批列表(待审批列表)
export function apiApproveList(params: any) {
return request.get({ url: "/approve.approve/lists", params });
}
// 任务审批(待审批列表)
export function apiApproveAudit(params: any) {
return request.get({ url: "/approve.approve/audit", params });
}

View File

@ -5,6 +5,11 @@ export function accountLog(params?: any) {
return request.get({ url: '/finance.account_log/lists', params }) return request.get({ url: '/finance.account_log/lists', params })
} }
// 成员信息
export function getCompanyUserList(params?: any) {
return request.get({ url: '/finance.account_log/getCompanyUserList', params })
}
// 充值记录 // 充值记录
export function rechargeLists(params?: any) { export function rechargeLists(params?: any) {
return request.get({ url: '/recharge.recharge/lists', params }, { ignoreCancelToken: true }) return request.get({ url: '/recharge.recharge/lists', params }, { ignoreCancelToken: true })

View File

@ -44,3 +44,8 @@ export function apiShopSendMsgApi(params: any) {
export function contractEvidence(params: any) { export function contractEvidence(params: any) {
return request.get({ url: "/shop_contract/evidence", params }); return request.get({ url: "/shop_contract/evidence", params });
} }
// 设置备注
export function apiShopContractAddNotes(params: any) {
return request.post({ url: '/shop_contract/addNote', params })
}

View File

@ -24,3 +24,8 @@ export function apiTaskTemplateDelete(params: any) {
export function apiTaskTemplateDetail(params: any) { export function apiTaskTemplateDetail(params: any) {
return request.get({ url: '/task_template.task_template/detail', params }) return request.get({ url: '/task_template.task_template/detail', params })
} }
// 任务类型
export function apiTaskTypeList(params: any) {
return request.get({ url: '/setting.dict.dict_data/lists', params })
}

View File

@ -53,11 +53,13 @@
class="upload-demo" class="upload-demo"
style="width: 100%" style="width: 100%"
drag drag
accept=".apk, .ipa, .wgt"
:headers="{ Token: userStore.token }" :headers="{ Token: userStore.token }"
:action="base_url + '/upload/file'" :action="base_url + '/upload/file'"
:limit="1" :limit="1"
:on-success="handleFile" :on-success="handleFile"
:on-exceed="handleExceed" :on-exceed="handleExceed"
:before-upload="handleBeforeUpload"
ref="upload" ref="upload"
> >
<el-icon class="el-icon--upload"><upload-filled /></el-icon> <el-icon class="el-icon--upload"><upload-filled /></el-icon>
@ -140,6 +142,18 @@ const handleExceed = (files: any) => {
upload.value!.submit(); upload.value!.submit();
}; };
const appTypeList = [".apk", ".ipa", ".wgt"];
const handleBeforeUpload = (e: any) => {
let a = appTypeList.find((item: any) => {
return item == e?.name?.substring(e.name.length - 4, e.name.length);
});
if (a) return true;
else {
ElMessage.error("仅支持上传APK/IPA/WGT文件");
return false;
}
};
// //
const popupTitle = computed(() => { const popupTitle = computed(() => {
return mode.value == "edit" ? "编辑app更新" : "新增app更新"; return mode.value == "edit" ? "编辑app更新" : "新增app更新";

View File

@ -1,338 +0,0 @@
<template>
<div class="edit-popup">
<el-form
ref="formRef"
:model="formData"
label-width="90px"
:rules="formRules"
:disabled="true"
>
<el-col :span="24" class="el-card pt-6">
<div class="tit">公司信息</div>
<el-row>
<el-col :span="8">
<el-form-item label="公司名称" prop="company_name">
<el-input
v-model="formData.company_b_name"
placeholder="请输入公司名称"
clearable
:disabled="isDisabled"
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="社会代码" prop="organization_code">
<el-input
:disabled="isDisabled"
v-model="formData.company_b_code"
placeholder="请输入社会代码"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="24" class="el-card pt-6">
<div class="tit">主要联系人</div>
<el-row>
<div style="display: flex; justify-content: left">
<!-- <div class="headimg">
<el-upload
:disabled="isDisabled"
v-model="formData.avatar"
class="avatar-uploader-head"
:data="{ cid: 1 }"
action="https://worker-task.lihaink.cn/api/upload/image"
:show-file-list="false"
:on-success="handleAvatarSuccessAvatar"
>
<img
v-if="formData.avatar"
:src="formData.avatar"
class="avatar"
/>
<el-icon v-else class="avatar-uploader-icon">
<Plus />
</el-icon>
</el-upload>
</div> -->
<div class="right">
<el-row>
<el-col :span="8">
<el-form-item label="姓名" prop="master_name">
<el-input
:disabled="isDisabled"
v-model="formData.company_b_user"
placeholder="请输入姓名"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机" prop="master_phone">
<el-input
:disabled="isDisabled"
v-model="formData.company_b_phone"
placeholder="请输入手机"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="邮箱">
<el-input
:disabled="isDisabled"
v-model="formData.company_b_email"
placeholder="请输入邮箱"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="10">
<el-form-item label="片区经理" prop="area_manager_name">
<el-input
:disabled="isDisabled"
v-model="formData.area_manager_name"
placeholder="选择片区经理"
clearable
:style="{ width: '100%' }"
@click="isAreaManager = true"
></el-input>
</el-form-item>
</el-col> -->
</el-row>
</div>
</div>
</el-row>
</el-col>
<!-- <div style="font-size: 1.2rem; margin: 10px 0">资质信息</div> -->
<el-col :span="24" class="el-card pt-6">
<div class="tit">租赁信息</div>
<!-- {{ formData.car_inf }} -->
<el-row v-for="(item, index) in formData.cars_info">
<el-col :span="4">
<el-form-item label-width="120px" label="车牌号"
><el-input
v-model="item.license"
placeholder="请输入车牌号"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label-width="120px" label="使用公司"
><el-input
v-model="formData.company_b_name"
placeholder="请输入使用公司"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label-width="120px" label="签约时间">
<el-input
v-model="formData.update_time"
placeholder="请输入签约时间"
clearable
:style="{ width: '100%' }"
></el-input
></el-form-item>
</el-col>
</el-row>
</el-col>
</el-form>
<!-- <el-button @click="create">完成</el-button> -->
<el-button
v-if="formData.status == 1"
type="primary"
:disabled="isDisabled"
size="medium"
@click="create"
>发送合同</el-button
><el-button
v-if="formData.status == 2"
type="primary"
:disabled="num"
size="medium"
@click="sendAgain"
>重新发送{{ num ? num + "s" : "" }}</el-button
>
<el-button type="primary" @click="checkContract" v-if="formData.file"
>查看合同</el-button
>
</div>
</template>
<script setup>
import { reactive, ref } from "vue";
// import { contractDetail, sendContract, sendMsg } from "@/api/contract";
import feedback from "@/utils/feedback";
import { leaseContractDetail } from "@/api/contract";
const router = useRouter();
const route = useRoute();
const formData = reactive({
id: 8,
contract_no: "",
company_a_name: "",
company_a_code: "",
company_a_user: "",
company_a_phone: "",
company_a_email: "",
company_b_id: 165,
company_b_name: "",
company_b_user: "",
company_b_phone: "",
company_b_code: "",
company_b_email: "",
num: 1,
cars_info: [
{
id: 20,
license: "",
},
],
status: 0,
file: "",
contract_url: "",
signing_timer: 0,
url: null,
create_time: "",
update_time: "",
});
const num = ref(0);
// route.query.flag
leaseContractDetail({ id: route.query.id }).then((res) => {
for (let key in formData) {
formData[key] = res[key];
}
// formData.cars_info = JSON.parse(formData.cars_info) || "";
// console.log(formData.cars_info);
});
const checkContract = () => {
window.open(formData.contract_url, "_blank");
};
const timeFn = () => {
const timers = setInterval(() => {
num.value--;
if (num.value <= 0) {
clearInterval(timeFn);
}
}, 1000);
};
const create = () => {
sendContract({
id: route.query.id,
}).then((res) => {
formData.status = 2;
feedback.msgSuccess("发送成功");
num.value = 10;
timeFn();
});
};
const sendAgain = () => {
sendMsg({ id: route.query.id }).then((res) => {
feedback.msgSuccess("发送成功");
num.value = 10;
timeFn();
});
};
</script>
<style lang="scss">
.tit {
font-size: 1.2rem;
translate: 1vw -1vw;
}
.avatar-uploader .el-upload {
width: 10vw;
height: 6.3vw;
background-color: #fff;
border: 1px dashed var(--el-border-color);
border-radius: 6px;
cursor: pointer;
position: relative;
overflow: hidden;
transition: var(--el-transition-duration-fast);
}
.headimg {
margin-left: 18px;
margin-bottom: 18px;
width: 120px;
height: 140px;
overflow: hidden;
border: 1px dashed var(--el-border-color);
border-radius: 6px;
flex-shrink: 0;
}
.avatar-uploader-head .el-upload {
width: 120px;
height: 140px;
background-color: #fff;
cursor: pointer;
position: relative;
overflow: hidden;
transition: var(--el-transition-duration-fast);
}
.avatar-uploader .el-upload:hover {
border-color: var(--el-color-primary);
}
.el-icon.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 178px;
height: 178px;
text-align: center;
}
.el-icon.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 178px;
height: 178px;
text-align: center;
}
.otherimg {
img {
width: 10vw;
height: 6.3vw;
border-radius: 5px;
margin-left: 12px;
margin-bottom: 12px;
}
}
.el-card {
margin-bottom: 10px;
background-color: #fff;
}
.tit {
margin-top: 15px;
}
.others {
width: 100% !important;
}
</style>

View File

@ -1,195 +0,0 @@
<template>
<div>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-form class="mb-[-16px]" inline>
<el-form-item label="公司名称" prop="company_name">
<el-input
class="w-[280px]"
v-model="queryParams.company_name"
clearable
placeholder="请输入公司名称"
/>
</el-form-item>
<el-form-item label="联系人" prop="contract_no">
<el-input
class="w-[280px]"
v-model="queryParams.company_b_user"
clearable
placeholder="请输入联系人"
/> </el-form-item
><el-form-item label="联系方式" prop="status">
<el-input
class="w-[280px]"
v-model="queryParams.company_b_phone"
clearable
placeholder="请输入联系方式"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
<div class="mt-4">
<el-table
:data="pager.lists"
:default-sort="{ prop: 'create_time', order: 'descending' }"
>
<el-table-column
label="公司名称"
:width="250"
prop="company_b_name"
show-overflow-tooltip
/>
<el-table-column
label="社会代码"
prop="company_b_code"
show-overflow-tooltip
/>
<el-table-column
label="主要联系人"
prop="company_b_user"
show-overflow-tooltip
/>
<el-table-column
label="联系方式"
prop="company_b_phone"
align="center"
show-overflow-tooltip
/>
<el-table-column
label="租车数量"
prop="num"
align="center"
show-overflow-tooltip
/>
<el-table-column
label="合同状态"
prop="num"
align="center"
show-overflow-tooltip
>
<template #default="{ row }">
{{ row.status >= 3 ? "已签约" : "未签约" }}
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
width="auto"
fixed="right"
>
<template #default="{ row }">
<el-button type="primary" link>
<router-link
:to="{
path: '/contract/card_detail',
query: {
id: row.id,
},
}"
>查看</router-link
>
</el-button>
<!-- <el-button type="primary" link @click="test(row.id)">
查看
</el-button> -->
<el-button
v-if="row.status == 1"
type="primary"
link
@click="sendContractFn(row.id)"
>发送合同</el-button
>
<el-button
v-if="row.status == 2"
:disabled="row.nums > 0"
@click="sendAgain(row.id)"
link
type="primary"
>重新发送{{ row.nums ? row.nums + "s" : "" }}</el-button
>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup
v-if="showEdit"
ref="editRef"
@success="getLists"
@close="showEdit = false"
/>
</div>
</template>
<script lang="ts" setup name="flowTypeLists">
import { usePaging } from "@/hooks/usePaging";
import { useDictData } from "@/hooks/useDictOptions";
// import { contractList, sendContract, sendMsg } from "@/api/contract";
import { apiContractLists, sendContract, sendMsg } from "@/api/car_contract";
import feedback from "@/utils/feedback";
const sendAgain = (id: number) => {
sendMsg({ id }).then((res) => {
var inde = pager.lists.findIndex(function (element) {
return element.id === id;
});
index.value = inde;
pager.lists[index.value].nums = 10;
timeFn(index.value);
});
};
const timeFn = (i: number) => {
const timers = setInterval(() => {
pager.lists[i].nums--;
if (pager.lists[i].nums <= 0) {
clearInterval(timers);
}
}, 1000);
};
const index = ref(0);
const sendContractFn = (id: number) => {
sendContract({ id }).then((res) => {
feedback.msgSuccess("发送成功");
var inde = pager.lists.findIndex(function (element) {
return element.id === id;
});
index.value = inde;
pager.lists[index.value].status = 2;
pager.lists[index.value].nums = 10;
timeFn(index.value);
});
};
const test = () => {
// console.log(5454);
};
//
const queryParams = reactive({
company_name: "",
company_b_user: "",
company_b_phone: "",
});
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiContractLists,
params: queryParams,
});
// console.log(pager.lists);
const handleView = async (data: any) => {
showEdit.value = true;
await nextTick();
editRef.value?.open(data.id);
};
getLists().then((res) => {
pager.lists.forEach((item, index) => {
item.nums = 0;
});
});
</script>

View File

@ -1,17 +1,17 @@
<template> <template>
<div> <div>
<el-card class="!border-none" shadow="never"> <el-card class="!border-none" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline> <el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="管理员名称" prop="name"> <el-form-item label="管理员名称" prop="name">
<el-input <el-input
class="w-[280px]" class="w-[280px]"
v-model="queryParams.name" v-model="queryParams.name"
clearable clearable
placeholder="请输入管理员名称" placeholder="请输入管理员名称"
/> />
</el-form-item> </el-form-item>
<el-form-item label="请选择管理员角色" prop="role_id"> <el-form-item label="请选择管理员角色" prop="role_id">
<el-select class="w-[280px]" v-model="queryParams.role_id"> <el-select class="w-[280px]" v-model="queryParams.role_id">
<el-option label="全部" value /> <el-option label="全部" value />
<el-option <el-option
v-for="(item, index) in optionsData.role" v-for="(item, index) in optionsData.role"
@ -20,38 +20,55 @@
:value="item.id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button> <el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button> <el-button @click="resetParams">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-card> </el-card>
<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" @cell-click="handleCurrentChange"> <el-table :data="pager.lists" @cell-click="handleCurrentChange">
<el-table-column label="账号" prop="account" min-width="120" /> <el-table-column label="账号" prop="account" min-width="120" />
<el-table-column label="名称" prop="name" min-width="100" /> <el-table-column label="名称" prop="name" min-width="100" />
<el-table-column label="角色" prop="role_name" min-width="100" show-tooltip-when-overflow /> <el-table-column
<el-table-column label="部门" prop="dept_name" min-width="100" show-tooltip-when-overflow /> label="角色"
<el-table-column label="创建时间" prop="create_time" min-width="180" /> prop="role_name"
<el-table-column label="最近登录时间" prop="login_time" min-width="180" /> min-width="100"
show-tooltip-when-overflow
/>
<el-table-column
label="部门"
prop="dept_name"
min-width="100"
show-tooltip-when-overflow
/>
<el-table-column
label="创建时间"
prop="create_time"
min-width="180"
/>
<el-table-column
label="最近登录时间"
prop="login_time"
min-width="180"
/>
<el-table-column label="最近登录IP" prop="login_ip" min-width="120" /> <el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
</el-table> </el-table>
</div> </div>
<div class="flex mt-4 justify-end"> <div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
</div> </div>
</el-card> </el-card>
</div> </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 { roleAll } from "@/api/perms/role"; import { roleAll } from "@/api/perms/role";
import { useDictData,useDictOptions } from '@/hooks/useDictOptions' import { useDictData, useDictOptions } from "@/hooks/useDictOptions";
import { adminLists} from "@/api/perms/admin"; import { adminLists } from "@/api/perms/admin";
import { defineEmits, defineProps } from 'vue'
const { optionsData } = useDictOptions<{ const { optionsData } = useDictOptions<{
role: any[]; role: any[];
}>({ }>({
@ -61,34 +78,34 @@ const { optionsData } = useDictOptions<{
}); });
// //
const queryParams = reactive({ const queryParams = reactive({
name: "", name: "",
role_id: "", role_id: "",
}) });
const props = defineProps({ const props = defineProps({
type: { type: {
type: Number, type: Number,
defualt: 0 defualt: 0,
} },
}) });
if(props.type==8){ if (props.type == 8) {
queryParams.role_id = 8 queryParams.role_id = 8;
} }
// //
const emits = defineEmits(['customEvent']) const emits = defineEmits(["customEvent"]);
// //
const handleCurrentChange = (value: any) => { const handleCurrentChange = (value: any) => {
emits('customEvent', value) emits("customEvent", value);
} };
// //
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: adminLists, fetchFun: adminLists,
params: queryParams params: queryParams,
}) });
getLists() getLists();
</script> </script>

View File

@ -10,217 +10,186 @@
<el-col :span="24" class="el-card pt-6"> <el-col :span="24" class="el-card pt-6">
<div class="tit">公司基本信息创建</div> <div class="tit">公司基本信息创建</div>
<el-row> <el-row>
<el-col :span="8"> <el-form-item label="公司名称" prop="company_name">
<el-form-item label="公司名称" prop="company_name"> <el-input
<el-input v-model="formData.company_name"
v-model="formData.company_name" placeholder="请输入公司名称"
placeholder="请输入公司名称" clearable
clearable :disabled="isDisabled"
:disabled="isDisabled" :style="{ width: '300px' }"
:style="{ width: '100%' }" ></el-input>
></el-input> </el-form-item>
</el-form-item> <el-form-item label="社会代码" prop="organization_code">
</el-col> <el-input
<el-col :span="8"> :disabled="isDisabled"
<el-form-item label="社会代码" prop="organization_code"> v-model="formData.organization_code"
<el-input placeholder="请输入社会代码"
:disabled="isDisabled" clearable
v-model="formData.organization_code" :style="{ width: '300px' }"
placeholder="请输入社会代码" ></el-input>
clearable </el-form-item>
:style="{ width: '100%' }" <el-form-item
></el-input> label="公司类型"
</el-form-item> :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
</el-col> prop="company_type"
<el-col :span="7"> >
<el-form-item <el-select
label="公司类型" :disabled="isDisabled"
:rules="[ v-model="formData.company_type"
{ required: true, message: '不可为空', trigger: 'blur' }, placeholder="请选择公司类型"
]" clearable
prop="company_type" @change="company_type_change"
> >
<el-select <el-option
:disabled="isDisabled" v-for="(item, index) in datas.dictTypeLists"
v-model="formData.company_type" :key="index"
placeholder="请选择公司类型" :label="item.name"
clearable :value="item.id"
@change="company_type_change" ></el-option>
:style="{ width: '100%' }" </el-select>
> </el-form-item>
<el-option <el-form-item
v-for="(item, index) in datas.dictTypeLists" label="省"
:key="index" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
:label="item.name" prop="province"
:value="item.id" >
></el-option> <el-select
</el-select> :disabled="isDisabled"
</el-form-item> v-model="formData.province"
</el-col> placeholder="请选择省"
<el-col :span="3"> clearable
<el-form-item @change="province_change"
label="省" :style="{ width: '100%' }"
:rules="[
{ required: true, message: '不可为空', trigger: 'blur' },
]"
prop="province"
> >
<el-select <el-option
:disabled="isDisabled" v-for="(item, index) in datas.provinceOptions"
v-model="formData.province" :key="index"
placeholder="请选择省" :label="item.province_name"
clearable :value="item.province_code"
@change="province_change" ></el-option>
:style="{ width: '100%' }" </el-select>
> </el-form-item>
<el-option <el-form-item
v-for="(item, index) in datas.provinceOptions" label="市"
:key="index" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
:label="item.province_name" prop="city"
:value="item.province_code" >
></el-option> <el-select
</el-select> :disabled="isDisabled"
</el-form-item> v-model="formData.city"
</el-col> placeholder="请选择市"
<el-col :span="3"> clearable
<el-form-item @change="city_change"
label="市" :style="{ width: '100%' }"
:rules="[
{ required: true, message: '不可为空', trigger: 'blur' },
]"
prop="city"
> >
<el-select <el-option
:disabled="isDisabled" v-for="(item, index) in datas.cityOptions"
v-model="formData.city" :key="index"
placeholder="请选择市" :label="item.city_name"
clearable :value="item.city_code"
@change="city_change" ></el-option>
:style="{ width: '100%' }" </el-select>
> </el-form-item>
<el-option <el-form-item
v-for="(item, index) in datas.cityOptions" v-if="isArea"
:key="index" label="区"
:label="item.city_name" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
:value="item.city_code" prop="area"
></el-option> >
</el-select> <el-select
</el-form-item> :disabled="isDisabled"
</el-col> v-model="formData.area"
<el-col :span="3" v-if="isArea"> placeholder="请选择区"
<el-form-item clearable
label="区" @change="area_change"
:rules="[ :style="{ width: '100%' }"
{ required: true, message: '不可为空', trigger: 'blur' },
]"
prop="area"
> >
<el-select <el-option
:disabled="isDisabled" v-for="(item, index) in datas.areaOptions"
v-model="formData.area" :key="index"
placeholder="请选择区" :label="item.area_name"
clearable :value="item.area_code"
@change="area_change" :disabled="item.disabled"
:style="{ width: '100%' }" ></el-option>
> </el-select>
<el-option </el-form-item>
v-for="(item, index) in datas.areaOptions" <el-form-item
:key="index" v-if="isStreet"
:label="item.area_name" label="镇"
:value="item.area_code" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
:disabled="item.disabled" prop="street"
></el-option> >
</el-select> <el-select
</el-form-item> :disabled="isDisabled"
</el-col> v-model="formData.street"
<el-col :span="3" v-if="isStreet"> placeholder="请选择镇"
<el-form-item clearable
label="镇" @change="street_change"
:rules="[ :style="{ width: '100%' }"
{ required: true, message: '不可为空', trigger: 'blur' },
]"
prop="street"
> >
<el-select <el-option
:disabled="isDisabled" v-for="(item, index) in datas.streetOptions"
v-model="formData.street" :key="index"
placeholder="请选择镇" :label="item.street_name"
clearable :value="item.street_code"
@change="street_change" :disabled="item.disabled"
:style="{ width: '100%' }" ></el-option>
> </el-select>
<el-option </el-form-item>
v-for="(item, index) in datas.streetOptions" <el-form-item
:key="index" v-if="isVillage"
:label="item.street_name" label="村"
:value="item.street_code" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
:disabled="item.disabled" prop="village"
></el-option> >
</el-select> <el-select
</el-form-item> :disabled="isDisabled"
</el-col> v-model="formData.village"
<el-col :span="3" v-if="isVillage"> placeholder="请选择村"
<el-form-item clearable
label="村" @change="village_change"
:rules="[ :style="{ width: '100%' }"
{ required: true, message: '不可为空', trigger: 'blur' },
]"
prop="village"
> >
<el-select <el-option
:disabled="isDisabled" v-for="(item, index) in datas.villageOptions"
v-model="formData.village" :key="index"
placeholder="请选择村" :label="item.village_name"
clearable :value="item.village_code"
@change="village_change" :disabled="item.disabled"
:style="{ width: '100%' }" ></el-option>
> </el-select>
<el-option </el-form-item>
v-for="(item, index) in datas.villageOptions" <el-form-item
:key="index" v-if="isBrigade"
:label="item.village_name" label="队"
:value="item.village_code" :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]"
:disabled="item.disabled" prop="brigade"
></el-option> >
</el-select> <el-select
</el-form-item> :disabled="isDisabled"
</el-col> v-model="formData.brigade"
<el-col :span="3" v-if="isBrigade"> placeholder="请选择队"
<el-form-item clearable
label="队" :style="{ width: '100%' }"
:rules="[
{ required: true, message: '不可为空', trigger: 'blur' },
]"
prop="brigade"
> >
<el-select <el-option
:disabled="isDisabled" v-for="(item, index) in datas.brigadeOptions"
v-model="formData.brigade" :key="index"
placeholder="请选择队" :label="item.brigade_name"
clearable :value="item.id"
:style="{ width: '100%' }" :disabled="item.disabled"
> ></el-option>
<el-option </el-select>
v-for="(item, index) in datas.brigadeOptions" </el-form-item>
:key="index" <el-form-item label="地址" prop="address">
:label="item.brigade_name" <el-input
:value="item.id" :disabled="isDisabled"
:disabled="item.disabled" v-model="formData.address"
></el-option> placeholder="请输入地址"
</el-select> clearable
</el-form-item> :style="{ width: '300px' }"
</el-col> ></el-input>
<el-col :span="4"> </el-form-item>
<el-form-item label="地址" prop="address">
<el-input
:disabled="isDisabled"
v-model="formData.address"
placeholder="请输入地址"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
<el-col :span="23"> <el-col :span="23">
<el-form-item label="负责区域" prop="region"> <el-form-item label="负责区域" prop="region">
<el-checkbox-group <el-checkbox-group
@ -266,6 +235,7 @@
<div class="headimg" style="margin-left: 5px"> <div class="headimg" style="margin-left: 5px">
<el-upload <el-upload
:disabled="isDisabled" :disabled="isDisabled"
:accept="acceptFileTypes"
v-model="formData.avatar" v-model="formData.avatar"
class="avatar-uploader-head" class="avatar-uploader-head"
:data="{ cid: 1 }" :data="{ cid: 1 }"
@ -290,88 +260,76 @@
<el-main> <el-main>
<el-row> <el-row>
<div style="display: flex; justify-content: left"> <div style="display: flex; justify-content: left">
<div class="right"> <div class="right" style="max-width: 1100px">
<el-row> <el-row>
<el-col :span="10"> <el-form-item label="姓名" prop="master_name">
<el-form-item label="姓名" prop="master_name"> <el-input
<el-input :disabled="isDisabled"
:disabled="isDisabled" v-model="formData.master_name"
v-model="formData.master_name" placeholder="请输入姓名"
placeholder="请输入姓名" clearable
clearable :style="{ width: '450px' }"
:style="{ width: '100%' }" ></el-input>
></el-input> </el-form-item>
</el-form-item> <el-form-item label="职务" prop="master_position">
</el-col> <el-input
<el-col :span="10"> :disabled="isDisabled"
<el-form-item label="职务" prop="master_position"> v-model="formData.master_position"
<el-input placeholder="请输入职务"
:disabled="isDisabled" clearable
v-model="formData.master_position" :style="{ width: '450px' }"
placeholder="请输入职务" ></el-input>
clearable </el-form-item>
:style="{ width: '100%' }" <el-form-item label="手机" prop="master_phone">
></el-input> <el-input
</el-form-item> :disabled="isDisabled"
</el-col> v-model="formData.master_phone"
<el-col :span="10"> placeholder="请输入手机"
<el-form-item label="手机" prop="master_phone"> clearable
<el-input :style="{ width: '450px' }"
:disabled="isDisabled" ></el-input>
v-model="formData.master_phone" </el-form-item>
placeholder="请输入手机" <el-form-item label="邮箱">
clearable <el-input
:style="{ width: '100%' }" disabled
></el-input> v-model="formData.master_email"
</el-form-item> placeholder="邮箱将由系统自动生成"
</el-col> clearable
<el-col :span="10"> :style="{ width: '450px' }"
<el-form-item label="邮箱"> ></el-input>
<el-input </el-form-item>
disabled <el-form-item label="性别" prop="sex">
v-model="formData.master_email" <el-select
placeholder="邮箱将由系统自动生成" :disabled="isDisabled"
clearable v-model="formData.sex"
:style="{ width: '100%' }" placeholder="请选择性别"
></el-input> :style="{ width: '450px' }"
</el-form-item> >
</el-col> <el-option label="男" value="1" />
<el-col :span="10"> <el-option label="女" value="2" />
<el-form-item label="性别" prop="sex"> </el-select>
<el-select </el-form-item>
:disabled="isDisabled" <el-form-item label="身份证">
v-model="formData.sex" <el-input
placeholder="请选择性别" :disabled="isDisabled"
:style="{ width: '100%' }" v-model="formData.id_card"
> placeholder="请输入身份证"
<el-option label="男" value="1" /> clearable
<el-option label="女" value="2" /> :style="{ width: '450px' }"
</el-select> ></el-input>
</el-form-item> </el-form-item>
</el-col> <!--
<el-col :span="10">
<el-form-item label="身份证">
<el-input
:disabled="isDisabled"
v-model="formData.id_card"
placeholder="请输入身份证"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="10">
<el-form-item label="片区经理" prop="area_manager_name"> <el-form-item label="片区经理" prop="area_manager_name">
<el-input <el-input
:disabled="isDisabled" :disabled="isDisabled"
v-model="formData.area_manager_name" v-model="formData.area_manager_name"
placeholder="选择片区经理" placeholder="选择片区经理"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '300px' }"
@click="isAreaManager = true" @click="isAreaManager = true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> --> -->
</el-row> </el-row>
</div> </div>
</div> </div>
@ -463,6 +421,7 @@
<el-form-item label="公司资质" required> <el-form-item label="公司资质" required>
<el-upload <el-upload
:disabled="isDisabled" :disabled="isDisabled"
:accept="acceptFileTypes"
v-model="formData.qualification.business_license" v-model="formData.qualification.business_license"
class="avatar-uploader pl-3" class="avatar-uploader pl-3"
:data="{ cid: 1 }" :data="{ cid: 1 }"
@ -491,6 +450,7 @@
</div> </div>
<el-upload <el-upload
v-if="imgflag" v-if="imgflag"
:accept="acceptFileTypes"
:disabled="isDisabled" :disabled="isDisabled"
class="avatar-uploader pl-3" class="avatar-uploader pl-3"
:data="{ cid: 1 }" :data="{ cid: 1 }"
@ -510,6 +470,7 @@
<el-form-item label-width="120px" label="开户许可证" required> <el-form-item label-width="120px" label="开户许可证" required>
<el-upload <el-upload
:disabled="isDisabled" :disabled="isDisabled"
:accept="acceptFileTypes"
v-model="formData.qualification.business_licenseB" v-model="formData.qualification.business_licenseB"
class="avatar-uploader pl-3" class="avatar-uploader pl-3"
:data="{ cid: 1 }" :data="{ cid: 1 }"
@ -713,6 +674,8 @@ if (route.query.isshow) {
imgflag = false; imgflag = false;
isDisabled = true; isDisabled = true;
} }
const acceptFileTypes = ref(".png, .jpg, .jpeg, image/png, image/jpeg");
console.log(isDisabled); console.log(isDisabled);
// //
const indexType = ref(0); const indexType = ref(0);

View File

@ -0,0 +1,113 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<el-form-item label="公司" prop="company_id">
<el-input v-model="formData.company_id" clearable placeholder="请输入公司" />
</el-form-item>
<el-form-item label="内容" prop="content">
<el-input v-model="formData.content" clearable placeholder="请输入内容" />
</el-form-item>
</el-form>
</popup>
</div>
</template>
<script lang="ts" setup name="companyComplaintFeedbackEdit">
import type { FormInstance } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiCompanyComplaintFeedbackAdd, apiCompanyComplaintFeedbackEdit, apiCompanyComplaintFeedbackDetail } from '@/api/company_complaint_feedback'
import { timeFormat } from '@/utils/util'
import type { PropType } from 'vue'
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref('add')
//
const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑投诉反馈' : '新增投诉反馈'
})
//
const formData = reactive({
id: '',
company_id: '',
content: '',
})
//
const formRules = reactive<any>({
content: [{
required: true,
message: '请输入内容',
trigger: ['blur']
}],
})
//
const setFormData = async (data: Record<any, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key]
}
}
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiCompanyComplaintFeedbackDetail({
id: row.id
})
setFormData(data)
}
//
const handleSubmit = async () => {
await formRef.value?.validate()
const data = { ...formData, }
mode.value == 'edit'
? await apiCompanyComplaintFeedbackEdit(data)
: await apiCompanyComplaintFeedbackAdd(data)
popupRef.value?.close()
emit('success')
}
//
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
}
//
const handleClose = () => {
emit('close')
}
defineExpose({
open,
setFormData,
getDetail
})
</script>

View File

@ -0,0 +1,161 @@
<template>
<div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="公司" prop="company_id">
<el-input
class="w-[280px]"
v-model="queryParams.company_id"
clearable
placeholder="请输入公司"
/>
</el-form-item>
<el-form-item label="内容" prop="content">
<el-input
class="w-[280px]"
v-model="queryParams.content"
clearable
placeholder="请输入内容"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<el-button
v-perms="['company_complaint_feedback/add']"
type="primary"
@click="handleAdd"
>
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button>
<el-button
v-perms="['company_complaint_feedback/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除
</el-button>
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
<el-table-column
label="id"
prop="id"
width="120"
show-overflow-tooltip
/>
<el-table-column
label="公司"
prop="company_name"
width="220"
show-overflow-tooltip
/>
<el-table-column label="内容" prop="content" show-overflow-tooltip />
<el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button
v-perms="['company_complaint_feedback/edit']"
type="primary"
link
@click="handleEdit(row)"
>
编辑
</el-button>
<el-button
v-perms="['company_complaint_feedback/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup
v-if="showEdit"
ref="editRef"
:dict-data="dictData"
@success="getLists"
@close="showEdit = false"
/>
</div>
</template>
<script lang="ts" setup name="companyComplaintFeedbackLists">
import { usePaging } from "@/hooks/usePaging";
import { useDictData } from "@/hooks/useDictOptions";
import {
apiCompanyComplaintFeedbackLists,
apiCompanyComplaintFeedbackDelete,
} from "@/api/company_complaint_feedback";
import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback";
import EditPopup from "./edit.vue";
const editRef = shallowRef<InstanceType<typeof EditPopup>>();
//
const showEdit = ref(false);
//
const queryParams = reactive({
company_id: "",
content: "",
});
//
const selectData = ref<any[]>([]);
//
const handleSelectionChange = (val: any[]) => {
selectData.value = val.map(({ id }) => id);
};
//
const { dictData } = useDictData("");
//
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiCompanyComplaintFeedbackLists,
params: queryParams,
});
//
const handleAdd = async () => {
showEdit.value = true;
await nextTick();
editRef.value?.open("add");
};
//
const handleEdit = async (data: any) => {
showEdit.value = true;
await nextTick();
editRef.value?.open("edit");
editRef.value?.setFormData(data);
};
//
const handleDelete = async (id: number | any[]) => {
await feedback.confirm("确定要删除?");
await apiCompanyComplaintFeedbackDelete({ id });
getLists();
};
getLists();
</script>

View File

@ -1,133 +1,170 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<popup <popup
ref="popupRef" ref="popupRef"
:title="popupTitle" :title="popupTitle"
:async="true" :async="true"
width="550px" width="550px"
@confirm="handleSubmit" @confirm="handleSubmit"
@close="handleClose" @close="handleClose"
> >
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules"> <el-form
<el-form-item label="" prop="company_name"> ref="formRef"
<el-input v-model="formData.company_name" clearable placeholder="请输入" /> :model="formData"
</el-form-item> label-width="90px"
<el-form-item label="" prop="organization_code"> :rules="formRules"
<el-input v-model="formData.organization_code" clearable placeholder="请输入" /> >
</el-form-item> <el-form-item label="商户名称" prop="company_name">
<el-form-item label="" prop="address"> <el-input
<el-input v-model="formData.address" clearable placeholder="请输入" /> v-model="formData.company_name"
</el-form-item> clearable
<el-form-item label="" prop="master_name"> placeholder="请输入商户名称"
<el-input v-model="formData.master_name" clearable placeholder="请输入" /> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="type"> <el-form-item label="社会信用统一代码" prop="organization_code">
<el-input
v-model="formData.organization_code"
clearable
placeholder="请输入社会信用统一代码"
/>
</el-form-item>
<el-form-item label="详细地址" prop="address">
<el-input
v-model="formData.address"
clearable
placeholder="请输入详细地址"
/>
</el-form-item>
<el-form-item label="法人名称" prop="master_name">
<el-input
v-model="formData.master_name"
clearable
placeholder="请输入法人名称"
/>
</el-form-item>
<!-- <el-form-item label="" prop="type">
<el-input v-model="formData.type" clearable placeholder="请输入" /> <el-input v-model="formData.type" clearable placeholder="请输入" />
</el-form-item> </el-form-item> -->
<el-form-item label="" prop="master_email"> <el-form-item label="法人邮箱" prop="master_email">
<el-input v-model="formData.master_email" clearable placeholder="请输入" /> <el-input
</el-form-item> v-model="formData.master_email"
<el-form-item label="" prop="notes"> clearable
<el-input v-model="formData.notes" clearable placeholder="请输入" /> placeholder="请输入法人邮箱"
</el-form-item> />
<el-form-item label="" prop="type_two"> </el-form-item>
<el-input v-model="formData.type_two" clearable placeholder="请输入" /> <el-form-item label="备注" prop="notes">
</el-form-item> <el-input v-model="formData.notes" clearable placeholder="请输入" />
</el-form> </el-form-item>
</popup> </el-form>
</div> </popup>
</div>
</template> </template>
<script lang="ts" setup name="companyFormEdit"> <script lang="ts" setup name="companyFormEdit">
import type { FormInstance } from 'element-plus' import type { FormInstance } from "element-plus";
import Popup from '@/components/popup/index.vue' import Popup from "@/components/popup/index.vue";
import { apiCompanyFormAdd, apiCompanyFormEdit, apiCompanyFormDetail } from '@/api/company_form' import {
import { timeFormat } from '@/utils/util' apiCompanyFormAdd,
import type { PropType } from 'vue' apiCompanyFormEdit,
apiCompanyFormDetail,
} from "@/api/company_form";
import { timeFormat } from "@/utils/util";
import type { PropType } from "vue";
defineProps({ defineProps({
dictData: { dictData: {
type: Object as PropType<Record<string, any[]>>, type: Object as PropType<Record<string, any[]>>,
default: () => ({}) default: () => ({}),
} },
}) });
const emit = defineEmits(['success', 'close']) const emit = defineEmits(["success", "close"]);
const formRef = shallowRef<FormInstance>() 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 popupTitle = computed(() => { const popupTitle = computed(() => {
return mode.value == 'edit' ? '编辑公司认证表格' : '新增公司认证表格' return mode.value == "edit" ? "编辑公司认证表格" : "新增公司认证表格";
}) });
// //
const formData = reactive({ const formData = reactive({
id: '', id: "",
company_name: '', company_name: "",
organization_code: '', organization_code: "",
address: '', address: "",
master_name: '', master_name: "",
type: '', type: "",
master_email: '', master_email: "",
notes: '', notes: "",
type_two: '', });
})
// //
const formRules = reactive<any>({ const formRules = reactive<any>({
company_name: [
}) {
required: true,
message: "请输入商户名称",
trigger: ["blur"],
},
],
organization_code: [
{
required: true,
message: "请输入社会信用统一代码",
trigger: ["blur"],
},
],
master_name: [
{
required: true,
message: "请输入法人名称",
trigger: ["blur"],
},
],
});
// //
const setFormData = async (data: Record<any, any>) => { const setFormData = async (data: Record<any, any>) => {
for (const key in formData) { for (const key in formData) {
if (data[key] != null && data[key] != undefined) { if (data[key] != null && data[key] != undefined) {
//@ts-ignore //@ts-ignore
formData[key] = data[key] formData[key] = data[key];
}
} }
}
};
}
const getDetail = async (row: Record<string, any>) => { const getDetail = async (row: Record<string, any>) => {
const data = await apiCompanyFormDetail({ const data = await apiCompanyFormDetail({
id: row.id id: row.id,
}) });
setFormData(data) setFormData(data);
} };
// //
const handleSubmit = async () => { const handleSubmit = async () => {
await formRef.value?.validate() await formRef.value?.validate();
const data = { ...formData, } const data = { ...formData };
mode.value == 'edit' mode.value == "edit"
? await apiCompanyFormEdit(data) ? await apiCompanyFormEdit(data)
: await apiCompanyFormAdd(data) : await apiCompanyFormAdd(data);
popupRef.value?.close() popupRef.value?.close();
emit('success') emit("success");
} };
// //
const open = (type = 'add') => { const open = (type = "add") => {
mode.value = type mode.value = type;
popupRef.value?.open() popupRef.value?.open();
} };
// //
const handleClose = () => { const handleClose = () => {
emit('close') emit("close");
} };
defineExpose({ defineExpose({
open, open,
setFormData, setFormData,
getDetail getDetail,
}) });
</script> </script>

View File

@ -1,43 +1,56 @@
<template> <template>
<div> <div>
<el-card class="!border-none mb-4" shadow="never"> <el-card class="!border-none mb-4" shadow="never">
<el-form <el-form class="mb-[-16px]" :model="queryParams" inline>
class="mb-[-16px]" <el-form-item label="商户名称" prop="company_name">
:model="queryParams" <el-input
inline class="w-[280px]"
> v-model="queryParams.company_name"
<el-form-item label="" prop="company_name"> clearable
<el-input class="w-[280px]" v-model="queryParams.company_name" clearable placeholder="请输入" /> placeholder="请输入商户名称"
</el-form-item> />
<el-form-item label="" prop="organization_code"> </el-form-item>
<el-input class="w-[280px]" v-model="queryParams.organization_code" clearable placeholder="请输入" /> <el-form-item label="社会代码" prop="organization_code">
</el-form-item> <el-input
<el-form-item label="" prop="address"> class="w-[280px]"
<el-input class="w-[280px]" v-model="queryParams.address" clearable placeholder="请输入" /> v-model="queryParams.organization_code"
</el-form-item> clearable
<el-form-item label="" prop="master_name"> placeholder="请输入社会代码"
<el-input class="w-[280px]" v-model="queryParams.master_name" clearable placeholder="请输入" /> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="type"> <!-- <el-form-item label="详细地址" prop="address">
<el-input class="w-[280px]" v-model="queryParams.type" clearable placeholder="请输入" /> <el-input
</el-form-item> class="w-[280px]"
<el-form-item label="" prop="master_email"> v-model="queryParams.address"
<el-input class="w-[280px]" v-model="queryParams.master_email" clearable placeholder="请输入" /> clearable
</el-form-item> placeholder="请输入详细地址"
<el-form-item label="" prop="notes"> />
<el-input class="w-[280px]" v-model="queryParams.notes" clearable placeholder="请输入" /> </el-form-item> -->
</el-form-item> <el-form-item label="法人名称" prop="master_name">
<el-form-item label="" prop="type_two"> <el-input
<el-input class="w-[280px]" v-model="queryParams.type_two" clearable placeholder="请输入" /> class="w-[280px]"
</el-form-item> v-model="queryParams.master_name"
<el-form-item> clearable
<el-button type="primary" @click="resetPage">查询</el-button> placeholder="请输入法人名称"
<el-button @click="resetParams">重置</el-button> />
</el-form-item> </el-form-item>
</el-form> <!-- <el-form-item label="法人邮箱" prop="master_email">
</el-card> <el-input
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> class="w-[280px]"
<el-button v-perms="['company_form/add']" type="primary" @click="handleAdd"> v-model="queryParams.master_email"
clearable
placeholder="请输入法人邮箱"
/>
</el-form-item> -->
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<!-- <el-button v-perms="['company_form/add']" type="primary" @click="handleAdd">
<template #icon> <template #icon>
<icon name="el-icon-Plus" /> <icon name="el-icon-Plus" />
</template> </template>
@ -49,112 +62,139 @@
@click="handleDelete(selectData)" @click="handleDelete(selectData)"
> >
删除 删除
</el-button> </el-button> -->
<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 type="selection" width="55" /> <el-table-column
<el-table-column label="" prop="company_name" show-overflow-tooltip /> label="ID"
<el-table-column label="" prop="organization_code" show-overflow-tooltip /> prop="id"
<el-table-column label="" prop="address" show-overflow-tooltip /> width="150px"
<el-table-column label="" prop="master_name" show-overflow-tooltip /> show-overflow-tooltip
<el-table-column label="" prop="type" show-overflow-tooltip /> />
<el-table-column label="" prop="master_email" show-overflow-tooltip /> <el-table-column
<el-table-column label="" prop="notes" show-overflow-tooltip /> label="商户名称"
<el-table-column label="" prop="type_two" show-overflow-tooltip /> width="330px"
<el-table-column label="操作" width="120" fixed="right"> prop="company_name"
<template #default="{ row }"> show-overflow-tooltip
<el-button />
v-perms="['company_form/edit']" <el-table-column
type="primary" label="社会代码"
link prop="organization_code"
@click="handleEdit(row)" width="250px"
> show-overflow-tooltip
编辑 />
</el-button> <el-table-column
<el-button label="详细地址"
v-perms="['company_form/delete']" width="350px"
type="danger" prop="address"
link show-overflow-tooltip
@click="handleDelete(row.id)" />
> <el-table-column
删除 label="法人名称"
</el-button> width="120px"
</template> prop="master_name"
</el-table-column> show-overflow-tooltip
</el-table> />
</div> <!-- <el-table-column
<div class="flex mt-4 justify-end"> label="法人邮箱"
<pagination v-model="pager" @change="getLists" /> prop="master_email"
</div> show-overflow-tooltip
</el-card> /> -->
<edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" /> <el-table-column label="备注" prop="notes" show-overflow-tooltip />
</div>
<!-- <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }">
<el-button type="primary" link>
<router-link
:to="{
path: '',
query: {
id: row.id,
},
}"
>详情</router-link
>
</el-button>
</template>
</el-table-column> -->
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<edit-popup
v-if="showEdit"
ref="editRef"
:dict-data="dictData"
@success="getLists"
@close="showEdit = false"
/>
</div>
</template> </template>
<script lang="ts" setup name="companyFormLists"> <script lang="ts" setup name="companyFormLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from "@/hooks/usePaging";
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from "@/hooks/useDictOptions";
import { apiCompanyFormLists, apiCompanyFormDelete } from '@/api/company_form' import { apiCompanyFormLists, apiCompanyFormDelete } from "@/api/company_form";
import { timeFormat } from '@/utils/util' import { timeFormat } from "@/utils/util";
import feedback from '@/utils/feedback' import feedback from "@/utils/feedback";
import EditPopup from './edit.vue' import EditPopup from "./edit.vue";
const editRef = shallowRef<InstanceType<typeof EditPopup>>() const editRef = shallowRef<InstanceType<typeof EditPopup>>();
// //
const showEdit = ref(false) const showEdit = ref(false);
// //
const queryParams = reactive({ const queryParams = reactive({
company_name: '', company_name: "",
organization_code: '', organization_code: "",
address: '', address: "",
master_name: '', master_name: "",
type: '', type: "",
master_email: '', master_email: "",
notes: '', notes: "",
type_two: '' });
})
// //
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: apiCompanyFormLists, fetchFun: apiCompanyFormLists,
params: queryParams params: queryParams,
}) });
// //
const handleAdd = async () => { const handleAdd = async () => {
showEdit.value = true showEdit.value = true;
await nextTick() await nextTick();
editRef.value?.open('add') editRef.value?.open("add");
} };
// //
const handleEdit = async (data: any) => { const handleEdit = async (data: any) => {
showEdit.value = true showEdit.value = true;
await nextTick() await nextTick();
editRef.value?.open('edit') editRef.value?.open("edit");
editRef.value?.setFormData(data) editRef.value?.setFormData(data);
} };
// //
const handleDelete = async (id: number | any[]) => { const handleDelete = async (id: number | any[]) => {
await feedback.confirm('确定要删除?') await feedback.confirm("确定要删除?");
await apiCompanyFormDelete({ id }) await apiCompanyFormDelete({ id });
getLists() getLists();
} };
getLists() getLists();
</script> </script>

View File

@ -96,7 +96,12 @@
> >
<el-form-item label="公司资质" prop="contract_type" required> <el-form-item label="公司资质" prop="contract_type" required>
<div class="company"> <div class="company">
<img :src="compenyimg.business_license" /> <el-image
:src="compenyimg.business_license"
:preview-src-list="[compenyimg.business_license]"
:initial-index="0"
fit="cover"
/>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -106,7 +111,12 @@
required required
> >
<div class="company"> <div class="company">
<img :src="compenyimg.business_licenseB" /> <el-image
:src="compenyimg.business_licenseB"
:preview-src-list="[compenyimg.business_licenseB]"
:initial-index="0"
fit="cover"
/>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -121,7 +131,12 @@
v-for="(v, i) in compenyimg.other_qualifications" v-for="(v, i) in compenyimg.other_qualifications"
:key="i" :key="i"
> >
<img :src="v" /> <el-image
:src="v"
:preview-src-list="compenyimg.other_qualifications"
:initial-index="i"
fit="cover"
/>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -217,7 +232,12 @@
> >
<el-form-item label="公司资质" prop="contract_type" required> <el-form-item label="公司资质" prop="contract_type" required>
<div class="company"> <div class="company">
<img :src="compenyBimg.business_license" /> <el-image
:src="compenyBimg.business_license"
:preview-src-list="[compenyBimg.business_license]"
:initial-index="0"
fit="cover"
/>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -227,7 +247,12 @@
required required
> >
<div class="company"> <div class="company">
<img :src="compenyBimg.business_licenseB" /> <el-image
:src="compenyBimg.business_licenseB"
:preview-src-list="[compenyBimg.business_licenseB]"
:initial-index="0"
fit="cover"
/>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
@ -242,7 +267,12 @@
v-for="(v, i) in compenyBimg.other_qualifications" v-for="(v, i) in compenyBimg.other_qualifications"
:key="i" :key="i"
> >
<img :src="v" /> <el-image
:src="v"
:preview-src-list="compenyBimg.other_qualifications"
:initial-index="i"
fit="cover"
/>
</div> </div>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -386,6 +416,7 @@
prop="field127" prop="field127"
> >
<el-upload <el-upload
accept=".pdf"
:headers="{ Token: userStore.token }" :headers="{ Token: userStore.token }"
class="upload-demo" class="upload-demo"
:action="base_url + '/upload/file'" :action="base_url + '/upload/file'"
@ -410,7 +441,12 @@
> >
</el-form-item> </el-form-item>
<el-form-item v-if="isshow || formData.status == 0"> <el-form-item v-if="isshow || formData.status == 0">
<el-button v-perms="['contract.contract/wind_control']" type="primary" @click="submitContract">确定</el-button> <el-button
v-perms="['contract.contract/wind_control']"
type="primary"
@click="submitContract"
>确定</el-button
>
</el-form-item> </el-form-item>
<el-form-item v-else-if="formData.file && formData.status"> <el-form-item v-else-if="formData.file && formData.status">
<a <a
@ -551,7 +587,7 @@ const handleAvatarSuccess_four: UploadProps["onSuccess"] = (
const router = useRouter(); const router = useRouter();
const submitContract = () => { const submitContract = () => {
if (!formData.file) ElMessage.error("请先上传合同!"); if (!formData.file) return ElMessage.error("请先上传合同!");
upContact({ file: formData.file, id: route.query.id }); upContact({ file: formData.file, id: route.query.id });
removeTab(); removeTab();
router.back(); router.back();
@ -589,7 +625,7 @@ onMounted(async () => {
.company { .company {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
img { .el-image {
width: 10vw; width: 10vw;
height: 6.3vw; height: 6.3vw;
margin-right: 10px; margin-right: 10px;

View File

@ -164,7 +164,11 @@
v-perms="['contract.contract/contract_send_again']" v-perms="['contract.contract/contract_send_again']"
type="primary" type="primary"
link link
@click="(showPop = true), (contractId = row.party_b)" @click="
(showPop = true),
(party_b_id = row.party_b),
(contract_id = row.id)
"
>发送短信</el-button >发送短信</el-button
> >
</template> </template>
@ -236,24 +240,32 @@ const datalist = ref([]);
const showPop = ref(false); const showPop = ref(false);
const showConctactPop = ref(false); const showConctactPop = ref(false);
// id // id
const contractId = ref(""); const contract_id = ref("");
const party_b_id = ref("");
// //
const showCreateConctPop = (row) => { const showCreateConctPop = (row: any) => {
(showPop.value = true), (showPop.value = true),
(showConctactPop.value = true), (showConctactPop.value = true),
(contractId.value = row.party_b); (contract_id.value = row.id),
(party_b_id.value = row.party_b);
}; };
const offPop = () => { const offPop = () => {
showPop.value = false; showPop.value = false;
showConctactPop.value = false; showConctactPop.value = false;
}; };
const creContct = async () => { const creContct = async () => {
await generateGontract({ id: contractId.value }); await generateGontract({
id: party_b_id.value,
contract_id: contract_id.value,
});
getLists(); getLists();
offPop(); offPop();
}; };
const sendMsg = async () => { const sendMsg = async () => {
await sendMsgApi({ id: contractId.value }); await sendMsgApi({
id: party_b_id.value,
contract_id: contract_id.value,
});
getLists(); getLists();
offPop(); offPop();
}; };

View File

@ -1,262 +1,156 @@
<template> <template>
<div class="edit-popup"> <div class="edit-popup">
<el-form <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules" :disabled="true">
ref="formRef" <el-col :span="24" class="el-card pt-6">
:model="formData" <div class="tit">甲方信息</div>
label-width="90px" <el-row>
:rules="formRules" <el-col :span="8">
:disabled="true" <el-form-item label="公司名称" prop="company_name">
> <el-input v-model="formData.company_a_name" placeholder="请输入公司名称" clearable
<el-col :span="24" class="el-card pt-6"> :disabled="isDisabled" :style="{ width: '100%' }"></el-input>
<div class="tit">甲方信息</div> </el-form-item>
<el-row> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="公司名称" prop="company_name"> <el-form-item label="社会代码" prop="organization_code">
<el-input <el-input :disabled="isDisabled" v-model="formData.company_a_code" placeholder="请输入社会代码"
v-model="formData.company_a_name" clearable :style="{ width: '100%' }"></el-input>
placeholder="请输入公司名称" </el-form-item>
clearable </el-col>
:disabled="isDisabled" </el-row>
:style="{ width: '100%' }" </el-col>
></el-input> <el-col :span="24" class="el-card pt-6">
</el-form-item> <div class="tit">主要联系人</div>
</el-col> <el-row>
<el-col :span="8"> <div style="display: flex; justify-content: left">
<el-form-item label="社会代码" prop="organization_code"> <div class="right">
<el-input <el-row>
:disabled="isDisabled" <el-col :span="8">
v-model="formData.company_a_code" <el-form-item label="姓名" prop="master_name">
placeholder="请输入社会代码" <el-input :disabled="isDisabled" v-model="formData.company_a_user"
clearable placeholder="请输入姓名" clearable :style="{ width: '100%' }"></el-input>
:style="{ width: '100%' }" </el-form-item>
></el-input> </el-col>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="24" class="el-card pt-6">
<div class="tit">主要联系人</div>
<el-row>
<div style="display: flex; justify-content: left">
<div class="right">
<el-row>
<el-col :span="8">
<el-form-item label="姓名" prop="master_name">
<el-input
:disabled="isDisabled"
v-model="formData.company_a_user"
placeholder="请输入姓名"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="手机" prop="master_phone"> <el-form-item label="手机" prop="master_phone">
<el-input <el-input :disabled="isDisabled" v-model="formData.company_a_phone"
:disabled="isDisabled" placeholder="请输入手机" clearable :style="{ width: '100%' }"></el-input>
v-model="formData.company_a_phone" </el-form-item>
placeholder="请输入手机" </el-col>
clearable <el-col :span="8">
:style="{ width: '100%' }" <el-form-item label="邮箱">
></el-input> <el-input :disabled="isDisabled" v-model="formData.company_a_email"
</el-form-item> placeholder="请输入邮箱" clearable :style="{ width: '100%' }"></el-input>
</el-col> </el-form-item>
<el-col :span="8"> </el-col>
<el-form-item label="邮箱"> </el-row>
<el-input </div>
:disabled="isDisabled" </div>
v-model="formData.company_a_email" </el-row>
placeholder="请输入邮箱" </el-col>
clearable <el-col :span="24" class="el-card pt-6">
:style="{ width: '100%' }" <div class="tit">乙方信息</div>
></el-input> <el-row>
</el-form-item> <el-col :span="8">
</el-col> <el-form-item label="公司名称" prop="company_name">
</el-row> <el-input v-model="formData.company_b_name" placeholder="请输入公司名称" clearable
</div> :disabled="isDisabled" :style="{ width: '100%' }"></el-input>
</div> </el-form-item>
</el-row> </el-col>
</el-col> <el-col :span="8">
<el-col :span="24" class="el-card pt-6"> <el-form-item label="社会代码" prop="organization_code">
<div class="tit">乙方信息</div> <el-input :disabled="isDisabled" v-model="formData.company_b_code" placeholder="请输入社会代码"
<el-row> clearable :style="{ width: '100%' }"></el-input>
<el-col :span="8"> </el-form-item>
<el-form-item label="公司名称" prop="company_name"> </el-col>
<el-input </el-row>
v-model="formData.company_b_name" </el-col>
placeholder="请输入公司名称" <el-col :span="24" class="el-card pt-6">
clearable <div class="tit">主要联系人</div>
:disabled="isDisabled" <el-row>
:style="{ width: '100%' }" <div style="display: flex; justify-content: left">
></el-input> <div class="right">
</el-form-item> <el-row>
</el-col> <el-col :span="8">
<el-col :span="8"> <el-form-item label="姓名" prop="master_name">
<el-form-item label="社会代码" prop="organization_code"> <el-input :disabled="isDisabled" v-model="formData.company_b_user"
<el-input placeholder="请输入姓名" clearable :style="{ width: '100%' }"></el-input>
:disabled="isDisabled" </el-form-item>
v-model="formData.company_b_code" </el-col>
placeholder="请输入社会代码"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
<el-col :span="24" class="el-card pt-6">
<div class="tit">主要联系人</div>
<el-row>
<div style="display: flex; justify-content: left">
<div class="right">
<el-row>
<el-col :span="8">
<el-form-item label="姓名" prop="master_name">
<el-input
:disabled="isDisabled"
v-model="formData.company_b_user"
placeholder="请输入姓名"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="手机" prop="master_phone"> <el-form-item label="手机" prop="master_phone">
<el-input <el-input :disabled="isDisabled" v-model="formData.company_b_phone"
:disabled="isDisabled" placeholder="请输入手机" clearable :style="{ width: '100%' }"></el-input>
v-model="formData.company_b_phone" </el-form-item>
placeholder="请输入手机" </el-col>
clearable <el-col :span="8">
:style="{ width: '100%' }" <el-form-item label="邮箱">
></el-input> <el-input :disabled="isDisabled" v-model="formData.company_b_email"
</el-form-item> placeholder="请输入邮箱" clearable :style="{ width: '100%' }"></el-input>
</el-col> </el-form-item>
<el-col :span="8"> </el-col>
<el-form-item label="邮箱"> </el-row>
<el-input </div>
:disabled="isDisabled" </div>
v-model="formData.company_b_email" </el-row>
placeholder="请输入邮箱"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</div>
</el-row>
</el-col>
<!-- -->
<el-col :span="24" class="el-card pt-6" v-if="formData.cars_info">
<div class="tit">租赁信息</div>
<div>
<el-row>
<el-col :span="4">
<el-form-item label-width="120px" label="车牌号"
><el-input
v-model="formData.cars_info.license"
placeholder="请输入车牌号"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="4"> <!-- -->
<el-form-item label-width="120px" label="车辆类型"> <el-col :span="24" class="el-card pt-6" v-if="formData.cars_info">
<el-input <div class="tit">租赁信息</div>
v-model="formData.type" <div>
placeholder="请输入车辆类型" <el-row>
clearable <el-col :span="4">
:style="{ width: '100%' }" <el-form-item label-width="120px" label="车牌号"><el-input v-model="formData.cars_info.license"
></el-input placeholder="请输入车牌号" clearable :style="{ width: '100%' }"></el-input>
></el-form-item> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="120px" label="车辆类型">
<el-input v-model="formData.type" placeholder="请输入车辆类型" clearable
:style="{ width: '100%' }"></el-input></el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label-width="120px" label="使用公司"><el-input v-model="formData.company_b_name"
placeholder="请输入使用公司" clearable :style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label-width="120px" label="签约时间">
<el-input v-model="formData.update_time" placeholder="请输入签约时间" clearable
:style="{ width: '100%' }"></el-input></el-form-item>
</el-col>
</el-row>
</div>
</el-col> </el-col>
<el-col :span="6"> </el-form>
<el-form-item label-width="120px" label="使用公司" <!-- 小组公司申请车辆 -->
><el-input <!-- {{ formData.contract_logistic_id }}
v-model="formData.company_b_name"
placeholder="请输入使用公司"
clearable
:style="{ width: '100%' }"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label-width="120px" label="签约时间">
<el-input
v-model="formData.update_time"
placeholder="请输入签约时间"
clearable
:style="{ width: '100%' }"
></el-input
></el-form-item>
</el-col>
</el-row>
</div>
</el-col>
</el-form>
<!-- 小组公司申请车辆 -->
<!-- {{ formData.contract_logistic_id }}
{{ formData.type }} --> {{ formData.type }} -->
<div <div v-if="formData.contract_logistic_id && formData.type == '租赁车辆'" class="el-card pt-6">
v-if="formData.contract_logistic_id && formData.type == '租赁车辆'" <div class="tit">租赁信息</div>
class="el-card pt-6"
>
<div class="tit">租赁信息</div>
<div style="padding: 0 2vw"> <div style="padding: 0 2vw">
<el-checkbox-group <el-checkbox-group :max="formData.num" v-model="checkList" @change="handChangeFn">
:max="formData.num" <el-checkbox :label="item.license" v-for="(item, index) in formData.car_list" :key="index" />
v-model="checkList" </el-checkbox-group>
@change="handChangeFn" </div>
> </div>
<el-checkbox <div class="el-card pt-6">
:label="item.license" <el-upload style="display: inline-block" :headers="{ Token: userStore.token }"
v-for="(item, index) in formData.car_list" :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_three"
:key="index" :before-upload="handleBeforeUpload" :limit="1" v-if="formData?.status == 0" :on-exceed="handleExceed"
/> ref="upload">
</el-checkbox-group> <el-button type="primary">{{
</div> formData.file ? "重新上传" : "上传合同"
}}</el-button>
</el-upload>
<a v-if="formData.file && formData?.status == 0" style="margin-left: 10px; color: #4a5dff" :href="formData.file"
target="_blank">合同已上传,点击查看</a>
<a style="margin-left: 10px; color: #4a5dff" :href="formData.file" v-if="formData.status > 0">查看合同</a>
</div>
<el-button type="primary" v-if="formData.status == 0" @click="create">确定</el-button>
</div> </div>
<div class="el-card pt-6">
<el-upload
style="display: inline-block"
:headers="{ Token: userStore.token }"
:action="base_url + '/upload/file'"
:on-success="handleAvatarSuccess_three"
:before-upload="handleBeforeUpload"
:limit="1"
v-if="formData?.status == 0"
:on-exceed="handleExceed"
ref="upload"
>
<el-button type="primary">{{
formData.file ? "重新上传" : "上传合同"
}}</el-button>
</el-upload>
<a
v-if="formData.file && formData?.status == 0"
style="margin-left: 10px; color: #4a5dff"
:href="formData.file"
target="_blank"
>合同已上传,点击查看</a
>
<a
style="margin-left: 10px; color: #4a5dff"
:href="formData.file"
v-if="formData.status > 0"
>查看合同</a
>
</div>
<el-button type="primary" v-if="formData.status == 0" @click="create"
>确定</el-button
>
</div>
</template> </template>
<script setup> <script setup>
import { reactive, ref, inject } from "vue"; import { reactive, ref, inject } from "vue";
@ -267,158 +161,160 @@ const router = useRouter();
const route = useRoute(); const route = useRoute();
const checkList = ref([]); const checkList = ref([]);
const formData = reactive({ const formData = reactive({
contract_logistic_id: "", contract_logistic_id: "",
contract_no: "", contract_no: "",
company_a_id: "", company_a_id: "",
company_a_name: "", company_a_name: "",
company_a_code: "", company_a_code: "",
company_a_user: "", company_a_user: "",
company_a_phone: "", company_a_phone: "",
company_a_email: "@service.ebaoquan.org", company_a_email: "@service.ebaoquan.org",
company_b_id: "", company_b_id: "",
company_b_name: "", company_b_name: "",
company_b_user: "", company_b_user: "",
company_b_phone: "", company_b_phone: "",
company_b_code: "", company_b_code: "",
company_b_email: "@service.ebaoquan.org", company_b_email: "@service.ebaoquan.org",
num: "", num: "",
cars_info: { cars_info: {
id: "", id: "",
license: "", license: "",
}, },
car_list: [], car_list: [],
type: 0, type: 0,
status: 0, status: 0,
file: "", file: "",
contract_url: "", contract_url: "",
signing_timer: 0, signing_timer: 0,
url: null, url: null,
create_time: "2023-08-31 14:26:42", create_time: "2023-08-31 14:26:42",
update_time: "2023-08-31 14:26:49", update_time: "2023-08-31 14:26:49",
reject_message: "", reject_message: "",
}); });
let arrs = []; let arrs = [];
const base_url = inject("base_url"); const base_url = inject("base_url");
const handChangeFn = (e) => { const handChangeFn = (e) => {
arrs = []; arrs = [];
e.map((item) => { e.map((item) => {
formData.car_list.forEach((element) => { formData.car_list.forEach((element) => {
if (element.license == item) { if (element.license == item) {
arrs.push(element); arrs.push(element);
} }
});
}); });
});
}; };
const test = () => { const test = () => {
window.open(formData.file, "_blank"); window.open(formData.file, "_blank");
}; };
leaseContractDetail({ id: route.query.id }).then((res) => { leaseContractDetail({ id: route.query.id }).then((res) => {
for (let key in formData) { for (let key in formData) {
formData[key] = res[key]; formData[key] = res[key];
} }
formData.type ? (formData.type = "自有车辆") : (formData.type = "租赁车辆"); formData.type ? (formData.type = "自有车辆") : (formData.type = "租赁车辆");
}); });
const handleAvatarSuccess_three = (response, uploadFile) => { const handleAvatarSuccess_three = (response, uploadFile) => {
formData.file = response.data.uri; formData.file = response.data.uri;
}; };
const create = () => { const create = () => {
leaseUpContract({ leaseUpContract({
id: route.query.id, id: route.query.id,
file: formData.file, file: formData.file,
cars: JSON.stringify(arrs), cars: JSON.stringify(arrs),
}).then((res) => { }).then((res) => {
setTimeout(() => { setTimeout(() => {
router.go(-1); router.go(-1);
}, 1000); }, 1000);
// console.log(res); // console.log(res);
}); });
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.tit { .tit {
font-size: 1.2rem; font-size: 1.2rem;
translate: 1vw -1vw; translate: 1vw -1vw;
} }
.avatar-uploader .el-upload { .avatar-uploader .el-upload {
width: 10vw; width: 10vw;
height: 6.3vw; height: 6.3vw;
background-color: #fff; background-color: #fff;
border: 1px dashed var(--el-border-color); border: 1px dashed var(--el-border-color);
border-radius: 6px; border-radius: 6px;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
transition: var(--el-transition-duration-fast); transition: var(--el-transition-duration-fast);
} }
.headimg { .headimg {
margin-left: 18px; margin-left: 18px;
margin-bottom: 18px; margin-bottom: 18px;
width: 120px; width: 120px;
height: 140px; height: 140px;
overflow: hidden; overflow: hidden;
border: 1px dashed var(--el-border-color); border: 1px dashed var(--el-border-color);
border-radius: 6px; border-radius: 6px;
flex-shrink: 0; flex-shrink: 0;
} }
.upload-demo { .upload-demo {
display: flex; display: flex;
} }
.avatar-uploader-head .el-upload { .avatar-uploader-head .el-upload {
width: 120px; width: 120px;
height: 140px; height: 140px;
background-color: #fff; background-color: #fff;
cursor: pointer; cursor: pointer;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
transition: var(--el-transition-duration-fast); transition: var(--el-transition-duration-fast);
} }
.avatar-uploader .el-upload:hover { .avatar-uploader .el-upload:hover {
border-color: var(--el-color-primary); border-color: var(--el-color-primary);
} }
.el-icon.avatar-uploader-icon { .el-icon.avatar-uploader-icon {
font-size: 28px; font-size: 28px;
color: #8c939d; color: #8c939d;
width: 178px; width: 178px;
height: 178px; height: 178px;
text-align: center; text-align: center;
} }
.el-icon.avatar-uploader-icon { .el-icon.avatar-uploader-icon {
font-size: 28px; font-size: 28px;
color: #8c939d; color: #8c939d;
width: 178px; width: 178px;
height: 178px; height: 178px;
text-align: center; text-align: center;
} }
.otherimg { .otherimg {
img { img {
width: 10vw; width: 10vw;
height: 6.3vw; height: 6.3vw;
border-radius: 5px; border-radius: 5px;
margin-left: 12px; margin-left: 12px;
margin-bottom: 12px; margin-bottom: 12px;
} }
} }
.el-card { .el-card {
margin-bottom: 10px; margin-bottom: 10px;
background-color: #fff; background-color: #fff;
} }
.tit { .tit {
margin-top: 15px; margin-top: 15px;
} }
.others { .others {
width: 100% !important; width: 100% !important;
} }
</style> </style>

View File

@ -1,198 +1,96 @@
<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">
<el-form class="mb-[-16px]" inline> <el-form class="mb-[-16px]" inline>
<el-form-item label="公司名称" prop="company_name"> <el-form-item label="公司名称" prop="company_name">
<el-input <el-input class="w-[280px]" v-model="queryParams.company_name" clearable placeholder="请输入公司名称" />
class="w-[280px]" </el-form-item>
v-model="queryParams.company_name" <el-form-item label="合同编号" prop="contract_no">
clearable <el-input class="w-[280px]" v-model="queryParams.contract_no" clearable placeholder="请输入合同编号" />
placeholder="请输入公司名称" </el-form-item><el-form-item label="合同状态" prop="status">
/> <el-select v-model="queryParams.status" placeholder="请选择合同类型" clearable class="w-[280px]">
</el-form-item> <el-option label="未上传" :value="0"></el-option>
<el-form-item label="合同编号" prop="contract_no"> <el-option label="已上传" :value="1"></el-option>
<el-input </el-select>
class="w-[280px]" </el-form-item>
v-model="queryParams.contract_no" <el-form-item>
clearable <el-button type="primary" @click="resetPage">查询</el-button>
placeholder="请输入合同编号" <el-button @click="resetParams">重置</el-button>
/> </el-form-item </el-form-item>
><el-form-item label="合同状态" prop="status"> </el-form>
<el-select <div class="mt-4">
v-model="queryParams.status" <el-table :data="pager.lists" :default-sort="{ prop: 'create_time', order: 'descending' }"
placeholder="请选择合同类型" @selection-change="handleSelectionChange">
clearable <el-table-column label="id" prop="id" />
class="w-[280px]" <el-table-column label="合同类型" align="center">
> <template #default="{ row }">
<el-option label="未上传" :value="0"></el-option> {{ typeFn(row.type) }}
<el-option label="已上传" :value="1"></el-option> </template>
</el-select> </el-table-column>
</el-form-item> <el-table-column label="合同编号" prop="contract_no" align="center" show-overflow-tooltip />
<el-form-item> <el-table-column label="甲方" prop="company_a_name" align="center" show-overflow-tooltip />
<el-button type="primary" @click="resetPage">查询</el-button> <el-table-column label="乙方" prop="company_b_name" align="center" show-overflow-tooltip />
<el-button @click="resetParams">重置</el-button> <el-table-column label="类型" prop="product_count" align="center" show-overflow-tooltip>
</el-form-item> <template #default="{ row }"> 公司 </template>
</el-form> </el-table-column>
<div class="mt-4"> <el-table-column label="租车数量(辆)" prop="num" align="center" show-overflow-tooltip />
<el-table <el-table-column label="状态" prop="product_count" align="center" show-overflow-tooltip>
:data="pager.lists" <template #default="{ row }">
:default-sort="{ prop: 'create_time', order: 'descending' }" <span :style="`color:${statusFn(row.status).color}`">
@selection-change="handleSelectionChange" {{ statusFn(row.status).tit }}</span>
> </template>
<el-table-column label="id" prop="id" /> </el-table-column>
<el-table-column label="合同类型" align="center"> <el-table-column label="操作" align="center" width="auto" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
{{ typeFn(row.type) }} <el-button type="primary" link v-perms="['contract.contract/wind_control']"
</template> v-if="row.status == 0">
</el-table-column> <router-link :to="{
<el-table-column path: 'vehicle_detail',
label="合同编号" query: {
prop="contract_no" id: row.id,
align="center" },
show-overflow-tooltip }">审核</router-link>
/> </el-button>
<el-table-column <el-button type="primary" link v-perms="['contract.contract/wind_control']"
label="甲方" v-if="row.status > 0">
prop="company_a_name" <router-link :to="{
align="center" path: 'vehicle_detail',
show-overflow-tooltip query: {
/> id: row.id,
<el-table-column },
label="乙方" }">详情</router-link>
prop="company_b_name" </el-button>
align="center" <el-button v-if="row.status == 1 && row.contract_logistic_id != 0" type="primary" link
show-overflow-tooltip @click="sendContractPopFn(row.id)">发送合同</el-button>
/> <el-button v-if="row.status == 2" :disabled="row.nums > 0" @click="sendAgaintPopFn(row.id)" link
<el-table-column type="primary">重新发送{{ row.nums ? row.nums + "s" : "" }}</el-button>
label="类型" <el-button v-if="row.status == 3" type="primary" link>
prop="product_count" <a :href="JSON.parse(row.contract_evidence).party_a">下载证据</a>
align="center" </el-button>
show-overflow-tooltip </template>
> </el-table-column>
<template #default="{ row }"> 公司 </template> </el-table>
</el-table-column> </div>
<el-table-column <div class="flex mt-4 justify-end">
label="租车数量(辆)" <pagination v-model="pager" @change="getLists" />
prop="num" </div>
align="center" </el-card>
show-overflow-tooltip
/> <el-dialog v-model="showPop" @close="offPop">
<el-table-column <h1>重要提醒</h1>
label="状态" <div class="content" v-if="!sendAgainPop">
prop="product_count" 请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
align="center" </div>
show-overflow-tooltip <div class="content" v-else>
> 确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
<template #default="{ row }"> </div>
<span :style="`color:${statusFn(row.status).color}`"> <p class="btn_menu">
{{ statusFn(row.status).tit }}</span <el-button type="primary" size="large" v-if="!sendAgainPop" @click="sendContractFn">确认</el-button>
> <el-button type="primary" size="large" v-else @click="sendAgain">重新发送</el-button>
</template> <el-button type="info" size="large" @click="offPop">返回</el-button>
</el-table-column> </p>
<el-table-column </el-dialog>
label="操作" </div>
align="center"
width="auto"
fixed="right"
>
<template #default="{ row }">
<el-button
type="primary"
link
v-perms="['contract.contract/wind_control']"
v-if="row.status == 0"
>
<router-link
:to="{
path: 'vehicle_detail',
query: {
id: row.id,
},
}"
>审核</router-link
>
</el-button>
<el-button
type="primary"
link
v-perms="['contract.contract/wind_control']"
v-if="row.status > 0"
>
<router-link
:to="{
path: 'vehicle_detail',
query: {
id: row.id,
},
}"
>详情</router-link
>
</el-button>
<!-- <el-button
v-if="row.status == 1"
type="primary"
link
@click="sendContractPopFn(row.id)"
>发送合同</el-button
> -->
<el-button
v-if="row.status == 1 && row.contract_logistic_id != 0"
type="primary"
link
@click="sendContractPopFn(row.id)"
>发送合同</el-button
>
<el-button
v-if="row.status == 2"
:disabled="row.nums > 0"
@click="sendAgaintPopFn(row.id)"
link
type="primary"
>重新发送{{ row.nums ? row.nums + "s" : "" }}</el-button
>
<el-button v-if="row.status == 3" type="primary" link>
<a :href="JSON.parse(row.contract_evidence).party_a"
>下载证据</a
>
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" />
</div>
</el-card>
<!-- <edit-popup
v-if="showEdit"
ref="editRef"
@success="getLists"
@close="showEdit = false"
/> -->
<el-dialog v-model="showPop" @close="offPop">
<h1>重要提醒</h1>
<!-- <div class="content" v-if="showConctactPop"> -->
<div class="content" v-if="!sendAgainPop">
请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
</div>
<div class="content" v-else>
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div>
<p class="btn_menu">
<el-button
type="primary"
size="large"
v-if="!sendAgainPop"
@click="sendContractFn"
>确认</el-button
>
<el-button type="primary" size="large" v-else @click="sendAgain"
>重新发送</el-button
>
<el-button type="info" size="large" @click="offPop">返回</el-button>
</p>
</el-dialog>
</div>
</template> </template>
<script lang="ts" setup name="flowTypeLists"> <script lang="ts" setup name="flowTypeLists">
@ -209,126 +107,127 @@ var contractId = 0;
const showPop = ref(false); const showPop = ref(false);
const sendAgainPop = ref(false); const sendAgainPop = ref(false);
const sendAgain = () => { const sendAgain = () => {
sendMsg({ id: contractId }).then((res) => { sendMsg({ id: contractId }).then((res) => {
var inde = pager.lists.findIndex(function (element) { var inde = pager.lists.findIndex(function (element) {
return element.id === contractId; return element.id === contractId;
});
index.value = inde;
pager.lists[index.value].nums = 10;
timeFn(index.value);
}); });
index.value = inde;
pager.lists[index.value].nums = 10;
timeFn(index.value);
});
}; };
const timeFn = (i: number) => { const timeFn = (i: number) => {
const timers = setInterval(() => { const timers = setInterval(() => {
pager.lists[i].nums--; pager.lists[i].nums--;
if (pager.lists[i].nums <= 0) { if (pager.lists[i].nums <= 0) {
clearInterval(timers); clearInterval(timers);
} }
}, 1000); }, 1000);
}; };
const sendContractPopFn = (id: number) => { const sendContractPopFn = (id: number) => {
(showPop.value = true), (sendAgainPop.value = true), (contractId = id); (showPop.value = true), (sendAgainPop.value = true), (contractId = id);
}; };
const sendAgaintPopFn = (id: number) => { const sendAgaintPopFn = (id: number) => {
(showPop.value = true), (contractId = id); (showPop.value = true), (contractId = id);
}; };
const sendContractFn = () => { const sendContractFn = () => {
sendContract({ id: contractId }).then((res) => { sendContract({ id: contractId }).then((res) => {
feedback.msgSuccess("发送成功"); feedback.msgSuccess("发送成功");
var inde = pager.lists.findIndex(function (element) { var inde = pager.lists.findIndex(function (element) {
return element.id === contractId; return element.id === contractId;
});
index.value = inde;
showPop.value = false;
pager.lists[index.value].status = 2;
pager.lists[index.value].nums = 10;
timeFn(index.value);
}); });
index.value = inde;
showPop.value = false;
pager.lists[index.value].status = 2;
pager.lists[index.value].nums = 10;
timeFn(index.value);
});
}; };
const offPop = () => { const offPop = () => {
showPop.value = false; showPop.value = false;
// showConctactPop.value = false; // showConctactPop.value = false;
}; };
// //
const queryParams = reactive({ const queryParams = reactive({
company_name: "", company_name: "",
contract_no: "", contract_no: "",
status: "", status: "",
}); });
const statusFn = (status: number) => { const statusFn = (status: number) => {
switch (status) { switch (status) {
case 0: case 0:
return { tit: "待上传", color: "rgb(238, 190, 119)" }; return { tit: "待上传", color: "rgb(238, 190, 119)" };
case 1: case 1:
return { tit: "已上传", color: "rgb(103, 194, 58)" }; return { tit: "已上传", color: "rgb(103, 194, 58)" };
case 2: case 2:
return { tit: "签约中", color: "red" }; return { tit: "签约中", color: "red" };
case 3: case 3:
return { tit: "已签约", color: "rgb(103, 194, 58)" }; return { tit: "已签约", color: "rgb(103, 194, 58)" };
// default: // default:
// return { tit: "", color: "green" }; // return { tit: "", color: "green" };
} }
}; };
const typeFn = (status: number) => { const typeFn = (status: number) => {
switch (status) { switch (status) {
case 0: case 0:
return "租赁合同"; return "租赁合同";
case 1: case 1:
return "自由车辆合同"; return "自由车辆合同";
case 2: case 2:
return "解除合同"; return "解除合同";
default: default:
} }
}; };
// //
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: leaseContractList, fetchFun: leaseContractList,
params: queryParams, params: queryParams,
}); });
getLists(); getLists();
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.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>

View File

@ -1,98 +1,113 @@
<template> <template>
<div> <div>
<el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px]" :model="queryParams" inline>
<el-form-item label="任务名称" prop="name">
<el-input
class="w-[280px]"
v-model="queryParams.name"
clearable
placeholder="请输入任务名称"
/>
</el-form-item>
<el-form-item label="审核状态" prop="name">
<el-select
v-model="queryParams.check_status"
placeholder="请选择审核状态"
clearable
class="w-[280px]"
>
<el-option
v-for="(item, index) in checkStatusList"
:key="index"
:label="item.name"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="resetPage">查询</el-button>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> <el-card class="!border-none" v-loading="pager.loading" shadow="never">
<!-- <el-button v-perms="['flow/add']" type="primary" @click="handleAdd">
<template #icon>
<icon name="el-icon-Plus" />
</template>
新增
</el-button> -->
<!-- <el-button
v-perms="['flow/delete']"
:disabled="!selectData.length"
@click="handleDelete(selectData)"
>
删除
</el-button> -->
<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" /> <el-table-column label="ID" prop="id" />
<el-table-column label="任务名称" prop="name" show-overflow-tooltip />
<el-table-column label="任务描述" prop="remark" show-overflow-tooltip>
</el-table-column>
<el-table-column label="任务金额" prop="remark" show-overflow-tooltip>
</el-table-column>
<el-table-column <el-table-column
label="任务完成时间" label="任务名称"
prop="remark" prop="task.title"
show-overflow-tooltip
/>
<el-table-column
label="任务描述"
prop="task.content"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="所属公司" prop="remark" show-overflow-tooltip>
</el-table-column>
<el-table-column label="片区经理" prop="remark" show-overflow-tooltip>
</el-table-column>
<el-table-column <el-table-column
label="当前审核人" label="任务金额"
prop="department" prop="task.money"
show-overflow-tooltip show-overflow-tooltip
> >
</el-table-column> </el-table-column>
<el-table-column label="审核状态" prop="status" show-overflow-tooltip> <el-table-column
<template #default="{ row }"> label="任务提交时间"
<span v-if="row.status == 2" style="color: #f56c6c">未通过</span> prop="task.update_time"
<span v-if="row.status == 1" style="color: #67c23a">已通过</span> show-overflow-tooltip
<span v-if="row.status == 0" style="color: #e6a23c">未审核</span> >
</template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="状态" prop="status" show-overflow-tooltip> <el-table-column
<template #default="{ row }"> label="公司名称"
<span v-if="row.status == 1">启用</span> prop="company_name"
<span v-if="row.status == 0">禁用</span> show-overflow-tooltip
</template> ></el-table-column>
</el-table-column> --> <el-table-column
<!-- <el-table-column label="片区经理"
label="账号状态" prop="area_manager"
min-width="100" show-overflow-tooltip
v-perms="['auth.admin/edit']" >
</el-table-column>
<el-table-column
label="审核状态"
prop="check_status"
show-overflow-tooltip
> >
<template #default="{ row }"> <template #default="{ row }">
<el-switch <span v-if="row.check_status == 3" style="color: #f56c6c"
v-if="row.root != 1" >未通过</span
v-model="row.status" >
:active-value="1" <span v-if="row.check_status == 2" style="color: #67c23a"
:inactive-value="0" >已通过</span
@change="changeStatus(row)" >
/> <span v-if="row.check_status == 1" style="color: #e6a23c"
>待审核</span
>
</template> </template>
</el-table-column> --> </el-table-column>
<el-table-column label="备注" prop="remark" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
v-if="row.check_status <= 1"
v-perms="['flow/edit']" v-perms="['flow/edit']"
type="primary" type="primary"
link link
v-if="row.status == 0" @click="handleEdit(row, 'edit')"
@click="handleEdit(row)"
> >
审核 审核
</el-button> </el-button>
<el-button <el-button
v-else
type="primary" type="primary"
link link
v-else
@click="handleEdit(row, 'details')" @click="handleEdit(row, 'details')"
> >
详情 详情
</el-button> </el-button>
<!-- <el-button
v-perms="['flow/delete']"
type="danger"
link
@click="handleDelete(row.id)"
>
删除
</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -111,13 +126,13 @@
</div> </div>
</template> </template>
<script lang="ts" setup name="flowLists"> <script lang="ts" setup name="flowLists">
import { usePaging } from "@/hooks/usePaging"; import { usePaging } from "@/hooks/usePaging";
import { useDictData } from "@/hooks/useDictOptions"; import { useDictData } from "@/hooks/useDictOptions";
import { apiFlowLists, apiFlowDetil, apiFlowStatus } from "@/api/examined"; import { apiApproveList } from "@/api/examined";
import { timeFormat } from "@/utils/util"; import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback"; import feedback from "@/utils/feedback";
import EditPopup from "./examined_popup.vue"; import EditPopup from "./index_list_popup.vue";
const editRef = shallowRef<InstanceType<typeof EditPopup>>(); const editRef = shallowRef<InstanceType<typeof EditPopup>>();
// //
@ -126,18 +141,25 @@ const showEdit = ref(false);
// //
const queryParams = reactive({ const queryParams = reactive({
name: "", name: "",
check_type: "", check_status: "",
type: "", type: 1,
flow_cate: "",
department_ids: "",
copy_uids: "",
remark: "",
flow_list: "",
admin_id: "",
status: "",
delete_user_id: "",
}); });
const checkStatusList = ref([
{
id: 1,
name: "待审核",
},
{
id: 2,
name: "已通过",
},
{
id: 3,
name: "未通过",
},
]);
// //
const selectData = ref<any[]>([]); const selectData = ref<any[]>([]);
@ -151,7 +173,7 @@ const { dictData } = useDictData("");
// //
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: apiFlowLists, fetchFun: apiApproveList,
params: queryParams, params: queryParams,
}); });
@ -169,11 +191,6 @@ const handleEdit = async (data: any, type = "edit") => {
editRef.value?.open(type); editRef.value?.open(type);
editRef.value?.setFormData(data); editRef.value?.setFormData(data);
}; };
//
const changeStatus = (row: any) => {
console.log(row.status);
apiFlowStatus({ id: row.id, status: row.status });
};
// //
// const handleDelete = async (id: number | any[]) => { // const handleDelete = async (id: number | any[]) => {

View File

@ -23,38 +23,38 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任务名称" prop="name"> <el-form-item label="任务名称" prop="task.title">
<el-input readonly v-model="formData.name" /> <el-input readonly v-model="formData.task.title" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任务金额" prop="flow_cate"> <el-form-item label="任务金额" prop="task.money">
<el-input readonly v-model="formData.flow_cate" /> <el-input readonly v-model="formData.task.money" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属公司" prop="name"> <el-form-item label="所属公司" prop="company_name">
<el-input readonly v-model="formData.name" /> <el-input readonly v-model="formData.company_name" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="任务描述" prop="remark"> <el-form-item label="任务描述" prop="task.content">
<el-input <el-input
readonly readonly
v-model="formData.remark" v-model="formData.task.content"
clearable clearable
type="textarea" type="textarea"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任务完成时间" prop="id"> <el-form-item label="任务提交时间" prop="id">
<el-input readonly v-model="formData.id" /> <el-input readonly v-model="formData.task.update_time" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="片区经理" prop="flow_cate"> <el-form-item label="片区经理" prop="flow_cate">
<el-input readonly v-model="formData.flow_cate" /> <el-input readonly v-model="formData.area_manager" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -64,28 +64,39 @@
<el-form-item label="详情描述" prop="remark"> <el-form-item label="详情描述" prop="remark">
<el-input <el-input
readonly readonly
v-model="formData.remark" :value="formData.task?.extend.other.note"
clearable clearable
type="textarea" type="textarea"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="附件" prop="flow_cate"> <el-form-item label="图片附件">
<el-image <el-image
class="attachment" class="attachment"
v-for="(item, index) in 5" v-for="(item, index) in formData.task.extend.other.annex"
:key="index" :key="index"
src="" :src="item"
:preview-src-list="[]" :preview-src-list="formData.task.extend.other.annex"
:initial-index="index" :initial-index="index"
fit="cover" fit="cover"
></el-image> ></el-image>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24">
<el-form-item label="视频附件">
<video
class="video"
:src="item"
v-for="(item, index) in formData.task.extend.other.video_annex"
:key="index"
controls
/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-divider /> <el-divider />
<el-col :span="24"> <!-- <el-col :span="24">
<el-form-item label=""> <el-form-item label="">
<el-timeline> <el-timeline>
<el-timeline-item <el-timeline-item
@ -99,20 +110,20 @@
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="12"> <el-col :span="12">
<el-form-item <el-form-item
label="审核" label="审核"
prop="flow_detail.check_type" prop="check_status"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
> >
<el-radio-group <el-radio-group
:disabled="mode == 'details'" :disabled="mode == 'details'"
v-model="formData.flow_detail.type" v-model="formData.check_status"
> >
<el-radio :label="1">通过</el-radio> <el-radio :label="2">通过</el-radio>
<el-radio :label="2">驳回</el-radio> <el-radio :label="3">驳回</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -136,7 +147,7 @@
<script lang="ts" setup name="flowEdit"> <script lang="ts" setup name="flowEdit">
import type { FormInstance } from "element-plus"; import type { FormInstance } from "element-plus";
import Popup from "@/components/popup/index.vue"; import Popup from "@/components/popup/index.vue";
import { apiFlowCreat, apiFlowDetil } from "@/api/examined"; import { apiApproveAudit } from "@/api/examined";
import { timeFormat } from "@/utils/util"; import { timeFormat } from "@/utils/util";
import type { PropType } from "vue"; import type { PropType } from "vue";
defineProps({ defineProps({
@ -176,32 +187,47 @@ const activities = ref([
// //
const formData = reactive({ const formData = reactive({
id: "", id: "",
name: "", task: {},
check_type: "", company_name: "",
type: "", area_manager: "",
flow_cate: "", check_status: 1,
remark: "", remark: "",
flow_detail: {
type: 1,
step: [{ type: "", user: [{ id: "", name: "" }] }],
},
copy_to: [{ id: "", name: "" }],
}); });
// //
const formRules = reactive<any>({}); const formRules = reactive<any>({
check_status: [
{
required: true,
validator: (rules: any, value: any, callback: any) => {
if (value != 2 && value != 3) callback("请选择审核状态");
else callback();
},
trigger: ["blur"],
},
],
// remark: [
// {
// required: false,
// validator: (rules: any, value: any, callback: any) => {
// if (formData.check_status == 3) callback("");
// else callback();
// },
// trigger: ["blur"],
// },
// ],
});
function customEvent(data: any) { function customEvent(data: any) {
isCompany.value = false; isCompany.value = false;
} }
// //
const setFormData = async (data: Record<any, any>) => { const setFormData = async (data: Record<any, any>) => {
let res = await apiFlowDetil(data.id); // let res = await apiFlowDetil(data.id);
for (const key in formData) { for (const key in formData) {
if (data[key] != null && data[key] != undefined) { if (data[key] != null && data[key] != undefined) {
//@ts-ignore //@ts-ignore
formData[key] = res[key]; formData[key] = data[key];
} }
} }
formData.flow_detail.type = Number(formData.flow_detail.type);
}; };
const getDetail = async (row: Record<string, any>) => { const getDetail = async (row: Record<string, any>) => {
@ -213,9 +239,13 @@ const getDetail = async (row: Record<string, any>) => {
// //
const handleSubmit = async () => { const handleSubmit = async () => {
await formRef.value?.validate(); await formRef.value?.validate();
mode.value == "edit" if (formData.check_status == 3 && formData.remark == "")
? await apiFlowCreat(formData) return ElMessage.error("驳回必须填写备注");
: await apiFlowCreat(formData); await apiApproveAudit({
id: formData.id,
check_status: formData.check_status,
remark: formData.remark,
});
popupRef.value?.close(); popupRef.value?.close();
emit("success"); emit("success");
}; };
@ -249,4 +279,11 @@ defineExpose({
margin-right: 10px; margin-right: 10px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.video {
width: 300px;
height: 150px;
/* background-color: red; */
margin-right: 10px;
margin-bottom: 10px;
}
</style> </style>

View File

@ -94,6 +94,11 @@
prop="create_time" prop="create_time"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column
label="备注"
prop="deny_desc"
show-overflow-tooltip
/>
<el-table-column label="操作" width="120" fixed="right"> <el-table-column label="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<!-- <el-button <!-- <el-button

View File

@ -7,6 +7,7 @@
width="550px" width="550px"
@confirm="handleSubmit" @confirm="handleSubmit"
@close="handleClose" @close="handleClose"
:button="mode == 'audit'"
> >
<el-form <el-form
ref="formRef" ref="formRef"
@ -30,7 +31,17 @@
placeholder="请输入提现金额" placeholder="请输入提现金额"
/> />
</el-form-item> </el-form-item>
<el-form-item label="" prop="amount"> <el-form-item label="电子发票" prop="invoice">
<el-button
v-if="formData.invoice"
type="primary"
link
@click="openTransfer(formData.invoice)"
>查看发票</el-button
>
<el-button v-else link>暂无发票</el-button>
</el-form-item>
<el-form-item label="余额详情" prop="amount">
<el-button type="primary" link> <el-button type="primary" link>
<router-link <router-link
:to="{ :to="{
@ -46,12 +57,17 @@
</el-button> </el-button>
</el-form-item> </el-form-item>
<el-form-item label="审核" prop="status"> <el-form-item label="审核" prop="status">
<el-radio-group v-model="formData.status"> <el-radio-group v-model="formData.status" :disabled="mode != 'audit'">
<el-radio :label="1">通过</el-radio> <el-radio :label="1">通过</el-radio>
<el-radio :label="2">拒绝</el-radio> <el-radio :label="2">拒绝</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-if="formData.status == 2" label="备注" prop="deny_desc"> <el-form-item
v-if="formData.status == 2"
label="备注"
prop="deny_desc"
:readonly="mode != 'audit'"
>
<el-input <el-input
v-model="formData.deny_desc" v-model="formData.deny_desc"
clearable clearable
@ -65,6 +81,7 @@
class="upload-demo" class="upload-demo"
style="width: 100%" style="width: 100%"
drag drag
:accept="fileTypeList.join(', ')"
:headers="{ Token: userStore.token }" :headers="{ Token: userStore.token }"
:action="actionUrl" :action="actionUrl"
:limit="1" :limit="1"
@ -79,7 +96,12 @@
<div class="el-upload__tip">请上传JPG/JPEG/PNG/GIF/PDF文件</div> <div class="el-upload__tip">请上传JPG/JPEG/PNG/GIF/PDF文件</div>
</template> </template>
</el-upload> </el-upload>
<el-button v-else type="primary" link @click="openTransfer"> <el-button
v-else
type="primary"
link
@click="openTransfer(formData.transfer_voucher)"
>
查看凭证 查看凭证
</el-button> </el-button>
</el-form-item> </el-form-item>
@ -135,6 +157,7 @@ const formData = reactive({
company_name: "", company_name: "",
s_date: "", s_date: "",
e_date: "", e_date: "",
invoice: "",
}); });
// //
@ -177,6 +200,8 @@ const setFormData = async (data: Record<any, any>) => {
formData[key] = data[key]; formData[key] = data[key];
} }
} }
formData.invoice =
"https://ceshi-worker-task.lihaink.cn/uploads/files/20230918/20230918093829d92260738.pdf";
}; };
const getDetail = async (row: Record<string, any>) => { const getDetail = async (row: Record<string, any>) => {
@ -229,8 +254,8 @@ const handleFile = (e: any) => {
}; };
// //
const openTransfer = () => { const openTransfer = (uri: any) => {
window.open(formData.transfer_voucher); window.open(uri);
}; };
// //

View File

@ -1,11 +1,8 @@
<template> <template>
<div> <div>
<el-row :gutter="16"> <el-row :gutter="16">
<el-col :span="8"> <el-col :span="8" v-for="item in userList" :key="item.id">
<people /> <people :datas="item" />
</el-col>
<el-col :span="8">
<people />
</el-col> </el-col>
</el-row> </el-row>
@ -133,11 +130,12 @@
</div> </div>
</template> </template>
<script lang="ts" setup name="articleLists"> <script lang="ts" setup name="articleLists">
import { getUmChangeType, accountLog } from "@/api/finance"; import { getUmChangeType, accountLog, getCompanyUserList } from "@/api/finance";
import { useDictOptions } from "@/hooks/useDictOptions"; import { useDictOptions } from "@/hooks/useDictOptions";
import { usePaging } from "@/hooks/usePaging"; import { usePaging } from "@/hooks/usePaging";
import { useRoute } from "vue-router"; import { useRoute } from "vue-router";
import people from "@/views/finance/component/people.vue"; import people from "@/views/finance/component/people.vue";
import { apiUserRoleLists } from "@/api/user_role";
const route = useRoute(); const route = useRoute();
// console.log("company_id", route.query?.company_id); // console.log("company_id", route.query?.company_id);
@ -153,6 +151,21 @@ if (route.query?.company_id) queryParams.company_id = route.query?.company_id;
if (route.query?.s_date) queryParams.start_time = route.query?.s_date; if (route.query?.s_date) queryParams.start_time = route.query?.s_date;
if (route.query?.e_date) queryParams.end_time = route.query?.e_date; if (route.query?.e_date) queryParams.end_time = route.query?.e_date;
const userList = ref([]);
const initUserList = async () => {
let res = await getCompanyUserList({
company_id: queryParams.company_id,
});
let role = await apiUserRoleLists({});
res = res.map((item: any) => {
let p = role.lists.find((e: any) => e.id == item.group_id);
p.name ? (item.group_name = p.name) : (item.group_name = "暂无角色");
return item;
});
userList.value = res;
};
initUserList();
const { pager, getLists, resetPage, resetParams } = usePaging({ const { pager, getLists, resetPage, resetParams } = usePaging({
fetchFun: accountLog, fetchFun: accountLog,
params: queryParams, params: queryParams,

View File

@ -1,20 +1,24 @@
<template> <template>
<el-card class="!border-none" shadow="never"> <el-card class="!border-none" shadow="never">
<div style="display: flex; align-items: center"> <div style="display: flex; align-items: center">
<el-avatar <el-avatar :size="80" :src="datas.avatar" style="margin-right: 16px" />
:size="80"
src="https://cube.elemecdn.com/0/88/03b0d39583f48206768a7534e55bcpng.png"
style="margin-right: 16px"
/>
<el-row> <el-row>
<el-col :span="12">姓名: 张三三</el-col> <el-col :span="12">姓名: {{ datas.nickname }}</el-col>
<el-col :span="12">电话: 1888888888888</el-col> <el-col :span="12">电话: {{ datas.mobile }}</el-col>
<el-col :span="24">角色: 超级管理员</el-col> <el-col :span="24">角色: {{ datas.group_name }}</el-col>
<el-col :span="12" <el-col :span="12"
>押金: <span style="color: #e6a23c; font-weight: bold">0.00</span> >押金:
<span style="color: #e6a23c; font-weight: bold">{{
datas.deposit
}}</span
>
</el-col> </el-col>
<el-col :span="12" <el-col :span="12"
>收益: <span style="color: #67c23a; font-weight: bold">0.00</span> >收益:
<span style="color: #67c23a; font-weight: bold">{{
datas.income
}}</span
>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -22,6 +26,12 @@
</template> </template>
<script lang="ts" setup name="peopleMoney"> <script lang="ts" setup name="peopleMoney">
defineProps({
datas: {
type: Object,
default: () => {},
},
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

View File

@ -197,7 +197,12 @@
> >
<el-form-item class="other" label="资质信息" prop="contract_no" required> <el-form-item class="other" label="资质信息" prop="contract_no" required>
<div class="company" v-for="(v, i) in compenyBimg" :key="i"> <div class="company" v-for="(v, i) in compenyBimg" :key="i">
<img :src="v" /> <el-image
:src="v"
:preview-src-list="compenyBimg"
:initial-index="i"
fit="cover"
/>
</div> </div>
</el-form-item> </el-form-item>
<!-- <el-form-item label="公司资质" prop="contract_type" required> <!-- <el-form-item label="公司资质" prop="contract_type" required>
@ -361,6 +366,10 @@
placeholder="商户入驻合同" placeholder="商户入驻合同"
/> />
</el-form-item> </el-form-item>
<br />
<el-form-item v-if="formData.notes" label="备注">
<el-input v-model="formData.notes" :readonly="true" type="textarea" />
</el-form-item>
<!-- <el-form-item label="合同编号" prop="contract_no"> <!-- <el-form-item label="合同编号" prop="contract_no">
<el-input <el-input
v-model="formData.party_b_name" v-model="formData.party_b_name"
@ -378,6 +387,7 @@
prop="field127" prop="field127"
> >
<el-upload <el-upload
accept=".pdf"
:headers="{ Token: userStore.token }" :headers="{ Token: userStore.token }"
class="upload-demo" class="upload-demo"
:action="base_url + '/upload/file'" :action="base_url + '/upload/file'"
@ -466,6 +476,7 @@ const formData = reactive({
url: "", url: "",
status_name: "", status_name: "",
signed_contract_url: "", signed_contract_url: "",
notes: "",
}); });
const fileList = ref<UploadUserFile[]>([]); const fileList = ref<UploadUserFile[]>([]);
const basicdata = ref({}); const basicdata = ref({});
@ -557,7 +568,7 @@ const handleAvatarSuccess_four: UploadProps["onSuccess"] = (
const router = useRouter(); const router = useRouter();
const submitContract = () => { const submitContract = () => {
if (!formData.file) ElMessage.error("请先上传合同!"); if (!formData.file) return ElMessage.error("请先上传合同!");
apiShopWindControl({ file: formData.file, id: route.query.id }); apiShopWindControl({ file: formData.file, id: route.query.id });
removeTab(); removeTab();
router.back(); router.back();
@ -600,6 +611,11 @@ onMounted(async () => {
height: 6.3vw; height: 6.3vw;
margin-right: 10px; margin-right: 10px;
} }
.el-image {
width: 10vw;
height: 6.3vw;
margin-right: 10px;
}
} }
.persenal { .persenal {
display: flex; display: flex;

View File

@ -110,8 +110,10 @@
<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="notes" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="220" fixed="right"> <el-table-column label="操作" width="280" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
type="primary" type="primary"
@ -126,6 +128,14 @@
>{{ row.status ? "详情" : "审核" }}</router-link >{{ row.status ? "详情" : "审核" }}</router-link
> >
</el-button> </el-button>
<el-button
type="primary"
v-perms="['shop_contract/details']"
link
@click="addNotes(row)"
>
设置备注
</el-button>
<template v-if="row.status == 0"> <template v-if="row.status == 0">
<el-button <el-button
v-perms="['shop_contract/details']" v-perms="['shop_contract/details']"
@ -220,6 +230,19 @@
<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>
<popup
ref="notesRef"
title="设置备注"
:async="true"
width="550px"
@confirm="handleSubmit"
>
<el-form :model="formData" :rules="noteRules">
<el-form-item label="备注" prop="notes">
<el-input v-model="formData.notes" type="textarea" />
</el-form-item>
</el-form>
</popup>
</div> </div>
</template> </template>
@ -232,10 +255,12 @@ import {
apiShopDraftingcontracts, apiShopDraftingcontracts,
apiShopSendMsgApi, apiShopSendMsgApi,
contractEvidence, contractEvidence,
apiShopContractAddNotes,
} from "@/api/shop_contract"; } from "@/api/shop_contract";
import { timeFormat } from "@/utils/util"; import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback"; import feedback from "@/utils/feedback";
import EditPopup from "./edit.vue"; import EditPopup from "./edit.vue";
import Popup from "@/components/popup/index.vue";
const statusdata = reactive([ const statusdata = reactive([
{ id: "1", name: "已签约" }, { id: "1", name: "已签约" },
@ -246,6 +271,37 @@ const editRef = shallowRef<InstanceType<typeof EditPopup>>();
// //
const showEdit = ref(false); const showEdit = ref(false);
//
const formData = ref({
id: "",
notes: "",
});
const noteRules = reactive({
notes: [
{
required: true,
message: "请输入备注",
trigger: ["blur"],
},
],
});
const notesRef = shallowRef();
const addNotes = (row: any) => {
let arr = Object.keys(formData.value);
arr.forEach((key: any) => {
formData.value[key] = row[key];
});
notesRef.value.open();
};
const handleSubmit = async () => {
await apiShopContractAddNotes({ ...formData.value });
getLists();
notesRef.value.close();
};
const handleClose = () => {
notesRef.value.close();
};
// //
const queryParams = reactive({ const queryParams = reactive({
contract_no: "", contract_no: "",

View File

@ -7,7 +7,7 @@
class="w-[280px]" class="w-[280px]"
v-model="queryParams.company_name" v-model="queryParams.company_name"
clearable clearable
placeholder="请输入公司名称" placeholder="请输入商户名称"
/> />
</el-form-item> </el-form-item>
<el-form-item label="主联系人姓名" prop="master_name"> <el-form-item label="主联系人姓名" prop="master_name">
@ -61,12 +61,12 @@
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="公司名称" label="商户名称"
prop="company_name" prop="company_name"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column <el-table-column
label="组织机构代码" label="社会代码"
prop="organization_code" prop="organization_code"
show-overflow-tooltip show-overflow-tooltip
/> />

View File

@ -22,7 +22,7 @@
:disabled="true" :disabled="true"
v-model="formData.id" v-model="formData.id"
clearable clearable
placeholder="请输入任务安排" placeholder="请输入任务ID"
/> />
</el-form-item> </el-form-item>
<el-form-item label="任务日期" prop="datetime"> <el-form-item label="任务日期" prop="datetime">
@ -50,10 +50,131 @@
<el-form-item label="任务描述" v-if="formData.template_name"> <el-form-item label="任务描述" v-if="formData.template_name">
<el-input <el-input
disabled disabled
v-model="formData.content" v-model="formData.templateInfo.content"
placeholder="没有任务描述" placeholder="没有任务描述"
/> />
</el-form-item> </el-form-item>
<el-form-item label="一阶段天数">
<el-input
disabled
v-model="formData.templateInfo.stage_day_one"
clearable
placeholder="请输入天数"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="一阶段金额">
<el-input
disabled
v-model="formData.templateInfo.money"
clearable
placeholder="请输入金额"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="二阶段天数">
<el-input
disabled
v-model="formData.templateInfo.stage_day_two"
clearable
placeholder="请输入天数"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="二阶段金额">
<el-input
disabled
v-model="formData.templateInfo.money_two"
clearable
placeholder="请输入金额"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item
v-if="noThreefilter(+formData.templateInfo.type)"
label="三阶段天数"
>
<el-input
disabled
v-model="formData.templateInfo.stage_day_three"
clearable
placeholder="请输入天数"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item
v-if="noThreefilter(+formData.templateInfo.type)"
label="三阶段金额"
>
<el-input
disabled
v-model="formData.templateInfo.new_money_three"
clearable
placeholder="请输入金额"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="长期金额" v-if="+formData.templateInfo.types == 2">
<el-input
disabled
v-model="formData.templateInfo.money_three"
clearable
placeholder="请输入金额"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item v-if="formData.templateInfo.type == 32" label="中转点">
<el-input
disabled
placeholder="请选择中转点"
:value="formData.templateInfo?.extend?.transfer?.address"
/>
</el-form-item>
<el-form-item v-if="formData.templateInfo.type == 32" label="终点">
<el-input
disabled
placeholder="请选择终点"
:value="formData.templateInfo?.extend?.terminus?.address"
/>
</el-form-item>
<!-- <el-form-item
v-if="formData.templateInfo.type == 35"
label="负责人"
prop="task_admin"
@click="clickTaskAdmin"
>
<el-input
placeholder="请选择负责人"
readonly
v-model="formData.task_admin_name"
/>
</el-form-item> -->
<el-form-item
v-if="formData.templateInfo.type == 35"
label="充值金额(元)"
prop="recharge"
>
<el-input
disabled
placeholder="请输入充值金额(元)"
v-model="formData.templateInfo.recharge"
type="number"
/>
</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>
@ -100,6 +221,7 @@ const formData = reactive({
end_time: "", end_time: "",
datetime: "", datetime: "",
content: "", content: "",
templateInfo: {},
}); });
interface RuleForm { interface RuleForm {
@ -116,6 +238,13 @@ const rules = reactive<FormRules<RuleForm>>({
}, },
}); });
// ID, 使
const noThreeList = reactive([31, 32, 33, 34, 35, 45, 48, 49]);
const noThreefilter = (id: number) => {
if (noThreeList.includes(id)) return false;
else return true;
};
function customEvent(data: any) { function customEvent(data: any) {
isShow.value = false; isShow.value = false;
formData.template_id = data.id; formData.template_id = data.id;

View File

@ -100,7 +100,7 @@ const queryParams = reactive({
start_time: "", start_time: "",
end_time: "", end_time: "",
page_no: 1, page_no: 1,
pageSize: 150, page_size: 300,
}); });
if (route.query.id) { if (route.query.id) {
queryParams.scheduling_id = route.query.id.toString(); queryParams.scheduling_id = route.query.id.toString();

View File

@ -1,31 +1,38 @@
<template> <template>
<div> <div>
<el-card class="!border-none mb-4" shadow="never"> <el-card class="!border-none mb-4" shadow="never">
<el-form class="mb-[-16px] formtabel" :model="queryParams" inline label-width="100px"> <el-form
<el-form-item label="区域经理" prop="create_user_id"> class="mb-[-16px] formtabel"
<el-input :model="queryParams"
class="w-[280px]" inline
v-model="queryParams.create_user_id" label-width="100px"
clearable >
placeholder="请输入区域经理" <el-form-item label="区域经理" prop="create_user_id">
/> <el-input
</el-form-item> class="w-[280px]"
<el-form-item label="公司" prop="company_id"> v-model="queryParams.create_user_id"
<el-input clearable
class="w-[280px]" placeholder="请输入区域经理"
v-model="queryParams.company_id" />
clearable </el-form-item>
placeholder="请输入公司" <el-form-item label="公司" prop="company_id">
/> <el-input
</el-form-item> class="w-[280px]"
<el-form-item> v-model="queryParams.company_id"
<el-button class="el-btn" type="primary" @click="resetPage">查询</el-button> clearable
<el-button @click="resetParams">重置</el-button> placeholder="请输入公司"
</el-form-item> />
</el-form> </el-form-item>
</el-card> <el-form-item>
<el-card class="!border-none" v-loading="pager.loading" shadow="never"> <el-button class="el-btn" type="primary" @click="resetPage"
<!-- <el-button >查询</el-button
>
<el-button @click="resetParams">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="!border-none" v-loading="pager.loading" shadow="never">
<!-- <el-button
v-perms="['task_scheduling.task_scheduling/add']" v-perms="['task_scheduling.task_scheduling/add']"
type="primary" type="primary"
@click="handleAdd" @click="handleAdd"
@ -35,7 +42,7 @@
</template> </template>
新增 新增
</el-button> --> </el-button> -->
<!-- <!--
<el-button <el-button
v-perms="['task_scheduling.task_scheduling/delete']" v-perms="['task_scheduling.task_scheduling/delete']"
:disabled="!selectData.length" :disabled="!selectData.length"
@ -43,176 +50,192 @@
> >
删除 删除
</el-button> --> </el-button> -->
<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 type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column label="区域经理" prop="admin_name" show-overflow-tooltip /> <el-table-column
<el-table-column label="公司" prop="company_name" show-overflow-tooltip /> label="区域经理"
<el-table-column label="每日最大金额" prop="money" show-overflow-tooltip /> prop="admin_name"
<el-table-column show-overflow-tooltip
label="公司类型" />
prop="company_type_name" <el-table-column
show-overflow-tooltip label="公司"
/> prop="company_name"
<el-table-column show-overflow-tooltip
label="状态" />
min-width="100" <el-table-column
v-perms="['task_scheduling.task_scheduling/edit']" label="每日最大金额"
> prop="money"
<template #default="{ row }"> show-overflow-tooltip
<el-switch />
v-model="row.status" <el-table-column
:active-value="1" label="公司类型"
:inactive-value="0" prop="company_type_name"
@change="changeStatus(row)" show-overflow-tooltip
/> />
</template> <el-table-column
</el-table-column> label="状态"
min-width="100"
v-perms="['task_scheduling.task_scheduling/edit']"
>
<template #default="{ row }">
<el-switch
v-model="row.status"
:active-value="1"
:inactive-value="0"
@change="changeStatus(row)"
/>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right"> <el-table-column label="操作" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
v-perms="['task.task_calendar']" v-perms="['task.task_calendar']"
@click="moneyAdd(row)" @click="moneyAdd(row)"
type="primary" type="primary"
link link
> >
金额 金额
</el-button> </el-button>
<el-button <el-button
v-perms="['task_template.task_template/lists']" v-perms="['task_template.task_template/lists']"
type="primary" type="primary"
link link
> >
<router-link <router-link
:to="{ :to="{
path: getRoutePath('task_template.task_template/lists'), path: getRoutePath('task_template.task_template/lists'),
query: { query: {
id: row.id, id: row.id,
company_id: row.company_id company_id: row.company_id,
} company_type: row.dict_company_type,
}" },
>任务安排</router-link }"
> >任务安排</router-link
</el-button> >
<el-button v-perms="['task.task_calendar']" type="primary" link> </el-button>
<router-link <el-button v-perms="['task.task_calendar']" type="primary" link>
:to="{ <router-link
path: getRoutePath('task.task_calendar'), :to="{
query: { path: getRoutePath('task.task_calendar'),
id: row.id, query: {
company_id: row.company_id id: row.id,
} company_id: row.company_id,
}" },
>任务日程</router-link }"
> >任务日程</router-link
</el-button> >
</template> </el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</div> </el-table>
<div class="flex mt-4 justify-end"> </div>
<pagination v-model="pager" @change="getLists" /> <div class="flex mt-4 justify-end">
</div> <pagination v-model="pager" @change="getLists" />
</el-card> </div>
<edit-popup </el-card>
v-if="showEdit" <edit-popup
ref="editRef" v-if="showEdit"
:dict-data="dictData" ref="editRef"
@success="getLists" :dict-data="dictData"
@close="showEdit = false" @success="getLists"
/> @close="showEdit = false"
<money />
ref="moneyRef" <money
v-if="moneyShow" ref="moneyRef"
@success="getLists" v-if="moneyShow"
@close="moneyShow = false" @success="getLists"
></money> @close="moneyShow = false"
</div> ></money>
</div>
</template> </template>
<script lang="ts" setup name="taskSchedulingLists"> <script lang="ts" setup name="taskSchedulingLists">
import { usePaging } from '@/hooks/usePaging' import { usePaging } from "@/hooks/usePaging";
import { useDictData } from '@/hooks/useDictOptions' import { useDictData } from "@/hooks/useDictOptions";
import { apiTaskSchedulingLists, apiTaskSchedulingEdit } from '@/api/task_scheduling' import {
import { timeFormat } from '@/utils/util' apiTaskSchedulingLists,
import feedback from '@/utils/feedback' apiTaskSchedulingEdit,
import EditPopup from './edit.vue' } from "@/api/task_scheduling";
import { dictDataLists } from '@/api/setting/dict' import { timeFormat } from "@/utils/util";
import { getRoutePath } from '@/router' import feedback from "@/utils/feedback";
import money from './money.vue' import EditPopup from "./edit.vue";
import { dictDataLists } from "@/api/setting/dict";
import { getRoutePath } from "@/router";
import money from "./money.vue";
const datalist = ref([]) const datalist = ref([]);
const editRef = shallowRef<InstanceType<typeof EditPopup>>() const editRef = shallowRef<InstanceType<typeof EditPopup>>();
const moneyRef = shallowRef<InstanceType<typeof money>>() const moneyRef = shallowRef<InstanceType<typeof money>>();
// //
const showEdit = ref(false) const showEdit = ref(false);
// //
const moneyShow = ref(false) const moneyShow = ref(false);
// //
const queryParams = reactive({ const queryParams = reactive({
create_user_id: '', create_user_id: "",
template_id: '', template_id: "",
company_id: '', company_id: "",
type: '', type: "",
status: '' status: "",
}) });
// //
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: apiTaskSchedulingLists, fetchFun: apiTaskSchedulingLists,
params: queryParams params: queryParams,
}) });
// //
const handleAdd = async () => { const handleAdd = async () => {
showEdit.value = true showEdit.value = true;
await nextTick() await nextTick();
editRef.value?.open('add') editRef.value?.open("add");
} };
// //
const moneyAdd = async (obj: any) => { const moneyAdd = async (obj: any) => {
moneyShow.value = true moneyShow.value = true;
await nextTick() await nextTick();
moneyRef.value?.open(obj.money ? 'edit' : 'add') moneyRef.value?.open(obj.money ? "edit" : "add");
moneyRef.value?.setFormData(obj) moneyRef.value?.setFormData(obj);
} };
const changeStatus = (data: any) => { const changeStatus = (data: any) => {
apiTaskSchedulingEdit({ apiTaskSchedulingEdit({
id: data.id, id: data.id,
status: data.status status: data.status,
}).finally(() => { }).finally(() => {
getLists() getLists();
}) });
} };
dictDataLists({ type_id: 10 }).then((res) => { dictDataLists({ type_id: 10 }).then((res) => {
datalist.value = res.lists datalist.value = res.lists;
}) });
getLists() getLists();
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.formtabel { .formtabel {
.el-form-item { .el-form-item {
width: 20%; width: 20%;
.el-btn { .el-btn {
margin-left: 100px; margin-left: 100px;
}
} }
}
} }
</style> </style>

View File

@ -18,6 +18,7 @@
<el-select <el-select
v-model="formData.type" v-model="formData.type"
clearable clearable
:disabled="mode != 'add'"
placeholder="请输入任务类型" placeholder="请输入任务类型"
@change="changeTaskType" @change="changeTaskType"
> >
@ -82,6 +83,7 @@
<el-select <el-select
v-model="formData.types" v-model="formData.types"
clearable clearable
:disabled="mode != 'add'"
placeholder="请输入阶段类型" placeholder="请输入阶段类型"
> >
<el-option <el-option
@ -224,12 +226,14 @@ import {
apiTaskTemplateAdd, apiTaskTemplateAdd,
apiTaskTemplateEdit, apiTaskTemplateEdit,
apiTaskTemplateDetail, apiTaskTemplateDetail,
apiTaskTypeList,
} from "@/api/task_template"; } from "@/api/task_template";
import { timeFormat } from "@/utils/util"; import { timeFormat } from "@/utils/util";
import type { PropType } from "vue"; import type { PropType } from "vue";
import { dictDataLists } from "@/api/setting/dict"; import { dictDataLists } from "@/api/setting/dict";
import taskMap from "./map.vue"; import taskMap from "./map.vue";
import personnelPopup from "./dialog_index_personnel.vue"; import personnelPopup from "./dialog_index_personnel.vue";
import { number } from "echarts/core";
defineProps({ defineProps({
dictData: { dictData: {
type: Object as PropType<Record<string, any[]>>, type: Object as PropType<Record<string, any[]>>,
@ -242,6 +246,7 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>();
const mode = ref("add"); const mode = ref("add");
const datalist = ref([]); const datalist = ref([]);
const route = useRoute(); const route = useRoute();
// //
const popupTitle = computed(() => { const popupTitle = computed(() => {
return mode.value == "edit" ? "编辑任务安排" : "新增任务安排"; return mode.value == "edit" ? "编辑任务安排" : "新增任务安排";
@ -285,7 +290,7 @@ if (route.query.id) {
formData.task_scheduling = route.query.id; formData.task_scheduling = route.query.id;
} }
// //
dictDataLists({ type_id: 10 }).then((res) => { apiTaskTypeList({ type_value: "task_type" }).then((res) => {
datalist.value = res.lists; datalist.value = res.lists;
}); });

View File

@ -0,0 +1,426 @@
<template>
<div class="edit-popup">
<popup
ref="popupRef"
:title="popupTitle"
:async="true"
width="550px"
@confirm="handleSubmit"
@close="handleClose"
>
<el-form
ref="formRef"
:model="formData"
label-width="120px"
:rules="formRules"
>
<el-form-item label="任务类型" prop="type">
<el-select
v-model="formData.type"
clearable
:disabled="mode != 'add'"
placeholder="请输入任务类型"
@change="changeTaskType"
>
<el-option
v-for="item in datalist"
:key="item.label"
:value="item.id"
:label="item.name"
/>
</el-select>
</el-form-item>
<el-form-item label="阶段类型" prop="types">
<div>
<el-select
v-model="formData.types"
clearable
:disabled="mode != 'add'"
placeholder="请输入阶段类型"
>
<el-option
v-for="item in [
{ label: 1, name: '循环' },
{ label: 2, name: '长期' },
{ label: 3, name: '单次' },
]"
:key="item.label"
:value="item.label"
:label="item.name"
/>
</el-select>
<div
v-if="formData.types == 3"
style="color: #e6a23c; font-size: 12px"
>
提示 : 单次任务不会每日结算,而是按阶段合计天数结算
</div>
</div>
</el-form-item>
<el-form-item label="一阶段天数">
<el-input
v-model="formData.stage_day_one"
clearable
placeholder="请输入天数"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="一阶段金额">
<el-input
v-model="formData.money"
clearable
placeholder="请输入金额"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="二阶段天数">
<el-input
v-model="formData.stage_day_two"
clearable
placeholder="请输入天数"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="二阶段金额">
<el-input
v-model="formData.money_two"
clearable
placeholder="请输入金额"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item v-if="noThreefilter(+formData.type)" label="三阶段天数">
<el-input
v-model="formData.stage_day_three"
clearable
placeholder="请输入天数"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item v-if="noThreefilter(+formData.type)" label="三阶段金额">
<el-input
v-model="formData.new_money_three"
clearable
placeholder="请输入金额"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="长期金额" v-if="+formData.types == 2">
<el-input
v-model="formData.money_three"
clearable
placeholder="请输入金额"
type="number"
>
<template #append></template>
</el-input>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio :label="1">显示</el-radio>
<el-radio :label="0">隐藏</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="任务描述" prop="content">
<el-input
v-model="formData.content"
clearable
placeholder="请输入任务描述"
type="textarea"
autosize
/>
</el-form-item>
</el-form>
<el-dialog
v-model="personnelShow"
ref="personnelRef"
title="选择负责人"
width="60%"
>
<personnelPopup
@custom-event="changePersonner"
:company_id="formData.company_id"
></personnelPopup>
</el-dialog>
</popup>
</div>
</template>
<script lang="ts" setup name="taskTemplateEdit">
import type { FormInstance } from "element-plus";
import Popup from "@/components/popup/index.vue";
import {
apiTaskTemplateAdd,
apiTaskTemplateEdit,
apiTaskTemplateDetail,
apiTaskTypeList,
} from "@/api/task_template";
import { timeFormat } from "@/utils/util";
import type { PropType } from "vue";
import { dictDataLists } from "@/api/setting/dict";
import taskMap from "./map.vue";
import personnelPopup from "./dialog_index_personnel.vue";
defineProps({
dictData: {
type: Object as PropType<Record<string, any[]>>,
default: () => ({}),
},
});
const emit = defineEmits(["success", "close"]);
const formRef = shallowRef<FormInstance>();
const popupRef = shallowRef<InstanceType<typeof Popup>>();
const mode = ref("add");
const datalist = ref([]);
const route = useRoute();
//
const popupTitle = computed(() => {
return mode.value == "edit" ? "编辑任务安排" : "新增任务安排";
});
// ID, 使
const noThreeList = reactive([45, 48, 49]);
const noThreefilter = (id: number) => {
if (noThreeList.includes(id)) return false;
else return true;
};
//
const formData = reactive({
id: "",
task_scheduling: 0,
company_id: "",
title: "",
admin_id: "",
type: "", //
status: "",
content: "",
stage_day_one: 0,
money: 0, //
stage_day_two: 0,
money_two: 0, //
stage_day_three: 0,
new_money_three: 0, //
money_three: 0, //
types: "", //
task_admin: "", //
task_admin_name: "", //
recharge: "",
extend: {
// origin: {
// address: "",
// lnglat: [],
// }, //
transfer: {
address: "",
lnglat: [],
}, //
terminus: {
address: "",
lnglat: [],
}, //
},
});
if (route.query.id) {
formData.task_scheduling = route.query.id;
}
//
apiTaskTypeList({ type_value: "town_task_type" }).then((res) => {
datalist.value = res.lists;
});
//
const formRules = reactive<any>({
title: [
{
required: true,
message: "请输入任务名称",
trigger: ["blur"],
},
],
admin_id: [
{
required: true,
message: "请输入创建人",
trigger: ["blur"],
},
],
type: [
{
required: true,
message: "请输入任务类型",
trigger: ["blur"],
},
],
status: [
{
required: true,
message: "请选择状态",
trigger: ["blur"],
},
],
types: [
{
required: true,
message: "请输入阶段类型",
trigger: ["blur"],
},
],
task_admin: [
{
required: true,
message: "请选择负责人",
trigger: ["blur"],
},
],
recharge: [
{
required: true,
// message: "",
validator: (rule: any, value: any, callback: any) => {
if (value <= 0) callback(new Error("充值金额不能小于0"));
else callback();
},
trigger: ["blur"],
},
],
"extend.origin.address": [
{
required: true,
message: "请选择中转点",
trigger: ["blur"],
},
],
"extend.transfer.address": [
{
required: true,
message: "请选择中转点",
trigger: ["blur"],
},
],
"extend.terminus.address": [
{
required: true,
message: "请选择终点",
trigger: ["blur"],
},
],
});
//
const setFormData = async (data: Record<any, any>) => {
for (const key in formData) {
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
formData[key] = data[key];
}
}
if (formData.type == 32) {
mapShow.value = true;
}
};
const getDetail = async (row: Record<string, any>) => {
const data = await apiTaskTemplateDetail({
id: row.id,
});
setFormData(data);
};
//
const mapShow = ref(false);
const mapRef = shallowRef<InstanceType<typeof taskMap>>();
//
const changeTaskType = async (e: any) => {
datalist.value.forEach((item: any) => {
if (item.id == e) formData.title = item.name;
});
if (e == 32) {
mapShow.value = true; //
// 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[mapType.value] = e[0];
};
//
const personnelShow = ref(false);
const personnelRef = shallowRef<InstanceType<typeof personnelPopup>>();
const changePersonner = (e: any) => {
formData.task_admin = e.id;
formData.task_admin_name = e.nickname;
personnelShow.value = false;
};
const clickTaskAdmin = async () => {
personnelShow.value = true;
};
//
const handleSubmit = async () => {
await formRef.value?.validate();
const data = { ...formData };
if (data.type != 32) data.extend = {}; // ,
mode.value == "edit"
? await apiTaskTemplateEdit(data)
: await apiTaskTemplateAdd(data);
popupRef.value?.close();
emit("success");
};
//
const open = (type = "add") => {
mode.value = type;
popupRef.value?.open();
};
//
const handleClose = () => {
emit("close");
};
defineExpose({
open,
setFormData,
getDetail,
});
</script>

View File

@ -150,7 +150,14 @@
</div> </div>
</el-card> </el-card>
<edit-popup <edit-popup
v-if="showEdit" v-if="showEdit && taskTypeId != 15"
ref="editRef"
:dict-data="dictData"
@success="getLists"
@close="showEdit = false"
/>
<edit-admin-popup
v-else-if="showEdit"
ref="editRef" ref="editRef"
:dict-data="dictData" :dict-data="dictData"
@success="getLists" @success="getLists"
@ -169,6 +176,7 @@ import {
import { timeFormat } from "@/utils/util"; import { timeFormat } from "@/utils/util";
import feedback from "@/utils/feedback"; import feedback from "@/utils/feedback";
import EditPopup from "./edit.vue"; import EditPopup from "./edit.vue";
import EditAdminPopup from "./edit_admin.vue";
import { dictDataLists } from "@/api/setting/dict"; import { dictDataLists } from "@/api/setting/dict";
const editRef = shallowRef<InstanceType<typeof EditPopup>>(); const editRef = shallowRef<InstanceType<typeof EditPopup>>();
const datalist = ref([]); const datalist = ref([]);
@ -188,8 +196,10 @@ const queryParams = reactive({
status: "", status: "",
content: "", content: "",
}); });
const taskTypeId = ref(10);
if (route.query?.id) queryParams.id = route.query.id; if (route.query?.id) queryParams.id = route.query.id;
if (route.query?.company_id) queryParams.company_id = route.query.company_id; if (route.query?.company_id) queryParams.company_id = route.query.company_id;
if (route.query?.company_type == 41) taskTypeId.value = 15;
const statusdata = reactive([ const statusdata = reactive([
{ id: 1, name: "显示" }, { id: 1, name: "显示" },
{ id: 2, name: "隐藏" }, { id: 2, name: "隐藏" },

View File

@ -89,8 +89,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const props = defineProps({ const props = defineProps({
datas: { datas: {
type: Object, type: Object,

View File

@ -89,8 +89,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const props = defineProps({ const props = defineProps({
datas: { datas: {
type: Object, type: Object,

View File

@ -93,8 +93,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const props = defineProps({ const props = defineProps({
datas: { datas: {
type: Object, type: Object,

View File

@ -97,8 +97,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const props = defineProps({ const props = defineProps({
datas: { datas: {
type: Object, type: Object,

View File

@ -101,8 +101,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const props = defineProps({ const props = defineProps({
datas: { datas: {
type: Object, type: Object,

View File

@ -217,8 +217,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const props = defineProps({ const props = defineProps({
datas: { datas: {
type: Object, type: Object,

View File

@ -124,17 +124,17 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="经营类型" prop="manage_type"> <el-form-item label="经营类型" prop="manage_type">
<el-select <el-select
v-model="datas.manage_type" v-model="datas.manage_type"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
> >
<el-option <el-option
v-for="(item, index) in storeTypeList" v-for="(item, index) in storeTypeList"
:key="index" :key="index"
:label="item" :label="item"
:value="index + ''" :value="index + ''"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -242,8 +242,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const storeTypeList = ref([ const storeTypeList = ref([
"超市", "超市",
"生鲜", "生鲜",

View File

@ -72,8 +72,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const props = defineProps({ const props = defineProps({
datas: { datas: {
type: Object, type: Object,

View File

@ -40,8 +40,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const props = defineProps({ const props = defineProps({
datas: { datas: {
type: Object, type: Object,

View File

@ -106,8 +106,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const props = defineProps({ const props = defineProps({
datas: { datas: {
type: Object, type: Object,

View File

@ -113,8 +113,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const storeTypeList = ref([ const storeTypeList = ref([
"超市", "超市",
"生鲜", "生鲜",

View File

@ -256,8 +256,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const landPlanList = ref(["自己种", "出租", "代种", "租更多地扩大种植"]); const landPlanList = ref(["自己种", "出租", "代种", "租更多地扩大种植"]);
const props = defineProps({ const props = defineProps({

View File

@ -164,8 +164,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const storeTypeList = ref([ const storeTypeList = ref([
"超市", "超市",
"生鲜", "生鲜",

View File

@ -124,17 +124,17 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="经营类型" prop="manage_type"> <el-form-item label="经营类型" prop="manage_type">
<el-select <el-select
v-model="datas.manage_type" v-model="datas.manage_type"
clearable clearable
:style="{ width: '100%' }" :style="{ width: '100%' }"
> >
<el-option <el-option
v-for="(item, index) in storeTypeList" v-for="(item, index) in storeTypeList"
:key="index" :key="index"
:label="item" :label="item"
:value="index + ''" :value="index + ''"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
@ -242,8 +242,6 @@
</template> </template>
<script setup lang='ts'> <script setup lang='ts'>
import { ref, defineProps } from "vue";
const storeTypeList = ref([ const storeTypeList = ref([
"超市", "超市",
"生鲜", "生鲜",