登记审核 && 我的消息

src/views/AAAFont/dataRegistration/enrollPublicDetail.vue

@@ -111,6 +111,16 @@
             label: '算法规则简要说明',
             field: 'ruleExplain',
           },
+          {
+            span: 12,
+            label: '存证公证编号',
+            field: 'publicCode',
+          },
+          {
+            span: 12,
+            label: '存证公证平台',
+            field: 'publicSituation',
+          },
         ],
         applyInfoData: {
           enrollCode: 'DIP2024000084573',

src/views/dataSharingAndExchange/enrollAudit/detail.vue

 <template>
-  <PageWrapper
-    :title="!isAudit ? '登记详情' : '登记审核'"
-    dense
-    contentBackground
-    fixed-height
-    @back="handleBack"
-  >
+  <PageWrapper dense contentBackground fixed-height>
+    <template #headerContent>
+      <div class="header">
+        <div class="h-title">
+          <LeftOutlined class="h-back" @click="handleBack" />
+          <FileProtectOutlined class="h-icon" :color="'#6499e9'" />
+          <div class="h-txt">
+            <div class="h-des">{{ isAudit ? '登记审核' : '审核详情' }}</div>
+          </div>
+        </div>
+      </div>
+    </template>
     <Row :gutter="[16, 30]">
       <Col :span="info.col" v-for="info in enrollColumns1" :key="info">
         <div class="col-item">
@@ -21,22 +26,28 @@
           <div v-else class="item-des">{{ data[info.dataIndex] ? data[info.dataIndex] : '-' }}</div>
         </div>
       </Col>
-      <Col :span="12">
-        <div class="col-item">
-          <div class="item-label">文件信息:</div>
-          <div>
-            <Upload style="width: 45%" v-model:file-list="fileList" />
-          </div>
-        </div>
-      </Col>
     </Row>
+    <div style="font-size: 16px; font-weight: bolder; margin: 50px 60px 20px 60px">文件信息</div>
+    <div class="col-item">
+      <el-table
+        :data="fileList"
+        stripe
+        border
+        style="width: 100%"
+        :header-cell-style="{ background: '#E4ECFA', color: '#3F3F3F', height: '60px' }"
+      >
+        <el-table-column label="文件名称" prop="fileName" min-width="180" />
+        <el-table-column label="文件大小" prop="fileSize" min-width="180" />
+        <el-table-column label="文件类型" prop="fileType" min-width="180" />
+      </el-table>
+    </div>
 
     <div
       v-if="isAudit"
-      style="justify-content: center; display: flex; gap: 10px; margin: 20px 0px 20px 350px"
+      style="justify-content: center; display: flex; gap: 20px; margin-bottom: 50px"
     >
-      <a-button @click="handleCancel">驳回</a-button>
-      <a-button type="primary" @click="handleEdit">通过</a-button>
+      <a-button style="padding: 4px 30px" @click="handleCancel">驳回</a-button>
+      <a-button style="padding: 4px 30px" type="primary" @click="handleEdit">通过</a-button>
     </div>
     <AuditModeal @register="registerModal" @audit-success="auditSuccess" />
   </PageWrapper>
@@ -53,6 +64,7 @@
   import { useModal } from '@/components/Modal';
   import AuditModeal from '@/views/dataSharingAndExchange/enrollAudit/auditModeal.vue';
   import ObjectionModal from '@/views/dataSharingAndExchange/enrollAudit/objectionModal.vue';
+  import { FileProtectOutlined, LeftOutlined } from '@ant-design/icons-vue';
 
   const { createMessage } = useMessage();
   const route = useRoute();
@@ -62,14 +74,14 @@
   const [registerModal, { openModal }] = useModal();
   const fileList = reactive([
     {
-      uid: 1,
-      name: '证明材料附件1.word',
-      status: 'done',
+      fileName: '证明材料附件1.word',
+      fileSize: '3.5Mb',
+      fileType: 'word',
     },
     {
-      uid: 2,
-      name: '证明材料附件2.pdf',
-      status: 'done',
+      fileName: '证明材料附件2.word',
+      fileSize: '1.5Mb',
+      fileType: 'word',
     },
   ]);
 
@@ -103,4 +115,34 @@
       width: 150px;
     }
   }
+
+  .header {
+    display: flex;
+    flex-direction: row;
+    gap: 10px;
+    .h-title {
+      flex: 1;
+      display: flex;
+      gap: 10px;
+      .h-icon {
+        font-size: 40px !important;
+        color: #0a208a;
+      }
+      .h-des {
+        font-size: 18px;
+        font-weight: bolder;
+        line-height: 40px;
+      }
+      .h-path {
+        font-size: 12px;
+      }
+    }
+    .h-group {
+      display: flex;
+      gap: 10px;
+    }
+    .h-back {
+      font-size: 20px;
+    }
+  }
 </style>

src/views/personalCenter/myMessage/detail.vue

 <template>
   <PageWrapper
-    :title="title==='代办'?title:'订单信息列'"
+    :title="title === '待办' ? title : '订单信息列'"
     dense
     contentBackground
     contentFullHeight
@@ -15,7 +15,7 @@
       </Col>
     </Row>
     <div class="flex">
-      <div v-if="title === '通知公告'" style="padding: 0 20%">
+      <div style="padding: 0 20%">
         <p class="des-p">
           为加强数据知识产权领域的服务质量，提升相关机构的市场竞争力，推动数据知识产权保护和创新应用，依据《数据知识产权专业服务机构管理办法》及相关政策要求，市场监督管理局于2023年开展了对数据知识产权专业服务机构的年度服务绩效评价工作。
           本次评价工作通过对全国范围内的数据知识产权服务机构进行全面评审，结合其在知识产权申请、管理、保护、转化等方面的实际表现，重点考察了各机构的技术能力、服务质量、创新成果以及社会影响力等多维度指标。<br />经过严格审定，现将2023年度服务绩效评价结果通报如下：
@@ -51,16 +51,7 @@
         </p>
         <p class="des-p"> 特此通报。</p>
       </div>
-      <div v-else class="flex-1">
-        <div class="flex" style="justify-content: center;margin-top: 30px">
-          <div style="line-height: 34px"
-            ><span style="color: #389be1">天津宏宇科技有限公司</span>在<span style="color: #389be1"
-              >2024.03.10</span
-            >购买了你的商品</div
-          >
-          <a-button type="link"><span>&lt;&lt;去查看&gt;&gt;</span></a-button>
-        </div>
-      </div>
+
     </div>
   </PageWrapper>
 </template>

src/views/personalCenter/myMessage/index.vue

@@ -17,6 +17,7 @@
             <template #bodyCell="{ column, record }">
               <template v-if="column.key === 'action'">
                 <TableAction
+                  v-if="record.messageType === '待办'"
                   :actions="[
                     {
                       label: '详情',
@@ -24,6 +25,15 @@
                     },
                   ]"
                 />
+                <TableAction
+                  v-else
+                  :actions="[
+                    {
+                      label: '详情',
+                      onClick: handleMessageDetail.bind(null, record),
+                    },
+                  ]"
+                />
               </template>
             </template>
           </BasicTable>
@@ -38,7 +48,7 @@
                   :actions="[
                     {
                       label: '详情',
-                      onClick: handleDetail.bind(null, record),
+                      onClick: handleMessageDetail.bind(null, record),
                     },
                   ]"
                 />
@@ -94,7 +104,7 @@
   // 数据
 
   const tabsKey = ref('1');
-  const { push } = useRouter();
+  const router = useRouter();
   onMounted(() => {});
   // 方法
   // 新增
@@ -239,11 +249,15 @@
     });
   }
   function handleDetail(record) {
-    push({
+    router.push({
+      path: '/personalCenter/orderingInformation/detail',
+      query: record,
+    });
+  }
+  function handleMessageDetail(record) {
+    router.push({
       path: '/personalCenter/myMessage/detail',
-      query: {
-        ...record,
-      },
+      query: record,
     });
   }
 </script>

src/views/personalCenter/myMessage/messageData.ts

@@ -28,15 +28,39 @@ export const myMessageData: any[] = [
     messageTitle: '订单消息',
     messageType: '待办',
     publishTime: '2024-04-22',
+    name: '季度运营总结',
+    type: '数据集',
+    version: 'v2.0',
+    uploadPerson: '孙涛',
+    money: 3000,
+    startTime: '2024-09-01',
+    endTime: '2024-09-30',
+    progress: '待支付',
   },
   {
     messageTitle: '订单消息',
     messageType: '待办',
     publishTime: '2024-04-22',
+    name: '季度运营总结',
+    type: 'API',
+    version: 'v2.0',
+    uploadPerson: '孙涛',
+    money: 3000,
+    startTime: '2024-09-01',
+    endTime: '2024-09-30',
+    progress: '待支付',
   },
   {
     messageTitle: '订单消息',
     messageType: '待办',
     publishTime: '2024-04-22',
+    name: '季度运营总结',
+    type: '数据服务',
+    version: 'v2.0',
+    uploadPerson: '孙涛',
+    money: 3000,
+    startTime: '2024-09-01',
+    endTime: '2024-09-30',
+    progress: '待支付',
   },
 ]