diff --git a/chenhai-ui/src/api/system/vetAduit.js b/chenhai-ui/src/api/system/vetAduit.js
index 5bcd36d..2a816ab 100644
--- a/chenhai-ui/src/api/system/vetAduit.js
+++ b/chenhai-ui/src/api/system/vetAduit.js
@@ -51,3 +51,12 @@ export function auditCertificate(data) {
     data: data
   })
 }
+
+
+// 删除
+export function delvetInfo(id) {
+  return request({
+    url: '/system/vetInfo/' + id,
+    method: 'delete'
+  })
+}
diff --git a/chenhai-ui/src/api/vet/info.js b/chenhai-ui/src/api/vet/info.js
index 57511c0..4ee9c78 100644
--- a/chenhai-ui/src/api/vet/info.js
+++ b/chenhai-ui/src/api/vet/info.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询兽医个人信息列表
 export function listInfo(query) {
   return request({
-    url: '/vet/info/list',
+    url: '/vet/unified/list',
     method: 'get',
     params: query
   })
@@ -12,18 +12,11 @@ export function listInfo(query) {
 // 查询兽医个人信息详细
 export function getInfo(id) {
   return request({
-    url: '/vet/info/' + id,
+    url: '/vet/unified/' + id,
     method: 'get'
   })
 }
 
-// 兽医个人信息详情
-export function getfull(id) {
-  return request({
-    url: '/vet/info/full/' + id,
-    method: 'get'
-  })
-}
 
 // 新增兽医个人信息
 export function addInfo(data) {
@@ -37,7 +30,7 @@ export function addInfo(data) {
 // 修改兽医个人信息
 export function updateInfo(data) {
   return request({
-    url: '/vet/info',
+    url: '/vet/unified',
     method: 'put',
     data: data
   })
diff --git a/chenhai-ui/src/api/vet/qualification.js b/chenhai-ui/src/api/vet/qualification.js
index 4aefef0..c76aa55 100644
--- a/chenhai-ui/src/api/vet/qualification.js
+++ b/chenhai-ui/src/api/vet/qualification.js
@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 资质+审核
 export function submitAuditQualification(data) {
   return request({
-    url: '/vet/qualification/submit',
+    url: '/vet/unified/submitAudit',
     method: 'post',
     data: data,
   })
@@ -26,13 +26,6 @@ export function resubmitQualification(data) {
   })
 }
 
-// 兽医资质提交审核
-// export function submitAuditQualification(qualificationId) {
-//   return request({
-//     url: '/vet/qualification/submitAudit/' + qualificationId,
-//     method: 'post',
-//   })
-// }
 
 // 审核
 export function auditQualification(data) {
diff --git a/chenhai-ui/src/views/login.vue b/chenhai-ui/src/views/login.vue
index 2317532..76a4127 100644
--- a/chenhai-ui/src/views/login.vue
+++ b/chenhai-ui/src/views/login.vue
@@ -31,7 +31,7 @@
       </div>
 
       <!-- 注册弹窗 -->
-      <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body class="register-dialog">
+      <el-dialog :title="title" :visible.sync="open" width="500px" :close-on-click-modal="false" append-to-body class="register-dialog">
         <el-form ref="registerForm" :model="registerForm" :rules="registerRules">
           <el-form-item prop="phone">
             <el-input
@@ -238,7 +238,7 @@ export default {
       registerRules: {
         phone: [
           {required: true, trigger: "blur", message: "请输入您的电话号码"},
-          { pattern: /^1[3-9]\d{9}$/, message: "请输入正确的手机号码格式", trigger: "blur" }
+          {pattern:  /^(?!1(\d)\1{9}$)(?!\d*(\d)\2{5,}\d*)(?!\d*0{4,}\d*)(?!\d*1{4,}\d*)(?!\d*2{4,}\d*)(?!\d*3{4,}\d*)(?!\d*4{4,}\d*)(?!\d*5{4,}\d*)(?!\d*6{4,}\d*)(?!\d*7{4,}\d*)(?!\d*8{4,}\d*)(?!\d*9{4,}\d*)1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}$/, message: "请输入正确的手机号码格式", trigger: "blur" }
         ],
         password: [
           {required: true, trigger: "blur", message: "请输入您的密码"},
diff --git a/chenhai-ui/src/views/muhu/trend/index.vue b/chenhai-ui/src/views/muhu/trend/index.vue
index 8d95e1a..259058f 100644
--- a/chenhai-ui/src/views/muhu/trend/index.vue
+++ b/chenhai-ui/src/views/muhu/trend/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="标题" prop="title">
         <el-input
           v-model="queryParams.title"
@@ -10,12 +10,14 @@
         />
       </el-form-item>
       <el-form-item label="趋势类型" prop="category">
-        <el-input
-          v-model="queryParams.category"
-          placeholder="请选择趋势类型"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.category" placeholder="请选择趋势类型" clearable>
+          <el-option
+            v-for="dict in dict.type.category_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -71,22 +73,32 @@
 
     <el-table v-loading="loading" :data="trendList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="趋势类型" align="center" prop="category" />
-      <el-table-column label="信息来源" align="center" prop="source" />
-      <el-table-column label="内容" align="center" prop="content" />
-      <el-table-column label="标签" align="center" prop="tags" />
+      <el-table-column label="标题" align="center" prop="title" width="200px" :show-overflow-tooltip="true"/>
+      <el-table-column label="趋势类型" align="center" prop="category" width="200px">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.category_type" :value="scope.row.category"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="信息来源" align="center" prop="source" width="200px"/>
+      <el-table-column label="内容" align="center" prop="content" width="300px" :show-overflow-tooltip="true"/>
+      <el-table-column label="标签" align="center" prop="tags" width="200px">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.tags_type" :value="scope.row.tags"/>
+        </template>
+      </el-table-column>
       <el-table-column label="发布日期" align="center" prop="publishDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.publishDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="300">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
+            style="color: #42B983"
+            class="info-btn alter-btn"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['muhu:trend:edit']"
           >修改</el-button>
@@ -94,6 +106,8 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
+            style="color: #f56c6c"
+            class="info-btn delete-btn"
             @click="handleDelete(scope.row)"
             v-hasPermi="['muhu:trend:remove']"
           >删除</el-button>
@@ -101,44 +115,80 @@
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <div class="pagestyle">
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
 
     <!-- 添加或修改市场趋势对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入标题" />
-        </el-form-item>
-        <el-form-item label="趋势类型" prop="category">
-          <el-select v-model="form.category" placeholder="请选择趋势类型" clearable>
-            <el-option v-for="dict in dict.type.category_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="信息来源" prop="source">
-          <el-input v-model="form.source" placeholder="请输入信息来源" />
-        </el-form-item>
-        <el-form-item label="内容">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="标签" prop="tags">
-          <el-select v-model="form.tags" placeholder="请选择标签" clearable>
-            <el-option v-for="dict in dict.type.tags_type" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="发布日期" prop="publishDate">
-          <el-date-picker clearable
-                          v-model="form.publishDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择发布日期">
-          </el-date-picker>
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="标题" prop="title">
+              <el-input v-model="form.title" placeholder="请输入标题" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="趋势类型" prop="category">
+              <el-select v-model="form.category" placeholder="请选择趋势类型" clearable>
+                <el-option
+                  v-for="dict in dict.type.category_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="信息来源" prop="source">
+              <el-input v-model="form.source" placeholder="请输入信息来源" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="标签" prop="tags">
+              <el-select v-model="form.tags" placeholder="请选择标签" clearable>
+                <el-option
+                  v-for="dict in dict.type.tags_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="发布日期" prop="publishDate">
+              <el-date-picker clearable
+                              v-model="form.publishDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择发布日期"
+                              style="width: 100%;">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="内容">
+              <editor v-model="form.content" :min-height="192"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -199,6 +249,12 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        title: [
+          { required: true, message: "标题不能为空", trigger: "blur" }
+        ],
+        category: [
+          { required: true, message: "趋势类型不能为空", trigger: "change" }
+        ]
       }
     }
   },
@@ -314,3 +370,117 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+/* 操作按钮样式 */
+.info-btn {
+  padding: 6px 10px;
+  border-radius: 4px;
+  margin: 0 10px;
+  transition: all 0.3s ease;
+}
+
+.alter-btn:hover{
+  background-color: rgb(230, 255, 238);
+  transform: translateY(-1px);
+}
+
+.delete-btn:hover {
+  background-color: rgba(245, 108, 108, 0.1);
+  transform: translateY(-1px);
+}
+
+/* 新增/修改的弹窗 */
+::v-deep .el-dialog {
+  border-radius: 12px;
+  overflow: hidden;
+  box-shadow: 0 10px 40px rgba(0, 0, 0, 0.12);
+  animation: dialogFadeIn 0.3s ease;
+}
+
+::v-deep .el-dialog__header {
+  background: linear-gradient(135deg, #2c7a4d 0%, #42b983 100%);
+  padding: 18px 24px;
+  border-bottom: none;
+  position: relative;
+}
+
+::v-deep .el-dialog__title {
+  font-size: 17px;
+  font-weight: 600;
+  color: white;
+  letter-spacing: 0.5px;
+}
+
+::v-deep .el-dialog__headerbtn:hover .el-dialog__close {
+  color: #ffd04b;
+  transform: rotate(90deg);
+}
+
+::v-deep .el-dialog__body {
+  padding: 28px 24px 20px;
+  background-color: #f8fafc;
+  max-height: 70vh;
+  overflow-y: auto;
+}
+
+::v-deep .el-form-item {
+  margin-bottom: 20px;
+  transition: all 0.3s;
+}
+
+::v-deep .el-form-item__label {
+  font-weight: 500;
+  color: #2d3748;
+  font-size: 14px;
+  transition: color 0.3s;
+}
+
+::v-deep .el-input,
+::v-deep .el-textarea,
+::v-deep .el-select {
+  width: 100%;
+}
+
+::v-deep .el-input__inner,
+::v-deep .el-textarea__inner {
+  border-radius: 8px;
+  border: 1px solid #dcdfe6;
+  font-size: 14px;
+  transition: all 0.3s;
+  background-color: #fcfdfe;
+}
+
+::v-deep .el-input__inner:focus,
+::v-deep .el-textarea__inner:focus {
+  border-color: #42B983;
+  box-shadow: 0 0 0 3px rgb(230, 255, 238);
+  background-color: white;
+}
+
+::v-deep .el-select .el-input__inner {
+  padding-right: 35px;
+}
+
+::v-deep .el-dialog__footer {
+  padding: 20px 24px;
+  background-color: #f8fafc;
+  border-top: 1px solid #eef2f7;
+  border-radius: 0 0 12px 12px;
+}
+
+::v-deep .pagestyle .el-input{
+  width: auto !important;
+}
+
+@keyframes dialogFadeIn {
+  from {
+    opacity: 0;
+    transform: translateY(-20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+</style>
diff --git a/chenhai-ui/src/views/muhu/warning/index.vue b/chenhai-ui/src/views/muhu/warning/index.vue
index adf287b..1bff57e 100644
--- a/chenhai-ui/src/views/muhu/warning/index.vue
+++ b/chenhai-ui/src/views/muhu/warning/index.vue
@@ -1,38 +1,22 @@
 <template>
   <div class="app-container">
-
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="预警类型" prop="warningType">
         <el-select v-model="queryParams.warningType" placeholder="请选择预警类型" clearable>
-          <el-option
-            v-for="dict in dict.type.warning_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-option v-for="dict in dict.type.warning_type" :key="dict.value" :label="dict.label" :value="dict.value"
+            @keyup.enter.native="handleQuery" />
         </el-select>
       </el-form-item>
 
       <el-form-item label="预警级别" prop="warningLevel">
         <el-select v-model="queryParams.warningLevel" placeholder="请选择预警级别" clearable>
-          <el-option
-            v-for="dict in dict.type.warning_level"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-            @keyup.enter.native="handleQuery"
-          />
+          <el-option v-for="dict in dict.type.warning_level" :key="dict.value" :label="dict.label" :value="dict.value"
+            @keyup.enter.native="handleQuery" />
         </el-select>
       </el-form-item>
 
       <el-form-item label="预警标题" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入预警标题"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.title" placeholder="请输入预警标题" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
       <el-form-item>
@@ -43,119 +27,131 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['muhu:warning:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['muhu:warning:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['muhu:warning:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['muhu:warning:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['muhu:warning:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['muhu:warning:remove']">删除</el-button>
       </el-col>
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="warning"-->
-<!--          plain-->
-<!--          icon="el-icon-download"-->
-<!--          size="mini"-->
-<!--          @click="handleExport"-->
-<!--          v-hasPermi="['muhu:warning:export']"-->
-<!--        >导出</el-button>-->
-<!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="warningList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="预警类型" align="center" prop="warningType" />
-      <el-table-column label="预警级别" align="center" prop="warningLevel" />
-      <el-table-column label="预警标题" align="center" prop="title" />
-      <el-table-column label="简要内容" align="center" prop="briefContent" />
-      <el-table-column label="详细内容" align="center" prop="detailContent" />
-      <el-table-column label="应对措施" align="center" prop="responseMeasures" />
-      <el-table-column label="影响区域" align="center" prop="affectedRegions" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="预警类型" align="center" prop="warningType" width="120px">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.warning_type" :value="scope.row.warningType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="预警级别" align="center" prop="warningLevel" width="120px">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.warning_level" :value="scope.row.warningLevel" />
+        </template>
+      </el-table-column>
+      <el-table-column label="预警标题" align="center" prop="title" width="200px" :show-overflow-tooltip="true" />
+      <el-table-column label="简要内容" align="center" prop="briefContent" width="250px" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            style="color: #42B983"
-            class = "warning-btn alter-btn"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['muhu:warning:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            style="color: #f28888"
-            class = "warning-btn delete-btn"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['muhu:warning:remove']"
-          >删除</el-button>
+          <div style="
+  display: -webkit-box;
+  -webkit-line-clamp: 3; /* 显示的行数 */
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;" v-html="scope.row.briefContent"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="详细内容" align="center" prop="detailContent" width="250px" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <div style="
+  display: -webkit-box;
+  -webkit-line-clamp: 3; /* 显示的行数 */
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;" v-html="scope.row.detailContent"></div>
+        </template>
+      </el-table-column>
+      <el-table-column label="应对措施" align="center" prop="responseMeasures":show-overflow-tooltip="true" />
+      <el-table-column label="影响区域" align="center" prop="affectedRegions" :show-overflow-tooltip="true" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" style="color: #42B983" class="warning-btn alter-btn"
+            @click="handleUpdate(scope.row)" v-hasPermi="['muhu:warning:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" style="color: #f56c6c" class="warning-btn delete-btn"
+            @click="handleDelete(scope.row)" v-hasPermi="['muhu:warning:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <div class="pagestyle">
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
+    </div>
 
     <!-- 添加或修改灾害预警信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="预警类型" prop="warningType">
-          <el-select v-model="form.warningType" placeholder="请选择预警类型" clearable>
-            <el-option v-for="dict in dict.type.warning_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="预警级别" prop="warningLevel">
-          <el-select v-model="form.warningLevel" placeholder="请选择预警级别" clearable>
-            <el-option v-for="dict in dict.type.warning_level" :key="dict.value" :label="dict.label" :value="dict.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="预警标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入预警标题" />
-        </el-form-item>
-        <el-form-item label="简要内容">
-          <editor v-model="form.briefContent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="详细内容">
-          <editor v-model="form.detailContent" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="应对措施" prop="responseMeasures">
-          <el-input v-model="form.responseMeasures" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="影响区域" prop="affectedRegions">
-          <el-input v-model="form.affectedRegions" placeholder="请输入影响区域" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="预警类型" prop="warningType">
+              <el-select v-model="form.warningType" placeholder="请选择预警类型" clearable style="width: 100%;">
+                <el-option v-for="dict in dict.type.warning_type" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="预警级别" prop="warningLevel">
+              <el-select v-model="form.warningLevel" placeholder="请选择预警级别" clearable style="width: 100%;">
+                <el-option v-for="dict in dict.type.warning_level" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="预警标题" prop="title">
+              <el-input v-model="form.title" placeholder="请输入预警标题" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="简要内容">
+              <editor v-model="form.briefContent" :min-height="192" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="详细内容">
+              <editor v-model="form.detailContent" :min-height="192" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="应对措施" prop="responseMeasures">
+              <el-input v-model="form.responseMeasures" type="textarea" placeholder="请输入内容" :rows="3" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="影响区域" prop="affectedRegions">
+              <el-input v-model="form.affectedRegions" placeholder="请输入影响区域" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -211,10 +207,10 @@ export default {
       // 表单校验
       rules: {
         warningType: [
-          { required: true, message: "预警类型：天气/疫病/环境不能为空", trigger: "change" }
+          { required: true, message: "请选择预警类型", trigger: "change" }
         ],
         warningLevel: [
-          { required: true, message: "预警级别：蓝/黄/橙/红不能为空", trigger: "blur" }
+          { required: true, message: "请选择预警级别", trigger: "change" }
         ],
         title: [
           { required: true, message: "预警标题不能为空", trigger: "blur" }
@@ -273,7 +269,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -315,12 +311,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids
-      this.$modal.confirm('是否确认删除灾害预警信息编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除灾害预警信息编号为"' + ids + '"的数据项？').then(function () {
         return delWarning(ids)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => { })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -332,17 +328,26 @@ export default {
 }
 </script>
 
+<style>
+/* 调整分页样式 */
+.pagestyle .el-input {
+  width: auto !important;
+}
+.el-tooltip__popper{
+   width: 300px !important;
+}
+</style>
+
 <style scoped lang="scss">
-/* 操作按钮样式 */
+// 操作按钮样式
 .warning-btn {
-    padding: 6px 10px;
-    border-radius: 4px;
-    margin: 0 10px;
-    transition: all 0.3s ease;
-
+  padding: 6px 10px;
+  border-radius: 4px;
+  margin: 0 10px;
+  transition: all 0.3s ease;
 }
 
-.alter-btn:hover{
+.alter-btn:hover {
   background-color: rgb(230, 255, 238);
   transform: translateY(-1px);
 }
@@ -351,4 +356,102 @@ export default {
   background-color: rgba(245, 108, 108, 0.1);
   transform: translateY(-1px);
 }
+
+// 新增/修改的弹窗
+::v-deep .el-dialog {
+  border-radius: 12px;
+  overflow: hidden;
+  box-shadow: 0 10px 40px rgba(0, 0, 0, 0.12);
+  animation: dialogFadeIn 0.3s ease;
+}
+
+::v-deep .el-dialog__header {
+  background: linear-gradient(135deg, #2c7a4d 0%, #42b983 100%);
+  padding: 18px 24px;
+  border-bottom: none;
+  position: relative;
+}
+
+::v-deep .el-dialog__title {
+  font-size: 17px;
+  font-weight: 600;
+  color: white;
+  letter-spacing: 0.5px;
+}
+
+::v-deep .el-dialog__headerbtn:hover .el-dialog__close {
+  color: #ffd04b;
+  transform: rotate(90deg);
+}
+
+::v-deep .el-dialog__body {
+  padding: 28px 24px 20px;
+  background-color: #f8fafc;
+  max-height: 70vh;
+  overflow-y: auto;
+}
+
+::v-deep .el-form-item {
+  margin-bottom: 20px;
+  transition: all 0.3s;
+}
+
+::v-deep .el-form-item__label {
+  font-weight: 500;
+  color: #2d3748;
+  font-size: 14px;
+  transition: color 0.3s;
+}
+
+::v-deep .el-input,
+::v-deep .el-textarea,
+::v-deep .el-select {
+  width: 100%;
+}
+
+::v-deep .el-input__inner,
+::v-deep .el-textarea__inner {
+  border-radius: 8px;
+  border: 1px solid #dcdfe6;
+  font-size: 14px;
+  transition: all 0.3s;
+  background-color: #fcfdfe;
+}
+
+::v-deep .el-input__inner:focus,
+::v-deep .el-textarea__inner:focus {
+  border-color: #42B983;
+  box-shadow: 0 0 0 3px rgb(230, 255, 238);
+  background-color: white;
+}
+
+::v-deep .el-select .el-input__inner {
+  padding-right: 35px;
+}
+
+::v-deep .el-dialog__footer {
+  padding: 20px 24px;
+  background-color: #f8fafc;
+  border-top: 1px solid #eef2f7;
+  border-radius: 0 0 12px 12px;
+}
+
+// 表格样式优化
+::v-deep .el-table {
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
+}
+
+
+::v-deep .el-table--enable-row-hover .el-table__body tr:hover>td {
+  background-color: #f0f9eb;
+}
+
+</style>
+
+<style scoped>
+::v-deep .pagestyle .el-input {
+  width: auto !important;
+}
 </style>
diff --git a/chenhai-ui/src/views/syd.vue b/chenhai-ui/src/views/syd.vue
index ba36ed8..3f261ae 100644
--- a/chenhai-ui/src/views/syd.vue
+++ b/chenhai-ui/src/views/syd.vue
@@ -254,8 +254,8 @@
       </div>
     </div>
 
-    <!-- 资质弹窗 -->
-    <el-dialog :title="title" :visible.sync="flag" width="80%" append-to-body>
+    <!-- 资质弹窗-->
+    <el-dialog :title="title" :visible.sync="flag" :close-on-click-modal="false" width="80%" append-to-body>
       <el-steps :active="activeStep" finish-status="success" simple style="margin-bottom: 40px;">
         <el-step title="选择经营范围"></el-step>
         <el-step title="上传资质"></el-step>
@@ -539,14 +539,8 @@
 </template>
 
 <script>
-// 修改为使用新版的API
-import {
-  getQualificationTypeOptions,
-  getScopeOptions,
-  checkNeedQualification,  // 改为使用新接口
-  saveVetInfo              // 改为使用新接口
-} from "@/api/vet/qualification";
-import { getStatsCard } from "@/api/vet/notification";
+import { submitAuditQualification, getQualificationTypeOptions, getScopeOptions, getQualificationStatus } from "../api/vet/qualification";
+import { getStatsCard } from "../api/vet/notification";
 import * as echarts from 'echarts';
 
 export default {
@@ -587,12 +581,12 @@ export default {
           { pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, message: "身份证号码不合法", trigger: "blur" },
           { min: 1, max: 18, message: "长度在18个字符", trigger: "blur" },
         ],
-        // qualificationType: [
-        //   {required: true, message: "请选择资质类型", trigger: "change"}
-        // ],
-        // scopeIds: [
-        //   {required: true, type: 'array', message: "请选择至少一个经营范围", trigger: "change"}
-        // ],
+        qualificationType: [
+          {required: true, message: "请选择资质类型", trigger: "change"}
+        ],
+        scopeIds: [
+          {required: true, type: 'array', message: "请选择至少一个经营范围", trigger: "change"}
+        ],
       },
       // 图表相关数据
       trendTimeRange: "7",
@@ -606,15 +600,6 @@ export default {
       herdsmanCount: "456/2",
       vetCount: 89.50,
       shopCount: 521,
-
-      // 资质类型分布模拟数据
-      qualificationTypeData: [
-        { name: '执业兽医', value: 120 },
-        { name: '乡村兽医', value: 85 },
-        { name: '官方兽医', value: 45 },
-        { name: '高级兽医师', value: 32 },
-        { name: '中级兽医师', value: 68 }
-      ]
     }
   },
   created() {
@@ -708,21 +693,18 @@ export default {
       }
     },
 
-    /** 获取资质状态 - 使用新接口 */
+    /** 获取资质状态 */
     getQualStatusAndHandle() {
-      checkNeedQualification()  // 使用新接口
+      getQualificationStatus()
         .then(res => {
           const statusData = res.data || {};
-          if (statusData.needPopup === true || !statusData.hasQualification) {
+          if (statusData.needPopup === true || statusData.status === 'empty') {
             this.flag = true;
           }
         })
-        .catch(error => {
-          console.error('获取资质状态失败:', error);
-        })
     },
 
-    /** 提交审核 - 使用新接口 */
+    /** 提交审核 */
     submitQualification() {
       this.loading = true;
 
@@ -743,8 +725,7 @@ export default {
         certificates: certificates,
       };
 
-      // 使用 saveVetInfo 替代旧的 submitAuditQualification
-      saveVetInfo(requestData).then(response => {
+      submitAuditQualification(requestData).then(response => {
         this.$message.success('提交成功，请等待审核');
         this.flag = false;
         setTimeout(() => {
@@ -754,13 +735,13 @@ export default {
           });
         }, 300);
       })
-        .catch(error => {
-          console.error('提交失败:', error);
-          this.$message.error(error.response?.data?.message || '提交失败，请重试');
-        })
-        .finally(() => {
-          this.loading = false;
-        });
+      .catch(error => {
+        console.error('提交失败:', error);
+        this.$message.error(error.response?.data?.message || '提交失败，请重试');
+      })
+      .finally(() => {
+        this.loading = false;
+      });
     },
 
     // 移除证书
@@ -1621,7 +1602,7 @@ export default {
 
 .summary-item {
   display: flex;
-  align-items: flex-start;
+  align-items: center;
   margin-bottom: 10px;
 
   &:last-child {
diff --git a/chenhai-ui/src/views/system/interpretation/index.vue b/chenhai-ui/src/views/system/interpretation/index.vue
index 424a74f..301b6c7 100644
--- a/chenhai-ui/src/views/system/interpretation/index.vue
+++ b/chenhai-ui/src/views/system/interpretation/index.vue
@@ -112,18 +112,6 @@
     <el-table v-loading="loading" :data="interpretationList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="标题" align="center" prop="title" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="政策文件" align="center" prop="policyFile" width="120">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-download"
-            @click="handleDownload(scope.row)"
-            v-if="scope.row.policyFile"
-          >下载文件</el-button>
-          <span v-else>-</span>
-        </template>
-      </el-table-column>
       <el-table-column label="发布日期" align="center" prop="releaseDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.releaseDate, '{y}-{m}-{d}') }}</span>
@@ -145,12 +133,24 @@
           <dict-tag :options="dict.type.sys_publish_status" :value="scope.row.publishStatus"/>
         </template>
       </el-table-column>
+      <el-table-column label="政策文件" align="center" prop="policyFile" width="120">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-download"
+            @click="handleDownload(scope.row)"
+            v-if="scope.row.policyFile"
+          >下载文件</el-button>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <el-table-column label="下架原因" align="center" prop="removalReason" width="100" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.removalReason || '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="300">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" >
         <template slot-scope="scope">
           <el-button
             size="mini"
diff --git a/chenhai-ui/src/views/system/slaughterInfo/index.vue b/chenhai-ui/src/views/system/slaughterInfo/index.vue
index f8dc5d9..f384e1d 100644
--- a/chenhai-ui/src/views/system/slaughterInfo/index.vue
+++ b/chenhai-ui/src/views/system/slaughterInfo/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="标题" prop="title">
         <el-input
           v-model="queryParams.title"
@@ -97,25 +97,26 @@
 
     <el-table v-loading="loading" :data="slaughterInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-<!--      <el-table-column label="主键ID" align="center" prop="id" />-->
-      <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="内容详情" align="center" prop="content" />
-      <el-table-column label="联系人" align="center" prop="contactPerson" />
-      <el-table-column label="联系电话" align="center" prop="contactPhone" />
-      <el-table-column label="详细地址" align="center" prop="address" />
-      <el-table-column label="服务时间" align="center" prop="serviceTime" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="标题" align="center" prop="title" width="200px" :show-overflow-tooltip="true"/>
+      <el-table-column label="内容详情" align="center" prop="content" width="300px" :show-overflow-tooltip="true"/>
+      <el-table-column label="联系人" align="center" prop="contactPerson" width="100px"/>
+      <el-table-column label="联系电话" align="center" prop="contactPhone" width="120px"/>
+      <el-table-column label="详细地址" align="center" prop="address" width="200px" :show-overflow-tooltip="true"/>
+      <el-table-column label="服务时间" align="center" prop="serviceTime" width="150px"/>
+      <el-table-column label="状态" align="center" prop="status" width="100px">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="备注" align="center" prop="remark" width="200px" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
+            style="color: #42B983"
+            class="info-btn alter-btn"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:slaughterInfo:edit']"
           >修改</el-button>
@@ -123,6 +124,8 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
+            style="color: #f56c6c"
+            class="info-btn delete-btn"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:slaughterInfo:remove']"
           >删除</el-button>
@@ -130,50 +133,82 @@
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <div class="pagestyle">
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
 
     <!-- 添加或修改屠宰信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入标题" />
-        </el-form-item>
-        <el-form-item label="内容详情">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="联系人" prop="contactPerson">
-          <el-input v-model="form.contactPerson" placeholder="请输入联系人" />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="contactPhone">
-          <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
-        </el-form-item>
-        <el-form-item label="详细地址" prop="address">
-          <el-input v-model="form.address" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="服务时间" prop="serviceTime">
-          <el-input v-model="form.serviceTime" placeholder="请输入服务时间" />
-        </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.sys_notice_status"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-<!--        <el-form-item label="删除标志" prop="delFlag">-->
-<!--          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />-->
-<!--        </el-form-item>-->
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="标题" prop="title">
+              <el-input v-model="form.title" placeholder="请输入标题" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人" prop="contactPerson">
+              <el-input v-model="form.contactPerson" placeholder="请输入联系人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="contactPhone">
+              <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="服务时间" prop="serviceTime">
+              <el-input v-model="form.serviceTime" placeholder="请输入服务时间" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="状态" prop="status">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_notice_status"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="详细地址" prop="address">
+              <el-input v-model="form.address" type="textarea" placeholder="请输入内容" :rows="3" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="内容详情">
+              <editor v-model="form.content" :min-height="192"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :rows="3" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -340,3 +375,150 @@ export default {
   }
 }
 </script>
+
+<style scoped>
+/* 操作按钮样式 */
+.info-btn {
+  padding: 6px 10px;
+  border-radius: 4px;
+  margin: 0 10px;
+  transition: all 0.3s ease;
+}
+
+.alter-btn:hover{
+  background-color: rgb(230, 255, 238);
+  transform: translateY(-1px);
+}
+
+.delete-btn:hover {
+  background-color: rgba(245, 108, 108, 0.1);
+  transform: translateY(-1px);
+}
+
+/* 分页样式 */
+::v-deep .pagestyle .el-input{
+  width: auto !important;
+}
+
+::v-deep .pagestyle {
+  margin-top: 20px;
+  display: flex;
+  justify-content: flex-end;
+}
+
+/* 弹窗样式 */
+::v-deep .el-dialog {
+  border-radius: 12px;
+  overflow: hidden;
+  box-shadow: 0 10px 40px rgba(0, 0, 0, 0.12);
+  animation: dialogFadeIn 0.3s ease;
+}
+
+::v-deep .el-dialog__header {
+  background: linear-gradient(135deg, #2c7a4d 0%, #42b983 100%);
+  padding: 18px 24px;
+  border-bottom: none;
+  position: relative;
+}
+
+::v-deep .el-dialog__title {
+  font-size: 17px;
+  font-weight: 600;
+  color: white;
+  letter-spacing: 0.5px;
+}
+
+::v-deep .el-dialog__headerbtn:hover .el-dialog__close {
+  color: #ffd04b;
+  transform: rotate(90deg);
+}
+
+::v-deep .el-dialog__body {
+  padding: 28px 24px 20px;
+  background-color: #f8fafc;
+  max-height: 70vh;
+  overflow-y: auto;
+}
+
+::v-deep .el-form-item {
+  margin-bottom: 20px;
+  transition: all 0.3s;
+}
+
+::v-deep .el-form-item__label {
+  font-weight: 500;
+  color: #2d3748;
+  font-size: 14px;
+  transition: color 0.3s;
+}
+
+::v-deep .el-input,
+::v-deep .el-textarea,
+::v-deep .el-select {
+  width: 100%;
+}
+
+::v-deep .el-input__inner,
+::v-deep .el-textarea__inner {
+  border-radius: 8px;
+  border: 1px solid #dcdfe6;
+  font-size: 14px;
+  transition: all 0.3s;
+  background-color: #fcfdfe;
+}
+
+::v-deep .el-input__inner:focus,
+::v-deep .el-textarea__inner:focus {
+  border-color: #42B983;
+  box-shadow: 0 0 0 3px rgb(230, 255, 238);
+  background-color: white;
+}
+
+::v-deep .el-select .el-input__inner {
+  padding-right: 35px;
+}
+
+::v-deep .el-dialog__footer {
+  padding: 20px 24px;
+  background-color: #f8fafc;
+  border-top: 1px solid #eef2f7;
+  border-radius: 0 0 12px 12px;
+}
+
+/* 搜索区域样式优化 */
+::v-deep .el-form--inline .el-form-item {
+  margin-right: 15px;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+  padding-right: 12px;
+}
+
+/* 表格样式优化 */
+::v-deep .el-table {
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
+}
+
+/* 按钮组样式优化 */
+.el-row.mb8 {
+  margin-bottom: 15px;
+}
+
+.el-button--mini {
+  border-radius: 6px;
+}
+
+/* 动画 */
+@keyframes dialogFadeIn {
+  0% {
+    opacity: 0;
+    transform: translateY(-20px);
+  }
+  100% {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+</style>
diff --git a/chenhai-ui/src/views/system/vet/aduit/index.vue b/chenhai-ui/src/views/system/vet/aduit/index.vue
index 891d748..03a8634 100644
--- a/chenhai-ui/src/views/system/vet/aduit/index.vue
+++ b/chenhai-ui/src/views/system/vet/aduit/index.vue
@@ -49,27 +49,6 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['vet:info:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['vet:info:edit']"
-        >修改</el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -98,32 +77,19 @@
     <!-- 表格部分 -->
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="用户昵称" align="center" prop="nickName" width="200px"/>
-      <el-table-column label="真实姓名" align="center" prop="realName" width="200px"/>
-      <el-table-column label="性别" align="center" prop="gender" width="100px"/>
-      <el-table-column label="出生日期" align="center" prop="birthday" width="200px">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="身份证号" align="center" prop="idCard" width="200px"/>
-      <el-table-column label="擅长领域" align="center" prop="specialty" width="300px" :show-overflow-tooltip="true"/>
-      <!--      <el-table-column label="工作经验" align="center" prop="workExperience" width="100px"/>-->
-      <el-table-column label="职称" align="center" prop="title" width="200px"/>
-      <el-table-column label="联系电话" align="center" prop="phone" width="200px"/>
-      <!--      <el-table-column label="电子邮箱" align="center" prop="email"/>-->
-      <el-table-column label="专家类型" align="center" prop="expertType" width="200px"/>
-      <el-table-column label="所属医院" align="center" prop="hospital" width="300px" :show-overflow-tooltip="true"/>
-      <!--      <el-table-column label="联系地址" align="center" prop="address" />-->
-      <!--      <el-table-column label="个人简介" align="center" prop="introduction" />-->
+      <el-table-column label="用户昵称" align="center" prop="nickName" />
+      <el-table-column label="真实姓名" align="center" prop="realName" />
+      <el-table-column label="擅长领域" align="center" prop="specialty" :show-overflow-tooltip="true"/>
+      <el-table-column label="职称" align="center" prop="title"/>
+      <el-table-column label="专家类型" align="center" prop="expertType" />
+      <el-table-column label="所属医院" align="center" prop="hospital"  :show-overflow-tooltip="true"/>
+      <el-table-column label="个人简介" align="center" prop="introduction" :show-overflow-tooltip="true" />
       <el-table-column label="审核状态" align="center" prop="auditStatus" width="100" class-name="audit-status-column">
         <template slot-scope="scope">
-          <el-tag :type="getAuditStatusTagType(scope.row.auditStatus)" size="small">
-            {{ getAuditStatusText(scope.row.auditStatus) }}
-          </el-tag>
+          <dict-tag :options="dict.type.audit_status" :value="scope.row.auditStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="220">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -164,8 +130,9 @@
       append-to-body
       :close-on-click-modal="false"
       class="audit-dialog"
+      @close="closeAuditDialog"
     >
-      <el-tabs v-model="activeAuditTab" type="border-card" @tab-click="handleTabClick">
+      <el-tabs v-model="activeAuditTab" type="border-card">
         <!-- 基本信息审核标签页 -->
         <el-tab-pane label="基本信息审核" name="basic">
           <div v-if="loadingBasicData" class="tab-loading">
@@ -191,9 +158,7 @@
                 <el-descriptions-item label="联系地址" :span="2">{{ basicInfo.address || '-' }}</el-descriptions-item>
                 <el-descriptions-item label="个人简介" :span="2">{{ basicInfo.introduction || '-' }}</el-descriptions-item>
                 <el-descriptions-item label="当前审核状态">
-                  <el-tag :type="getAuditStatusTagType(basicInfo.auditStatus)" size="small">
-                    {{ getAuditStatusText(basicInfo.auditStatus) }}
-                  </el-tag>
+                  <dict-tag :options="dict.type.audit_status" :value="basicInfo.auditStatus" />
                 </el-descriptions-item>
                 <el-descriptions-item label="审核人">{{ basicInfo.auditor || '-' }}</el-descriptions-item>
                 <el-descriptions-item label="审核时间">{{ parseTime(basicInfo.auditTime) || '-' }}</el-descriptions-item>
@@ -205,17 +170,15 @@
               <h3>基本信息审核</h3>
               <el-form ref="basicAuditForm" :model="basicAuditForm" :rules="basicAuditRules" label-width="100px">
                 <el-form-item label="审核结果" prop="auditStatus">
-                  <el-radio-group v-model="basicAuditForm.auditStatus">
+                  <el-radio-group v-model="basicAuditForm.auditStatus" @change="handleBasicAuditChange">
                     <el-radio label="1">审核通过</el-radio>
                     <el-radio label="2">审核不通过</el-radio>
                   </el-radio-group>
                   <span v-if="basicInfo.auditStatus && basicInfo.auditStatus !== '0'" class="audit-status-tag">
-                    <el-tag :type="getAuditStatusTagType(basicInfo.auditStatus)" size="small">
-                      {{ getAuditStatusText(basicInfo.auditStatus) }}
-                    </el-tag>
+                    <dict-tag :options="dict.type.audit_status" :value="basicInfo.auditStatus" />
                   </span>
                 </el-form-item>
-                <el-form-item label="审核意见" prop="auditDesc">
+                <el-form-item label="审核意见" prop="auditDesc" v-if="basicAuditForm.auditStatus === '2'">
                   <el-input
                     v-model="basicAuditForm.auditDesc"
                     type="textarea"
@@ -231,7 +194,7 @@
         </el-tab-pane>
 
         <!-- 资质证书审核标签页 -->
-        <el-tab-pane label="资质证书审核" name="certificate" v-if="showCertificateTab">
+        <el-tab-pane label="资质证书审核" name="certificate">
           <div v-if="loadingCertData" class="tab-loading">
             <i class="el-icon-loading"></i>
             <div>加载证书信息...</div>
@@ -268,26 +231,14 @@
                     <div class="cert-header">
                       <div class="cert-title">
                         <span>{{ cert.certName || cert.qualificationType || '未命名证书' }}</span>
-                        <el-tag
-                          v-if="cert.auditStatus === '1'"
-                          type="success"
-                          size="small"
+                        <dict-tag
+                          v-if="cert.auditStatus && cert.auditStatus !== '0'"
+                          :options="dict.type.audit_status"
+                          :value="cert.auditStatus"
                           class="cert-status-tag"
-                          effect="dark"
-                        >
-                          <i class="el-icon-success"></i> 已通过
-                        </el-tag>
+                        />
                         <el-tag
-                          v-if="cert.auditStatus === '2'"
-                          type="danger"
-                          size="small"
-                          class="cert-status-tag"
-                          effect="dark"
-                        >
-                          <i class="el-icon-error"></i> 未通过
-                        </el-tag>
-                        <el-tag
-                          v-if="!cert.auditStatus || cert.auditStatus === '0'"
+                          v-else
                           type="warning"
                           size="small"
                           class="cert-status-tag"
@@ -353,11 +304,11 @@
                             <el-radio label="1">审核通过</el-radio>
                             <el-radio label="2">审核不通过</el-radio>
                           </el-radio-group>
-                          <span v-if="certAuditForms[cert.qualificationId].submitted" class="audit-saved-tag">
-                            <el-tag type="success" size="small">已保存</el-tag>
+                          <span v-if="cert.auditStatus && cert.auditStatus !== '0'" class="audit-status-tag">
+                            <dict-tag :options="dict.type.audit_status" :value="cert.auditStatus" />
                           </span>
                         </el-form-item>
-                        <el-form-item label="审核意见" prop="auditOpinion">
+                        <el-form-item label="审核意见" prop="auditOpinion" v-if="certAuditForms[cert.qualificationId].auditStatus === '2'">
                           <el-input
                             v-model="certAuditForms[cert.qualificationId].auditOpinion"
                             type="textarea"
@@ -365,19 +316,8 @@
                             placeholder="请输入审核意见"
                             :maxlength="200"
                             show-word-limit
-                            @blur="saveCertificateAudit(cert.qualificationId)"
                           />
                         </el-form-item>
-                        <el-form-item>
-                          <el-button
-                            type="primary"
-                            @click="saveCertificateAudit(cert.qualificationId)"
-                            :loading="certAuditForms[cert.qualificationId] && certAuditForms[cert.qualificationId].saving"
-                          >
-                            保存审核
-                          </el-button>
-                          <el-button @click="resetCertAudit(cert.qualificationId)">重置</el-button>
-                        </el-form-item>
                       </el-form>
                     </div>
                   </div>
@@ -389,7 +329,7 @@
       </el-tabs>
 
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitAllAudit" :loading="submittingAll">
+        <el-button type="primary" @click="submitAllAudit" :loading="submittingAll" :disabled="!isAllAuditSelected">
           {{ submittingAll ? '提交中...' : '提交审核' }}
         </el-button>
         <el-button @click="auditVisible = false">关 闭</el-button>
@@ -431,9 +371,7 @@
                 <el-descriptions-item label="工作经验">{{ detailData.workExperience || '-' }}</el-descriptions-item>
                 <el-descriptions-item label="个人简介" :span="2">{{ detailData.introduction || '-' }}</el-descriptions-item>
                 <el-descriptions-item label="当前审核状态">
-                  <el-tag :type="getAuditStatusTagType(detailData.auditStatus)" size="small">
-                    {{ getAuditStatusText(detailData.auditStatus) }}
-                  </el-tag>
+                  <dict-tag :options="dict.type.audit_status" :value="detailData.auditStatus" />
                 </el-descriptions-item>
                 <el-descriptions-item label="审核人">{{ detailData.auditor || '-' }}</el-descriptions-item>
                 <el-descriptions-item label="审核时间">{{ parseTime(detailData.auditTime) || '-' }}</el-descriptions-item>
@@ -457,33 +395,11 @@
                     <div class="cert-header">
                       <div class="cert-title">
                         <span>{{ cert.certName || cert.qualificationType || '未命名证书' }}</span>
-                        <el-tag
-                          v-if="cert.auditStatus === '1'"
-                          type="success"
-                          size="small"
-                          class="cert-status-tag"
-                          effect="dark"
-                        >
-                          <i class="el-icon-success"></i> 已通过
-                        </el-tag>
-                        <el-tag
-                          v-if="cert.auditStatus === '2'"
-                          type="danger"
-                          size="small"
-                          class="cert-status-tag"
-                          effect="dark"
-                        >
-                          <i class="el-icon-error"></i> 未通过
-                        </el-tag>
-                        <el-tag
-                          v-if="!cert.auditStatus || cert.auditStatus === '0'"
-                          type="warning"
-                          size="small"
+                        <dict-tag
+                          :options="dict.type.audit_status"
+                          :value="cert.auditStatus"
                           class="cert-status-tag"
-                          effect="dark"
-                        >
-                          <i class="el-icon-time"></i> 待审核
-                        </el-tag>
+                        />
                       </div>
                       <div class="cert-info">
                         <span><strong>证书编号：</strong>{{ cert.certificateNo || '-' }}</span>
@@ -493,11 +409,6 @@
                         <span><strong>颁发日期：</strong>{{ parseTime(cert.issueDate, '{y}-{m}-{d}') || '-' }}</span>
                         <span><strong>到期日期：</strong>{{ parseTime(cert.expireDate, '{y}-{m}-{d}') || '-' }}</span>
                         <span><strong>证书状态：</strong>{{ cert.certStatus || '-' }}</span>
-                        <span><strong>审核状态：</strong>
-                          <el-tag :type="getAuditStatusTagType(cert.auditStatus)" size="small">
-                            {{ getAuditStatusText(cert.auditStatus) }}
-                          </el-tag>
-                        </span>
                         <span><strong>审核意见：</strong>{{ cert.auditOpinion || '-' }}</span>
                         <span><strong>审核时间：</strong>{{ parseTime(cert.auditTime) || '-' }}</span>
                       </div>
@@ -553,12 +464,12 @@
 </template>
 
 <script>
-import { listInfo, getInfo, auditBasicInfo, auditCertificate, listQualification } from "@/api/system/vetAduit"
+import { listInfo, getInfo, auditBasicInfo, auditCertificate, listQualification, delvetInfo } from "@/api/system/vetAduit"
 import axios from 'axios'
 
 export default {
   name: "Info",
-  dicts: ['expert_type'],
+  dicts: ['expert_type', 'audit_status'],
   data() {
     return {
       loading: true,
@@ -585,9 +496,9 @@ export default {
       activeCertTab: null,
       currentVetId: null,
       currentUserId: null,
-      showCertificateTab: true,
 
       loadingBasicData: false,
+      loadingCertData: false,
       submittingAll: false,
       basicInfo: {},
       basicAuditForm: {
@@ -600,7 +511,6 @@ export default {
         ]
       },
 
-      loadingCertData: false,
       certificateList: [],
       certAuditForms: {},
       certAuditRules: {
@@ -612,8 +522,6 @@ export default {
       imagePreviewVisible: false,
       previewImageUrl: "",
 
-      certAuditTimer: null,
-
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -641,14 +549,47 @@ export default {
     }
   },
   computed: {
-    canCompleteAudit() {
-      if (this.basicInfo.auditStatus && this.basicInfo.auditStatus !== '0') {
-        return true
+    // 判断是否所有审核项都已选择审核结果
+    isAllAuditSelected() {
+      // 基本信息未选择审核结果（审核状态必须是1或2）
+      if (!this.basicAuditForm.auditStatus ||
+          (this.basicAuditForm.auditStatus !== '1' && this.basicAuditForm.auditStatus !== '2')) {
+        return false
       }
-      if (this.basicAuditForm.auditStatus) {
-        return true
+
+      // 如果有证书，需要所有证书都选择了审核结果（审核状态必须是1或2）
+      if (this.certificateList && this.certificateList.length > 0) {
+        for (let i = 0; i < this.certificateList.length; i++) {
+          const cert = this.certificateList[i]
+          const form = this.certAuditForms[cert.qualificationId]
+          if (!form || !form.auditStatus ||
+              (form.auditStatus !== '1' && form.auditStatus !== '2')) {
+            return false
+          }
+        }
       }
-      return false
+
+      return true
+    }
+  },
+  watch: {
+    // 监听基本信息审核结果变化
+    'basicAuditForm.auditStatus': {
+      handler() {
+        this.$nextTick(() => {
+          // 触发计算属性更新
+        })
+      },
+      deep: true
+    },
+    // 监听证书审核结果变化
+    certAuditForms: {
+      handler() {
+        this.$nextTick(() => {
+          // 触发计算属性更新
+        })
+      },
+      deep: true
     }
   },
   created() {
@@ -677,213 +618,236 @@ export default {
       this.auditVisible = true
       this.activeAuditTab = "basic"
 
-      this.loadBasicData(id)
+      // 同时加载基本信息和证书数据
+      this.loadAllData(id)
     },
 
-    handleTabClick(tab) {
-      if (tab.name === 'certificate' && (!this.certificateList || this.certificateList.length === 0)) {
-        if (this.basicInfo && this.basicInfo.userId) {
-          this.loadCertificateData(this.basicInfo.userId)
-        } else {
-          this.$message.warning('无法获取用户信息')
-        }
-      }
-    },
-
-    loadBasicData(id) {
+    // 同时加载基本信息和证书数据
+    async loadAllData(vetId) {
       this.loadingBasicData = true
+      this.loadingCertData = true
 
-      getInfo(id).then(response => {
-        if (response.code === 200) {
-          this.basicInfo = response.data || {}
+      try {
+        // 加载基本信息
+        const basicResponse = await getInfo(vetId)
+        if (basicResponse.code === 200) {
+          this.basicInfo = basicResponse.data || {}
           this.currentUserId = this.basicInfo.userId
 
-          this.basicAuditForm = {
-            auditStatus: this.basicInfo.auditStatus || "",
-            auditDesc: this.basicInfo.auditDesc || ""
+          // 如果基本信息已经有审核状态（1或2），则回显
+          if (this.basicInfo.auditStatus && this.basicInfo.auditStatus !== '0') {
+            this.basicAuditForm = {
+              auditStatus: this.basicInfo.auditStatus,
+              auditDesc: this.basicInfo.auditDesc || ""
+            }
+          } else {
+            this.basicAuditForm = {
+              auditStatus: "",
+              auditDesc: ""
+            }
           }
-
         } else {
-          this.$message.error(response.msg || '加载失败')
+          this.$message.error(basicResponse.msg || '加载基本信息失败')
         }
-      }).catch(error => {
-        console.error('加载失败:', error)
-        this.$message.error('加载失败')
-      }).finally(() => {
-        this.loadingBasicData = false
-      })
-    },
 
-    loadCertificateData(userId) {
-      this.loadingCertData = true
-
-      const queryParams = {
-        userId: userId,
-        pageNum: 1,
-        pageSize: 1000
-      }
+        // 加载证书数据
+        if (this.currentUserId) {
+          const queryParams = {
+            userId: this.currentUserId,
+            pageNum: 1,
+            pageSize: 1000
+          }
 
-      listQualification(queryParams).then(response => {
-        if (response.code === 200) {
-          this.certificateList = response.rows || []
+          const certResponse = await listQualification(queryParams)
+          if (certResponse.code === 200) {
+            this.certificateList = certResponse.rows || []
 
-          if (this.certificateList.length === 0) {
-            this.$message.info('该兽医暂无资质证书')
-          } else {
             if (this.certificateList.length > 0) {
-              this.activeCertTab = 'cert' + this.certificateList[0].qualificationId
-            }
-          }
-
-          const forms = {}
-          this.certificateList.forEach(cert => {
-            forms[cert.qualificationId] = {
-              qualificationId: cert.qualificationId,
-              auditStatus: cert.auditStatus || "",
-              auditOpinion: cert.auditOpinion || "",
-              submitted: !!cert.auditStatus && cert.auditStatus !== '0',
-              saving: false
+              if (this.certificateList.length > 0) {
+                this.activeCertTab = 'cert' + this.certificateList[0].qualificationId
+              }
             }
-          })
-          this.certAuditForms = forms
 
-        } else {
-          this.$message.error(response.msg || '加载证书列表失败')
+            const forms = {}
+            this.certificateList.forEach(cert => {
+              // 如果证书已经有审核状态（1或2），则回显
+              if (cert.auditStatus && cert.auditStatus !== '0') {
+                forms[cert.qualificationId] = {
+                  qualificationId: cert.qualificationId,
+                  auditStatus: cert.auditStatus,
+                  auditOpinion: cert.auditOpinion || "",
+                  audited: true
+                }
+              } else {
+                forms[cert.qualificationId] = {
+                  qualificationId: cert.qualificationId,
+                  auditStatus: "",
+                  auditOpinion: "",
+                  audited: false
+                }
+              }
+            })
+            this.certAuditForms = forms
+          } else {
+            this.$message.error(certResponse.msg || '加载证书列表失败')
+          }
         }
-      }).catch(error => {
-        console.error('加载证书列表失败:', error)
-        this.$message.error('加载证书列表失败')
-      }).finally(() => {
+      } catch (error) {
+        console.error('加载数据失败:', error)
+        this.$message.error('加载数据失败')
+      } finally {
+        this.loadingBasicData = false
         this.loadingCertData = false
-      })
+      }
     },
 
-    handleCertAuditChange(qualificationId) {
-      if (this.certAuditForms[qualificationId]) {
-        this.certAuditForms[qualificationId].submitted = false
+    handleBasicAuditChange(e) {
+      console.log(e);
+      // 如果选择审核通过，清空审核意见
+      if (this.basicAuditForm.auditStatus === '1') {
+        this.basicAuditForm.auditDesc = ''
       }
     },
 
-    saveCertificateAudit(qualificationId) {
-      const formRef = this.$refs['certForm' + qualificationId]
-      if (!formRef || !formRef[0]) return
+    handleCertAuditChange(qualificationId) {
+      // 如果选择审核通过，清空审核意见
+      if (this.certAuditForms[qualificationId].auditStatus === '1') {
+        this.certAuditForms[qualificationId].auditOpinion = ''
+      }
+      // 标记为已审核（选择了结果）
+      this.certAuditForms[qualificationId].audited = true
+    },
 
-      formRef[0].validate(valid => {
-        if (valid) {
-          const form = this.certAuditForms[qualificationId]
-          if (!form.auditStatus) {
-            this.$message.warning('请选择审核结果')
-            return
-          }
+    submitAllAudit() {
+      // 验证基本信息审核结果
+      if (!this.basicAuditForm.auditStatus ||
+          (this.basicAuditForm.auditStatus !== '1' && this.basicAuditForm.auditStatus !== '2')) {
+        this.$message.warning('请选择基本信息审核结果')
+        this.activeAuditTab = 'basic'
+        return
+      }
 
-          form.saving = true
+      // 验证基本信息审核意见（不通过时必须填写）
+      if (this.basicAuditForm.auditStatus === '2' && !this.basicAuditForm.auditDesc) {
+        this.$message.warning('审核不通过时，请填写审核意见')
+        this.activeAuditTab = 'basic'
+        return
+      }
 
-          const auditData = {
-            qualificationId: qualificationId,
-            auditStatus: form.auditStatus,
-            auditOpinion: form.auditOpinion || ''
+      // 验证证书审核
+      if (this.certificateList && this.certificateList.length > 0) {
+        let unselectedCertNames = []
+        let invalidOpinionCertNames = []
+
+        for (let i = 0; i < this.certificateList.length; i++) {
+          const cert = this.certificateList[i]
+          const form = this.certAuditForms[cert.qualificationId]
+          const certName = cert.certName || cert.qualificationType || `证书${i + 1}`
+
+          if (!form || !form.auditStatus ||
+              (form.auditStatus !== '1' && form.auditStatus !== '2')) {
+            unselectedCertNames.push(certName)
+          } else if (form.auditStatus === '2' && !form.auditOpinion) {
+            invalidOpinionCertNames.push(certName)
           }
-
-          auditCertificate(auditData).then(response => {
-            if (response.code === 200) {
-              form.submitted = true
-
-              const certIndex = this.certificateList.findIndex(c => c.qualificationId === qualificationId)
-              if (certIndex !== -1) {
-                this.certificateList[certIndex].auditStatus = form.auditStatus
-                this.certificateList[certIndex].auditOpinion = form.auditOpinion
-              }
-
-              this.$message.success('证书审核已保存')
-            } else {
-              this.$message.error(response.msg || '保存失败')
-            }
-          }).catch(error => {
-            console.error('保存证书审核失败:', error)
-            this.$message.error('保存失败')
-          }).finally(() => {
-            form.saving = false
-          })
-        }
-      })
-    },
-
-    resetCertAudit(qualificationId) {
-      const cert = this.certificateList.find(c => c.qualificationId === qualificationId)
-      if (cert) {
-        this.certAuditForms[qualificationId] = {
-          qualificationId: cert.qualificationId,
-          auditStatus: cert.auditStatus || "",
-          auditOpinion: cert.auditOpinion || "",
-          submitted: !!cert.auditStatus && cert.auditStatus !== '0',
-          saving: false
         }
-        this.$message.info('已重置审核表单')
-      }
-    },
 
-    submitAllAudit() {
-      this.$refs.basicAuditForm.validate(valid => {
-        if (!valid) {
-          this.$message.warning('请完成基本信息审核')
-          this.activeAuditTab = 'basic'
+        // 如果有未选择审核结果的证书
+        if (unselectedCertNames.length > 0) {
+          const message = `请为以下证书选择审核结果：${unselectedCertNames.join('、')}`
+          this.$message.warning(message)
+          this.activeAuditTab = 'certificate'
+          // 切换到第一个未选择的证书标签页
+          const firstUnselectedCert = this.certificateList.find(cert => {
+            const form = this.certAuditForms[cert.qualificationId]
+            return !form || !form.auditStatus ||
+                   (form.auditStatus !== '1' && form.auditStatus !== '2')
+          })
+          if (firstUnselectedCert) {
+            this.activeCertTab = 'cert' + firstUnselectedCert.qualificationId
+          }
           return
         }
 
-        let allCertAudited = true
-        if (this.certificateList.length > 0) {
-          for (let i = 0; i < this.certificateList.length; i++) {
-            const cert = this.certificateList[i]
+        // 如果有审核不通过但未填写意见的证书
+        if (invalidOpinionCertNames.length > 0) {
+          const message = `以下证书审核不通过，请填写审核意见：${invalidOpinionCertNames.join('、')}`
+          this.$message.warning(message)
+          this.activeAuditTab = 'certificate'
+          // 切换到第一个未填写意见的证书标签页
+          const firstInvalidCert = this.certificateList.find(cert => {
             const form = this.certAuditForms[cert.qualificationId]
-            if (!form || !form.submitted) {
-              allCertAudited = false
-              break
-            }
-          }
-
-          if (!allCertAudited) {
-            this.$message.warning('请完成所有证书的审核')
-            this.activeAuditTab = 'certificate'
-            return
+            return form && form.auditStatus === '2' && !form.auditOpinion
+          })
+          if (firstInvalidCert) {
+            this.activeCertTab = 'cert' + firstInvalidCert.qualificationId
           }
+          return
         }
+      }
 
-        this.submittingAll = true
+      this.submittingAll = true
 
-        const auditData = {
-          id: this.currentVetId,
-          auditStatus: this.basicAuditForm.auditStatus,
-          auditDesc: this.basicAuditForm.auditDesc
-        }
+      // 提交基本信息审核
+      const basicAuditData = {
+        id: this.currentVetId,
+        auditStatus: this.basicAuditForm.auditStatus,
+        auditDesc: this.basicAuditForm.auditDesc
+      }
 
-        auditBasicInfo(auditData).then(response => {
-          if (response.code === 200) {
-            this.$message.success('审核提交成功')
-            this.auditVisible = false
-            this.getList()
-          } else {
-            this.$message.error(response.msg || '提交失败')
+      auditBasicInfo(basicAuditData).then(response => {
+        if (response.code === 200) {
+          // 提交证书审核
+          if (this.certificateList && this.certificateList.length > 0) {
+            const certPromises = []
+            this.certificateList.forEach(cert => {
+              const form = this.certAuditForms[cert.qualificationId]
+              const certAuditData = {
+                qualificationId: cert.qualificationId,
+                auditStatus: form.auditStatus,
+                auditOpinion: form.auditOpinion || ''
+              }
+              certPromises.push(auditCertificate(certAuditData))
+            })
+
+            return Promise.all(certPromises)
           }
-        }).catch(error => {
-          console.error('提交失败:', error)
-          this.$message.error('提交失败')
-        }).finally(() => {
-          this.submittingAll = false
-        })
+          return Promise.resolve()
+        } else {
+          throw new Error(response.msg || '基本信息审核提交失败')
+        }
+      }).then(results => {
+        this.$message.success('审核提交成功')
+        this.auditVisible = false
+        this.getList()
+      }).catch(error => {
+        console.error('提交失败:', error)
+        this.$message.error(error.message || '提交失败')
+      }).finally(() => {
+        this.submittingAll = false
       })
     },
 
     getCertSummaryText() {
-      if (this.certificateList.length === 0) {
+      if (!this.certificateList || this.certificateList.length === 0) {
         return '暂无资质证书'
       }
 
-      const total = this.certificateList.length
-      const audited = Object.values(this.certAuditForms).filter(f => f.submitted).length
-      const passed = this.certificateList.filter(c => c.auditStatus === '1').length
-      const failed = this.certificateList.filter(c => c.auditStatus === '2').length
+      let selectedCount = 0
+      this.certificateList.forEach(cert => {
+        const form = this.certAuditForms[cert.qualificationId]
+        if (form && form.auditStatus &&
+            (form.auditStatus === '1' || form.auditStatus === '2')) {
+          selectedCount++
+        }
+      })
 
-      return `共 ${total} 个证书，已审核 ${audited} 个，其中通过 ${passed} 个，不通过 ${failed} 个`
+      const totalCount = this.certificateList.length
+      if (selectedCount === totalCount) {
+        return `共 ${totalCount} 个证书，所有证书均已选择审核结果`
+      } else {
+        return `共 ${totalCount} 个证书，已选择审核结果 ${selectedCount} 个，还有 ${totalCount - selectedCount} 个证书未选择`
+      }
     },
 
     resetAuditData() {
@@ -897,10 +861,12 @@ export default {
       this.currentVetId = null
       this.currentUserId = null
       this.activeCertTab = null
-      if (this.certAuditTimer) {
-        clearTimeout(this.certAuditTimer)
-        this.certAuditTimer = null
-      }
+      this.loadingBasicData = false
+      this.loadingCertData = false
+    },
+
+    closeAuditDialog() {
+      this.resetAuditData()
     },
 
     handleView(row) {
@@ -1000,13 +966,14 @@ export default {
       })
     },
 
+    // 删除
     handleDelete(row) {
       const ids = row.id || this.ids
       this.$modal.confirm('是否确认删除兽医个人信息编号为"' + ids + '"的数据项？').then(() => {
-        this.$axios.delete('/system/vetInfo/' + ids).then(response => {
-          this.getList()
-          this.$modal.msgSuccess("删除成功")
-        })
+        return delvetInfo(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
       }).catch(() => {})
     },
 
@@ -1085,7 +1052,7 @@ export default {
       axios({
         method: 'get',
         url: fullUrl,
-        responseType: 'blob', // 关键：设置响应类型为blob
+        responseType: 'blob',
         headers: {
         }
       }).then(response => {
@@ -1120,10 +1087,17 @@ export default {
 }
 </script>
 
+<style>
+.el-tooltip__popper{
+  width: 300px !important;
+}
+</style>
+
 <style scoped>
 ::v-deep .pagestyle .el-input{
   width: auto !important;
 }
+
 </style>
 
 <style scoped lang="scss">
@@ -1256,27 +1230,7 @@ export default {
     font-size: 13px;
     font-weight: 600;
     color: #303133;
-    //flex: 1;
   }
-
-  //.el-tag {
-  //  font-weight: 500;
-  //
-  //  &.el-tag--success {
-  //    background-color: rgba(103, 194, 58, 0.1);
-  //    border-color: rgba(103, 194, 58, 0.2);
-  //  }
-  //
-  //  &.el-tag--danger {
-  //    background-color: rgba(245, 108, 108, 0.1);
-  //    border-color: rgba(245, 108, 108, 0.2);
-  //  }
-  //
-  //  &.el-tag--warning {
-  //    background-color: rgba(230, 162, 60, 0.1);
-  //    border-color: rgba(230, 162, 60, 0.2);
-  //  }
-  //}
 }
 
 .cert-info {
@@ -1364,7 +1318,6 @@ export default {
     color: #606266;
     font-size: 13px;
 
-    // 新增：下载按钮样式
     .download-btn {
       color: #409EFF;
       padding: 0;
@@ -1418,31 +1371,6 @@ export default {
   }
 }
 
-//.info-btn {
-//  padding: 6px 12px;
-//  border-radius: 4px;
-//  margin: 0 4px;
-//  transition: all 0.3s ease;
-//  font-weight: 500;
-//
-//  &:hover {
-//    transform: translateY(-2px);
-//    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
-//  }
-//}
-//
-//.view-btn:hover {
-//  background-color: rgba(243, 239, 231, 0.9);
-//  border-color: #e6a23c;
-//  color: #e6a23c;
-//}
-//
-//.audit-btn:hover {
-//  background-color: rgba(64, 158, 255, 0.15);
-//  border-color: #409eff;
-//  color: #409eff;
-//}
-
 :deep(.dialog-footer) {
   .el-button {
     min-width: 100px;
@@ -1483,7 +1411,6 @@ export default {
   }
 }
 
-// 操作按钮样式
 .info-btn {
   padding: 6px 10px;
   border-radius: 4px;
@@ -1501,7 +1428,6 @@ export default {
   transform: translateY(-1px);
 }
 
-// 新增/修改的弹窗
 ::v-deep .el-dialog {
   border-radius: 12px;
   overflow: hidden;
@@ -1580,7 +1506,6 @@ export default {
   border-radius: 0 0 12px 12px;
 }
 
-// 证书中的状态标签样式
 .cert-status-tag {
   min-width: 70px;
   display: inline-flex;
diff --git a/chenhai-ui/src/views/vet/info/index.vue b/chenhai-ui/src/views/vet/info/index.vue
index 0acc5f3..bb38d54 100644
--- a/chenhai-ui/src/views/vet/info/index.vue
+++ b/chenhai-ui/src/views/vet/info/index.vue
@@ -3,44 +3,29 @@
     <!-- 搜索部分 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
       <el-form-item label="真实姓名" prop="realName">
-        <el-input
-          v-model="queryParams.realName"
-          placeholder="请输入真实姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.realName" placeholder="请输入真实姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-<!--      <el-form-item label="性别" prop="gender">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.gender"-->
-<!--          placeholder="请输入性别"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="性别" prop="gender">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.gender"-->
+      <!--          placeholder="请输入性别"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="身份证号" prop="idCard">
-        <el-input
-          v-model="queryParams.idCard"
-          placeholder="请输入身份证号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-<!--      <el-form-item label="工作经验" prop="workExperience">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.workExperience"-->
-<!--          placeholder="请输入工作经验"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <!--      <el-form-item label="工作经验" prop="workExperience">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.workExperience"-->
+      <!--          placeholder="请输入工作经验"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="所属医院" prop="hospital">
-        <el-input
-          v-model="queryParams.hospital"
-          placeholder="请输入所属医院"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.hospital" placeholder="请输入所属医院" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -49,37 +34,17 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['vet:info:add']">新增</el-button>
+      </el-col> -->
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['vet:info:add']"
-        >新增</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+          v-hasPermi="['vet:info:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['vet:info:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['vet:info:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['vet:info:remove']">删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -89,77 +54,55 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="头像" align="center" prop="avatar" width="100">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.avatar" :width="50" :height="50"/>
+          <image-preview :src="scope.row.avatar" :width="50" :height="50" />
         </template>
       </el-table-column>
       <el-table-column label="用户昵称" align="center" prop="nickName" />
-      <el-table-column label="真实姓名" align="center" prop="realName" width="150" :show-overflow-tooltip="true"/>
-      <el-table-column label="性别" align="center" prop="gender" />
+      <el-table-column label="真实姓名" align="center" prop="realName" width="150" :show-overflow-tooltip="true" />
+      <!-- <el-table-column label="性别" align="center" prop="gender" />
       <el-table-column label="出生日期" align="center" prop="birthday" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.birthday, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="身份证号" align="center" prop="idCard"  width="200"/>
-      <el-table-column label="擅长领域" align="center" prop="specialty" width="150" :show-overflow-tooltip="true"/>
-      <el-table-column label="工作经验" align="center" prop="workExperience"/>
-      <el-table-column label="职称" align="center" prop="title" width="150"/>
-      <el-table-column label="联系电话" align="center" prop="phone" width="200"/>
-      <el-table-column label="电子邮箱" align="center" prop="email" width="200"/>
-      <el-table-column label="专家类型" align="center" prop="expertType" width="150"/>
-      <el-table-column label="所属医院" align="center" prop="hospital" width="150" :show-overflow-tooltip="true"/>
-      <el-table-column label="联系地址" align="center" prop="address" width="150" :show-overflow-tooltip="true"/>
-      <el-table-column label="个人简介" align="center" prop="introduction" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column label="身份证号" align="center" prop="idCard" width="200" /> -->
+      <el-table-column label="擅长领域" align="center" prop="specialty" :show-overflow-tooltip="true" />
+      <el-table-column label="工作经验" align="center" prop="workExperience" />
+      <el-table-column label="职称" align="center" prop="title" />
+      <!-- <el-table-column label="联系电话" align="center" prop="phone" width="200" />
+      <el-table-column label="电子邮箱" align="center" prop="email" width="200" /> -->
+      <el-table-column label="专家类型" align="center" prop="expertType" width="150" />
+      <!-- <el-table-column label="所属医院" align="center" prop="hospital" width="150" :show-overflow-tooltip="true" />
+      <el-table-column label="联系地址" align="center" prop="address" width="150" :show-overflow-tooltip="true" />
+      <el-table-column label="个人简介" align="center" prop="introduction" width="150" :show-overflow-tooltip="true" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="300">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            class = "info-btn view-btn"
-            @click="handleView(scope.row)"
-            v-hasPermi="['vet:info:view']"
-          >详情</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            style="color: #42B983"
-            class = "info-btn alter-btn"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['vet:info:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            style="color: #f28888"
-            class = "info-btn delete-btn"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['vet:info:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" class="info-btn view-btn" @click="handleView(scope.row)"
+            v-hasPermi="['vet:info:view']">详情</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" style="color: #42B983" class="info-btn alter-btn"
+            @click="handleUpdate(scope.row)" v-hasPermi="['vet:info:edit']">完善信息</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" style="color: #f28888" class="info-btn delete-btn"
+            @click="handleDelete(scope.row)" v-hasPermi="['vet:info:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <div class="pagestyle">
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
     </div>
 
     <!-- 添加或修改兽医个人信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="80%" :close-on-click-modal="false" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="头像" prop="avatar">
-          <image-upload v-model="form.avatar" :limit='1'/>
+          <image-upload v-model="form.avatar" :limit='1' />
+        </el-form-item>
+        <el-form-item label="用户昵称" prop="nickName">
+          <el-input v-model="form.nickName" placeholder="请输入用户昵称" minlength="2" maxlength="10" />
         </el-form-item>
         <el-form-item label="真实姓名" prop="realName">
-          <el-input v-model="form.realName" placeholder="请输入真实姓名" minlength="2" maxlength="10"/>
+          <el-input v-model="form.realName" placeholder="请输入真实姓名" minlength="2" maxlength="10" />
         </el-form-item>
         <el-form-item label="性别" prop="gender">
           <el-select v-model="form.gender" placeholder="请选择性别" clearable>
@@ -168,11 +111,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="出生日期" prop="birthday">
-          <el-date-picker clearable
-                          v-model="form.birthday"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择出生日期">
+          <el-date-picker clearable v-model="form.birthday" type="date" value-format="yyyy-MM-dd" placeholder="请选择出生日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="职称" prop="title">
@@ -186,7 +125,7 @@
         </el-form-item>
         <el-form-item label="专家类型" prop="expertType">
           <el-select v-model="form.expertType" placeholder="请选择专家类型" clearable>
-            <el-option v-for="dict in dict.type.expert_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+            <el-option v-for="dict in dict.type.expert_type" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <el-form-item label="身份证号" prop="idCard" minlength="18" maxlength="18">
@@ -220,16 +159,18 @@
         <!-- 显示兽医基本信息 -->
         <el-descriptions title="兽医基本信息" :column="2" border>
           <el-descriptions-item label="真实姓名">{{ detailData.realName || '-' }}</el-descriptions-item>
+          <el-descriptions-item label="用户昵称">{{ detailData.realName || '-' }}</el-descriptions-item>
           <el-descriptions-item label="性别">{{ detailData.gender || '-' }}</el-descriptions-item>
           <el-descriptions-item label="出生日期">{{ detailData.birthday || '-' }}</el-descriptions-item>
           <el-descriptions-item label="身份证号">{{ detailData.idCard || '-' }}</el-descriptions-item>
           <el-descriptions-item label="擅长领域">{{ detailData.specialty || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="工作经验">{{ detailData.workExperience ? detailData.workExperience + '年' : '-' }}</el-descriptions-item>
+          <el-descriptions-item label="工作经验">{{ detailData.workExperience ? detailData.workExperience + '年' : '-'
+          }}</el-descriptions-item>
           <el-descriptions-item label="职称">{{ detailData.title || '-' }}</el-descriptions-item>
           <el-descriptions-item label="联系电话">{{ detailData.phone || '-' }}</el-descriptions-item>
           <el-descriptions-item label="电子邮箱">{{ detailData.email || '-' }}</el-descriptions-item>
           <el-descriptions-item label="专家类型">
-            <dict-tag :options="dict.type.expert_type" :value="detailData.expertType"/>
+            <dict-tag :options="dict.type.expert_type" :value="detailData.expertType" />
           </el-descriptions-item>
           <el-descriptions-item label="所属医院">{{ detailData.hospital || '-' }}</el-descriptions-item>
           <el-descriptions-item label="联系地址" :span="2">{{ detailData.address || '-' }}</el-descriptions-item>
@@ -237,17 +178,11 @@
         </el-descriptions>
 
         <!-- 显示资质证书信息 -->
-        <div style="margin-top: 30px;">
+        <!-- <div style="margin-top: 30px;">
           <h3 style="margin-bottom: 15px;color: #303133;font-weight: bold;">资质证书信息</h3>
-          <el-alert
-            v-if="!certificateList || certificateList.length === 0"
-            title="暂无资质证书"
-            type="info"
-            :closable="false"
-            style="margin-bottom: 20px;"
-          />
+          <el-alert v-if="!certificateList || certificateList.length === 0" title="暂无资质证书" type="info" :closable="false"
+            style="margin-bottom: 20px;" />
           <el-table v-else :data="certificateList" border style="width: 100%">
-<!--            <el-table-column prop="qualificationName" label="资质名称" align="center" width="180"></el-table-column>-->
             <el-table-column prop="certName" label="证书名称" align="center"></el-table-column>
             <el-table-column prop="certificateNo" label="证书编号" align="center"></el-table-column>
             <el-table-column prop="issueDate" label="颁发日期" align="center">
@@ -275,7 +210,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </div>
+        </div> -->
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="closeDetail">关 闭</el-button>
@@ -285,7 +220,7 @@
 </template>
 
 <script>
-import { listInfo, getInfo, getfull, delInfo, addInfo, updateInfo } from "@/api/vet/info"
+import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/vet/info"
 import request from '@/utils/request'
 
 export default {
@@ -340,15 +275,30 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        // avatar: [
+        //   { required: true, message: "头像不能为空", trigger: "change" }
+        // ],
+        // nickName: [
+        //   { required: true, message: "用户昵称不能为空", trigger: "change" }
+        // ],
         realName: [
-          {required: true, message: "真实姓名不能为空", trigger: "blur"},
+          { required: true, message: "真实姓名不能为空", trigger: "blur" },
           { min: 2, max: 10, message: "长度在2到10个字符", trigger: "blur" },
         ],
-        gender: [
-          { required: true, message: "性别不能为空", trigger: "change" }
+        specialty: [
+          { required: true, message: "擅长领域不能为空", trigger: "blur" },
+        ],
+        phone: [
+          { required: true, message: "手机号不能为空", trigger: "blur" },
+        ],
+        workExperience: [
+          { required: true, message: "工作经验不能为空", trigger: "blur" },
+        ],
+        expertType: [
+          { required: true, message: "专家类型不能为空", trigger: "change" }
         ],
         idCard: [
-          {required: true, message: "身份证号不能为空", trigger: "blur"},
+          { required: true, message: "身份证号不能为空", trigger: "blur" },
           { pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, message: "身份证号码不合法", trigger: "blur" },
           { min: 1, max: 18, message: "长度在18个字符", trigger: "blur" },
         ]
@@ -394,6 +344,7 @@ export default {
       this.form = {
         id: null,
         userId: null,
+        nickName: null,
         realName: null,
         avatar: null,
         gender: null,
@@ -427,8 +378,8 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.ids = selection.map(item => item.userId)
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 详情按钮操作 */
@@ -436,8 +387,8 @@ export default {
       this.detailVisible = true
       this.detailTitle = "兽医详情信息"
 
-      const id = row.id || this.ids
-      getfull(id).then(response => {
+      const id = row.userId || this.ids
+      getInfo(id).then(response => {
         if (response.code === 200) {
           const data = response.data
           console.log('详情返回数据:', data)
@@ -477,13 +428,6 @@ export default {
 
     /** 加载当前用户信息 */
     loadCurrentUserInfo() {
-      // 方法1：使用项目中已有的API调用方式
-      // 查看 listInfo 是如何调用的，模仿它
-
-      // 方法2：直接使用项目的request工具
-      // 先导入 request
-
-
       request({
         url: '/vet/info/current',
         method: 'get',
@@ -517,6 +461,9 @@ export default {
             this.form.phone = response.data.phonenumber
             console.log('从用户资料设置手机号:', this.form.phone)
           }
+          if (response.data.avatar && !this.form.avatar) {
+            this.form.avatar = response.data.avatar
+          }
 
           // 也可以填充其他字段
           if (response.data.nickName && !this.form.nickName) {
@@ -525,9 +472,6 @@ export default {
           if (response.data.email && !this.form.email) {
             this.form.email = response.data.email
           }
-          if (response.data.sex && !this.form.gender) {
-            this.form.gender = response.data.sex
-          }
         }
       }).catch(error => {
         console.error('获取用户资料失败:', error)
@@ -572,6 +516,9 @@ export default {
       if (personalInfo.gender) {
         this.form.gender = personalInfo.gender
       }
+      if (personalInfo.avatar) {
+        this.form.avatar = personalInfo.avatar
+      }
 
       // 提示用户
       if (data.hasQualifications) {
@@ -581,7 +528,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      const id = row.id || this.ids
+      const id = row.userId || this.ids
       getInfo(id).then(response => {
         this.form = response.data
         this.open = true
@@ -592,12 +539,11 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.id != null) {
+          if (this.form.userId != null) {
             updateInfo(this.form).then(response => {
               this.$modal.msgSuccess("修改成功")
               this.open = false
               this.getList()
-              this.$router.go(0)
             })
           } else {
             addInfo(this.form).then(response => {
@@ -612,12 +558,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids
-      this.$modal.confirm('是否确认删除兽医个人信息编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除兽医个人信息编号为"' + ids + '"的数据项？').then(function () {
         return delInfo(ids)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => { })
     },
 
     // 获取审核状态文本
@@ -664,16 +610,17 @@ export default {
 </script>
 
 <style scoped>
-::v-deep .el-descriptions-item__cell{
+::v-deep .el-descriptions-item__cell {
   width: 90px;
 }
 
-::v-deep .pagestyle .el-input{
+::v-deep .pagestyle .el-input {
   width: auto !important;
 }
 
-::v-deep .el-descriptions-row th{
-  text-align: center !important;color: #7b7c7f;
+::v-deep .el-descriptions-row th {
+  text-align: center !important;
+  color: #7b7c7f;
 }
 
 ::v-deep .el-descriptions .is-bordered .el-descriptions-item__cell {
@@ -696,7 +643,7 @@ export default {
   transform: translateY(-1px);
 }
 
-.alter-btn:hover{
+.alter-btn:hover {
   background-color: rgb(230, 255, 238);
   transform: translateY(-1px);
 }
diff --git a/chenhai-ui/src/views/vet/qualification/index.vue b/chenhai-ui/src/views/vet/qualification/index.vue
index 2926274..35e0b9d 100644
--- a/chenhai-ui/src/views/vet/qualification/index.vue
+++ b/chenhai-ui/src/views/vet/qualification/index.vue
@@ -2,44 +2,38 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="真实姓名" prop="realName">
-        <el-input
-          v-model="queryParams.realName"
-          placeholder="请输入真实姓名"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.realName" placeholder="请输入真实姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="身份证号" prop="idCard">
-        <el-input
-          v-model="queryParams.idCard"
-          placeholder="请输入身份证号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.idCard" placeholder="请输入身份证号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="资质类型" prop="qualificationType">
-        <el-select
-          v-model="queryParams.qualificationType"
-          placeholder="请选择资质类型"
-          style="width: 100%;"
-          @keyup.enter.native="handleQuery"
-        >
-          <el-option
-            v-for="dict in dict.type.qualification_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.qualificationType" placeholder="请选择资质类型" style="width: 100%;"
+          @keyup.enter.native="handleQuery">
+          <el-option v-for="dict in dict.type.qualification_type" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
+      <!--      <el-form-item label="资质类型" prop="qualificationType">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.qualificationType"-->
+      <!--          placeholder="请输入资质类型"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="证书编号" prop="certificateNo">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.certificateNo"-->
+      <!--          placeholder="请输入证书编号"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
       <el-form-item label="审核状态" prop="auditStatus">
-        <el-select v-model="queryParams.auditStatus" placeholder="审核状态" clearable style="width: 100px">
-          <el-option
-            v-for="dict in dict.type.qualification_shenhe"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.auditStatus" placeholder="审核状态" clearable>
+          <el-option v-for="dict in dict.type.qualification_shenhe" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -49,298 +43,125 @@
     </el-form>
 
     <!-- 表格 -->
-    <el-table v-loading="loading" :data="qualificationList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="qualificationList" border style="width: 100%">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="真实姓名" align="center" prop="realName" width="150" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <span v-if="scope.row.realName">{{ scope.row.realName }}</span>
-          <span v-else style="color: #909399">-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="身份证号" align="center" prop="idCard" width="200">
-        <template slot-scope="scope">
-          <span v-if="scope.row.idCard">{{ scope.row.idCard }}</span>
-          <span v-else style="color: #909399">-</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="资质类型" align="center" prop="qualificationType" width="150">
-        <template slot-scope="scope">
-          <span>{{ formatQualificationType(scope.row.qualificationType) }}</span>
-        </template>
+      <el-table-column prop="certName" label="证书名称" align="center" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column prop="certificateNo" label="证书编号" align="center" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column label="发证机构" align="center" prop="issueOrg" width="150" :show-overflow-tooltip="true" />
+      <el-table-column label="资质类型" align="center" prop="issueOrg" width="150" :show-overflow-tooltip="true" >
+
       </el-table-column>
-      <el-table-column label="申请时间" align="center" prop="applyTime" width="180">
+
+
+      <el-table-column prop="issueDate" label="发证日期" align="center" width="150">
         <template slot-scope="scope">
-          <span v-if="scope.row.applyTime">{{ parseTime(scope.row.applyTime, '{y}-{m}-{d}') }}</span>
-          <span v-else style="color: #909399">-</span>
+          <span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审核时间" align="center" prop="auditTime" width="180">
+      <el-table-column prop="expireDate" label="到期日期" align="center" width="150">
         <template slot-scope="scope">
-          <span v-if="scope.row.auditTime">{{ parseTime(scope.row.auditTime, '{y}-{m}-{d}') }}</span>
-          <span v-else style="color: #909399">-</span>
+          <span>{{ parseTime(scope.row.expireDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审核状态" align="center" prop="auditStatus" width="100">
+      <el-table-column label="证书状态" align="center" prop="certStatus" width="100">
         <template slot-scope="scope">
-          <el-tag :type="getAuditStatusType(scope.row.auditStatus)" size="small">
-            {{ getDictLabel('qualification_shenhe', scope.row.auditStatus) }}
+          <el-tag :type="getCertStatusType(scope.row.certStatus)" size="small">
+            {{ getCertStatusLabel(scope.row.certStatus) }}
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" width="150" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="300">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleView(scope.row)"
-            v-hasPermi="['vet:qualification:query']"
-            class="info-btn view-btn"
-          >详情</el-button>
+          <el-button v-if="!detailData.auditStatus || detailData.auditStatus === '0' || detailData.auditStatus === '2'"
+            size="mini" type="text" icon="el-icon-edit" style="color: #42B983" @click="handleUpdate(scope.row)"
+            v-hasPermi="['vet:qualification:edit']" class="info-btn alter-btn">修改</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <div class="pagestyle">
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
-    </div>
-
-    <!-- 显示资质证书信息弹窗 -->
-    <el-dialog :title="title" :visible.sync="openDetail" width="80%" append-to-body>
-      <div v-if="detailData" style="padding: 20px;">
-        <!-- 显示实名信息摘要 -->
-        <el-card class="auth-info-card" style="margin-bottom: 20px; background-color: #f0f9eb;" v-if="authInfo">
-          <div slot="header" class="clearfix">
-            <span><i class="el-icon-success" style="color: #67C23A;"></i> 实名认证信息</span>
-          </div>
-          <div class="auth-info-content">
-            <el-row :gutter="20">
-              <el-col :span="8">
-                <span class="auth-label">真实姓名：</span>
-                <span class="auth-value">{{ authInfo.realName || detailData.realName || '-' }}</span>
-              </el-col>
-              <el-col :span="16">
-                <span class="auth-label">身份证号：</span>
-                <span class="auth-value">{{ authInfo.maskedIdCard || detailData.idCard || '-' }}</span>
-              </el-col>
-            </el-row>
-          </div>
-        </el-card>
-
-        <div>
-          <el-alert
-            v-if="!certificateList || certificateList.length === 0"
-            title="暂无资质证书"
-            type="info"
-            :closable="false"
-            style="margin-bottom: 20px;"
-          />
-          <el-table v-else :data="certificateList" border style="width: 100%">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column prop="certificateNo" label="证书编号" align="center" width="150" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                <span>{{ scope.row.certificateNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="certName" label="证书名称" align="center" width="150" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                <span>{{ scope.row.certName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="发证机构" align="center" prop="issueOrg" width="150" :show-overflow-tooltip="true">
-              <template slot-scope="scope">
-                <span v-if="scope.row.issueOrg">{{ scope.row.issueOrg }}</span>
-                <span v-else style="color: #909399">-</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="证书文件" prop="certificateFiles" align="center" width="100">
-              <template slot-scope="scope">
-                <span v-if="scope.row.certificateFiles">
-                  <template v-if="isImageFile(scope.row.certificateFiles)">
-                    <el-button
-                      type="text"
-                      icon="el-icon-view"
-                      @click="previewCertificate(scope.row.certificateFiles)"
-                      style="color: #409EFF;font-size: 20px"
-                    >
-                    </el-button>
-                  </template>
-                  <template v-else-if="isPdfFile(scope.row.certificateFiles)">
-                    <el-button
-                      type="text"
-                      icon="el-icon-download"
-                      @click="downloadFile(scope.row.certificateFiles)"
-                      style="color: #287c07;font-size: 20px"
-                    >
-                    </el-button>
-                  </template>
-                  <template v-else>
-                    {{ getImageUrl(scope.row.certificateFiles) }}
-                  </template>
-                </span>
-                <span v-else style="color: #909399">-</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="issueDate" label="发证日期" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d}') }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="expireDate" label="到期日期" align="center" width="150">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.expireDate, '{y}-{m}-{d}') }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="证书状态" align="center" prop="certStatus" width="100">
-              <template slot-scope="scope">
-                <el-tag :type="getCertStatusType(scope.row.certStatus)" size="small">
-                  {{ getCertStatusLabel(scope.row.certStatus) }}
-                </el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="300">
-              <template slot-scope="scope">
-                <el-button
-                  v-if="!detailData.auditStatus || detailData.auditStatus === '0' || detailData.auditStatus === '2'"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  style="color: #42B983"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['vet:qualification:edit']"
-                  class="info-btn alter-btn"
-                >修改</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="closeDetail">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 图片预览弹窗 -->
-    <el-dialog :visible.sync="previewDialogVisible" width="80%" append-to-body>
-      <div style="text-align: center; padding: 20px;">
-        <img
-          :src="getImageUrl(previewFileUrl)"
-          style="max-width: 100%; max-height: 70vh; height: auto;"
-          preview-teleported
-          :preview-src-list="[getImageUrl(previewFileUrl)]"
-        />
-      </div>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="closeimage">关 闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 添加或修改兽医资质弹窗 -->
-    <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
-      <!-- 实名认证提示 -->
-      <el-alert
-        v-if="authInfo"
-        type="success"
-        :closable="false"
-        show-icon
-        style="margin-bottom: 20px;"
-      >
-        <span>已通过实名认证，姓名和身份证已自动填充并锁定</span>
-      </el-alert>
-
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <!-- 真实姓名 - 根据实名认证状态决定是否只读 -->
-        <el-form-item label="真实姓名" prop="realName">
-          <el-input
-            v-model="form.realName"
-            placeholder="请输入真实姓名"
-            :readonly="realNameReadOnly"
-            :disabled="realNameReadOnly"
-          >
-            <template v-if="realNameReadOnly" slot="suffix">
-              <el-tooltip content="已通过实名认证" placement="top">
-                <i class="el-icon-success" style="color: #67C23A; line-height: 32px;"></i>
-              </el-tooltip>
-            </template>
-          </el-input>
-        </el-form-item>
-
-        <!-- 身份证号 - 根据实名认证状态决定是否只读 -->
-        <el-form-item label="身份证号" prop="idCard">
-          <el-input
-            v-model="form.idCard"
-            placeholder="请输入身份证号"
-            :readonly="idCardReadOnly"
-            :disabled="idCardReadOnly"
-          >
-            <template v-if="idCardReadOnly" slot="suffix">
-              <el-tooltip content="已通过实名认证" placement="top">
-                <i class="el-icon-success" style="color: #67C23A; line-height: 32px;"></i>
-              </el-tooltip>
-            </template>
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="证书编号" prop="certificateNo">
-          <el-input v-model="form.certificateNo" placeholder="请输入证书编号" />
-        </el-form-item>
-        <el-form-item label="证书名称" prop="certName">
-          <el-input v-model="form.certName" placeholder="请输入证书名称" />
-        </el-form-item>
-        <el-form-item label="发证机构" prop="issueOrg">
-          <el-input v-model="form.issueOrg" placeholder="请输入发证机构" />
-        </el-form-item>
-        <el-form-item label="发证日期" prop="issueDate">
-          <el-date-picker clearable
-                          v-model="form.issueDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择发证日期"
-                          style="width: 100%">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="到期日期" prop="expireDate">
-          <el-date-picker clearable
-                          v-model="form.expireDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择到期日期"
-                          style="width: 100%">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="证书文件" prop="certificateFiles">
-          <file-upload
-            v-model="form.certificateFiles"
-            :limit="1"
-            :file-type="['pdf','png','jpg','jpeg']"
-          />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="resubmitForm">重新提交审核</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
+  <div class="pagestyle">
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
   </div>
+
+
+  <!-- 图片预览弹窗 -->
+  <el-dialog :visible.sync="previewDialogVisible" width="80%" append-to-body>
+    <div style="text-align: center; padding: 20px;">
+      <img :src="getImageUrl(previewFileUrl)" style="max-width: 100%; max-height: 70vh; height: auto;" preview-teleported
+        :preview-src-list="[getImageUrl(previewFileUrl)]" />
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="closeimage">关 闭</el-button>
+    </div>
+  </el-dialog>
+
+  <!--     添加或修改兽医资质弹窗-->
+  <el-dialog :title="title" :visible.sync="open" width="80%" append-to-body>
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <!--        <el-form-item label="真实姓名" prop="realName">-->
+      <!--          <el-input v-model="form.realName" placeholder="请输入真实姓名" />-->
+      <!--        </el-form-item>-->
+      <!--        <el-form-item label="身份证号" prop="idCard">-->
+      <!--          <el-input v-model="form.idCard" placeholder="请输入身份证号" />-->
+      <!--        </el-form-item>-->
+      <!--        <el-form-item label="资质类型" prop="qualificationType">-->
+      <!--          <el-select-->
+      <!--            v-model="form.qualificationType"-->
+      <!--            placeholder="请选择资质类型"-->
+      <!--            style="width: 100%;"-->
+      <!--          >-->
+      <!--            <el-option-->
+      <!--              v-for="dict in dict.type.qualification_type"-->
+      <!--              :key="dict.value"-->
+      <!--              :label="dict.label"-->
+      <!--              :value="dict.value"-->
+      <!--            />-->
+      <!--          </el-select>-->
+      <!--        </el-form-item>-->
+      <el-form-item label="证书编号" prop="certificateNo">
+        <el-input v-model="form.certificateNo" placeholder="请输入证书编号" />
+      </el-form-item>
+      <el-form-item label="证书名称" prop="certName">
+        <el-input v-model="form.certName" placeholder="请输入证书名称" />
+      </el-form-item>
+      <el-form-item label="发证机构" prop="issueOrg">
+        <el-input v-model="form.issueOrg" placeholder="请输入发证机构" />
+      </el-form-item>
+      <el-form-item label="发证日期" prop="issueDate">
+        <el-date-picker clearable v-model="form.issueDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择发证日期"
+          style="width: 100%">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="到期日期" prop="expireDate">
+        <el-date-picker clearable v-model="form.expireDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择到期日期"
+          style="width: 100%">
+        </el-date-picker>
+      </el-form-item>
+      <!--        <el-form-item label="证书图片" prop="certImage">-->
+      <!--          <image-upload v-model="form.certImage"/>-->
+      <!--        </el-form-item>-->
+      <el-form-item label="证书文件" prop="certificateFiles">
+        <!--&lt;!&ndash;          <el-input v-model="form.certificateFiles" type="textarea" placeholder="请输入内容" />&ndash;&gt;-->
+        <file-upload v-model="form.certificateFiles" :limit="1" :file-type="['pdf', 'png', 'jpg', 'jpeg']" />
+      </el-form-item>
+      <!--        <el-form-item label="提前提醒天数" prop="remindDays">-->
+      <!--          <el-input v-model="form.remindDays" placeholder="请输入提前提醒天数" />-->
+      <!--        </el-form-item>-->
+      <!--        <el-form-item label="备注" prop="remark">-->
+      <!--          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />-->
+      <!--        </el-form-item>-->
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="resubmitForm">重新提交审核</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+  </el-dialog>
+</div>
 </template>
 
 <script>
-import {
-  listQualification,
-  getQualificationCertificate,
-  delQualification,
-  getQualificationCertificates,
-  updateAndSubmitQualification,
-  listQualificationCertificates
-} from "@/api/vet/qualification"
-import { getUserInfo } from "@/api/system/user"
+import { listQualification, getQualificationCertificate, delQualification, getQualificationCertificates, updateAndSubmitQualification, listQualificationCertificates } from "@/api/vet/qualification"
 
 export default {
   name: "Qualification",
@@ -375,16 +196,6 @@ export default {
       open: false,
       openDetail: false,
       previewDialogVisible: false,
-
-      // ========== 实名认证相关字段 ==========
-      // 实名认证信息
-      authInfo: null,
-      // 控制姓名和身份证是否只读
-      realNameReadOnly: false,
-      idCardReadOnly: false,
-      // 是否已获取过实名信息
-      authInfoFetched: false,
-
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -401,8 +212,17 @@ export default {
       },
       // 表单参数
       form: {},
-      // 表单校验 - 移除姓名和身份证的必填验证
+      // 表单校验
       rules: {
+        // realName: [
+        //   { required: true, message: "真实姓名不能为空", trigger: "blur" }
+        // ],
+        // idCard: [
+        //   { required: true, message: "身份证号不能为空", trigger: "blur" }
+        // ],
+        // qualificationType: [
+        //   { required: true, message: "资质类型不能为空", trigger: "change" }
+        // ],
         certificateNo: [
           { required: true, message: "证书编号不能为空", trigger: "blur" }
         ],
@@ -424,77 +244,16 @@ export default {
       }
     }
   },
-
   created() {
     this.getList()
-    this.getUserAuthInfo() // 获取用户实名信息
   },
-
-  // ========== 添加 watch 监听弹窗打开状态 ==========
-  watch: {
-    open(val) {
-      if (val) {
-        // 弹窗打开时，确保表单有实名信息
-        this.$nextTick(() => {
-          this.fillAuthInfoToForm()
-        })
-      }
-    }
-  },
-
   methods: {
-    // ========== 获取用户实名认证信息 ==========
-    async getUserAuthInfo() {
-      if (this.authInfoFetched) return // 如果已获取过，不再重复获取
-
-      try {
-        const res = await getUserInfo()
-
-        if (res.code === 200) {
-          const userInfo = res.data
-
-          // 如果已实名认证，保存信息
-          if (userInfo.authStatus === '已认证' && userInfo.authInfo) {
-            this.authInfo = userInfo.authInfo
-            this.realNameReadOnly = true
-            this.idCardReadOnly = true
-            this.authInfoFetched = true
-
-            console.log('已获取实名认证信息:', this.authInfo)
-
-            // 如果当前弹窗是打开的，立即填充
-            if (this.open) {
-              this.fillAuthInfoToForm()
-            }
-          } else if (userInfo.authStatus === '未认证') {
-            console.log('用户未完成实名认证')
-            this.authInfoFetched = true
-          }
-        }
-      } catch (error) {
-        console.error('获取用户实名信息失败:', error)
-      }
-    },
-
-    // ========== 填充实名信息到表单 ==========
-    fillAuthInfoToForm() {
-      if (this.authInfo) {
-        // 使用 Vue.set 或直接赋值，确保响应式
-        this.$set(this.form, 'realName', this.authInfo.realName)
-        this.$set(this.form, 'idCard', this.authInfo.idCard)
-
-        // 如果身份证是脱敏的，可能需要原始值，这里用脱敏的也可以
-        // 如果后端返回的是完整身份证，直接用 this.authInfo.idCard
-
-        console.log('已填充实名信息到表单:', this.form.realName, this.form.idCard)
-      }
-    },
-
     // 查询兽医资质列表
     getList() {
       this.loading = true
       listQualification(this.queryParams).then(response => {
-        this.qualificationList = response.rows
+        this.qualificationList = response.rows[0].certificates
+        console.log(2222, this.qualificationList);
         this.total = response.total
         this.loading = false
       })
@@ -523,10 +282,10 @@ export default {
     // 获取审核状态标签类型
     getAuditStatusType(status) {
       const map = {
-        '0': 'info',
-        '1': 'success',
-        '2': 'danger',
-        '3': 'warning'
+        '0': 'info',     // 待审核 - 蓝色
+        '1': 'success',  // 已上架 - 绿色
+        '2': 'danger',   // 已拒绝 - 红色
+        '3': 'warning'   // 已下架 - 黄色
       }
       return map[status] || 'info'
     },
@@ -550,7 +309,7 @@ export default {
     // 判断是否为图片文件
     isImageFile(filePath) {
       if (!filePath) return false;
-      const imageExts = ['.png','.jpg','.jpeg'];
+      const imageExts = ['.png', '.jpg', '.jpeg'];
       const ext = filePath.substring(filePath.lastIndexOf('.')).toLowerCase();
       return imageExts.includes(ext);
     },
@@ -573,14 +332,108 @@ export default {
       const fullUrl = this.getImageUrl(filePath);
       const link = document.createElement('a');
       link.href = fullUrl;
+
       const fileName = filePath.substring(filePath.lastIndexOf('/') + 1);
       link.download = fileName;
+
       document.body.appendChild(link);
       link.click();
       document.body.removeChild(link);
       this.$modal.msgSuccess('开始下载文件');
     },
 
+    /** 下架操作 */
+    // handleUnshelf(row) {
+    //   this.$prompt('请输入下架原因', '下架确认', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     inputPlaceholder: '请输入下架原因（如：证书过期、违规操作等）',
+    //     inputValidator: (value) => {
+    //       if (!value || value.trim().length < 2) {
+    //         return '下架原因不能少于2个字'
+    //       }
+    //       if (value.trim().length > 200) {
+    //         return '下架原因不能超过200字'
+    //       }
+    //       return true
+    //     }
+    //   }).then(({ value }) => {
+    //     this.loading = true
+    //     unshelfQualification(row.qualificationId, value).then(response => {
+    //       this.loading = false
+    //       if (response.code === 200) {
+    //         this.$modal.msgSuccess('下架成功')
+    //         this.getList() // 刷新列表
+    //       } else {
+    //         this.$modal.msgError(response.msg || '下架失败')
+    //       }
+    //     }).catch(error => {
+    //       this.loading = false
+    //       this.$modal.msgError(error.msg || '下架失败')
+    //     })
+    //   }).catch(() => {
+    //     // 用户取消操作
+    //   })
+    // },
+
+    /** 上架操作 */
+    // handleShelf(row) {
+    //   this.$confirm('确认要上架此资质吗？', '上架确认', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning'
+    //   }).then(() => {
+    //     this.loading = true
+    //     shelfQualification(row.qualificationId).then(response => {
+    //       this.loading = false
+    //       if (response.code === 200) {
+    //         this.$modal.msgSuccess('上架成功')
+    //         this.getList() // 刷新列表
+    //       } else {
+    //         this.$modal.msgError(response.msg || '上架失败')
+    //       }
+    //     }).catch(error => {
+    //       this.loading = false
+    //       this.$modal.msgError(error.msg || '上架失败')
+    //     })
+    //   }).catch(() => {
+    //     // 用户取消操作
+    //   })
+    // },
+
+    /** 提交审核操作 */
+    // handleSubmitAudit(row) {
+    //   this.$modal.confirm('确认提交 "' + row.realName + '" 的资质进行审核？').then(() => {
+    //     // 准备提交数据
+    //     const submitData = {
+    //       qualificationId: row.qualificationId,
+    //       realName: row.realName,
+    //       idCard: row.idCard,
+    //       qualificationType: row.qualificationType,
+    //       certificateNo: row.certificateNo,
+    //       certName: row.certName,
+    //       issueOrg: row.issueOrg,
+    //       issueDate: row.issueDate,
+    //       expireDate: row.expireDate,
+    //       certImage: row.certImage,
+    //       certificateFiles: row.certificateFiles,
+    //       remark: row.remark,
+    //       // 提交审核时设置审核状态为待审核(0)
+    //       auditStatus: '0'
+    //     }
+    //
+    //     return submitQualification(submitData)
+    //   }).then(response => {
+    //     if (response.code === 200) {
+    //       this.$modal.msgSuccess("提交审核成功")
+    //       this.getList()
+    //     } else {
+    //       this.$modal.msgError(response.msg || "提交审核失败")
+    //     }
+    //   }).catch(() => {
+    //   })
+    // },
+
     // 重新提交审核
     resubmitForm() {
       this.$refs["form"].validate(valid => {
@@ -598,8 +451,8 @@ export default {
           const submitData = {
             certId: certId,
             qualificationId: this.form.qualificationId,
-            realName: this.form.realName || (this.authInfo ? this.authInfo.realName : null),
-            idCard: this.form.idCard || (this.authInfo ? this.authInfo.idCard : null),
+            realName: this.form.realName,
+            idCard: this.form.idCard,
             qualificationType: this.form.qualificationType,
             certificateNo: this.form.certificateNo,
             certName: this.form.certName,
@@ -652,8 +505,66 @@ export default {
       })
     },
 
+    /** 查看详情 */
+    // handleView(row) {
+    //   // 构建详情内容
+    //   let detailContent = `
+    //     <table style="width:100%; border-collapse: collapse;">
+    //       <tr>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee; color: #666;">姓名：</td>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee;">${row.realName || '-'}</td>
+    //       </tr>
+    //       <tr>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee; color: #666;">身份证：</td>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee;">${row.idCard || '-'}</td>
+    //       </tr>
+    //       <tr>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee; color: #666;">证书编号：</td>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee;">${row.certificateNo || '-'}</td>
+    //       </tr>
+    //       <tr>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee; color: #666;">证书名称：</td>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee;">${row.certName || '-'}</td>
+    //       </tr>
+    //       <tr>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee; color: #666;">发证机构：</td>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee;">${row.issueOrg || '-'}</td>
+    //       </tr>
+    //       <tr>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee; color: #666;">到期日期：</td>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee;">${row.expireDate ? this.parseTime(row.expireDate, '{y}-{m}-{d}') : '-'}</td>
+    //       </tr>
+    //       <tr>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee; color: #666;">证书状态：</td>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee;">${this.getCertStatusLabel(row.certStatus)}</td>
+    //       </tr>
+    //       <tr>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee; color: #666;">审核状态：</td>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee;">${this.getDictLabel('qualification_shenhe', row.auditStatus) || '-'}</td>
+    //       </tr>`
+    //
+    //   // 如果有审核意见，添加审核意见
+    //   if (row.auditOpinion) {
+    //     detailContent += `
+    //       <tr>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee; color: #666;">审核意见：</td>
+    //         <td style="padding:8px 5px; border-bottom: 1px solid #eee;">${row.auditOpinion}</td>
+    //       </tr>`
+    //   }
+    //
+    //   detailContent += `</table>`
+    //
+    //   this.$alert(detailContent, '资质详情', {
+    //     dangerouslyUseHTMLString: true,
+    //     confirmButtonText: '关闭',
+    //     width: '550px',
+    //     customClass: 'qualification-detail-dialog'
+    //   })
+    // },
+
     // 资质证书详情
     handleView(row) {
+      console.log(1111, row);
       this.openDetail = true
       this.detailData = row
       this.title = "资质证书详情"
@@ -674,22 +585,18 @@ export default {
     },
 
     // 关闭按钮
-    closeDetail(){
+    closeDetail() {
       this.openDetail = false
       this.reset()
     },
 
     // closeimage
-    closeimage(){
+    closeimage() {
       this.previewDialogVisible = false
     },
 
-    // ========== 修改 reset 方法，保留实名信息 ==========
+    // 表单重置
     reset() {
-      // 保存当前的实名信息
-      const currentRealName = this.form?.realName
-      const currentIdCard = this.form?.idCard
-
       this.form = {
         qualificationId: null,
         userId: null,
@@ -716,15 +623,7 @@ export default {
         scopeIds: null,
         scopeNames: null
       }
-
       this.resetForm("form")
-
-      // 重置后如果有实名信息，重新填充
-      if (this.authInfo) {
-        this.$nextTick(() => {
-          this.fillAuthInfoToForm()
-        })
-      }
     },
 
     // 搜索按钮操作
@@ -746,30 +645,16 @@ export default {
       this.multiple = !selection.length
     },
 
-    // ========== 修改 handleAdd 方法 ==========
-    async handleAdd() {
+    // 新增按钮操作
+    handleAdd() {
       this.reset()
       this.open = true
       this.title = "添加兽医资质"
       this.form.auditStatus = null
-
-      // 如果还没有实名信息，等待获取
-      if (!this.authInfoFetched) {
-        await this.getUserAuthInfo()
-      }
-
-      // 填充实名信息
-      this.fillAuthInfoToForm()
-
-      if (this.authInfo) {
-        this.$nextTick(() => {
-          this.$message.success('已自动填充实名信息')
-        })
-      }
     },
 
-    // ========== 修改 handleUpdate 方法 ==========
-    async handleUpdate(row) {
+    // 修改按钮操作
+    handleUpdate(row) {
       this.reset()
       let certId = row.certId || row.certificateId || row.id
       if (certId && typeof certId === 'object') {
@@ -782,41 +667,60 @@ export default {
         return
       }
 
-      try {
-        const response = await getQualificationCertificate(certId)
+      getQualificationCertificate(certId).then(response => {
         if (response.code === 200 && response.data) {
           this.form = response.data
-
-          // 如果还没有实名信息，等待获取
-          if (!this.authInfoFetched) {
-            await this.getUserAuthInfo()
-          }
-
-          // 填充实名信息
-          this.fillAuthInfoToForm()
-
           this.open = true
           this.title = "修改兽医资质证书信息"
         } else {
           this.$modal.msgError(response.msg || "获取证书信息失败")
         }
-      } catch (error) {
+      }).catch(error => {
         console.error('获取证书信息失败:', error)
         this.$modal.msgError("获取证书信息失败")
-      }
+      })
     },
 
+    /** 提交按钮 */
+    // submitForm() {
+    //   this.$refs["form"].validate(valid => {
+    //     if (valid) {
+    //       if (this.form.qualificationId != null) {
+    //         updateQualification(this.form).then(response => {
+    //           this.$modal.msgSuccess("修改成功")
+    //           this.open = false
+    //           this.getList()
+    //         })
+    //       } else {
+    //         this.form.auditStatus = null
+    //         addQualification(this.form).then(response => {
+    //           this.$modal.msgSuccess("新增成功")
+    //           this.open = false
+    //           this.getList()
+    //         })
+    //       }
+    //     }
+    //   })
+    // },
+
     // 删除按钮操作
     handleDelete(row) {
       const qualificationIds = row.qualificationId || this.ids
-      this.$modal.confirm('是否确认删除兽医资质编号为"' + qualificationIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除兽医资质编号为"' + qualificationIds + '"的数据项？').then(function () {
         return delQualification(qualificationIds)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess("删除成功")
-      }).catch(() => {})
+      }).catch(() => { })
     },
 
+    // 导出按钮操作
+    // handleExport() {
+    //   this.download('vet/qualification/export', {
+    //     ...this.queryParams
+    //   }, `qualification_${new Date().getTime()}.xlsx`)
+    // },
+
     // 根据字典值获取标签
     getDictLabel(dictType, value) {
       const dict = this.dict.type[dictType]
@@ -843,43 +747,16 @@ export default {
   margin: 2px;
 }
 
-::v-deep .pagestyle .el-input{
-  width: auto !important;
-}
-::v-deep .pageway .el-input{
+::v-deep .pagestyle .el-input {
   width: auto !important;
 }
-::v-deep .pageway .pagination-container{
-  background-color: #f8fafc;
-}
-
-/* 实名信息卡片样式 */
-.auth-info-card {
-  border-radius: 8px;
-  border-left: 4px solid #67C23A;
-}
 
-.auth-info-card .el-card__header {
-  background-color: #f0f9eb;
-  border-bottom: 1px solid #e1f3d8;
-  padding: 12px 20px;
-  font-weight: 600;
-  color: #67C23A;
-}
-
-.auth-info-content {
-  padding: 12px 0;
-}
-
-.auth-label {
-  color: #606266;
-  font-size: 14px;
+::v-deep .pageway .el-input {
+  width: auto !important;
 }
 
-.auth-value {
-  color: #303133;
-  font-weight: 500;
-  font-size: 14px;
+::v-deep .pageway .pagination-container {
+  background-color: #f8fafc;
 }
 
 /* 详情对话框样式 */
@@ -911,7 +788,7 @@ export default {
   transform: translateY(-1px);
 }
 
-.alter-btn:hover{
+.alter-btn:hover {
   background-color: rgb(230, 255, 238);
   transform: translateY(-1px);
 }
diff --git a/chenhai-ui/vue.config.js b/chenhai-ui/vue.config.js
index 84c6e4c..fade4ba 100644
--- a/chenhai-ui/vue.config.js
+++ b/chenhai-ui/vue.config.js
@@ -10,9 +10,9 @@ const CompressionPlugin = require('compression-webpack-plugin')
 const name = process.env.VUE_APP_TITLE || '"与牧同行"' // 网页标题
 
 const baseUrl = // 后端接口
-  'http://localhost:8081'
+  // 'http://localhost:8081'
   // 'http://192.168.101.105:8082'
-  // 'http://192.168.101.109:8080'
+  'http://192.168.101.109:8080'
   // 'http://192.168.101.111:8081'