1、字典中新增是否涉及危化证字段

2、企业基础信息页面新增是否涉及危化证字段
This commit is contained in:
Wayne 2024-05-08 09:56:55 +08:00
parent 07164903d6
commit 21f8ad9061
5 changed files with 94 additions and 64 deletions

View File

@ -1,53 +1,54 @@
import request from '@/config/axios' import request from '@/config/axios'
// 企业信息 VO // 企业信息 VO
export interface EnterpriseInformationVO { export interface EnterpriseInformationVO {
id: number // 编号 id: number // 编号
name: string // 企业名称 name: string // 企业名称
legalPerson: string // 企业法定代表人 legalPerson: string // 企业法定代表人
unifiedCreditCode: string // 统一信用代码 unifiedCreditCode: string // 统一信用代码
telephone: string // 电话 telephone: string // 电话
mailbox: string // 邮箱 mailbox: string // 邮箱
registerAddress: string // 注册地址 registerAddress: string // 注册地址
communicationAddress: string // 通信地址 communicationAddress: string // 通信地址
operateState: boolean // 经营状态 operateState: number // 经营状态
establishDate: Date // 成立日期 isSecure: number //是否涉及危化证
enterpriseType: boolean // 企业类型 establishDate: Date // 成立日期
enterpriseBelongingToRegion: string // 企业所属地区 enterpriseType: number // 企业类型
enterpriseBelongingToIndustry: string // 企业所属行业 enterpriseBelongingToRegion: string // 企业所属地区
registerOffice: string // 登记机关 enterpriseBelongingToIndustry: string // 企业所属行业
operatePermitRange: string // 经营许可范围 registerOffice: string // 登记机关
} operatePermitRange: string // 经营许可范围
}
// 企业信息 API
export const EnterpriseInformationApi = { // 企业信息 API
// 查询企业信息分页 export const EnterpriseInformationApi = {
getEnterpriseInformationPage: async (params: any) => { // 查询企业信息分页
return await request.get({ url: `/fta/enterprise-information/page`, params }) getEnterpriseInformationPage: async (params: any) => {
}, return await request.get({ url: `/fta/enterprise-information/page`, params })
},
// 查询企业信息详情
getEnterpriseInformation: async (id: number) => { // 查询企业信息详情
return await request.get({ url: `/fta/enterprise-information/get?id=` + id }) getEnterpriseInformation: async (id: number) => {
}, return await request.get({ url: `/fta/enterprise-information/get?id=` + id })
},
// 新增企业信息
createEnterpriseInformation: async (data: EnterpriseInformationVO) => { // 新增企业信息
return await request.post({ url: `/fta/enterprise-information/create`, data }) createEnterpriseInformation: async (data: EnterpriseInformationVO) => {
}, return await request.post({ url: `/fta/enterprise-information/create`, data })
},
// 修改企业信息
updateEnterpriseInformation: async (data: EnterpriseInformationVO) => { // 修改企业信息
return await request.put({ url: `/fta/enterprise-information/update`, data }) updateEnterpriseInformation: async (data: EnterpriseInformationVO) => {
}, return await request.put({ url: `/fta/enterprise-information/update`, data })
},
// 删除企业信息
deleteEnterpriseInformation: async (id: number) => { // 删除企业信息
return await request.delete({ url: `/fta/enterprise-information/delete?id=` + id }) deleteEnterpriseInformation: async (id: number) => {
}, return await request.delete({ url: `/fta/enterprise-information/delete?id=` + id })
},
// 导出企业信息 Excel
exportEnterpriseInformation: async (params) => { // 导出企业信息 Excel
return await request.download({ url: `/fta/enterprise-information/export-excel`, params }) exportEnterpriseInformation: async (params) => {
}, return await request.download({ url: `/fta/enterprise-information/export-excel`, params })
} },
}

View File

@ -213,5 +213,6 @@ export enum DICT_TYPE {
// ========== FTA - 自贸区模块 ========== // ========== FTA - 自贸区模块 ==========
ENTERPRISE_OPERATE_STATE = 'enterprise_operate_state', // 企业经营状态 ENTERPRISE_OPERATE_STATE = 'enterprise_operate_state', // 企业经营状态
ENTERPRISE_IS_SECURITY = 'enterprise_is_secure', //是否涉及危化证
ENTERPRISE_TYPE = 'enterprise_type' // 企业类型 ENTERPRISE_TYPE = 'enterprise_type' // 企业类型
} }

View File

@ -67,6 +67,16 @@
<el-form-item label="经营许可范围" prop="operatePermitRange"> <el-form-item label="经营许可范围" prop="operatePermitRange">
<el-input v-model="formData.operatePermitRange" placeholder="请输入经营许可范围" /> <el-input v-model="formData.operatePermitRange" placeholder="请输入经营许可范围" />
</el-form-item> </el-form-item>
<el-form-item label="是否涉及危化证" prop="isSecure">
<el-select v-model="formData.isSecure" placeholder="请选择是否涉及危化证">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISE_IS_SECURITY)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-col v-if="startUserSelectTasks.length > 0"> <el-col v-if="startUserSelectTasks.length > 0">
<el-card class="mb-10px"> <el-card class="mb-10px">
<template #header>指定审批人</template> <template #header>指定审批人</template>
@ -126,6 +136,7 @@ const formData = ref({
registerAddress: undefined, registerAddress: undefined,
communicationAddress: undefined, communicationAddress: undefined,
operateState: undefined, operateState: undefined,
isSecure: undefined,
establishDate: undefined, establishDate: undefined,
enterpriseType: undefined, enterpriseType: undefined,
enterpriseBelongingToRegion: undefined, enterpriseBelongingToRegion: undefined,
@ -148,6 +159,7 @@ const formRules = reactive({
enterpriseBelongingToIndustry: [{ required: true, message: '企业所属行业不能为空', trigger: 'blur' }], enterpriseBelongingToIndustry: [{ required: true, message: '企业所属行业不能为空', trigger: 'blur' }],
registerOffice: [{ required: true, message: '登记机关不能为空', trigger: 'blur' }], registerOffice: [{ required: true, message: '登记机关不能为空', trigger: 'blur' }],
operatePermitRange: [{ required: true, message: '经营许可范围不能为空', trigger: 'blur' }], operatePermitRange: [{ required: true, message: '经营许可范围不能为空', trigger: 'blur' }],
isSecure: [{ required: true, message: '是否涉及危化证不能为空', trigger: 'blur' }]
}) })
const formRef = ref() // Ref const formRef = ref() // Ref

View File

@ -43,6 +43,9 @@
<el-descriptions-item label="经营许可范围"> <el-descriptions-item label="经营许可范围">
{{ detailData.operatePermitRange }} {{ detailData.operatePermitRange }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="是否涉及危化证">
<dict-tag :type="DICT_TYPE.ENTERPRISE_IS_SECURITY" :value="detailData.isSecure" />
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</ContentWrap> </ContentWrap>
</template> </template>

View File

@ -54,7 +54,7 @@
class="!w-240px" class="!w-240px"
> >
<el-option <el-option
v-for="dict in getBoolDictOptions(DICT_TYPE.ENTERPRISE_OPERATE_STATE)" v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISE_OPERATE_STATE)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@ -80,7 +80,7 @@
class="!w-240px" class="!w-240px"
> >
<el-option <el-option
v-for="dict in getBoolDictOptions(DICT_TYPE.ENTERPRISE_TYPE)" v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISE_TYPE)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@ -114,6 +114,21 @@
class="!w-240px" class="!w-240px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="是否涉及危化证" prop="operateState">
<el-select
v-model="queryParams.isSecure"
placeholder="请选择是否涉及危化证"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISE_IS_SECURITY)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@ -121,14 +136,6 @@
<Icon class="mr-5px" icon="ep:plus" /> <Icon class="mr-5px" icon="ep:plus" />
发起创建 发起创建
</el-button> </el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['fta:enterprise-information:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button <el-button
type="success" type="success"
plain plain
@ -183,6 +190,11 @@
<el-table-column label="企业所属行业" align="center" prop="enterpriseBelongingToIndustry" /> <el-table-column label="企业所属行业" align="center" prop="enterpriseBelongingToIndustry" />
<el-table-column label="登记机关" align="center" prop="registerOffice" /> <el-table-column label="登记机关" align="center" prop="registerOffice" />
<el-table-column label="经营许可范围" align="center" prop="operatePermitRange" /> <el-table-column label="经营许可范围" align="center" prop="operatePermitRange" />
<el-table-column label="是否涉及危化证" align="center" prop="isSecure">
<template #default="scope">
<dict-tag :type="DICT_TYPE.ENTERPRISE_IS_SECURITY" :value="scope.row.isSecure" />
</template>
</el-table-column>
<el-table-column align="center" label="操作"> <el-table-column align="center" label="操作">
<template #default="scope"> <template #default="scope">
<el-button <el-button
@ -224,7 +236,7 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { getBoolDictOptions, DICT_TYPE } from '@/utils/dict' import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime' import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download' import download from '@/utils/download'
import { EnterpriseInformationApi, EnterpriseInformationVO } from '@/api/fta/enterpriseinformation' import { EnterpriseInformationApi, EnterpriseInformationVO } from '@/api/fta/enterpriseinformation'
@ -249,6 +261,7 @@ const queryParams = reactive({
legalPerson: undefined, legalPerson: undefined,
unifiedCreditCode: undefined, unifiedCreditCode: undefined,
operateState: undefined, operateState: undefined,
isSecure: undefined,
establishDate: [], establishDate: [],
enterpriseType: undefined, enterpriseType: undefined,
enterpriseBelongingToIndustry: undefined, enterpriseBelongingToIndustry: undefined,