Merge remote-tracking branch 'origin/master'

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/dataStandards/namingDictionary/domain/batchPublish.vue

@@ -71,11 +71,11 @@
         data: JSON.stringify([
           {
             key: '日期类',
-            model: {},
+            model: { path: '共享工作区/日期类', type: '域' },
           },
           {
             key: '短编号',
-            model: {},
+            model: { path: '共享工作区/短编号', type: '域' },
           },
         ]),
         formSchema: '6',

src/views/dataStandards/referenceDocument/applyPublication.vue

@@ -9,10 +9,29 @@
     </div>
     <BasicForm @register="registerForm" />
     <BasicForm @register="registerForm1" />
-    <Tabs v-model:activeKey="activeKey" tab-position="left" animated>
-      <TabPane :key="index" :tab="item.key" v-for="(item, index) in list">
+    <Row class="tab-body" :gutter="16">
+      <Col :span="6">
+        <List>
+          <template v-for="(item, index) in list" :key="item.key">
+            <List.Item
+              style="cursor: pointer"
+              @click="handleChange(item, index)"
+              :class="selectId === index ? 'selectionClass' : null"
+            >
+              <List.Item.Meta>
+                <template #title>
+                  <span>{{ item.key }}</span>
+                </template>
+              </List.Item.Meta>
+            </List.Item>
+          </template>
+        </List>
+      </Col>
+      <Col :span="18">
         <BasicForm @register="registerForm2">
-          <template #path> </template>
+          <template #path>
+            <span>{{ key }}</span>
+          </template>
         </BasicForm>
         <div class="contrastTitle">版本对比</div>
         <div class="table-container">
@@ -39,21 +58,53 @@
           <div class="table-row">
             <div class="table-cell label">
               <BasicForm @register="registerLeftForm1" />
-              <BasicForm v-if="isShow === '1'" @register="registerLeftForm11" />
-              <BasicForm v-if="isShow === '1'" @register="registerLeftForm12" />
-              <BasicForm v-if="isShow === '2'" @register="registerLeftForm21" />
-              <BasicForm v-if="isShow === '2'" @register="registerLeftForm22" />
             </div>
             <div class="table-cell value">
               <BasicForm @register="registerLeftForm2" />
-              <BasicForm v-if="isShow === '1'" @register="registerLeftForm11" />
-              <BasicForm v-if="isShow === '1'" @register="registerLeftForm12" />
-              <BasicForm v-if="isShow === '2'" @register="registerLeftForm21" />
-              <BasicForm v-if="isShow === '2'" @register="registerLeftForm22" />
             </div>
           </div>
         </div>
-      </TabPane>
+      </Col>
+    </Row>
+<!--    <Tabs v-model:activeKey="activeKey" :tabClick="handleResetValue" tab-position="left" animated>-->
+<!--      <TabPane :key="index" :tab="item.key" v-for="(item, index) in list">-->
+<!--        <BasicForm @register="registerForm2">-->
+<!--          <template #path>-->
+<!--            <span>{{ item.key }}</span>-->
+<!--          </template>-->
+<!--        </BasicForm>-->
+<!--        <div class="contrastTitle">版本对比</div>-->
+<!--        <div class="table-container">-->
+<!--          <div class="table-row">-->
+<!--            <div class="table-cell label">-->
+<!--              <div>-->
+<!--                <Icon icon="ant-design:database-outlined" :size="20" :color="'#42C465'" />-->
+<!--                <span>{{ key }}</span>-->
+<!--                <div>{{ path }}</div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--            <div class="table-cell value">-->
+<!--              <div>-->
+<!--                <Icon icon="ant-design:database-outlined" :size="20" :color="'#42C465'" />-->
+<!--                <span>{{ key }}</span>-->
+<!--                <div>{{ path }}</div>-->
+<!--              </div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--          <div class="table-row">-->
+<!--            <div class="table-cell label">版本:2</div>-->
+<!--            <div class="table-cell value">版本:下个版本</div>-->
+<!--          </div>-->
+<!--          <div class="table-row">-->
+<!--            <div class="table-cell label">-->
+<!--              <BasicForm @register="registerLeftForm1" />-->
+<!--            </div>-->
+<!--            <div class="table-cell value">-->
+<!--              <BasicForm @register="registerLeftForm2" />-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </TabPane>-->
       <!--      <TabPane key="2" tab="短编号">-->
       <!--        <BasicForm @register="registerForm3" />-->
       <!--        <div class="contrastTitle">版本对比</div>-->
@@ -89,7 +140,7 @@
       <!--          </div>-->
       <!--        </div>-->
       <!--      </TabPane>-->
-    </Tabs>
+<!--    </Tabs>-->
   </div>
 </template>
 
@@ -97,7 +148,7 @@
   import { BasicForm, FormProps, useForm } from '@/components/Form';
   import StepHeader from '@/components/stepHeader.vue';
   import { nextTick, onMounted, ref } from 'vue';
-  import { Tabs, Col, Row } from 'ant-design-vue';
+  import { Tabs, Col, Row, List } from 'ant-design-vue';
   import {
     applySchemas,
     applySchemas1,
@@ -112,13 +163,28 @@
     contrastSchema11,
     contrastSchema12,
     contrastSchema21,
-    contrastSchema22,
+    contrastSchema22, registerLeftForm12,
   } from './referenceDocument.data';
   import moment from 'moment';
   import { router } from '@/router';
   import { useRoute } from 'vue-router';
+  import {
+    leftContrastData,
+    leftContrastData1,
+    leftContrastData2,
+    leftContrastData3,
+    leftContrastData4,
+    leftContrastData5,
+    rightContrastData1,
+    rightContrastData2,
+    rightContrastData3,
+    rightContrastData4,
+    rightContrastData5,
+  } from '@/views/dataStandards/referenceDocument/mock';
+  import { rightContrastData } from '@/views/dataStandards/namingDictionary/mock';
 
   const route = useRoute();
+  const selectId = ref(0);
   const activeKey = ref(0);
   const TabPane = Tabs.TabPane;
   const list = ref([]);
@@ -135,37 +201,14 @@
       baseColProps: { span: 24 },
       showActionButtonGroup: false,
     } as FormProps);
-  const [registerLeftForm2, { setFieldsValue: setLeftFieldsValue2, resetSchema: resetSchema2 }] =
+  const [registerLeftForm2, { setFieldsValue: setRightFieldsValue2, resetSchema: resetSchema2 }] =
     useForm({
       labelWidth: 100,
       // schemas: [],
       baseColProps: { span: 24 },
       showActionButtonGroup: false,
     } as FormProps);
-  const [registerLeftForm11, {}] = useForm({
-    labelWidth: 100,
-    schemas: contrastSchema11,
-    baseColProps: { span: 24 },
-    showActionButtonGroup: false,
-  } as FormProps);
-  const [registerLeftForm12, {}] = useForm({
-    labelWidth: 100,
-    schemas: contrastSchema12,
-    baseColProps: { span: 24 },
-    showActionButtonGroup: false,
-  } as FormProps);
-  const [registerLeftForm21, {}] = useForm({
-    labelWidth: 100,
-    schemas: contrastSchema21,
-    baseColProps: { span: 24 },
-    showActionButtonGroup: false,
-  } as FormProps);
-  const [registerLeftForm22, {}] = useForm({
-    labelWidth: 100,
-    schemas: contrastSchema22,
-    baseColProps: { span: 24 },
-    showActionButtonGroup: false,
-  } as FormProps);
+
   const [registerForm, { setFieldsValue }] = useForm({
     labelWidth: 100,
     baseColProps: { lg: 12, md: 24 },
@@ -184,6 +227,8 @@
       span: 23,
     },
   });
+
+
   const [registerForm2, { setFieldsValue: setForm2Value }] = useForm({
     labelWidth: 100,
     baseColProps: { lg: 12, md: 24 },
@@ -194,19 +239,18 @@
     },
   });
 
-  const [registerForm3, {}] = useForm({
-    labelWidth: 100,
-    baseColProps: { lg: 12, md: 24 },
-    schemas: applySchemas3,
-    showActionButtonGroup: false,
-    actionColOptions: {
-      span: 23,
-    },
-  });
+
   function handleGoBack() {
     router.go(-1);
   }
-  onMounted(() => {
+
+  function handleChange(item, index) {
+    selectId.value = index;
+    key.value = item.key;
+    path.value = item.model.path;
+  }
+
+  function handleResetValue() {
     list.value = JSON.parse(route.query.data);
     path.value = list.value[0].model.path;
     type.value = list.value[0].model.type;
@@ -217,19 +261,29 @@
       if (formSchema === '1') {
         resetSchema1([...contrastSchema1]);
         resetSchema2([...contrastSchema1]);
+        setLeftFieldsValue1({ ...leftContrastData1 });
+        setRightFieldsValue2({ ...rightContrastData1 });
       } else if (formSchema === '2') {
         resetSchema1([...contrastSchema2]);
         resetSchema2([...contrastSchema2]);
+        setLeftFieldsValue1({ ...leftContrastData2 });
+        setRightFieldsValue2({ ...rightContrastData2 });
       } else if (formSchema === '3') {
         resetSchema1([...contrastSchema3]);
         resetSchema2([...contrastSchema3]);
+        setLeftFieldsValue1({ ...leftContrastData3 });
+        setRightFieldsValue2({ ...rightContrastData3 });
       } else if (formSchema === '4') {
         resetSchema1([...contrastSchema4]);
         resetSchema2([...contrastSchema4]);
+        setLeftFieldsValue1({ ...leftContrastData4 });
+        setRightFieldsValue2({ ...rightContrastData4 });
       } else if (formSchema === '5') {
         console.log('12312312');
         resetSchema1([...contrastSchema5]);
         resetSchema2([...contrastSchema5]);
+        setLeftFieldsValue1({ ...leftContrastData5 });
+        setRightFieldsValue2({ ...rightContrastData5 });
       } else if (formSchema === '6') {
         resetSchema1([...contrastSchema6]);
         resetSchema2([...contrastSchema6]);
@@ -238,6 +292,9 @@
     setFieldsValue({
       time: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
     });
+  }
+  onMounted(() => {
+    handleResetValue();
   });
 </script>
 
@@ -278,4 +335,14 @@
       padding: 8px 300px 8px 0;
     }
   }
+  .tab-body {
+    display: flex;
+    margin-top: 20px;
+  }
+
+  .selectionClass {
+    background-color: #e3f0fe;
+    border: 1px solid #5498f7;
+    border-radius: 10px;
+  }
 </style>

src/views/dataStandards/referenceDocument/mock.ts

@@ -108,6 +108,263 @@ export const leftContrastData: any[] = [
   },
 ];
 
+export const leftContrastData1 = {
+  standardNumber: 'BAS-001',
+  standardEnglishName: 'Basic Standard',
+  standardAlias: 'Basic Standard',
+  standardSource: '1',
+  definitionBasis: '相关法律法规',
+  businessRule: '所有基础标准必须经过审核才能发布。',
+  dataType: '1',
+  tecDataType: 'varchar',
+  valueRange: '非空字符串',
+  codeNumber: 'CODE-100',
+  adaptability: '1',
+  technicalAttribute: '通用技术属性',
+  dataDisplay: '文本显示',
+  dataPrecision: '无',
+  dataLength: '255',
+  measurementUnit: '无',
+  managementAttribute: '通用管理属性',
+  creator: '张三',
+  updater: '李四',
+  secondaryAuthorityDepartment: '技术部',
+  tertiaryAuthorityDepartment: '研发组',
+  coreSystem: '核心系统A',
+  dataStandardStatus: '有效',
+  expirationDate: '2025-10-24',
+  expirationReason: '无',
+  collaborativeDepartment: '财务部, 市场部',
+};
+
+export const rightContrastData1 = {
+  standardNumber: 'BAS-001',
+  standardEnglishName: 'Basic Standard',
+  standardAlias: 'Basic Standard',
+  standardSource: '1',
+  definitionBasis: '相关法律法规',
+  businessRule: '所有基础标准必须经过审核才能发布。',
+  dataType: '1',
+  tecDataType: 'varchar',
+  valueRange: '非空字符串',
+  codeNumber: 'CODE-100',
+  adaptability: '1',
+  technicalAttribute: '通用技术属性',
+  dataDisplay: '文本显示',
+  dataPrecision: '无',
+  dataLength: '255',
+  measurementUnit: '无',
+  managementAttribute: '通用管理属性',
+  creator: '张三',
+  updater: '李四',
+  secondaryAuthorityDepartment: '技术部',
+  tertiaryAuthorityDepartment: '研发组',
+  coreSystem: '核心系统A',
+  dataStandardStatus: '有效',
+  expirationDate: '2025-10-24',
+  expirationReason: '无',
+  collaborativeDepartment: '财务部, 市场部',
+};
+
+export const leftContrastData2 = {
+  standardNumber: 'BAS-001',
+  standardEnglishName: 'Basic Standard',
+  standardAlias: 'Basic Standard',
+  standardPath: '/基础标准',
+  indicatorCaliber: '销售额-成本/实际成本',
+  referenceDocument: '100',
+  calculationFormula: '销售额-成本/实际成本',
+  standardSource: '1',
+  definitionBasis: '相关法律法规',
+  businessRule: '所有基础标准必须经过审核才能发布。',
+  dataType: '1',
+  tecDataType: 'varchar',
+  valueRange: '非空字符串',
+  codeNumber: 'CODE-100',
+  adaptability: '1',
+  technicalAttribute: '通用技术属性',
+  dataDisplay: '文本显示',
+  dataPrecision: '无',
+  dataLength: '255',
+  measurementUnit: '无',
+  managementAttribute: '通用管理属性',
+  creator: '张三',
+  updater: '李四',
+  secondaryAuthorityDepartment: '技术部',
+  tertiaryAuthorityDepartment: '研发组',
+  coreSystem: '核心系统A',
+  dataStandardStatus: '有效',
+  expirationDate: '2025-10-24',
+  expirationReason: '无',
+  collaborativeDepartment: '财务部, 市场部',
+};
+
+export const leftContrastData4 = {
+  valueOne: '企业号',
+  valueTwo: 'REF000023',
+  valueThree: '标准文件A',
+};
+export const rightContrastData4 = {
+  valueOne: '企业号',
+  valueTwo: 'REF000023',
+  valueThree: '标准文件A',
+};
+
+export const leftContrastData5 = {
+  referenceStandard: [{ icon: '🌐🔍', text: '数据源1' }],
+  businessId: 202,
+  standardChineseName: '对外投资控股标志',
+  anotherName: '对外投资控股标志',
+  parentId: 102,
+  publishStatus: '未发布',
+  businessDefinition: '对外投资控股标志',
+  standardCode: 'BAS000005',
+  ancestors: '0,100,102',
+  location: '/公共代码/个人工作区/对外投资控股标志',
+  holderGroup: '个人工作区',
+  createDate: '2024-10-22 8:04:04',
+  updateDate: '2024-10-22 8:04:04',
+  icon: 'ant-design:partition-outlined',
+  businessAttribute: '财务',
+  standardNumber: 'BAS-005',
+  standardEnglishName: 'Investment Holding Mark',
+  standardAlias: 'Investment Holding Mark',
+  standardSource: '国家标准化管理委员会',
+  definitionBasis: '相关法律法规',
+  businessRule: '对外投资的控股标志必须明确记录。',
+  dataType: '1',
+  tecDataType: 'varchar',
+  valueRange: '非空字符串',
+  codeNumber: 'CODE-202',
+  adaptability: '1',
+  technicalAttribute: '通用技术属性',
+  dataDisplay: '文本显示',
+  dataPrecision: '无',
+  dataLength: '255',
+  measurementUnit: '无',
+  managementAttribute: '通用管理属性',
+  creator: '王五',
+  updater: '赵六',
+  secondaryAuthorityDepartment: '技术部',
+  tertiaryAuthorityDepartment: '运维组',
+  coreSystem: '核心系统B',
+  dataStandardStatus: '有效',
+  expirationDate: '2025-10-24',
+  expirationReason: '无',
+  collaborativeDepartment: '人力资源部, 技术部',
+  standardPath: '/公共代码/个人工作区/对外投资控股标志',
+  indicatorCaliber: '销售额-成本/实际成本',
+  referenceDocument: '/引用文档',
+  calculationFormula: '销售额-成本/实际成本',
+  belongingTheme: '投资',
+};
+
+export const rightContrastData5 = {
+  businessId: 202,
+  standardChineseName: '对外投资控股标志',
+  anotherName: '对外投资控股标志',
+  parentId: 102,
+  publishStatus: '未发布',
+  businessDefinition: '对外投资控股标志',
+  standardCode: 'BAS000005',
+  ancestors: '0,100,102',
+  location: '/公共代码/个人工作区/对外投资控股标志',
+  holderGroup: '个人工作区',
+  createDate: '2024-10-22 8:04:04',
+  updateDate: '2024-10-22 8:04:04',
+  icon: 'ant-design:partition-outlined',
+  businessAttribute: '财务',
+  standardNumber: 'BAS-005',
+  standardEnglishName: 'Investment Holding Mark',
+  standardAlias: 'Investment Holding Mark',
+  standardSource: '国家标准化管理委员会',
+  definitionBasis: '相关法律法规',
+  businessRule: '对外投资的控股标志必须明确记录。',
+  dataType: '1',
+  tecDataType: 'varchar',
+  valueRange: '非空字符串',
+  codeNumber: 'CODE-202',
+  adaptability: '1',
+  technicalAttribute: '通用技术属性',
+  dataDisplay: '文本显示',
+  dataPrecision: '无',
+  dataLength: '255',
+  measurementUnit: '无',
+  managementAttribute: '通用管理属性',
+  creator: '王五',
+  updater: '赵六',
+  secondaryAuthorityDepartment: '技术部',
+  tertiaryAuthorityDepartment: '运维组',
+  coreSystem: '核心系统B',
+  dataStandardStatus: '有效',
+  expirationDate: '2025-10-24',
+  expirationReason: '无',
+  collaborativeDepartment: '人力资源部, 技术部',
+  standardPath: '/公共代码/个人工作区/对外投资控股标志',
+  indicatorCaliber: '销售额-成本/实际成本',
+  referenceDocument: '/引用文档',
+  calculationFormula: '销售额-成本/实际成本',
+  belongingTheme: '投资',
+};
+
+
+
+
+export const rightContrastData2 = {
+  standardNumber: 'BAS-001',
+  standardEnglishName: 'Basic Standard',
+  standardAlias: 'Basic Standard',
+  standardPath: '/基础标准',
+  indicatorCaliber: '销售额-成本/实际成本',
+  referenceDocument: '100',
+  calculationFormula: '销售额-成本/实际成本',
+  standardSource: '1',
+  definitionBasis: '相关法律法规',
+  businessRule: '所有基础标准必须经过审核才能发布。',
+  dataType: '1',
+  tecDataType: 'varchar',
+  valueRange: '非空字符串',
+  codeNumber: 'CODE-100',
+  adaptability: '1',
+  technicalAttribute: '通用技术属性',
+  dataDisplay: '文本显示',
+  dataPrecision: '无',
+  dataLength: '255',
+  measurementUnit: '无',
+  managementAttribute: '通用管理属性',
+  creator: '张三',
+  updater: '李四',
+  secondaryAuthorityDepartment: '技术部',
+  tertiaryAuthorityDepartment: '研发组',
+  coreSystem: '核心系统A',
+  dataStandardStatus: '有效',
+  expirationDate: '2025-10-24',
+  expirationReason: '无',
+  collaborativeDepartment: '财务部, 市场部',
+};
+
+export const leftContrastData3 = {
+  valueOne: '标准文件管理',
+  valueTwo: 'REF000023',
+  valueThree: '标准文件A',
+  valueFour: '-',
+  valueFive: '某部队',
+  valueSix: '202304',
+  valueSeven: '2023001',
+  valueEight: '-',
+};
+
+export const rightContrastData3 = {
+  valueOne: '标准文件管理',
+  valueTwo: 'REF000023',
+  valueThree: '标准文件A',
+  valueFour: '-',
+  valueFive: '某部队',
+  valueSix: '202304',
+  valueSeven: '2023001',
+  valueEight: '-',
+};
+
 export const rightContrastData: any[] = [
   {
     valueOne: '标准文件管理',
@@ -126,9 +383,9 @@ export const relatedRelationshipsData2 = [
     standardName: '当前就读学校',
     standardNumber: 'BIDQ000000001',
     path: '/基础标准/DMP_admin-个人工作区/...',
-    associationRelation:'无',
+    associationRelation: '无',
     associationDescription: '无',
     associationTime: '2024-01-01 10:00:00',
     operatorUser: 'DMP_admin',
   },
-]
+];

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: '待支付',
   },
 ]