修复部分bug

This commit is contained in:
weipengfei 2023-08-12 11:15:52 +08:00
parent 49e3ba2b74
commit f0d4bdb1ef
5 changed files with 1525 additions and 1298 deletions

View File

@ -179,6 +179,8 @@
</el-col>
<el-col :span="24" class="el-card pt-6">
<div class="tit">主要联系人</div>
<el-row>
<el-col :span="2">
<div class="headimg">
<el-upload
:disabled="isDisabled"
@ -189,12 +191,18 @@
:show-file-list="false"
:on-success="handleAvatarSuccessAvatar"
>
<img v-if="formData.avatar" :src="formData.avatar" class="avatar" />
<img
v-if="formData.avatar"
:src="formData.avatar"
class="avatar"
/>
<el-icon v-else class="avatar-uploader-icon">
<Plus />
</el-icon>
</el-upload>
</div>
</el-col>
<el-col :span="20">
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="master_name">
@ -258,7 +266,7 @@
<el-input
:disabled="isDisabled"
v-model="formData.id_card"
placeholder="请输入生份证"
placeholder="请输入身份证"
clearable
:style="{ width: '100%' }"
></el-input>
@ -278,6 +286,8 @@
</el-col> -->
</el-row>
</el-col>
</el-row>
</el-col>
<el-col :span="24" class="el-card pt-6">
<div class="tit">其他联系人</div>
@ -381,7 +391,7 @@
</el-form-item>
<el-form-item class="others" label="其他资质">
<div
v-for="(v, i) in formData.qualification.qualifications"
v-for="(v, i) in formData.qualification.other_qualifications"
:key="i"
class="otherimg"
>
@ -653,7 +663,7 @@ const formData = reactive({
qualification: {
business_license: "",
business_licenseB: "",
qualifications: [],
other_qualifications: [],
bank_accountB: [],
bank_account: [],
},
@ -816,7 +826,8 @@ const handleAvatarSuccess_two: UploadProps["onSuccess"] = (
ElMessage.error(response.msg);
return;
}
formData.qualification.qualifications.push(response.data.uri);
formData.qualification.other_qualifications.push(response.data.uri);
// console.log(formData.qualification.other_qualifications);
};
const handleAvatarSuccess_twoB: UploadProps["onSuccess"] = (
response,
@ -981,23 +992,30 @@ const getDetails = async () => {
];
if (data[key] != null && data[key] != undefined) {
formData[key] = data[key];
if (key == "qualification" && formData.qualification.qualifications) {
try {
if (Array.isArray(JSON.parse(formData.qualification.qualifications))) {
formData.qualification.qualifications = JSON.parse(
formData.qualification.qualifications
);
} else {
const str = formData.qualification.qualifications;
formData.qualification.qualifications = [];
formData.qualification.qualifications.push(str);
}
} catch (error) {
const str = formData.qualification.qualifications;
formData.qualification.qualifications = [];
formData.qualification.qualifications.push(str);
}
}
// if (
// key == "qualification" &&
// formData.qualification.other_qualifications
// ) {
// try {
// if (
// Array.isArray(
// JSON.parse(formData.qualification.other_qualifications)
// )
// ) {
// formData.qualification.other_qualifications = JSON.parse(
// formData.qualification.other_qualifications
// );
// } else {
// const str = formData.qualification.other_qualifications;
// formData.qualification.other_qualifications = [];
// formData.qualification.other_qualifications.push(str);
// }
// } catch (error) {
// const str = formData.qualification.other_qualifications;
// formData.qualification.other_qualifications = [];
// formData.qualification.other_qualifications.push(str);
// }
// }
}
if (stringArr.includes(key)) formData[key] = formData[key].toString();
});
@ -1017,7 +1035,7 @@ const getDetails = async () => {
};
const clickdelete = (index) => {
if (!route.query.read) {
formData.qualification.qualifications.splice(index, 1);
formData.qualification.other_qualifications.splice(index, 1);
}
};
@ -1037,8 +1055,8 @@ const handleAvatarSuccessAvatar: UploadProps["onSuccess"] = (
const create = async () => {
await formRef.value?.validate();
const data = JSON.parse(JSON.stringify({ ...formData }));
data.qualification.qualifications = JSON.stringify(
data.qualification.qualifications
data.qualification.other_qualifications = JSON.stringify(
data.qualification.other_qualifications
);
if (route.query.id) {
await apiCompanyEdit(data);
@ -1075,9 +1093,9 @@ defineExpose({
.headimg {
margin-left: 18px;
margin-bottom: 18px;
width: 120px;
height: 140px;
float: left;
overflow: hidden;
}

View File

@ -219,8 +219,11 @@
@click="handleAuthentication(row.id)"
>企业认证</el-button
>
<template v-if="row.is_contract == 0">
<template v-if="row.is_authentication && row.is_contract == 0">
<el-button
v-if="
Array.isArray(row.contract) && row.contract.length == 0
"
v-perms="['company/initiate_contract']"
type="primary"
link
@ -228,6 +231,17 @@
>生成合同</el-button
>
<el-button
v-if="
Array.isArray(row.contract) && row.contract.length == 0
"
v-perms="['company/initiate_contract']"
type="warning"
link
@click="showChangeCompany(row)"
>生成合同</el-button
>
<el-button
v-else-if="row.contract?.check_status == 2"
v-perms="['company/Draftingcontracts']"
type="primary"
link
@ -235,6 +249,7 @@
>发送合同</el-button
>
<el-button
v-else-if="row.contract?.check_status == 3"
v-perms="['company/postsms']"
type="primary"
link

View File

@ -12,7 +12,11 @@
class="select"
>
<el-form-item label="公司名称" prop="company_name" required>
<el-input disabled v-model="compeny.company_name" placeholder="请输入公司名称" />
<el-input
disabled
v-model="compeny.company_name"
placeholder="请输入公司名称"
/>
</el-form-item>
<el-form-item label="社会代码" prop="organization_code" required>
<el-input
@ -22,7 +26,11 @@
/>
</el-form-item>
<el-form-item label="主要联系人" prop="company_name" required>
<el-input disabled v-model="compeny.master_name" placeholder="请输入主要联系人" />
<el-input
disabled
v-model="compeny.master_name"
placeholder="请输入主要联系人"
/>
</el-form-item>
<el-form-item label="公司类型" prop="compeny">
<el-select
@ -33,17 +41,27 @@
</el-select>
</el-form-item>
<el-form-item label="省" prop="province">
<el-select disabled v-model="compeny.province_name" placeholder="请选择省">
<el-select
disabled
v-model="compeny.province_name"
placeholder="请选择省"
>
</el-select>
</el-form-item>
<el-form-item label="市" prop="city">
<el-select disabled v-model="compeny.city_name" placeholder="请选择市"> </el-select>
<el-select disabled v-model="compeny.city_name" placeholder="请选择市">
</el-select>
</el-form-item>
<el-form-item label="区" prop="area">
<el-select disabled v-model="compeny.area_name" placeholder="请选择区"> </el-select>
<el-select disabled v-model="compeny.area_name" placeholder="请选择区">
</el-select>
</el-form-item>
<el-form-item label="镇" prop="company_type_name">
<el-select disabled v-model="compeny.street_name" placeholder="请选择镇">
<el-select
disabled
v-model="compeny.street_name"
placeholder="请选择镇"
>
</el-select>
</el-form-item>
<el-form-item label="地址" prop="address">
@ -73,13 +91,22 @@
<img :src="compenyimg.business_license" />
</div>
</el-form-item>
<el-form-item label-width="120px" label="开户许可证" prop="contract_no" required>
<el-form-item
label-width="120px"
label="开户许可证"
prop="contract_no"
required
>
<div class="company">
<img :src="compenyimg.business_licenseB" />
</div>
</el-form-item>
<el-form-item label="其他资质" prop="contract_no" required>
<div class="company other" v-for="(v,i) in compenyimg.bank_account" :key="i">
<div
class="company other"
v-for="(v, i) in compenyimg.bank_account"
:key="i"
>
<img :src="v" />
</div>
</el-form-item>
@ -98,7 +125,11 @@
class="select"
>
<el-form-item label="公司名称" prop="company_name" required>
<el-input disabled v-model="compenyB.company_name" placeholder="请输入公司名称" />
<el-input
disabled
v-model="compenyB.company_name"
placeholder="请输入公司名称"
/>
</el-form-item>
<el-form-item label="社会代码" prop="organization_code" required>
<el-input
@ -117,10 +148,18 @@
</el-select>
</el-form-item>
<el-form-item label="主要联系人" prop="master_name" required>
<el-input disabled v-model="compenyB.master_name" placeholder="请输入主要联系人" />
<el-input
disabled
v-model="compenyB.master_name"
placeholder="请输入主要联系人"
/>
</el-form-item>
<el-form-item label="省" prop="province">
<el-select disabled v-model="compenyB.province_name" placeholder="请选择省">
<el-select
disabled
v-model="compenyB.province_name"
placeholder="请选择省"
>
</el-select>
</el-form-item>
<el-form-item label="市" prop="city">
@ -132,7 +171,11 @@
</el-select>
</el-form-item>
<el-form-item label="镇" prop="street">
<el-select disabled v-model="compenyB.street_name" placeholder="请选择镇">
<el-select
disabled
v-model="compenyB.street_name"
placeholder="请选择镇"
>
<el-option></el-option>
</el-select>
</el-form-item>
@ -163,13 +206,22 @@
<img :src="compenyBimg.business_license" />
</div>
</el-form-item>
<el-form-item label-width="120px" label="开户许可证" prop="contract_no" required>
<el-form-item
label-width="120px"
label="开户许可证"
prop="contract_no"
required
>
<div class="company">
<img :src="compenyBimg.business_licenseB" />
</div>
</el-form-item>
<el-form-item class="other" label="其他资质" prop="contract_no" required>
<div class="company" v-for="(v,i) in compenyBimg.qualifications" :key="i">
<div
class="company"
v-for="(v, i) in compenyBimg.other_qualifications"
:key="i"
>
<img :src="v" />
</div>
</el-form-item>
@ -190,19 +242,31 @@
class="person_select"
>
<el-form-item label="姓名">
<el-input disabled v-model="persen.nickname" placeholder="请输入姓名" />
<el-input
disabled
v-model="persen.nickname"
placeholder="请输入姓名"
/>
</el-form-item>
<el-form-item label="性别">
<el-input disabled v-model="persen.sex" placeholder="请输入性别" />
</el-form-item>
<el-form-item label="联系电话">
<el-input disabled v-model="persen.mobile" placeholder="请输入联系电话" />
<el-input
disabled
v-model="persen.mobile"
placeholder="请输入联系电话"
/>
</el-form-item>
<el-form-item label="身份证号">
<el-input v-model="persen.id" placeholder="请输入身份证号" disabled />
</el-form-item>
<el-form-item label="省" prop="province">
<el-select disabled v-model="persen.province_name" placeholder="请选择省">
<el-select
disabled
v-model="persen.province_name"
placeholder="请选择省"
>
</el-select>
</el-form-item>
<el-form-item label="市" prop="city">
@ -215,7 +279,11 @@
</el-select>
</el-form-item>
<el-form-item label="镇" prop="street">
<el-select disabled v-model="persen.street_name" placeholder="请选择镇">
<el-select
disabled
v-model="persen.street_name"
placeholder="请选择镇"
>
<el-option></el-option>
</el-select>
</el-form-item>
@ -227,18 +295,21 @@
<span>个人资质信息</span>
</template>
<el-form class="idcard" :model="persenimg" :inline="true">
<el-form-item label="身份证">
<el-form-item label="身份证">
<img :src="persenimg.id_card" />
<img :src="persenimg.id_card_b" />
</el-form-item>
<el-form-item label="行驶证号">
<img :src="persenimg.car_card" />
<img :src="persenimg.car_card_b" />
</el-form-item>
<el-form-item label="银行卡号">
<el-form-item label="银行卡">
<img :src="persenimg.bank_account" />
<img :src="persenimg.bank_account_b" />
</el-form-item>
<el-form-item
v-if="persenimg.car_card || persenimg.car_card_b"
label="行驶证"
>
<img v-if="persenimg.car_card" :src="persenimg.car_card" />
<img v-if="persenimg.car_card_b" :src="persenimg.car_card_b" />
</el-form-item>
</el-form>
</el-card>
<el-card>
@ -253,25 +324,25 @@
label-width="90px"
:rules="formRules"
>
<el-form-item label="签约方" prop="contract_type">
<el-form-item label="方" prop="contract_type">
<el-input
v-model="compeny.company_name"
:disabled="true"
placeholder="暂无签约方"
placeholder="暂无甲方方"
/>
</el-form-item>
<el-form-item label="被签约公司" prop="contract_no">
<el-form-item label="乙方" prop="contract_no">
<el-input
v-model="compenyB.company_name"
:disabled="true"
placeholder="暂无签约方"
placeholder="暂无方"
/>
</el-form-item>
<el-form-item label="合同类型" prop="contract_no">
<el-input
v-model="basicdata.contract_type_name"
:disabled="true"
placeholder="暂无签约方"
placeholder="暂无合同"
/>
</el-form-item>
<!-- <el-form-item label="合同编号" prop="contract_no">
@ -284,8 +355,8 @@
</el-form>
</el-card>
<el-card v-if="isshow">
<el-form>
<el-form-item label="合同上传" prop="field127">
<el-form label>
<el-form-item label="合同上传" label-width="100px" prop="field127">
<el-upload
:headers="{ Token: userStore.token }"
v-model:file-list="fileList"
@ -298,96 +369,121 @@
<el-button type="primary">上传</el-button>
</el-upload>
</el-form-item>
<el-form-item>
<el-button
style="margin-left: 100px"
type="primary"
@click="submitContract"
>确定</el-button
>
</el-form-item>
</el-form>
</el-card>
</template>
<script lang="ts" setup>
import type { FormInstance, UploadProps, ElMessage, UploadUserFile } from 'element-plus'
import { apiContractDetail } from '@/api/contract'
import { ref, reactive, defineExpose, computed } from 'vue'
import { useRoute } from 'vue-router'
import { dictDataLists } from '@/api/setting/dict'
import { upContact } from '@/api/consumer'
const { query } = useRoute()
import useUserStore from '@/stores/modules/user'
import {
type FormInstance,
type UploadProps,
ElMessage,
type UploadUserFile,
} from "element-plus";
import { apiContractDetail } from "@/api/contract";
import { ref, reactive, defineExpose, computed } from "vue";
import { useRoute } from "vue-router";
import { dictDataLists } from "@/api/setting/dict";
import { upContact } from "@/api/consumer";
const { query } = useRoute();
import useUserStore from "@/stores/modules/user";
const formData = reactive({
id: '',
company_id: '',
contract_type: '',
contract_type_name: '',
contract_no: '',
file: '',
status: '',
party_a: '',
party_a_name: '',
party_b: '',
party_b_name: '',
area_manager: '',
area_manager_name: '',
type_name: '',
url: '',
status_name: ''
})
const fileList = ref<UploadUserFile[]>([])
const basicdata = ref({})
const compeny = ref({})
const compenyimg = ref([])
const compenyB = ref([])
const compenyBimg = ref([])
const persen = ref([])
const persenimg = ref([])
const show = ref(true)
const flag = ref(true)
const isshow=ref(true)
const route = useRoute()
const userStore = useUserStore()
id: "",
company_id: "",
contract_type: "",
contract_type_name: "",
contract_no: "",
file: "",
status: "",
party_a: "",
party_a_name: "",
party_b: "",
party_b_name: "",
area_manager: "",
area_manager_name: "",
type_name: "",
url: "",
status_name: "",
});
const fileList = ref<UploadUserFile[]>([]);
const basicdata = ref({});
const compeny = ref({});
const compenyimg = ref([]);
const compenyB = ref([]);
const compenyBimg = ref([]);
const persen = ref([]);
const persenimg = ref([]);
const show = ref(true);
const flag = ref(true);
const isshow = ref(true);
const route = useRoute();
const userStore = useUserStore();
async function render() {
//
const res = await apiContractDetail({ id: query.id })
compeny.value = res.party_a_info
basicdata.value = res
if(basicdata.value.status==1){isshow.value=false}
const res = await apiContractDetail({ id: query.id });
compeny.value = res.party_a_info;
basicdata.value = res;
if (basicdata.value.status == 1) {
isshow.value = false;
}
try {
res.party_a_info.qualification.bank_account = JSON.parse(
res.party_a_info.qualification.bank_account
)
compenyimg.value = res.party_a_info.qualification
res.party_b_info.qualification.qualifications = JSON.parse(
res.party_b_info.qualification.qualifications
)
compenyBimg.value = res.party_b_info.qualification
);
compenyimg.value = res.party_a_info.qualification;
res.party_b_info.qualification.other_qualifications = JSON.parse(
res.party_b_info.qualification.other_qualifications
);
compenyBimg.value = res.party_b_info.qualification;
} catch (error) {}
compenyimg.value = res.party_a_info.qualification
compenyimg.value = res.party_a_info.qualification;
console.log(compenyimg.value);
if (res.type == 2) {
show.value = false
res.party_b_info.sex == 1 ? (res.party_b_info.sex = '男') : (res.party_b_info.sex = '女')
persen.value = res.party_b_info
persenimg.value = res.party_b_info.qualification
show.value = false;
res.party_b_info.sex == 1
? (res.party_b_info.sex = "男")
: (res.party_b_info.sex = "女");
persen.value = res.party_b_info;
persenimg.value = res.party_b_info.qualification;
}
if (res.type == 1) {
compenyB.value = res.party_b_info
compenyBimg.value = res.party_b_info.qualification
flag.value = false
compenyB.value = res.party_b_info;
compenyBimg.value = res.party_b_info.qualification;
flag.value = false;
} else {
compenyB.value.company_name = res.party_b_info.nickname
compenyB.value.company_name = res.party_b_info.nickname;
}
}
const handleAvatarSuccess_four: UploadProps['onSuccess'] = (response, uploadFile) => {
const handleAvatarSuccess_four: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
}
formData.file = response.data.uri
upContact({ file: formData.file, id: route.query.id })
ElMessage.error(response.msg);
return;
}
formData.file = response.data.uri;
};
const submitContract = () => {
if (!formData.file) ElMessage.error("请先上传合同!");
upContact({ file: formData.file, id: route.query.id });
};
onMounted(async () => {
await render()
})
await render();
});
</script>
<style lang="scss" scoped>
@ -435,6 +531,7 @@ onMounted(async () => {
img {
width: 10vw;
height: 6.3vw;
margin-right: 12px;
}
}
.company_z {
@ -448,4 +545,12 @@ onMounted(async () => {
.el-card {
margin-top: 10px;
}
.el-upload-list .el-upload-list__item-thumbnail {
width: 500px; /* 设置文件缩略图的宽度 */
}
.el-upload-list .el-upload-list__item-name {
max-width: 450px; /* 设置文件名的最大宽度 */
}
</style>

View File

@ -8,7 +8,12 @@
@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
@ -130,7 +135,12 @@
</el-select>
</el-form-item>
<el-form-item label="镇" prop="street" style="flex: 1">
<el-form-item
v-if="disabledPartyA"
label="镇"
prop="street"
style="flex: 1"
>
<el-select
:disabled="isCheck"
v-model="formData.street"
@ -147,7 +157,12 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="村社小队" prop="address" style="flex: 1.5">
<el-form-item
v-if="disabledPartyA"
label="村社小队"
prop="address"
style="flex: 1.5"
>
<el-input
:disabled="isCheck"
v-model="formData.address"
@ -195,64 +210,74 @@
</div>
</template>
<script lang="ts" setup>
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)
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,
contract: {
url: ''
}
})
url: "",
},
});
//
const datas: any = reactive({
provinceOptions: [],
@ -261,291 +286,330 @@ 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 = ''
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 = ''
disabledPartyA.value = false;
formData.party_a = "";
} else {
disabledPartyA.value = true
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')
: await adminAdd(formData).then((res) => console.log(res));
popupRef.value?.close();
emit("success");
};
const open = (type = "add") => {
mode.value = type;
popupRef.value?.open();
if (type == "view") {
isCheck.value = true;
}
const open = (type = 'add') => {
mode.value = type
popupRef.value?.open()
if (type == 'view') {
isCheck.value = true
}
}
const fileList = ref<UploadUserFile[]>([])
};
const fileList = ref<UploadUserFile[]>([]);
// url
const handleAvatarSuccessIdA: UploadProps['onSuccess'] = (response, uploadFile) => {
const handleAvatarSuccessIdA: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
ElMessage.error(response.msg);
return;
}
formData.qualification.id_card = response.data.uri
}
const handleAvatarSuccessAvatar: UploadProps['onSuccess'] = (response, uploadFile) => {
formData.qualification.id_card = response.data.uri;
};
const handleAvatarSuccessAvatar: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
ElMessage.error(response.msg);
return;
}
formData.avatar = response.data.uri
}
const handleAvatarSuccessIdB: UploadProps['onSuccess'] = (response, uploadFile) => {
formData.avatar = response.data.uri;
};
const handleAvatarSuccessIdB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
ElMessage.error(response.msg);
return;
}
formData.qualification.id_card_b = response.data.uri
}
const handleAvatarSuccessCarA: UploadProps['onSuccess'] = (response, uploadFile) => {
formData.qualification.id_card_b = response.data.uri;
};
const handleAvatarSuccessCarA: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
ElMessage.error(response.msg);
return;
}
formData.qualification.car_card = response.data.uri
}
const handleAvatarSuccessCarB: UploadProps['onSuccess'] = (response, uploadFile) => {
formData.qualification.car_card = response.data.uri;
};
const handleAvatarSuccessCarB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
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) => {
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
ElMessage.error(response.msg);
return;
}
formData.qualification.bank_account = response.data.uri
}
const handleAvatarSuccessBankB: UploadProps['onSuccess'] = (response, uploadFile) => {
formData.qualification.bank_account = response.data.uri;
};
const handleAvatarSuccessBankB: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
ElMessage.error(response.msg);
return;
}
formData.qualification.bank_account_b = response.data.uri
}
const handleAvatarSuccess_four: UploadProps['onSuccess'] = (response, uploadFile) => {
formData.qualification.bank_account_b = response.data.uri;
};
const handleAvatarSuccess_four: UploadProps["onSuccess"] = (
response,
uploadFile
) => {
if (response.code == 0) {
ElMessage.error(response.msg)
return
ElMessage.error(response.msg);
return;
}
formData.file = response.data.uri
formData.file = response.data.uri;
fileList.value[0].url = response.data.uri
fileList.value[0].name = '合同文件'
}
const beforeAvatarUpload_three: UploadProps['beforeUpload'] = (rawFile) => {
return true
}
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
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
disabledPartyA.value = false;
}
fileList.value[0] = {
url: data['contract']['file'],
name: '合同文件'
}
await getCityList()
await getAreaList()
await getStreetList()
}
url: data.contract?.file,
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,10 +57,14 @@
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="是否签约"
@ -69,11 +73,17 @@
min-width="120"
>
<template #default="{ row }">
<span v-if="row.is_contract == 1" style="color: #67c23a">已签约</span>
<span v-if="row.is_contract == 1" style="color: #67c23a"
>已签约</span
>
<span v-else style="color: #fe0000">未签约</span>
</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"
@ -81,7 +91,11 @@
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"
@ -93,7 +107,12 @@
</template>
</el-table-column>
<el-table-column label="操作" width="330" align="center" fixed="right">
<el-table-column
label="操作"
width="230"
align="center"
fixed="right"
>
<template #default="{ row }">
<div style="display: flex">
<el-button
@ -126,7 +145,7 @@
@click="handleAbolition(row.id)"
>废除合同</el-button
> -->
<template v-if="row.company_id != 0 && row.is_contract == 0">
<!-- <template v-if="row.company_id != 0 && row.is_contract == 0">
<el-button
v-perms="['auth.admin/Draftingcontracts']"
type="primary"
@ -145,7 +164,7 @@
@click=";(showPop = true), (contractId = row.id)"
>重新短信</el-button
>
</template>
</template> -->
</div>
</template>
</el-table-column>
@ -171,10 +190,16 @@
确认签约短信将在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>
@ -188,48 +213,48 @@ import {
adminDelete,
generateGontract,
sendMsgApi,
abolition
} 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>>()
abolition,
} 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: '',
company_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({
@ -238,65 +263,65 @@ 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 handleView = async (data: any) => {
isCheck.value = false
showEdit.value = true
await nextTick()
editRef.value?.open('view')
editRef.value?.setFormData(data)
}
isCheck.value = false;
showEdit.value = true;
await nextTick();
editRef.value?.open("view");
editRef.value?.setFormData(data);
};
const handleDelete = async (id: number) => {
await feedback.confirm('确定要删除?')
await adminDelete({ id })
getLists()
}
await feedback.confirm("确定要删除?");
await adminDelete({ id });
getLists();
};
const handleAbolition = async (id: number) => {
await feedback.confirm('确定要废除合同?')
await abolition({ id })
getLists()
}
await feedback.confirm("确定要废除合同?");
await abolition({ 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()
formData.company_id = route.query.company_id?.toString();
}
onMounted(() => {
getLists()
})
getLists();
});
</script>
<style lang="scss" scoped>
h1 {