diff --git a/src/views/company_form/edit.vue b/src/views/company_form/edit.vue
index 953975a..64466dd 100644
--- a/src/views/company_form/edit.vue
+++ b/src/views/company_form/edit.vue
@@ -1,133 +1,143 @@
-<template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="" prop="company_name">
-                    <el-input v-model="formData.company_name" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="organization_code">
-                    <el-input v-model="formData.organization_code" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="address">
-                    <el-input v-model="formData.address" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="master_name">
-                    <el-input v-model="formData.master_name" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="type">
-                    <el-input v-model="formData.type" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="master_email">
-                    <el-input v-model="formData.master_email" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="notes">
-                    <el-input v-model="formData.notes" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="type_two">
-                    <el-input v-model="formData.type_two" clearable placeholder="请输入" />
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
-</template>
-
-<script lang="ts" setup name="companyFormEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiCompanyFormAdd, apiCompanyFormEdit, apiCompanyFormDetail } from '@/api/company_form'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
-defineProps({
-    dictData: {
-        type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
-
-
-// 弹窗标题
-const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑公司认证表格' : '新增公司认证表格'
-})
-
-// 表单数据
-const formData = reactive({
-    id: '',
-    company_name: '',
-    organization_code: '',
-    address: '',
-    master_name: '',
-    type: '',
-    master_email: '',
-    notes: '',
-    type_two: '',
-})
-
-
-// 表单验证
-const formRules = reactive<any>({
-
-})
-
-
-// 获取详情
-const setFormData = async (data: Record<any, any>) => {
-    for (const key in formData) {
-        if (data[key] != null && data[key] != undefined) {
-            //@ts-ignore
-            formData[key] = data[key]
-        }
-    }
-    
-    
-}
-
-const getDetail = async (row: Record<string, any>) => {
-    const data = await apiCompanyFormDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
-
-// 提交按钮
-const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiCompanyFormEdit(data) 
-        : await apiCompanyFormAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
-
-//打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
-
-// 关闭回调
-const handleClose = () => {
-    emit('close')
-}
-
-
-
-defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
-</script>
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            :title="popupTitle"
+            :async="true"
+            width="550px"
+            @confirm="handleSubmit"
+            @close="handleClose"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-form-item label="商户名称" prop="company_name">
+                    <el-input v-model="formData.company_name" clearable placeholder="请输入商户名称" />
+                </el-form-item>
+                <el-form-item label="社会信用统一代码" prop="organization_code">
+                    <el-input v-model="formData.organization_code" clearable placeholder="请输入社会信用统一代码" />
+                </el-form-item>
+                <el-form-item label="详细地址" prop="address">
+                    <el-input v-model="formData.address" clearable placeholder="请输入详细地址" />
+                </el-form-item>
+                <el-form-item label="法人名称" prop="master_name">
+                    <el-input v-model="formData.master_name" clearable placeholder="请输入法人名称" />
+                </el-form-item>
+                <el-form-item label="" prop="type">
+                    <el-input v-model="formData.type" clearable placeholder="请输入" />
+                </el-form-item>
+                <el-form-item label="法人邮箱" prop="master_email">
+                    <el-input v-model="formData.master_email" clearable placeholder="请输入法人邮箱" />
+                </el-form-item>
+                <el-form-item label="" prop="notes">
+                    <el-input v-model="formData.notes" clearable placeholder="请输入" />
+                </el-form-item>

+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="companyFormEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiCompanyFormAdd, apiCompanyFormEdit, apiCompanyFormDetail } from '@/api/company_form'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑公司认证表格' : '新增公司认证表格'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    company_name: '',
+    organization_code: '',
+    address: '',
+    master_name: '',
+    type: '',
+    master_email: '',
+    notes: '',

+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    company_name: [{
+        required: true,
+        message: '请输入商户名称',
+        trigger: ['blur']
+    }],
+    organization_code: [{
+        required: true,
+        message: '请输入社会信用统一代码',
+        trigger: ['blur']
+    }],
+    master_name: [{
+        required: true,
+        message: '请输入法人名称',
+        trigger: ['blur']
+    }],
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiCompanyFormDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiCompanyFormEdit(data) 
+        : await apiCompanyFormAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/company_form/index.vue b/src/views/company_form/index.vue
index 93bab60..69361d7 100644
--- a/src/views/company_form/index.vue
+++ b/src/views/company_form/index.vue
@@ -1,160 +1,155 @@
-<template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="" prop="company_name">
-                    <el-input class="w-[280px]" v-model="queryParams.company_name" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="organization_code">
-                    <el-input class="w-[280px]" v-model="queryParams.organization_code" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="address">
-                    <el-input class="w-[280px]" v-model="queryParams.address" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="master_name">
-                    <el-input class="w-[280px]" v-model="queryParams.master_name" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="type">
-                    <el-input class="w-[280px]" v-model="queryParams.type" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="master_email">
-                    <el-input class="w-[280px]" v-model="queryParams.master_email" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="notes">
-                    <el-input class="w-[280px]" v-model="queryParams.notes" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="" prop="type_two">
-                    <el-input class="w-[280px]" v-model="queryParams.type_two" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['company_form/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
-                v-perms="['company_form/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
-                删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="" prop="company_name" show-overflow-tooltip />
-                    <el-table-column label="" prop="organization_code" show-overflow-tooltip />
-                    <el-table-column label="" prop="address" show-overflow-tooltip />
-                    <el-table-column label="" prop="master_name" show-overflow-tooltip />
-                    <el-table-column label="" prop="type" show-overflow-tooltip />
-                    <el-table-column label="" prop="master_email" show-overflow-tooltip />
-                    <el-table-column label="" prop="notes" show-overflow-tooltip />
-                    <el-table-column label="" prop="type_two" show-overflow-tooltip />
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                             <el-button
-                                v-perms="['company_form/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['company_form/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
-</template>
-
-<script lang="ts" setup name="companyFormLists">
-import { usePaging } from '@/hooks/usePaging'
-import { useDictData } from '@/hooks/useDictOptions'
-import { apiCompanyFormLists, apiCompanyFormDelete } from '@/api/company_form'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
-// 是否显示编辑框
-const showEdit = ref(false)
-
-
-// 查询条件
-const queryParams = reactive({
-    company_name: '',
-    organization_code: '',
-    address: '',
-    master_name: '',
-    type: '',
-    master_email: '',
-    notes: '',
-    type_two: ''
-})
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 表格选择后回调事件
-const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
-}
-
-// 获取字典数据
-const { dictData } = useDictData('')
-
-// 分页相关
-const { pager, getLists, resetParams, resetPage } = usePaging({
-    fetchFun: apiCompanyFormLists,
-    params: queryParams
-})
-
-// 添加
-const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
-
-// 编辑
-const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
-
-// 删除
-const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiCompanyFormDelete({ id })
-    getLists()
-}
-
-getLists()
-</script>
-
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form
+                class="mb-[-16px]"
+                :model="queryParams"
+                inline
+            >
+                <el-form-item label="商户名称" prop="company_name">
+                    <el-input class="w-[280px]" v-model="queryParams.company_name" clearable placeholder="请输入商户名称" />
+                </el-form-item>
+                <el-form-item label="社会信用统一代码" prop="organization_code">
+                    <el-input class="w-[280px]" v-model="queryParams.organization_code" clearable placeholder="请输入社会信用统一代码" />
+                </el-form-item>
+                <el-form-item label="详细地址" prop="address">
+                    <el-input class="w-[280px]" v-model="queryParams.address" clearable placeholder="请输入详细地址" />
+                </el-form-item>
+                <el-form-item label="法人名称" prop="master_name">
+                    <el-input class="w-[280px]" v-model="queryParams.master_name" clearable placeholder="请输入法人名称" />
+                </el-form-item>
+                <el-form-item label="" prop="type">
+                    <el-input class="w-[280px]" v-model="queryParams.type" clearable placeholder="请输入" />
+                </el-form-item>
+                <el-form-item label="法人邮箱" prop="master_email">
+                    <el-input class="w-[280px]" v-model="queryParams.master_email" clearable placeholder="请输入法人邮箱" />
+                </el-form-item>
+                <el-form-item label="" prop="notes">
+                    <el-input class="w-[280px]" v-model="queryParams.notes" clearable placeholder="请输入" />
+                </el-form-item>

+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['company_form/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button
+                v-perms="['company_form/delete']"
+                :disabled="!selectData.length"
+                @click="handleDelete(selectData)"
+            >
+                删除
+            </el-button>
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="商户名称" prop="company_name" show-overflow-tooltip />
+                    <el-table-column label="社会信用统一代码" prop="organization_code" show-overflow-tooltip />
+                    <el-table-column label="详细地址" prop="address" show-overflow-tooltip />
+                    <el-table-column label="法人名称" prop="master_name" show-overflow-tooltip />
+                    <el-table-column label="" prop="type" show-overflow-tooltip />
+                    <el-table-column label="法人邮箱" prop="master_email" show-overflow-tooltip />
+                    <el-table-column label="" prop="notes" show-overflow-tooltip />

+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                             <el-button
+                                v-perms="['company_form/edit']"
+                                type="primary"
+                                link
+                                @click="handleEdit(row)"
+                            >
+                                编辑
+                            </el-button>
+                            <el-button
+                                v-perms="['company_form/delete']"
+                                type="danger"
+                                link
+                                @click="handleDelete(row.id)"
+                            >
+                                删除
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="companyFormLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiCompanyFormLists, apiCompanyFormDelete } from '@/api/company_form'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    company_name: '',
+    organization_code: '',
+    address: '',
+    master_name: '',
+    type: '',
+    master_email: '',
+    notes: '',
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiCompanyFormLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiCompanyFormDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+