个人中心-我的异议-bug修改

src/views/personalCenter/myObjection/detail.vue

@@ -3,11 +3,33 @@
     :title="!isAudit ? '异议详情' : '异议审核'"
     dense
     contentBackground
-    contentFullHeight
+
     fixed-height
     headerSticky
     @back="handleBack"
   >
+    <step-header class="ml-5" title="登记信息" />
+    <Row :gutter="[16, 30]">
+      <Col :span="12" v-for="info in myRegistrationColumnsForDetail" :key="info">
+        <div class="col-item">
+          <div class="item-label">{{ info.title }}：</div>
+          <div v-if="['enrollBook'].includes(info.dataIndex)" class="item-des"
+          ><TableImg
+            :size="150"
+            :simpleShow="true"
+            :showBadge="false"
+            :imgList="data[info.dataIndex]"
+          />
+          </div>
+          <div v-else-if="['dataStructure'].includes(info.dataIndex)" class="item-des">
+            引入表格占位
+          </div>
+          <div v-else class="item-des">{{ data[info.dataIndex] ? data[info.dataIndex] : '-' }}</div>
+        </div>
+      </Col>
+    </Row>
+
+    <step-header class="ml-5 mt-10" title="异议内容" />
     <Row :gutter="[16, 30]">
       <Col :span="12" v-for="info in objectionColumns" :key="info">
         <div class="col-item">
@@ -22,27 +44,27 @@
         </div>
       </Col>
     </Row>
-    <div style="display: flex">
-      <div v-if="isAudit" style="margin: 40px 60px" class="flex">
-        <div style="line-height: 35px">证明材料:</div>
-        <div style="margin-left: 100px">
-          <Upload style="width: 45%" v-model:file-list="fileList" />
-        </div>
-      </div>
-      <div v-if="isAudit" style="margin: 40px 0 0 440px" class="flex">
-        <div style="line-height: 35px">审核意见:</div>
-        <div style="margin-left: 100px">
-          <Textarea v-model:value="idea" style="width: 300px" placeholder="请输入审核意见" />
-        </div>
-      </div>
-    </div>
-    <div
-      v-if="isAudit"
-      style="justify-content: right; display: flex; gap: 10px; margin-right: 20px"
-    >
-      <a-button @click="handleCancel">驳回</a-button>
-      <a-button type="primary" @click="handleEdit">审核</a-button>
-    </div>
+<!--    <div style="display: flex">-->
+<!--      <div v-if="isAudit" style="margin: 40px 60px" class="flex">-->
+<!--        <div style="line-height: 35px">证明材料:</div>-->
+<!--        <div style="margin-left: 100px">-->
+<!--          <Upload style="width: 45%" v-model:file-list="fileList" />-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div v-if="isAudit" style="margin: 40px 0 0 440px" class="flex">-->
+<!--        <div style="line-height: 35px">审核意见:</div>-->
+<!--        <div style="margin-left: 100px">-->
+<!--          <Textarea v-model:value="idea" style="width: 300px" placeholder="请输入审核意见" />-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <div-->
+<!--      v-if="isAudit"-->
+<!--      style="justify-content: right; display: flex; gap: 10px; margin-right: 20px"-->
+<!--    >-->
+<!--      <a-button @click="handleCancel">驳回</a-button>-->
+<!--      <a-button type="primary" @click="handleEdit">审核</a-button>-->
+<!--    </div>-->
   </PageWrapper>
 </template>
 
@@ -61,6 +83,10 @@
   import { TableImg } from '@/components/Table';
   import { useMessage } from '@/hooks/web/useMessage';
   import { objectionColumns } from '@/views/personalCenter/myObjection/objection.data';
+  import StepHeader from "@/components/stepHeader.vue";
+  import {
+    myRegistrationColumnsForDetail
+  } from "@/views/personalCenter/myRegistration/myRegistration.data";
 
   const { createMessage } = useMessage();
   const route = useRoute();

src/views/personalCenter/myObjection/index.vue

@@ -20,21 +20,8 @@
             <TableImg :size="60" :simpleShow="true" :showBadge="false" :imgList="text" />
           </template>
           <template v-if="column.key === 'action'">
+
             <TableAction
-              v-if="record.objectionType === '我收到的'"
-              :actions="[
-                {
-                  label: '详情',
-                  onClick: handleDetail.bind(null, record),
-                },
-                {
-                  label: '审核',
-                  onClick: handleEdit.bind(null, record),
-                },
-              ]"
-            />
-            <TableAction
-              v-else
               :actions="[
                 {
                   label: '详情',

src/views/personalCenter/myObjection/objection.data.ts

@@ -22,11 +22,7 @@ export const objectionColumns: BasicColumn[] = [
     dataIndex: 'applyTime',
   },
   {
-    title: '更新时间',
-    dataIndex: 'updateTime',
-  },
-  {
-    title: '类型',
-    dataIndex: 'objectionType',
+    title: '状态',
+    dataIndex: 'state',
   },
 ];

src/views/personalCenter/myObjection/objectionData.ts

@@ -5,17 +5,15 @@ export const objectionData: any[] = [
     dataSource: '自行生产',
     applyScene: '大数据分析',
     applyTime: '2024-11-30',
-    updateTime: '2024-12-17',
-    objectionType: '我收到的',
+    state: '处理中',
   },
   {
-    title: '大数据弹性分析数据',
-    applicant: '天津宏飞园宜科技有限公司',
-    dataSource: '自行生产',
-    applyScene: '大数据分析',
-    applyTime: '2024-11-30',
-    updateTime: '2024-12-17',
-    objectionType: '我收到的',
+    "title": "智能交通流量预测",
+    "applicant": "深圳智慧交通研究院",
+    "dataSource": "政府公开数据",
+    "applyScene": "城市规划",
+    "applyTime": "2024-11-28",
+    "state": "处理中"
   },
   {
     title: '大数据弹性分析数据',
@@ -23,17 +21,15 @@ export const objectionData: any[] = [
     dataSource: '自行生产',
     applyScene: '大数据分析',
     applyTime: '2024-11-30',
-    updateTime: '2024-12-17',
-    objectionType: '我收到的',
+    state: '驳回',
   },
   {
-    title: '大数据弹性分析数据',
-    applicant: '天津宏飞园宜科技有限公司',
-    dataSource: '自行生产',
-    applyScene: '大数据分析',
-    applyTime: '2024-11-30',
-    updateTime: '2024-12-17',
-    objectionType: '我提交的',
+    "title": "医疗健康数据分析",
+    "applicant": "广州康体生物科技有限公司",
+    "dataSource": "公共数据集",
+    "applyScene": "健康管理",
+    "applyTime": "2024-12-05",
+    "state": "驳回"
   },
   {
     title: '大数据弹性分析数据',
@@ -41,25 +37,22 @@ export const objectionData: any[] = [
     dataSource: '自行生产',
     applyScene: '大数据分析',
     applyTime: '2024-11-30',
-    updateTime: '2024-12-17',
-    objectionType: '我提交的',
+    state: '已确认',
   },
   {
-    title: '大数据弹性分析数据',
-    applicant: '天津宏飞园宜科技有限公司',
-    dataSource: '自行生产',
-    applyScene: '大数据分析',
-    applyTime: '2024-11-30',
-    updateTime: '2024-12-17',
-    objectionType: '我提交的',
+    "title": "用户行为模式分析",
+    "applicant": "北京智联未来科技有限公司",
+    "dataSource": "第三方合作",
+    "applyScene": "市场研究",
+    "applyTime": "2024-12-01",
+    "state": "已确认"
   },
   {
-    title: '大数据弹性分析数据',
-    applicant: '天津宏飞园宜科技有限公司',
-    dataSource: '自行生产',
-    applyScene: '大数据分析',
-    applyTime: '2024-11-30',
-    updateTime: '2024-12-17',
-    objectionType: '我提交的',
+    "title": "实时物流跟踪优化",
+    "applicant": "上海速达物流有限公司",
+    "dataSource": "自行生产",
+    "applyScene": "物流管理",
+    "applyTime": "2024-12-15",
+    "state": "已确认"
   },
 ];