修复错误

This commit is contained in:
shengchanzhe 2023-07-23 18:02:22 +08:00
parent 81f4f3ad88
commit 8d98349f96
6 changed files with 1834 additions and 1896 deletions

View File

@ -1,39 +1,42 @@
import request from "@/utils/request";
import request from '@/utils/request'
// 公司列表
export function apiCompanyLists(params: any) {
return request.get({ url: "/company/lists", params });
return request.get({ url: '/company/lists', params })
}
// 添加公司
export function apiCompanyAdd(params: any) {
return request.post({ url: "/company/add", params });
return request.post({ url: '/company/add', params })
}
// 编辑公司
export function apiCompanyEdit(params: any) {
return request.post({ url: "/company/edit", params });
return request.post({ url: '/company/edit', params })
}
// 删除公司
export function apiCompanyDelete(params: any) {
return request.post({ url: "/company/delete", params });
return request.post({ url: '/company/delete', params })
}
// 公司详情
export function apiCompanyDetail(params: any) {
return request.get({ url: "/company/detail", params });
return request.get({ url: '/company/detail', params })
}
// 下属公司详情
export function apiSubordinateList(params: any) {
return request.get({ url: "/company/subordinate", params });
return request.get({ url: '/company/subordinate', params })
}
export function sendMsgApi(params: any) {
return request.get({ url: '/company/postsms', params })
}
// 生成合同
export function generateGontract(params: any) {
return request.get({ url: "/company/Draftingcontracts", params });
return request.get({ url: '/company/Draftingcontracts', params })
}
// 发送短信
export function sendMsgApi(params: any) {
return request.get({ url: "/company/postsms", params });
export function authentication(params: any) {
return request.get({ url: '/company/authentication', params })
}

View File

@ -1,11 +1,6 @@
<template>
<div class="edit-popup">
<el-form
ref="formRef"
:model="formData"
label-width="90px"
:rules="formRules"
>
<el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
<div style="font-size: 1.2rem; margin: 10px 0">公司基本信息创建</div>
<el-col :span="24" class="el-card pt-6">
<el-row>
@ -175,7 +170,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="master_email">
<el-form-item label="邮箱">
<el-input
:disabled="isDisabled"
v-model="formData.master_email"
@ -214,10 +209,7 @@
<div style="font-size: 1.2rem; margin: 10px 0">其他联系人</div>
<el-col :span="24" class="el-card pt-6">
<el-row>
<template
v-for="(item, index) in formData.other_contacts"
:key="index"
>
<template v-for="(item, index) in formData.other_contacts" :key="index">
<el-col :span="12">
<el-form-item label="姓名" prop="field120">
<el-input
@ -252,7 +244,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="field123">
<el-form-item label="邮箱">
<el-input
:disabled="isDisabled"
v-model="item.email"
@ -362,7 +354,6 @@
</el-col>
</el-row>
</el-col>
<template v-if="userStore.userInfo.root == 0">
<div style="font-size: 1.2rem; margin: 10px 0">电子合同</div>
<el-col :span="24" class="el-card pt-6">
<el-row>
@ -379,11 +370,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="100px"
label="被签约公司"
prop="field131"
>
<el-form-item label-width="100px" label="被签约公司" prop="field131">
<el-input
:disabled="true"
v-model="formData.company_name"
@ -394,11 +381,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item
label-width="100px"
label="合同类型"
prop="contract_type"
>
<el-form-item label-width="100px" label="合同类型" prop="contract_type">
<el-select
:disabled="isDisabled"
v-model="formData.contract.contract_type"
@ -417,11 +400,7 @@
</el-col>
<el-col :span="12">
<el-form-item
label-width="100px"
label="合同编号"
prop="field133"
>
<el-form-item label-width="100px" label="合同编号" prop="field133">
<el-input
placeholder="系统自动生成"
v-model="formData.contract.contract_no"
@ -447,15 +426,12 @@
:limit="1"
:on-success="handleAvatarSuccess_three"
>
<el-button :disabled="isDisabled" type="primary"
>上传</el-button
>
<el-button :disabled="isDisabled" type="primary">上传</el-button>
</el-upload>
</el-form-item>
</el-col>
</el-row>
</el-col>
</template>
<el-col :span="24" class="el-card pt-6">
<el-form-item label prop="field139">
@ -486,79 +462,64 @@
</template>
<script lang="ts" setup name="companyEdit">
import type {
FormInstance,
UploadProps,
ElMessage,
UploadUserFile,
} from "element-plus";
import Popup from "@/components/popup/index.vue";
import {
apiCompanyAdd,
apiCompanyEdit,
apiCompanyDetail,
apiCompanyLists,
} from "@/api/company";
import {
apiCityList,
apiAreaList,
apiStreetList,
apiProvinceList,
} from "@/api/common";
import { dictDataLists } from "@/api/setting/dict";
import { timeFormat } from "@/utils/util";
import DialogIndex from "./dialog_index.vue";
import DialogIndexMan from "./dialog_index_man.vue";
import type { PropType } from "vue";
import useMultipleTabs from "@/hooks/useMultipleTabs";
import useUserStore from "@/stores/modules/user";
const userStore = useUserStore();
import type { FormInstance, UploadProps, ElMessage, UploadUserFile } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { apiCompanyAdd, apiCompanyEdit, apiCompanyDetail, apiCompanyLists } from '@/api/company'
import { apiCityList, apiAreaList, apiStreetList, apiProvinceList } from '@/api/common'
import { dictDataLists } from '@/api/setting/dict'
import { timeFormat } from '@/utils/util'
import DialogIndex from './dialog_index.vue'
import DialogIndexMan from './dialog_index_man.vue'
import type { PropType } from 'vue'
import useMultipleTabs from '@/hooks/useMultipleTabs'
import useUserStore from '@/stores/modules/user'
const userStore = useUserStore()
const { removeTab } = useMultipleTabs();
const router = useRouter();
const route = useRoute();
let isDisabled = ref(false);
let isEdit = ref(false);
const { removeTab } = useMultipleTabs()
const router = useRouter()
const route = useRoute()
let isDisabled = ref(false)
let isEdit = ref(false)
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();
isDisabled = route.query.read;
isEdit = route.query.edit;
default: () => ({})
}
})
const emit = defineEmits(['success', 'close'])
const formRef = shallowRef<FormInstance>()
const popupRef = shallowRef<InstanceType<typeof Popup>>()
const mode = ref()
isDisabled = route.query.read
isEdit = route.query.edit
//
const formData = reactive({
admin_id: "",
admin_name: "",
area_manager: "",
area_manager_name: "",
id: "",
admin_id: '',
admin_name: '',
area_manager: '',
area_manager_name: '',
id: '',
// level_two: '',
// level_one: '',
company_name: "",
organization_code: "",
province: "",
city: "",
area: "",
street: "",
address: "",
company_type: "",
master_name: "",
master_position: "",
master_phone: "",
master_email: "",
company_name: '',
organization_code: '',
province: '',
city: '',
area: '',
street: '',
address: '',
company_type: '',
master_name: '',
master_position: '',
master_phone: '',
master_email: '',
other_contacts: [
{
name: "",
position: "",
phone: "",
email: "",
},
name: '',
position: '',
phone: '',
email: ''
}
],
// area_manager: '',
// is_contract: '',
@ -567,26 +528,26 @@ const formData = reactive({
// deposit: '',
// deposit_time: '',
qualification: {
business_license: "",
business_licenseB: "",
bank_account: "",
bank_accountB: "",
business_license: '',
business_licenseB: '',
bank_account: '',
bank_accountB: ''
},
contract: {
contract_type: "",
contract_type: '',
party_a: 0,
file: "",
contract_no: "系统自动生成",
file: '',
contract_no: '系统自动生成'
},
//
party_a_name: "",
file_image: "",
party_a_name: '',
file_image: ''
// status: ''
});
})
if (userStore.userInfo.root == 0) {
formData.contract.party_a = userStore.userInfo.company?.id;
formData.party_a_name = userStore.userInfo.company?.company_name;
formData.contract.party_a = userStore.userInfo.company?.id
formData.party_a_name = userStore.userInfo.company?.company_name
}
const datas = reactive({
provinceOptions: [],
@ -594,95 +555,88 @@ const datas = reactive({
areaOptions: [],
streetOptions: [],
dictTypeLists: [],
contract_type: [],
});
contract_type: []
})
const fileList = ref<UploadUserFile[]>([
{
name: "",
url: "",
},
]);
name: '',
url: ''
}
])
//
const formRules = reactive<any>({
company_name: [
{
required: true,
message: "请输入公司名称",
trigger: ["blur"],
},
message: '请输入公司名称',
trigger: ['blur']
}
],
organization_code: [
{
required: true,
message: "请输入组织机构代码",
trigger: ["blur"],
},
message: '请输入组织机构代码',
trigger: ['blur']
}
],
master_name: [
{
required: true,
message: "请输入主联系人姓名",
trigger: ["blur"],
},
message: '请输入主联系人姓名',
trigger: ['blur']
}
],
master_position: [
{
required: true,
message: "请输入主联系人职务",
trigger: ["blur"],
},
message: '请输入主联系人职务',
trigger: ['blur']
}
],
master_phone: [
{
required: true,
message: "请输入主联系人手机",
trigger: ["blur"],
},
],
master_email: [
{
required: true,
message: "请输入主联系人邮箱",
trigger: ["blur"],
},
message: '请输入主联系人手机',
trigger: ['blur']
}
],
account: [
{
required: true,
message: "请输入账号",
trigger: ["blur"],
},
message: '请输入账号',
trigger: ['blur']
}
],
password: [
{
required: true,
message: "请输入密码",
trigger: ["blur"],
},
],
});
const isCompany = ref(false);
const isMan = ref(false);
const isAreaManager = ref(false);
message: '请输入密码',
trigger: ['blur']
}
]
})
const isCompany = ref(false)
const isMan = ref(false)
const isAreaManager = ref(false)
function customEvent(data: any) {
isCompany.value = false;
formData.contract.party_a = data.id;
formData.party_a_name = data.company_name;
isCompany.value = false
formData.contract.party_a = data.id
formData.party_a_name = data.company_name
}
function customEventMan(data: any) {
isMan.value = false;
formData.admin_name = data.name;
formData.admin_id = data.id;
isMan.value = false
formData.admin_name = data.name
formData.admin_id = data.id
}
//
function EventAreaManager(data: any) {
isAreaManager.value = false;
formData.area_manager_name = data.name;
formData.area_manager = data.id;
isAreaManager.value = false
formData.area_manager_name = data.name
formData.area_manager = data.id
}
function openCompany() {
isCompany.value = true;
isCompany.value = true
}
//
@ -690,163 +644,148 @@ 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];
formData[key] = data[key]
}
}
};
}
const getDetail = async (row: Record<string, any>) => {
const data = await apiCompanyDetail({
id: row.id,
});
setFormData(data);
};
id: row.id
})
setFormData(data)
}
//1
const handleAvatarSuccess: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
const handleAvatarSuccess: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.code == 0) {
ElMessage.error(response.msg);
return;
ElMessage.error(response.msg)
return
}
formData.qualification.business_license = response.data.uri;
};
const handleAvatarSuccessB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
formData.qualification.business_license = response.data.uri
}
const handleAvatarSuccessB: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.code == 0) {
ElMessage.error(response.msg);
return;
ElMessage.error(response.msg)
return
}
formData.qualification.business_licenseB = response.data.uri;
};
formData.qualification.business_licenseB = response.data.uri
}
//2
const handleAvatarSuccess_two: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
const handleAvatarSuccess_two: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.code == 0) {
ElMessage.error(response.msg);
return;
ElMessage.error(response.msg)
return
}
formData.qualification.bank_account = response.data.uri;
};
const handleAvatarSuccess_twoB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
formData.qualification.bank_account = response.data.uri
}
const handleAvatarSuccess_twoB: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.code == 0) {
ElMessage.error(response.msg);
return;
ElMessage.error(response.msg)
return
}
formData.qualification.bank_accountB = response.data.uri;
};
formData.qualification.bank_accountB = response.data.uri
}
//3
const handleAvatarSuccess_three: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
const handleAvatarSuccess_three: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.code == 0) {
ElMessage.error(response.msg);
return;
ElMessage.error(response.msg)
return
}
formData.file_image = response.data.uri;
formData.contract.file = response.data.uri;
fileList.value[0].url = response.data.uri;
fileList.value[0].name = "合同文件";
};
formData.file_image = response.data.uri
formData.contract.file = response.data.uri
fileList.value[0].url = response.data.uri
fileList.value[0].name = '合同文件'
}
//
function other() {
formData.other_contacts.push({
name: "",
position: "",
phone: "",
email: "",
});
name: '',
position: '',
phone: '',
email: ''
})
}
//
function province_change(value: string) {
getCityList();
getCityList()
}
function city_change(value: string) {
getAreaList();
getAreaList()
}
function area_change(value: string) {
getStreetList();
getStreetList()
}
function street_change(value: string) {
formData.street = value;
formData.street = value
}
const getProvinceList = async () => {
const data = await apiProvinceList({});
datas["provinceOptions"] = data;
};
const data = await apiProvinceList({})
datas['provinceOptions'] = data
}
const getCityList = async () => {
const data = await apiCityList({ city: formData.province });
datas["cityOptions"] = data;
};
const data = await apiCityList({ city: formData.province })
datas['cityOptions'] = data
}
const getAreaList = async () => {
const data = await apiAreaList({ area: formData.city });
datas["areaOptions"] = data;
};
const data = await apiAreaList({ area: formData.city })
datas['areaOptions'] = data
}
const getStreetList = async () => {
const data = await apiStreetList({ street: formData.area });
datas["streetOptions"] = data;
};
getProvinceList();
const data = await apiStreetList({ street: formData.area })
datas['streetOptions'] = data
}
getProvinceList()
const getcontract_type = async () => {
const data = await dictDataLists({ type_id: 7 });
datas["contract_type"] = data["lists"];
};
const data = await dictDataLists({ type_id: 7 })
datas['contract_type'] = data['lists']
}
const getdictTypeLists = async () => {
const data = await dictDataLists({ type_id: 6 });
datas["dictTypeLists"] = data["lists"];
};
const data = await dictDataLists({ type_id: 6 })
datas['dictTypeLists'] = data['lists']
}
const getDetails = async () => {
const data = await apiCompanyDetail({
id: route.query.id,
});
id: route.query.id
})
Object.keys(formData).forEach((key) => {
const stringArr = ["province", "city", "area", "street"];
const stringArr = ['province', 'city', 'area', 'street']
//@ts-ignore
formData[key] = data[key];
if (stringArr.includes(key)) formData[key] = formData[key].toString();
});
formData["party_a_name"] = data["contract"]["party_a_name"];
formData["file_image"] = data["contract"]["file"];
fileList.value[0].url = data["contract"]["file"];
fileList.value[0].name = "合同文件";
await getCityList();
await getAreaList();
await getStreetList();
};
formData[key] = data[key]
if (stringArr.includes(key)) formData[key] = formData[key].toString()
})
formData['party_a_name'] = data['contract']['party_a_name']
formData['file_image'] = data['contract']['file']
fileList.value[0].url = data['contract']['file']
fileList.value[0].name = '合同文件'
await getCityList()
await getAreaList()
await getStreetList()
}
getdictTypeLists();
getcontract_type();
getdictTypeLists()
getcontract_type()
const create = async () => {
await formRef.value?.validate();
const data = { ...formData };
await formRef.value?.validate()
const data = { ...formData }
if (route.query.id) {
await apiCompanyEdit(data);
await apiCompanyEdit(data)
} else {
await apiCompanyAdd(data);
await apiCompanyAdd(data)
}
removeTab();
router.back();
};
route.query.id && getDetails();
removeTab()
router.back()
}
route.query.id && getDetails()
defineExpose({
open,
setFormData,
getDetail,
});
getDetail
})
</script>
<style>
.avatar-uploader .el-upload {

View File

@ -83,15 +83,19 @@
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column label="id" prop="id" show-overflow-tooltip width="60" />
<el-table-column label="签约公司" prop="company_name" show-overflow-tooltip />
<el-table-column label="公司名称" prop="company_name" show-overflow-tooltip />
<el-table-column label="公司类型" prop="company_type" show-overflow-tooltip />
<el-table-column label="区县" prop="area" show-overflow-tooltip />
<el-table-column label="乡镇" prop="street" show-overflow-tooltip />
<el-table-column label="主联系人" prop="master_name" show-overflow-tooltip />
<el-table-column label="联系方式" prop="master_phone" show-overflow-tooltip />
<el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
<el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip />
<el-table-column label="操作" align="center" width="450" fixed="right">
<el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip>
<template #default="{ row }">
{{ row.is_contract == 1 ? '已签约' : '未签约' }}
</template></el-table-column
>
<el-table-column label="操作" align="center" width="500" fixed="right">
<template #default="{ row }">
<div style="display: flex">
<el-button type="primary" link>
@ -149,6 +153,15 @@
@click="handleDelete(row.id)"
>删除</el-button
>
<el-button
v-if="row.is_authentication == 0"
v-perms="['company/authentication']"
type="primary"
link
@click="handleAuthentication(row.id)"
>企业认证</el-button
>
<template v-if="row.is_contract == 0">
<el-button
v-perms="['company/Draftingcontracts']"
type="primary"
@ -163,6 +176,7 @@
@click=";(showPop = true), (contractId = row.id)"
>发送短信</el-button
>
</template>
</div>
</template>
</el-table-column>
@ -194,13 +208,20 @@
<script lang="ts" setup name="companyLists">
import { usePaging } from '@/hooks/usePaging'
import { useDictData } from '@/hooks/useDictOptions'
import { apiCompanyLists, apiCompanyDelete } from '@/api/company'
import { generateGontract, sendMsgApi } from '@/api/perms/admin'
import useUserStore from '@/stores/modules/user'
import {
apiCompanyLists,
apiCompanyDelete,
generateGontract,
sendMsgApi,
authentication
} from '@/api/company'
import { timeFormat } from '@/utils/util'
import feedback from '@/utils/feedback'
import { dictDataLists } from '@/api/setting/dict'
import { getRoutePath } from '@/router'
const userStore = useUserStore()
const route = useRoute()
const company_type_show = ref(true)
//
@ -272,6 +293,11 @@ const handleDelete = async (id: number | any[]) => {
await apiCompanyDelete({ id })
getLists()
}
const handleAuthentication = async (id: number | any[]) => {
await feedback.confirm('确定要认证?')
await authentication({ id })
getLists()
}
getLists()
</script>

View File

@ -4,14 +4,22 @@
<div class="mt-4">
<el-table :data="pager.lists" @selection-change="handleSelectionChange">
<el-table-column label="id" prop="id" show-overflow-tooltip width="60" />
<el-table-column label="签约公司" prop="company_name" show-overflow-tooltip />
<el-table-column label="公司名称" prop="company_name" show-overflow-tooltip />
<el-table-column label="公司类型" prop="company_type" show-overflow-tooltip />
<el-table-column label="区县" prop="area" show-overflow-tooltip />
<el-table-column label="乡镇" prop="street" show-overflow-tooltip />
<el-table-column label="区县" prop="area_name" show-overflow-tooltip />
<el-table-column label="乡镇" prop="street_name" show-overflow-tooltip />
<el-table-column label="主联系人" prop="master_name" show-overflow-tooltip />
<el-table-column label="联系方式" prop="master_phone" show-overflow-tooltip />
<el-table-column label="片区经理" prop="area_manager" show-overflow-tooltip />
<el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip />
<el-table-column
label="片区经理"
prop="area_manager_name"
show-overflow-tooltip
/>
<el-table-column label="是否签约" prop="is_contract" show-overflow-tooltip>
<template #default="{ row }">
{{ row.is_contract == 1 ? '已签约' : '未签约' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="450" fixed="right">
<template #default="{ row }">
<div style="display: flex">

View File

@ -8,12 +8,7 @@
@confirm="handleSubmit"
@close="handleClose"
>
<el-form
ref="formRef"
:model="formData"
label-width="84px"
:rules="formRules"
>
<el-form ref="formRef" :model="formData" label-width="84px" :rules="formRules">
<div style="font-size: 1.2rem; margin: 10px 0">基本信息创建</div>
<div class="headimg">
<el-upload
@ -166,14 +161,14 @@
<el-col :span="24" style="margin-top: 1vh">
<el-row>
<el-col :span="12" v-if="userStore.userInfo.root == 0">
<!-- <el-col :span="12" v-if="true"> -->
<el-col :span="12">
<el-form-item label="授权身份" prop="role_id">
<el-select
v-model="formData.role_id"
:disabled="formData.root == 1 || isCheck"
placeholder="请选择授权身份"
:style="{ width: '100%' }"
@change="role_change"
clearable
>
<el-option
@ -190,32 +185,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-else>
<el-form-item label="授权身份" prop="role_id">
<el-select
v-model="formData.role_id"
:disabled="formData.root == 1 || isCheck"
placeholder="请选择授权身份"
:style="{ width: '100%' }"
clearable
>
<el-option
v-if="formData.root == 1"
label="系统管理员"
:value="0"
/>
<el-option
v-for="(item, index) in optionsData.role"
:key="index"
:label="item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="userStore.userInfo.root == 0">
<!-- <el-col :span="12" v-if="true"> -->
<el-col :span="12" v-if="disabledPartyA">
<el-form-item label="签约方" prop="field130">
<el-input
:disabled="isCheck"
@ -224,6 +194,7 @@
clearable
:style="{ width: '100%' }"
@click="isCompany = true"
@clear="clearPartyA"
></el-input>
</el-form-item>
</el-col>
@ -355,8 +326,7 @@
</el-form-item>
</div>
</div>
<template v-if="userStore.userInfo.root == 0">
<!-- <template v-if="true"> -->
<template v-if="disabledPartyA">
<el-col :span="24">
<el-row>
<el-col :span="12">
@ -449,7 +419,7 @@
<el-form-item label="合同上传" prop="field127">
<el-upload
:headers="{ Token: userStore.token }"
v-model="formData.file"
v-model:file-list="fileList"
class="upload-demo"
action="https://worker-task.lihaink.cn/adminapi/upload/file"
:on-success="handleAvatarSuccess_four"
@ -469,64 +439,61 @@
</div>
</template>
<script lang="ts" setup>
import type { FormInstance, UploadProps } from "element-plus";
import Popup from "@/components/popup/index.vue";
import { useDictOptions } from "@/hooks/useDictOptions";
import { adminAdd, adminDetail, adminEdit } from "@/api/perms/admin";
import { roleAll } from "@/api/perms/role";
import { jobsAll } from "@/api/org/post";
import { deptAll } from "@/api/org/department";
import {
apiCityList,
apiAreaList,
apiStreetList,
apiProvinceList,
} from "@/api/common";
import { dictDataLists } from "@/api/setting/dict";
import DialogIndex from "./dialog_index.vue";
import useUserStore from "@/stores/modules/user";
const isCheck = ref(false);
import type { FormInstance, UploadProps, ElMessage, UploadUserFile } from 'element-plus'
import Popup from '@/components/popup/index.vue'
import { useDictOptions } from '@/hooks/useDictOptions'
import { adminAdd, adminDetail, adminEdit } from '@/api/perms/admin'
import { roleAll } from '@/api/perms/role'
import { jobsAll } from '@/api/org/post'
import { deptAll } from '@/api/org/department'
import { apiCityList, apiAreaList, apiStreetList, apiProvinceList } from '@/api/common'
import { dictDataLists } from '@/api/setting/dict'
import DialogIndex from './dialog_index.vue'
import useUserStore from '@/stores/modules/user'
const disabledPartyA = ref(true)
const isCheck = ref(false)
const isCheckFn = (flag: boolean) => {
isCheck.value = flag;
};
const emit = defineEmits(["success", "close"]);
const formRef = shallowRef<FormInstance>();
const popupRef = shallowRef<InstanceType<typeof Popup>>();
const mode = ref("add");
isCheck.value = flag
}
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" ? "编辑管理员" : "新增管理员";
});
return mode.value == 'edit' ? '编辑管理员' : '新增管理员'
})
const formData = reactive({
id: "",
sex: "",
id_card: "",
name: "",
province: "",
city: "",
area: "",
street: "",
address: "",
account: "",
id: '',
sex: '',
id_card: '',
name: '',
province: '',
city: '',
area: '',
street: '',
address: '',
account: '',
is_contract: 0,
//
party_a_name: "",
party_a: "",
party_a_name: '',
party_a: '',
qualification: {
id_card: "",
id_card_b: "",
car_card: "",
car_card_b: "",
bank_account: "",
bank_account_b: "",
id_card: '',
id_card_b: '',
car_card: '',
car_card_b: '',
bank_account: '',
bank_account_b: ''
},
//
contract_type: "",
file: "",
role_id: "",
avatar: "",
contract_type: '',
file: '',
role_id: '',
avatar: '',
multipoint_login: 1,
root: 0,
});
disable: 0
})
//
const datas: any = reactive({
provinceOptions: [],
@ -535,273 +502,291 @@ const datas: any = reactive({
streetOptions: [],
dictTypeLists: [],
contract_type: [],
contract: [],
});
const userStore = useUserStore();
contract: []
})
const userStore = useUserStore()
const getcontract_type = async () => {
const data = await dictDataLists({ type_id: 7 });
datas["contract_type"] = data["lists"];
};
getcontract_type();
const data = await dictDataLists({ type_id: 7 })
datas['contract_type'] = data['lists']
}
getcontract_type()
const isCompany = ref(false);
const isCompany = ref(false)
function customEvent(data: any) {
isCompany.value = false;
formData.party_a = data.id;
formData.party_a_name = data.company_name;
isCompany.value = false
formData.party_a = data.id
formData.party_a_name = data.company_name
}
function clearPartyA() {
formData.party_a = ''
formData.party_a_name = ''
}
//
//
const ValidatorPhone = (rule: object, value: string, callback: any) => {
const rg = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/;
rg.test(formData.account)
? callback()
: callback(new Error("请输入正确的手机号"));
};
const rg = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/
rg.test(formData.account) ? callback() : callback(new Error('请输入正确的手机号'))
}
//
const ValidatorId = (rule: object, value: string, callback: any) => {
const rg =
/^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|10|11|12)(?:0[1-9]|[1-2]\d|30|31)\d{3}[\dXx]$/;
rg.test(formData.id_card)
? callback()
: callback(new Error("请输入正确的身份证号码"));
};
const rg = /^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|10|11|12)(?:0[1-9]|[1-2]\d|30|31)\d{3}[\dXx]$/
rg.test(formData.id_card) ? callback() : callback(new Error('请输入正确的身份证号码'))
}
const Validatorcard = (rule: object, value: string, callback: any) => {
formData.qualification.car_card
? callback()
: callback(new Error("请输入驾驶证正面"));
};
formData.qualification.car_card ? callback() : callback(new Error('请输入驾驶证正面'))
}
const ValidatorcardB = (rule: object, value: string, callback: any) => {
formData.qualification.car_card_b
? callback()
: callback(new Error("请输入驾驶证反面"));
};
formData.qualification.car_card_b ? callback() : callback(new Error('请输入驾驶证反面'))
}
const ValidatorBankcard = (rule: object, value: string, callback: any) => {
formData.qualification.bank_account
? callback()
: callback(new Error("请输入银行卡正面"));
};
formData.qualification.bank_account ? callback() : callback(new Error('请输入银行卡正面'))
}
const ValidatorBankcardB = (rule: object, value: string, callback: any) => {
formData.qualification.bank_account_b
? callback()
: callback(new Error("请输入银行卡反面"));
};
formData.qualification.bank_account_b ? callback() : callback(new Error('请输入银行卡反面'))
}
function role_change(e: any) {
if (e == 8) {
disabledPartyA.value = false
formData.party_a = ''
} else {
disabledPartyA.value = true
}
}
const formRules = reactive({
account: [
{
required: true,
trigger: ["blur"],
validator: ValidatorPhone,
},
trigger: ['blur'],
validator: ValidatorPhone
}
],
id_card: [
{
required: true,
trigger: ["blur"],
validator: ValidatorId,
},
trigger: ['blur'],
validator: ValidatorId
}
],
sex: [
{
required: true,
message: "请选择性别",
trigger: ["blur"],
},
message: '请选择性别',
trigger: ['blur']
}
],
name: [
{
required: true,
message: "请输入名称",
trigger: ["blur"],
},
message: '请输入名称',
trigger: ['blur']
}
],
car_card: [
{
required: true,
trigger: ["change"],
validator: Validatorcard,
},
trigger: ['change'],
validator: Validatorcard
}
],
car_card_b: [
{
required: true,
trigger: ["blur"],
validator: ValidatorcardB,
},
trigger: ['blur'],
validator: ValidatorcardB
}
],
bank_account: [
{
required: true,
trigger: ["change"],
validator: ValidatorBankcard,
},
trigger: ['change'],
validator: ValidatorBankcard
}
],
bank_account_b: [
{
required: true,
trigger: ["change"],
validator: ValidatorBankcardB,
},
trigger: ['change'],
validator: ValidatorBankcardB
}
],
role_id: [
{
required: true,
message: "请选择角色",
trigger: ["blur"],
},
],
});
message: '请选择角色',
trigger: ['blur']
}
]
})
//
const { optionsData } = useDictOptions<{
role: any[];
jobs: any[];
dept: any[];
role: any[]
jobs: any[]
dept: any[]
}>({
role: {
api: roleAll,
api: roleAll
},
jobs: {
api: jobsAll,
api: jobsAll
},
dept: {
api: deptAll,
},
});
api: deptAll
}
})
const handleSubmit = async () => {
if (isCheck.value) {
popupRef.value?.close();
return;
popupRef.value?.close()
return
}
await formRef.value?.validate();
mode.value == "edit"
await formRef.value?.validate()
mode.value == 'edit'
? await adminEdit(formData)
: await adminAdd(formData).then((res) => console.log(res));
popupRef.value?.close();
emit("success");
};
const open = (type = "add") => {
mode.value = type;
popupRef.value?.open();
};
: await adminAdd(formData).then((res) => console.log(res))
popupRef.value?.close()
emit('success')
}
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
}
const fileList = ref<UploadUserFile[]>([
{
name: '',
url: ''
}
])
// url
const handleAvatarSuccessIdA: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
formData.qualification.id_card = response.data.uri;
};
const handleAvatarSuccessAvatar: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
formData.avatar = response.data.uri;
};
const handleAvatarSuccessIdB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
formData.qualification.id_card_b = response.data.uri;
};
const handleAvatarSuccessCarA: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
formData.qualification.car_card = response.data.uri;
};
const handleAvatarSuccessCarB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
formData.qualification.car_card_b = response.data.uri;
};
const beforeAvatarUpload_two: UploadProps["beforeUpload"] = (rawFile) => {
return true;
};
const handleAvatarSuccessBankA: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
formData.qualification.bank_account = response.data.uri;
};
const handleAvatarSuccessBankB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
formData.qualification.bank_account_b = response.data.uri;
};
const handleAvatarSuccess_four: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
formData.file = response.data.uri;
};
const beforeAvatarUpload_three: UploadProps["beforeUpload"] = (rawFile) => {
return true;
};
const handleAvatarSuccessIdA: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
}
formData.qualification.id_card = response.data.uri
}
const handleAvatarSuccessAvatar: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
}
formData.avatar = response.data.uri
}
const handleAvatarSuccessIdB: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
}
formData.qualification.id_card_b = response.data.uri
}
const handleAvatarSuccessCarA: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
}
formData.qualification.car_card = response.data.uri
}
const handleAvatarSuccessCarB: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
}
formData.qualification.car_card_b = response.data.uri
}
const beforeAvatarUpload_two: UploadProps['beforeUpload'] = (rawFile) => {
return true
}
const handleAvatarSuccessBankA: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
}
formData.qualification.bank_account = response.data.uri
}
const handleAvatarSuccessBankB: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
}
formData.qualification.bank_account_b = response.data.uri
}
const handleAvatarSuccess_four: UploadProps['onSuccess'] = (response, uploadFile) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
}
formData.file = response.data.uri
fileList.value[0].url = response.data.uri
fileList.value[0].name = '合同文件'
}
const beforeAvatarUpload_three: UploadProps['beforeUpload'] = (rawFile) => {
return true
}
//
function province_change(value: string) {
getCityList();
getCityList()
}
function city_change(value: string) {
getAreaList();
getAreaList()
}
function area_change(value: string) {
getStreetList();
getStreetList()
}
function street_change(value: string) {
formData.street = value;
formData.street = value
}
const getProvinceList = async () => {
const data = await apiProvinceList({});
datas["provinceOptions"] = data;
};
const data = await apiProvinceList({})
datas['provinceOptions'] = data
}
const getCityList = async () => {
const data = await apiCityList({ city: formData.province });
datas["cityOptions"] = data;
};
const data = await apiCityList({ city: formData.province })
datas['cityOptions'] = data
}
const getAreaList = async () => {
const data = await apiAreaList({ area: formData.city });
datas["areaOptions"] = data;
};
const data = await apiAreaList({ area: formData.city })
datas['areaOptions'] = data
}
const getStreetList = async () => {
const data = await apiStreetList({ street: formData.area });
datas["streetOptions"] = data;
};
getProvinceList();
const data = await apiStreetList({ street: formData.area })
datas['streetOptions'] = data
}
getProvinceList()
const setFormData = async (row: any) => {
const data = await adminDetail({
id: row.id,
});
id: row.id
})
for (const key in formData) {
const stringArr = ["sex", "province", "city", "area", "street"];
const stringArr = ['sex', 'province', 'city', 'area', 'street']
if (data[key] != null && data[key] != undefined) {
//@ts-ignore
key == "role_id"
? (formData[key] = data[key][0])
: (formData[key] = data[key]);
if (stringArr.includes(key)) formData[key] = formData[key].toString();
key == 'role_id' ? (formData[key] = data[key][0]) : (formData[key] = data[key])
if (stringArr.includes(key)) formData[key] = formData[key].toString()
}
}
formData.contract_type = data.contract.contract_type;
formData.party_a_name = data.contract.party_a_name;
formData.party_a = data.contract.party_a;
formData.file = data.contract.file;
await getCityList();
await getAreaList();
await getStreetList();
};
formData.contract_type = data.contract.contract_type
formData.party_a_name = data.contract.party_a_name
formData.party_a = data.contract.party_a
formData.file = data.contract.file
if (data.role_id[0] == 8) {
disabledPartyA.value = false
}
fileList.value[0].url = data['contract']['file']
fileList.value[0].name = '合同文件'
await getCityList()
await getAreaList()
await getStreetList()
}
const handleClose = () => {
emit("close");
};
emit('close')
}
defineExpose({
open,
setFormData,
isCheckFn,
});
isCheckFn
})
</script>
<style lang="scss">

View File

@ -57,30 +57,22 @@
align="center"
>
<template #default="{ row }">
{{ row.company.company_name || "/" }}
{{ row.company.company_name || '/' }}
</template>
</el-table-column>
<el-table-column
label="所在乡镇"
prop="street_name"
min-width="120"
/>
<el-table-column label="所在乡镇" prop="street_name" min-width="120" />
<el-table-column label="授权身份" prop="role_name" min-width="120" />
<el-table-column
label="是否签约"
prop="contract_id"
prop="is_contract"
align="center"
min-width="120"
>
<template #default="{ row }">
{{ row.contract_id == 0 ? "未签约" : "已签约" }}
{{ row.is_contract == 1 ? '已签约' : '未签约' }}
</template>
</el-table-column>
<el-table-column
label="最近登录时间"
prop="login_time"
min-width="180"
/>
<el-table-column label="最近登录时间" prop="login_time" min-width="180" />
<el-table-column
label="创建时间"
prop="create_time"
@ -88,11 +80,7 @@
align="center"
/>
<el-table-column label="最近登录IP" prop="login_ip" min-width="120" />
<el-table-column
label="账号状态"
min-width="100"
v-perms="['auth.admin/edit']"
>
<el-table-column label="账号状态" min-width="100" v-perms="['auth.admin/edit']">
<template #default="{ row }">
<el-switch
v-if="row.root != 1"
@ -104,12 +92,7 @@
</template>
</el-table-column>
<el-table-column
label="操作"
width="330"
align="center"
fixed="right"
>
<el-table-column label="操作" width="330" align="center" fixed="right">
<template #default="{ row }">
<div style="display: flex">
<el-button
@ -134,12 +117,13 @@
@click="handleDelete(row.id)"
>删除</el-button
>
<template v-if="row.company_id != 0 && row.is_contract == 0">
<el-button
v-perms="['company/edit', 'company/add']"
type="primary"
link
@click="
(showPop = true),
;(showPop = true),
(showConctactPop = true),
(contractId = row.id)
"
@ -149,9 +133,10 @@
v-perms="['company/edit', 'company/add']"
type="primary"
link
@click="(showPop = true), (contractId = row.id)"
@click=";(showPop = true), (contractId = row.id)"
>发送短信</el-button
>
</template>
</div>
</template>
</el-table-column>
@ -177,16 +162,10 @@
确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
</div>
<p class="btn_menu">
<el-button
type="primary"
size="large"
v-if="showConctactPop"
@click="creContct"
<el-button type="primary" size="large" v-if="showConctactPop" @click="creContct"
>确认创建</el-button
>
<el-button type="primary" size="large" v-else @click="sendMsg"
>确认</el-button
>
<el-button type="primary" size="large" v-else @click="sendMsg">确认</el-button>
<el-button type="info" size="large" @click="offPop">返回</el-button>
</p>
</el-dialog>
@ -194,51 +173,47 @@
</template>
<script lang="ts" setup name="admin">
import {
adminEdit,
adminLists,
adminDelete,
generateGontract,
sendMsgApi,
} from "@/api/perms/admin";
import { roleAll } from "@/api/perms/role";
import { useDictOptions } from "@/hooks/useDictOptions";
import { usePaging } from "@/hooks/usePaging";
import feedback from "@/utils/feedback";
import EditPopup from "./edit.vue";
const editRef = shallowRef<InstanceType<typeof EditPopup>>();
import { adminEdit, adminLists, adminDelete, generateGontract, sendMsgApi } from '@/api/perms/admin'
import { roleAll } from '@/api/perms/role'
import { useDictOptions } from '@/hooks/useDictOptions'
import { usePaging } from '@/hooks/usePaging'
import feedback from '@/utils/feedback'
import EditPopup from './edit.vue'
const route = useRoute()
const editRef = shallowRef<InstanceType<typeof EditPopup>>()
//
const formData = reactive({
name: "",
role_id: "",
});
const contractId = ref("");
name: '',
role_id: '',
company_id: ''
})
const contractId = ref('')
//
const showPop = ref(false);
const showConctactPop = ref(false);
const showPop = ref(false)
const showConctactPop = ref(false)
const offPop = () => {
showPop.value = false;
showConctactPop.value = false;
};
showPop.value = false
showConctactPop.value = false
}
const creContct = () => {
// feedback.msgSuccess("");
generateGontract({ id: contractId.value }).then(() => {
feedback.msgSuccess("发送成功");
});
offPop();
};
feedback.msgSuccess('发送成功')
})
offPop()
}
const sendMsg = () => {
sendMsgApi({ id: contractId.value }).then((res) => {
feedback.msgSuccess("发送成功");
});
offPop();
};
feedback.msgSuccess('发送成功')
})
offPop()
}
//
const showEdit = ref(false);
const showEdit = ref(false)
const { pager, getLists, resetParams, resetPage } = usePaging({
fetchFun: adminLists,
params: formData,
});
params: formData
})
const changeStatus = (data: any) => {
adminEdit({
@ -247,52 +222,54 @@ const changeStatus = (data: any) => {
name: data.name,
role_id: data.role_id,
disable: data.disable,
multipoint_login: data.multipoint_login,
multipoint_login: data.multipoint_login
}).finally(() => {
getLists();
});
};
getLists()
})
}
//
const isCheck = ref(false);
const isCheck = ref(false)
const handleCheck = async (data: any) => {
isCheck.value = true;
showEdit.value = true;
await nextTick();
editRef.value?.open("edit");
editRef.value?.setFormData(data);
};
isCheck.value = true
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
const handleAdd = async () => {
isCheck.value = false;
showEdit.value = true;
await nextTick();
editRef.value?.open("add");
};
isCheck.value = false
showEdit.value = true
await nextTick()
editRef.value?.open('add')
}
const handleEdit = async (data: any) => {
isCheck.value = false;
showEdit.value = true;
await nextTick();
editRef.value?.open("edit");
editRef.value?.setFormData(data);
};
isCheck.value = false
showEdit.value = true
await nextTick()
editRef.value?.open('edit')
editRef.value?.setFormData(data)
}
const handleDelete = async (id: number) => {
await feedback.confirm("确定要删除?");
await adminDelete({ id });
getLists();
};
await feedback.confirm('确定要删除?')
await adminDelete({ id })
getLists()
}
const { optionsData } = useDictOptions<{
role: any[];
role: any[]
}>({
role: {
api: roleAll,
},
});
api: roleAll
}
})
if (route.query.company_id) {
formData.company_id = route.query.company_id?.toString()
}
onMounted(() => {
getLists();
});
getLists()
})
</script>
<style lang="scss" scoped>
h1 {