cxc/cas_cloud_admin
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

企业列表地区选择器

Browse Source
This commit is contained in:
cxc
2022-07-25 17:32:16 +08:00
parent 65fd5e1adb
commit a18495cc1c
6 changed files with 322 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env.production
View File

@ -7,6 +7,7 @@ VITE_APP_ENV = 'production'
# 若依管理系统/生产环境
# VITE_APP_BASE_API = '/prod-api'
VITE_APP_BASE_API = 'http://120.26.107.74:1618'
#VITE_APP_BASE_API = '/api'
# 是否在打包时开启压缩，支持 gzip 和 brotli
VITE_BUILD_COMPRESS = gzip

152
src/views/components/CityOptions/index.vue
View File

@ -1,7 +1,7 @@
<template>
<el-form
ref="form"
:model="value"
ref="formRef"
:model="modelValue"
:rules="rules"
:label-width="labelWidth + 'px'"
>
@ -12,16 +12,16 @@
<el-col :span="7">
<el-form-item prop="province">
<el-select
v-model="value.province"
v-model="modelValue.province"
clearable
placeholder="请选择"
@change="provinceCodeChange"
@change="provinceChanged"
>
<el-option
v-for="(key, value) in provinceSelectList"
:key="value"
:label="key"
:value="value"
v-for="item in provinceSelectList"
:key="item.provinceCode"
:label="item.provinceName"
:value="item.provinceCode"
>
</el-option>
</el-select>
@ -30,16 +30,16 @@
<el-col :span="7">
<el-form-item prop="city">
<el-select
v-model="value.city"
v-model="modelValue.city"
clearable
placeholder="请选择"
@change="cityCodeChange"
@change="cityChanged"
>
<el-option
v-for="(key, value) in citySelectList"
:key="value"
:label="key"
:value="value"
v-for="item in citySelectList"
:key="item.cityCode"
:label="item.cityName"
:value="item.cityCode"
>
</el-option>
</el-select>
@ -48,15 +48,15 @@
<el-col :span="7">
<el-form-item prop="district">
<el-select
v-model="value.district"
v-model="modelValue.district"
clearable
placeholder="请选择"
>
<el-option
v-for="(key, value) in districtSelectList"
:key="value"
:label="key"
:value="value"
v-for="item in districtSelectList"
:key="item.areaCode"
:label="item.areaName"
:value="item.areaCode"
>
</el-option>
</el-select>
@ -68,33 +68,83 @@
</el-row>
</el-form>
</template>
<script>
import { areaList } from "@/api/config";
export default {
props: {
value: Object,
labelWidth: {
type: Number,
default: 120,
},
<script setup name="CityOptions">
import { provinceList, cityList, districtList } from "@/api/config";
import { reactive, ref, toRefs } from "vue";
const props = defineProps({
modelValue: Object,
labelWidth: {
type: Number,
default: 120,
},
});
const { modelValue, labelWidth } = toRefs(props);
const formRef = ref(null);
const provinceSelectList = ref([]); // 省
const citySelectList = ref([]); // 市
const districtSelectList = ref([]); // 区\
const data = reactive({
rules: {
province: [
{ required: true, message: "请选择", trigger: ["change", "blue"] },
],
city: [{ required: true, message: "请选择", trigger: ["change", "blue"] }],
district: [
{ required: true, message: "请选择", trigger: ["change", "blue"] },
],
},
});
const { rules } = toRefs(data);
// 获取 省列表
const getProvinceList = async () => {
const resp = await provinceList();
provinceSelectList.value = resp.data;
};
// 获取市列表
const getCityListByProvinceId = async (provinceId) => {
const { data } = await cityList(provinceId);
citySelectList.value = data;
};
// 根据市id获取县区列表
const getAreaListByCityId = async (cityId) => {
const { data } = await districtList(cityId);
districtSelectList.value = data;
};
// 当省改变时
const provinceChanged = () => {
// 清除市县代码列表
modelValue.value.city = undefined;
modelValue.value.district = undefined;
// 清除市县列表
citySelectList.value = [];
districtSelectList.value = [];
// 重新请求城市列表
modelValue.value.province &&
getCityListByProvinceId(modelValue.value.province);
};
// 当市改变时
const cityChanged = () => {
// 清除县区代码列表
modelValue.value.district = undefined;
districtSelectList.value = [];
modelValue.value.city && getAreaListByCityId(modelValue.value.city);
};
const validateForm = async () => {
return await formRef.value.validate();
};
getProvinceList();
defineExpose({
validateForm,
});
</script>
<!-- <script>
export default {
data() {
return {
provinceSelectList: [], // 省
citySelectList: [], // 市
districtSelectList: [], // 区
rules: {
province: [
{ required: true, message: "请选择", trigger: ["change", "blue"] },
],
city: [
{ required: true, message: "请选择", trigger: ["change", "blue"] },
],
district: [
{ required: true, message: "请选择", trigger: ["change", "blue"] },
],
},
};
return {};
},
watch: {
value(newOld) {
@ -123,10 +173,10 @@ export default {
});
},
async provinceCodeChange(id) {
// delete this.value.city;
// delete this.value.district;
this.value.city = undefined;
this.value.district = undefined;
// delete this.modelValue.city;
// delete this.modelValue.district;
this.modelValue.city = undefined;
this.modelValue.district = undefined;
if (!id) {
this.citySelectList = [];
this.districtSelectList = [];
@ -135,8 +185,8 @@ export default {
this.citySelectList = await this.getProvinceByParent(id);
},
async cityCodeChange(id) {
// delete this.value.district;
this.value.district = undefined;
// delete this.modelValue.district;
this.modelValue.district = undefined;
if (!id) {
this.districtSelectList = [];
return false;
@ -157,4 +207,4 @@ export default {
});
},
};
</script>
</script> -->

400
src/views/components/ExpertForm/index.vue
View File

@ -1,7 +1,8 @@
<template>
<el-button @click="check">验证</el-button>
<el-form
ref="form"
:model="value"
ref="formRef"
:model="modelValue"
:rules="rules"
:label-width="labelWidth + 'px'"
>
@ -9,7 +10,7 @@
<el-row>
<el-col :span="24">
<el-form-item :label="imageName" prop="image">
<ImageUpload v-model="value.image" :fileSize="2" :limit="1" />
<ImageUpload v-model="modelValue.image" :fileSize="2" :limit="1" />
</el-form-item>
</el-col>
</el-row>
@ -18,7 +19,7 @@
<el-col :span="24">
<el-form-item :label="nameName" prop="name">
<el-input
v-model="value.name"
v-model="modelValue.name"
:disabled="isAdd ? false : true"
></el-input>
</el-form-item>
@ -30,7 +31,7 @@
<el-form-item label="组织机构代码:" prop="code">
<el-row type="flex" justify="space-between">
<el-col :span="20">
<el-input v-model="value.code" :disabled="!isAdd"></el-input>
<el-input v-model="modelValue.code" :disabled="!isAdd"></el-input>
</el-col>
<el-col :span="3">
<el-button type="primary" @click="" :disabled="!isAdd"
@ -45,7 +46,7 @@
<el-row v-if="formType == 2">
<el-col :span="24">
<el-form-item label="企业类型:" prop="kind">
<el-select v-model="value.kind" placeholder="请选择">
<el-select v-model="modelValue.kind" placeholder="请选择">
<el-option
v-for="item in enterpriseOptions"
:key="item.key"
@ -58,7 +59,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="核心成果核心产品:" prop="product">
<el-input v-model="value.product"></el-input>
<el-input v-model="modelValue.product"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -67,7 +68,7 @@
<el-col :span="12">
<el-form-item label="姓名:" prop="name">
<el-input
v-model="value.name"
v-model="modelValue.name"
:disabled="isAdd ? false : true"
></el-input>
</el-form-item>
@ -75,7 +76,7 @@
<el-col :span="12">
<el-form-item label="手机号:" prop="mobile">
<el-input
v-model="value.mobile"
v-model="modelValue.mobile"
:disabled="isAdd ? false : true"
></el-input>
</el-form-item>
@ -84,17 +85,30 @@
<el-row>
<el-col :span="24">
<el-form-item label="所属站点:" prop="tenant_id">
<SiteOptions :size="''" :limitWidth="false" v-model="value" />
<el-form-item label="所属站点:" prop="tenantId">
<el-select
v-model="modelValue.tenantId"
placeholder="请选择，支持搜索"
size="default"
filterable
>
<el-option
v-for="item in siteList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
<!-- <SiteOptions :size="''" :limitWidth="false" v-model="value" /> -->
</el-form-item>
</el-col>
</el-row>
<el-row v-if="formType == 1">
<el-col :span="12">
<el-form-item label="所属单位:" prop="research_id">
<el-form-item label="所属单位:" prop="researchId">
<el-select
v-model="value.research_id"
v-model="modelValue.researchId"
filterable
placeholder="请选择"
@change="setLaboratory"
@ -112,7 +126,7 @@
<el-col :span="12">
<el-form-item label="所属实验室:">
<el-select
v-model="value.laboratory_id"
v-model="modelValue.laboratory_id"
filterable
placeholder="请选择"
>
@ -128,12 +142,16 @@
</el-col>
</el-row>
<CityOptions v-model="value" :labelWidth="labelWidth" ref="cityForm" />
<CityOptions
v-model="modelValue"
:labelWidth="labelWidth"
ref="cityFormRef"
/>
<el-row>
<el-col :span="24">
<el-form-item label="详细地址:">
<el-input v-model="value.address"></el-input>
<el-input v-model="modelValue.address"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -141,7 +159,7 @@
<el-row v-if="formType == 1">
<el-col :span="24">
<el-form-item label="毕业院校:" prop="school">
<el-input v-model="value.school"></el-input>
<el-input v-model="modelValue.school"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -149,7 +167,7 @@
<el-row v-if="formType == 1">
<el-col :span="12">
<el-form-item label="最高学历:" prop="education">
<el-select v-model="value.education" placeholder="请选择">
<el-select v-model="modelValue.education" placeholder="请选择">
<el-option
v-for="item in educationOptions"
:key="item.text"
@ -162,7 +180,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="主修专业:" prop="major">
<el-input v-model="value.major"></el-input>
<el-input v-model="modelValue.major"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -170,21 +188,21 @@
<el-row v-if="formType == 1">
<el-col :span="12">
<el-form-item label="职务:" prop="job">
<el-input v-model="value.job"></el-input>
<el-input v-model="modelValue.job"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="职称:" prop="title">
<el-input v-model="value.title"></el-input>
<el-input v-model="modelValue.title"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="formType == 1">
<el-col :span="12">
<el-form-item label="从业时间:" prop="work_at">
<el-form-item label="从业时间:" prop="workAt">
<el-date-picker
v-model="value.work_at"
v-model="modelValue.workAt"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@ -194,15 +212,15 @@
</el-col>
<el-col :span="12">
<el-form-item label="性别:" prop="gender">
<el-radio v-model="value.gender" :label="1">男</el-radio>
<el-radio v-model="value.gender" :label="2">女</el-radio>
<el-radio v-model="modelValue.gender" :label="1">男</el-radio>
<el-radio v-model="modelValue.gender" :label="2">女</el-radio>
</el-form-item>
</el-col>
</el-row>
<FieldOptions v-model="value" :labelWidth="labelWidth" ref="fieldForm" />
<!-- <FieldOptions v-model="value" :labelWidth="labelWidth" ref="fieldForm" /> -->
<InputBoxAdd
<!-- <InputBoxAdd
:labelWidth="labelWidth"
v-model="value"
title="关键词"
@ -229,17 +247,20 @@
placeholder="请输入生产方向"
fieldKey="directions"
ref="directionsForm"
/>
/> -->
<el-row v-if="formType == 2">
<el-col :span="24">
<el-form-item label="邀请码:">
<el-input v-model="value.inviter_code" :disabled="!isAdd"></el-input>
<el-input
v-model="modelValue.inviter_code"
:disabled="!isAdd"
></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="企业网站:">
<el-input v-model="value.url"></el-input>
<el-input v-model="modelValue.url"></el-input>
</el-form-item>
</el-col>
</el-row>
@ -247,7 +268,11 @@
<el-row v-if="formType == 2">
<el-col :span="24">
<el-form-item label="营业执照:" prop="license">
<ImageUpload v-model="value.license" :isShowTip="false" :limit="1" />
<ImageUpload
v-model="modelValue.license"
:isShowTip="false"
:limit="1"
/>
</el-form-item>
</el-col>
</el-row>
@ -256,158 +281,194 @@
<el-form-item :label="introduceName" prop="introduce">
<el-input
v-if="formType == 1"
v-model="value.introduce"
v-model="modelValue.introduce"
type="textarea"
:autosize="{ minRows: 2, maxRows: 6 }"
/>
<Editor
<WangEditor v-model="modelValue.introduce" minHeight="150px" />
<!-- <Editor
v-else
v-model="value.introduce"
v-model="modelValue.introduce"
:minHeight="150"
ref="introduceRef"
@click.native="handleEditAble"
/>
/> -->
</el-form-item>
</el-col>
</el-row>
</el-form>
</template>
<script>
<script setup name="ExpertForm">
import CityOptions from "@/views/components/CityOptions";
import FieldOptions from "@/views/components/FieldOptions";
import InputBoxAdd from "@/views/components/InputBoxAdd";
// import FieldOptions from "@/views/components/FieldOptions";
// import InputBoxAdd from "@/views/components/InputBoxAdd";
import { researchSelect } from "@/api/dataList/research";
import { laboratorySelect } from "@/api/dataList/laboratory";
export default {
components: {
CityOptions,
FieldOptions,
InputBoxAdd,
import { tenantSelect } from "@/api/subPlatform/tenant";
import { enterpriseOptions } from "@/utils/parameter";
import { reactive, ref, toRefs } from "vue";
import WangEditor from "../../../components/WangEditor/index.vue";
const props = defineProps({
modelValue: { type: Object },
isAdd: {
type: Boolean,
default: true,
},
props: {
value: Object,
isAdd: {
type: Boolean,
default: true,
},
showTitle: {
type: Boolean,
default: false,
},
formType: {
type: Number,
default: 1,
},
labelWidth: {
type: Number,
default: 120,
},
showTitle: {
type: Boolean,
default: false,
},
computed: {
introduceName() {
let str = "";
switch (this.formType) {
case 1:
str = "个人简介:";
break;
case 2:
str = "单位简介:";
break;
default:
break;
}
return str;
},
imageName() {
let str = "";
switch (this.formType) {
case 1:
str = "专家头像:";
break;
case 2:
str = "企业logo:";
break;
default:
break;
}
return str;
},
nameName() {
let str = "";
switch (this.formType) {
case 2:
str = "单位名称:";
break;
default:
break;
}
return str;
},
formType: {
type: Number,
default: 1,
},
data() {
return {
researchOptions: [],
options: [
// { value: "", label: "" }
],
rules: {
product: [{ required: true, message: "请输入", trigger: "blur" }],
name: [{ required: true, message: "请输入", trigger: "blur" }],
kind: [{ required: true, message: "请选择", trigger: "change" }],
code: [{ required: true, message: "请输入", trigger: "blur" }],
mobile: [
{ required: true, message: "请输入", trigger: "blur" },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur",
},
],
research_id: [{ required: true, message: "请选择", trigger: "change" }],
tenant_id: [
{
required: true,
message: "请选择",
trigger: ["blur", "change"],
},
],
school: [{ required: true, message: "请输入", trigger: "blur" }],
education: [{ required: true, message: "请选择", trigger: "change" }],
major: [{ required: true, message: "请输入", trigger: "blur" }],
job: [{ required: true, message: "请输入", trigger: "blur" }],
title: [{ required: true, message: "请输入", trigger: "blur" }],
work_at: [
{
required: true,
message: "从业时间不能为空",
trigger: ["change", "blur"],
},
],
license: [
{
required: true,
message: "请上传",
trigger: ["blur", "change"],
},
],
introduce: [{ required: true, message: "请输入", trigger: "blur" }],
labelWidth: {
type: Number,
default: 120,
},
});
const { formType, modelValue } = toRefs(props);
const cityFormRef = ref(null);
const researchOptions = ref([]);
const options = ref([]);
const siteList = ref([]);
const data = reactive({
rules: {
product: [{ required: true, message: "请输入", trigger: "blur" }],
name: [{ required: true, message: "请输入", trigger: "blur" }],
kind: [{ required: true, message: "请选择", trigger: "change" }],
code: [{ required: true, message: "请输入", trigger: "blur" }],
mobile: [
{ required: true, message: "请输入", trigger: "blur" },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur",
},
};
],
researchId: [{ required: true, message: "请选择", trigger: "change" }],
tenantId: [
{
required: true,
message: "请选择",
trigger: ["blur", "change"],
},
],
school: [{ required: true, message: "请输入", trigger: "blur" }],
education: [{ required: true, message: "请选择", trigger: "change" }],
major: [{ required: true, message: "请输入", trigger: "blur" }],
job: [{ required: true, message: "请输入", trigger: "blur" }],
title: [{ required: true, message: "请输入", trigger: "blur" }],
workAt: [
{
required: true,
message: "从业时间不能为空",
trigger: ["change", "blur"],
},
],
license: [
{
required: true,
message: "请上传",
trigger: ["blur", "change"],
},
],
introduce: [{ required: true, message: "请输入", trigger: "blur" }],
},
});
const { rules } = toRefs(data);
const introduceName = computed(() => {
if (formType.value === 1) {
return "个人简介:";
} else if (formType.value === 2) {
return "单位简介:";
} else {
return "";
}
});
const imageName = computed(() => {
if (formType.value === 1) {
return "专家头像:";
} else if (formType.value === 2) {
return "企业logo:";
} else {
return "";
}
});
const nameName = computed(() => {
if (formType.value === 2) {
return "单位名称:";
} else {
return "";
}
});
// 获取站点列表
const getSiteList = async () => {
const resp = await tenantSelect();
siteList.value = resp.rows;
};
const check = async () => {
// console.log(cityFormRef.value);
// console.log(cityFormRef.value.formRef.value.validate());
cityFormRef.value
.validateForm()
.then((re) => {
console.log(re);
})
.catch((error) => {
console.log(error);
});
};
const submitForm = () => {
let flag = false;
if (this.formType == 1) {
this.$refs["form"].validate((valid) => {
const cityForm = this.$refs.cityForm.submitForm(); // 城市
const fieldForm = this.$refs.fieldForm.submitForm(); // 所属领域
const keywordsForm = this.$refs.keywordsForm.submitForm(); // 关键词
const researchsForm = this.$refs.researchsForm.submitForm(); // 研究方向
if (valid && cityForm && fieldForm && keywordsForm && researchsForm) {
flag = !flag;
}
});
} else if (this.formType == 2) {
this.$refs["form"].validate((valid) => {
const cityForm = this.$refs.cityForm.submitForm();
const fieldForm = this.$refs.fieldForm.submitForm();
const keywordsForm = this.$refs.keywordsForm.submitForm();
const directionsForm = this.$refs.directionsForm.submitForm();
if (valid && cityForm && fieldForm && keywordsForm && directionsForm) {
flag = !flag;
}
});
}
return flag;
};
getSiteList();
</script>
<!-- <script>
export default {
data() {
return {};
},
watch: {
"value.tenant_id"(newOld) {
"modelmodelValue.tenantId"(newOld) {
console.log(newOld);
if (newOld) {
if (this.formType == 1) {
// this.formType == 1 专家表单
// 获取所属单位-研究机构options
researchSelect({ tenant_id: newOld }).then(({ data }) => {
researchSelect({ tenantId: newOld }).then(({ data }) => {
this.researchOptions = data;
});
}
} else {
this.researchOptions = [];
if (this.value.research_id) this.value.research_id = undefined;
if (this.modelmodelValue.researchId) this.modelmodelValue.researchId = undefined;
}
},
},
@ -427,41 +488,10 @@ export default {
this.$refs.introduceRef.Quill.focus();
},
setLaboratory(e) {
laboratorySelect({ research_id: e }).then((res) => {
laboratorySelect({ researchId: e }).then((res) => {
console.log(res);
});
},
submitForm() {
let flag = false;
if (this.formType == 1) {
this.$refs["form"].validate((valid) => {
const cityForm = this.$refs.cityForm.submitForm(); // 城市
const fieldForm = this.$refs.fieldForm.submitForm(); // 所属领域
const keywordsForm = this.$refs.keywordsForm.submitForm(); // 关键词
const researchsForm = this.$refs.researchsForm.submitForm(); // 研究方向
if (valid && cityForm && fieldForm && keywordsForm && researchsForm) {
flag = !flag;
}
});
} else if (this.formType == 2) {
this.$refs["form"].validate((valid) => {
const cityForm = this.$refs.cityForm.submitForm();
const fieldForm = this.$refs.fieldForm.submitForm();
const keywordsForm = this.$refs.keywordsForm.submitForm();
const directionsForm = this.$refs.directionsForm.submitForm();
if (
valid &&
cityForm &&
fieldForm &&
keywordsForm &&
directionsForm
) {
flag = !flag;
}
});
}
return flag;
},
},
};
</script>
@ -481,4 +511,4 @@ export default {
display: block;
width: 100%;
}
</style>
</style> -->

7
src/views/dataList/enterprise/add.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<!-- <div style="width: 50%">
<div style="width: 50%">
<ExpertForm
v-model="form"
:showTitle="true"
@ -8,15 +8,14 @@
:labelWidth="140"
ref="expertFormRef"
/>
</div> -->
</div>
<el-button @click="cancel">取消</el-button>
<el-button type="primary" @click="submitForm">提交</el-button>
</div>
</template>
<script setup name="EnterpriseAdd">
// import ExpertForm from "@/views/components/ExpertForm";
import ExpertForm from "@/views/components/ExpertForm";
import tab from "@/plugins/tab";
import {
companyAdd,

2
src/views/login.vue
View File

@ -127,7 +127,7 @@ function handleLogin() {
function getCode() {
getCodeImg().then(res => {
captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled;
captchaEnabled.value = res.captchaOnOff === undefined ? true : res.captchaOnOff;
if (captchaEnabled.value) {
codeUrl.value = "data:image/gif;base64," + res.img;
loginForm.value.uuid = res.uuid;

2
src/views/website/siteSet/footer/index.vue
View File

@ -243,7 +243,7 @@ const getTreeselect = (options) => {
delete item.children;
});
menuOptions.value = [];
const menu = { id: "", title: "主类目", children: [] };
const menu = { id: 0, title: "主类目", children: [] };
menu.children = arr;
menuOptions.value.push(menu);
};