From 79a2569146748bbb3ba0e5dd65fa94e5fc6a693f Mon Sep 17 00:00:00 2001
From: cc_caijp <1049976610@qq.com>
Date: Tue, 6 Jan 2026 13:53:44 +0800
Subject: [PATCH] fix

---
 src/api/除名公告.js                          |  9 +++++++++
 src/views/expelled/announcement/index.vue        |  6 ++++++
 .../audit/components/不除名除名填写.vue   | 16 ++++++++--------
 src/views/expelled/audit/index.vue               |  8 ++++----
 .../objection/components/选择企业.vue        |  2 +-
 .../objection/components/除名异议申诉.vue  | 12 ++++++------
 6 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/api/除名公告.js b/src/api/除名公告.js
index 975393f..acabadd 100644
--- a/src/api/除名公告.js
+++ b/src/api/除名公告.js
@@ -53,6 +53,15 @@ export function expelledObjectSave(data) {
   })
 }
 
+// 新增、更新、删除除名决定管理
+export function expelledAuditSave(data) {
+  return request({
+    url: '/expelled/audit/save',
+    method: 'post',
+    data
+  })
+}
+
 export function expelledAnnouncementListBase(data) {
   return request({
     url: '/expelled/announcement/listEntBase',
diff --git a/src/views/expelled/announcement/index.vue b/src/views/expelled/announcement/index.vue
index c8d3dfe..ca3ffca 100644
--- a/src/views/expelled/announcement/index.vue
+++ b/src/views/expelled/announcement/index.vue
@@ -41,6 +41,9 @@
           <el-table-column prop="reason" :show-overflow-tooltip="true" label="除名决定的理由" min-width="180" align="left" />
           <el-table-column prop="law" :show-overflow-tooltip="true" label="除名决定的依据" min-width="180" align="left" />
           <el-table-column prop="result" :show-overflow-tooltip="true" label="除名决定的后果" min-width="80" align="left" />
+          <el-table-column prop="objectionOpinion" :show-overflow-tooltip="true" label="异议意见" min-width="80" align="left" />
+          <el-table-column prop="isRemove" :show-overflow-tooltip="true" label="除名状态" :formatter="formatterIsRemove" min-width="80" align="left" />
+          <el-table-column prop="removeOpinion" :show-overflow-tooltip="true" label="除名意见" min-width="80" align="left" />
           <el-table-column :show-overflow-tooltip="true" label="操作" align="left">
             <template #default="scope">
               <el-button type="text" size="mini" @click="openDialog(scope.row)">查看详情</el-button>
@@ -147,6 +150,9 @@ export default {
     },
     openDialog(row) {
       this.$refs.DismissalObjectionAppeal.openDialog(row)
+    },
+    formatterIsRemove(row) {
+      return row.isRemove === '0' ? '不同意除名' : (row.isRemove === '1' ? '同意除名' : '')
     }
   }
 }
diff --git a/src/views/expelled/audit/components/不除名除名填写.vue b/src/views/expelled/audit/components/不除名除名填写.vue
index 7c1ad77..9acf2b4 100644
--- a/src/views/expelled/audit/components/不除名除名填写.vue
+++ b/src/views/expelled/audit/components/不除名除名填写.vue
@@ -9,8 +9,8 @@
       width="50%"
     >
       <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="160px" class="demo-ruleForm">
-        <el-form-item label="理由" prop="reason">
-          <el-input v-model="ruleForm.reason" type="textarea" placeholder="请输入理由" />
+        <el-form-item label="理由" prop="removeOpinion">
+          <el-input v-model="ruleForm.removeOpinion" type="textarea" placeholder="请输入理由" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { expelledObjectSave } from '@/api/除名公告.js'
+import { expelledAuditSave } from '@/api/除名公告.js'
 export default {
   data() {
     return {
@@ -31,12 +31,12 @@ export default {
       id: '',
       dialogVisible: false,
       ruleForm: {
-        reason: ''
+        removeOpinion: ''
       },
       entList: [],
       rules: {
-        reason: [
-          { required: true, message: '请输入统一社会信用代码', trigger: 'blur' }
+        removeOpinion: [
+          { required: true, message: '请输入理由', trigger: 'blur' }
         ]
       }
     }
@@ -53,9 +53,9 @@ export default {
             ...this.ruleForm,
             bizType: '2',
             id: this.id,
-            isRemove: this.title === '同意除名' ? '1' : '2'
+            isRemove: this.title === '同意除名' ? '1' : '0'
           }
-          expelledObjectSave(submitForm).then(res => {
+          expelledAuditSave(submitForm).then(res => {
             if (res.code === 0) {
               this.dialogVisible = false
               this.$message({
diff --git a/src/views/expelled/audit/index.vue b/src/views/expelled/audit/index.vue
index 685219c..1255d90 100644
--- a/src/views/expelled/audit/index.vue
+++ b/src/views/expelled/audit/index.vue
@@ -29,10 +29,10 @@
       >
         <el-table-column prop="index" label="序号" min-width="50" align="center" />
         <el-table-column prop="bizNo" label="业务号" min-width="120" align="left" />
-        <el-table-column prop="truth" :show-overflow-tooltip="true" label="除名决定事实" min-width="100" align="left" />
-        <el-table-column prop="reason" :show-overflow-tooltip="true" label="除名决定的理由" min-width="180" align="left" />
-        <el-table-column prop="law" :show-overflow-tooltip="true" label="除名决定的依据" min-width="180" align="left" />
-        <el-table-column prop="result" :show-overflow-tooltip="true" label="除名决定的后果" min-width="80" align="left" />
+        <el-table-column prop="objectionOpinion" :show-overflow-tooltip="true" label="异议意见" min-width="100" align="left" />
+<!--        <el-table-column prop="reason" :show-overflow-tooltip="true" label="除名决定的理由" min-width="180" align="left" />-->
+<!--        <el-table-column prop="law" :show-overflow-tooltip="true" label="除名决定的依据" min-width="180" align="left" />-->
+<!--        <el-table-column prop="result" :show-overflow-tooltip="true" label="除名决定的后果" min-width="80" align="left" />-->
         <el-table-column width="200px" label="操作" align="left">
           <template #default="scope">
             <el-button type="text" size="mini" @click="openDialog(scope.row, '同意除名')">同意除名</el-button>
diff --git a/src/views/expelled/objection/components/选择企业.vue b/src/views/expelled/objection/components/选择企业.vue
index 9c63d84..ef09490 100644
--- a/src/views/expelled/objection/components/选择企业.vue
+++ b/src/views/expelled/objection/components/选择企业.vue
@@ -93,7 +93,7 @@ export default {
 
   },
   mounted() {
-    this.loadPage()
+    // this.loadPage()
   },
   methods: {
     tableRowClassName({ row, rowIndex }) {
diff --git a/src/views/expelled/objection/components/除名异议申诉.vue b/src/views/expelled/objection/components/除名异议申诉.vue
index b94e7a3..d41a0b6 100644
--- a/src/views/expelled/objection/components/除名异议申诉.vue
+++ b/src/views/expelled/objection/components/除名异议申诉.vue
@@ -14,8 +14,8 @@
             <span>{{ index + 1 }}、{{ item.entName }}（统一社会信用代码：{{ item.uscc }}）</span>
           </div>
         </el-form-item>
-        <el-form-item label="申辩意见" prop="reason">
-          <el-input v-model="ruleForm.reason" type="textarea" placeholder="请输入申辩意见" />
+        <el-form-item label="异议意见" prop="objectionOpinion">
+          <el-input v-model="ruleForm.objectionOpinion" type="textarea" placeholder="请输入异议意见" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
@@ -35,12 +35,12 @@ export default {
       title: '',
       dialogVisible: false,
       ruleForm: {
-        reason: ''
+        objectionOpinion: ''
       },
       entList: [],
       rules: {
-        reason: [
-          { required: true, message: '请输入统一社会信用代码', trigger: 'blur' }
+        objectionOpinion: [
+          { required: true, message: '请输入异议意见', trigger: 'blur' }
         ]
       }
     }
@@ -56,7 +56,7 @@ export default {
           const submitForm = {
             ...this.ruleForm,
             entIds: this.entList.map((item) => {
-              return item.id
+              return item.entId
             }),
             bizType: '2',
             noticeBizId: this.noticeBizId