登记审核bug修改

src/views/dataSharingAndExchange/enrollAudit/detail.vue

@@ -3,13 +3,11 @@
     :title="!isAudit ? '登记详情' : '登记审核'"
     dense
     contentBackground
-    contentFullHeight
     fixed-height
-    headerSticky
     @back="handleBack"
   >
     <Row :gutter="[16, 30]">
-      <Col :span="12" v-for="info in enrollColumns" :key="info">
+      <Col :span="info.col" v-for="info in enrollColumns1" :key="info">
         <div class="col-item">
           <div class="item-label">{{ info.title }}：</div>
           <div v-if="['enrollBook'].includes(info.dataIndex)" class="item-des"
@@ -24,7 +22,7 @@
         </div>
       </Col>
     </Row>
-    <div v-if="isAudit" style="justify-content: center; display: flex; gap: 10px">
+    <div v-if="isAudit" style="justify-content: center; display: flex; gap: 10px; margin: 20px 0px 20px 350px">
       <a-button @click="handleCancel">驳回</a-button>
       <a-button type="primary" @click="handleEdit">审核</a-button>
     </div>
@@ -35,7 +33,7 @@
   import PageWrapper from '@/components/Page/src/PageWrapper.vue';
   import { useRoute, useRouter } from 'vue-router';
   import { Col, Row } from 'ant-design-vue';
-  import { enrollColumns } from './enroll.data';
+  import { enrollColumns1 } from './enroll.data';
   import { ref, onMounted } from 'vue';
   import { TableImg } from '@/components/Table';
   import { useMessage } from '@/hooks/web/useMessage';

src/views/dataSharingAndExchange/enrollAudit/enroll.data.ts

@@ -34,9 +34,111 @@ export const enrollColumns: BasicColumn[] = [
     dataIndex: 'isObjection',
   },
   {
+    title: '状态',
+    dataIndex: 'status',
+  },
+  {
+    title: '登记证书',
+    dataIndex: 'enrollBook',
+  },
+];
+
+export const enrollColumns1: any[] = [
+  {
+    col: 12,
+    title: '登记编号',
+    dataIndex: 'enrollNum',
+  },
+  {
+    col: 12,
+    title: '申请人',
+    dataIndex: 'applicant',
+  },
+  {
+    col: 12,
+    title: '数据知识产权名称',
+    dataIndex: 'dataName',
+  },
+  {
+    col: 12,
+    title: '所属行业',
+    dataIndex: 'sector',
+  },
+  {
+    col: 12,
+    title: '数据类型',
+    dataIndex: 'dataType',
+  },
+  {
+    col: 12,
+    title: '数据来源',
+    dataIndex: 'dataBase',
+  },
+  {
+    col: 12,
+    title: '数据格式',
+    dataIndex: 'dataFormat',
+  },
+  {
+    col: 12,
+    title: '数据规模',
+    dataIndex: 'dataSize',
+  },
+  {
+    col: 24,
+    title: '数据结构',
+    dataIndex: 'dataStructure',
+  },
+  {
+    col: 12,
+    title: '更新频次',
+    dataIndex: 'updateRate',
+  },
+  {
+    col: 12,
+    title: '应用场景',
+    dataIndex: 'applyScene',
+  },
+  {
+    col: 12,
+    title: '算法规则简要说',
+    dataIndex: 'ruleExplain',
+  },
+  {
+    col: 12,
+    title: '登记日期',
+    dataIndex: 'enrollDate',
+  },
+  {
+    col: 12,
+    title: '登记备案状态',
+    dataIndex: 'enrollStatus',
+  },
+  {
+    col: 12,
+    title: '是否存在异议',
+    dataIndex: 'isObjection',
+  },
+  {
+    col: 12,
+    title: '状态',
+    dataIndex: 'status',
+  },
+  {
+    col: 12,
     title: '登记证书',
     dataIndex: 'enrollBook',
   },
+  {
+    col: 12,
+    title: '存证公证编号',
+    dataIndex: 'publicCode',
+  },
+  {
+    col: 12,
+    title: '存证公证平台',
+    dataIndex: 'publicPlatform',
+  },
 ];
 
 export const searchFormSchema: FormSchema[] = [

src/views/dataSharingAndExchange/enrollAudit/enrollData.ts

@@ -8,6 +8,7 @@ export const enrollData: any[] = [
     enrollDate: '2023-01-15',
     enrollStatus: '已备案',
     isObjection: '否',
+    status: '待审核',
     enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
@@ -19,6 +20,7 @@ export const enrollData: any[] = [
     enrollDate: '2022-09-20',
     enrollStatus: '待审核',
     isObjection: '否',
+    status: '审核通过',
     enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
@@ -30,6 +32,7 @@ export const enrollData: any[] = [
     enrollDate: '2023-03-05',
     enrollStatus: '已备案',
     isObjection: '否',
+    status: '驳回',
     enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
@@ -41,6 +44,7 @@ export const enrollData: any[] = [
     enrollDate: '2022-12-10',
     enrollStatus: '已备案',
     isObjection: '是',
+    status: '已上架',
     enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
@@ -52,6 +56,7 @@ export const enrollData: any[] = [
     enrollDate: '2023-06-18',
     enrollStatus: '待审核',
     isObjection: '是',
+    status: '待审核',
     enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
@@ -63,6 +68,7 @@ export const enrollData: any[] = [
     enrollDate: '2021-11-25',
     enrollStatus: '已备案',
     isObjection: '是',
+    status: '待审核',
     enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
@@ -74,6 +80,7 @@ export const enrollData: any[] = [
     enrollDate: '2022-05-30',
     enrollStatus: '已备案',
     isObjection: '是',
+    status: '待审核',
     enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
@@ -85,6 +92,7 @@ export const enrollData: any[] = [
     enrollDate: '2023-02-10',
     enrollStatus: '待审核',
     isObjection: '是',
+    status: '待审核',
     enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
@@ -96,6 +104,7 @@ export const enrollData: any[] = [
     enrollDate: '2023-04-15',
     enrollStatus: '已备案',
     isObjection: '是',
+    status: '待审核',
     enrollBook: ['src/assets/images/登记证书.jpg'],
   },
   {
@@ -107,6 +116,7 @@ export const enrollData: any[] = [
     enrollDate: '2023-07-20',
     enrollStatus: '已备案',
     isObjection: '是',
+    status: '待审核',
     enrollBook: ['src/assets/images/登记证书.jpg'],
   },
 ];

src/views/dataSharingAndExchange/enrollAudit/objectionModal.vue

@@ -5,7 +5,11 @@
     @register="registerModal"
     :title="getTitle"
     @ok="handleSubmit"
+    okText="确认异议"
   >
+    <template #insertFooter>
+      <a-button @click="handleCancel">异议驳回</a-button>
+    </template>
     <Alert
       show-icon
       type="info"
@@ -15,8 +19,7 @@
     <div class="flex" style="margin-bottom: 20px">
       <div style="margin-top: 4px">异议内容：</div>
       <div
-        ><span style="font-size: 18px; font-weight: bolder">xxx科技有限公司</span
-        ><span>认为</span
+        ><span style="font-size: 18px; font-weight: bolder">xxx科技有限公司</span><span>认为</span
         ><span style="font-size: 18px; font-weight: bolder">xxx科技有限公司</span
         ><span>有抄袭行为</span></div
       >
@@ -58,7 +61,7 @@
 
 <script lang="ts" setup>
   import BasicModal from '@/components/Modal/src/BasicModal.vue';
-  import { useModalInner } from '@/components/Modal';
+  import { ModalProps, useModalInner } from '@/components/Modal';
   import { FormProps, useForm } from '@/components/Form';
   import { Descriptions, Alert } from 'ant-design-vue';
   import { objectionFormSchema } from '@/views/dataSharingAndExchange/enrollAudit/enroll.data';
@@ -69,7 +72,12 @@
   const { createMessage } = useMessage();
 
   /** 初始化弹框*/
-  const [registerModal, { closeModal }] = useModalInner(async (data) => {});
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
+    setModalProps({
+      confirmLoading: false,
+      showCancelBtn: false,
+    } as ModalProps);
+  });
 
   /** 初始化表单*/
   const [registerForm, { setFieldsValue, validate }] = useForm({
@@ -83,6 +91,10 @@
     closeModal();
     createMessage.success('处理成功！');
   }
+  function handleCancel() {
+    closeModal();
+    createMessage.success('驳回成功！');
+  }
 </script>
 
 <style scoped></style>

src/views/personalCenter/myObjection/detail.vue

@@ -61,7 +61,6 @@
   import { TableImg } from '@/components/Table';
   import { useMessage } from '@/hooks/web/useMessage';
   import { objectionColumns } from '@/views/personalCenter/myObjection/objection.data';
-  import { formSchema1 } from '@/views/servicePlatform/enterpriseCertification/enterpriseColumns.data';
 
   const { createMessage } = useMessage();
   const route = useRoute();

src/views/servicePlatform/enterpriseCertification/detail.vue

@@ -90,12 +90,6 @@
     },
   ]);
 
-  const [register1] = useDescription({
-    bordered: false,
-    data: mockData,
-    schema: formSchema1,
-  });
-
   function handleBack() {
     router.go(-1);
   }

src/views/servicePlatform/enterpriseCertification/enterpriseColumns.data.ts

@@ -56,7 +56,7 @@ export const enterpriseColumns: BasicColumn[] = [
 export const formSchema1: DescItem[] = [
   {
     field: 'companyName',
-    label: '公司名称',
+    label: '企业名称',
   },
   {
     field: 'code',
@@ -66,6 +66,11 @@ export const formSchema1: DescItem[] = [
     field: 'leader',
     label: '法人',
   },
+
+  {
+    field: 'leaderNum',
+    label: '法人身份证号码：',
+  },
   {
     field: 'buildTime',
     label: '成立日期',
@@ -74,18 +79,18 @@ export const formSchema1: DescItem[] = [
     field: 'registerNum',
     label: '注册资本',
   },
-  {
-    field: 'website',
-    label: '网址',
-  },
 
   {
     field: 'businessRange',
     label: '经营范围',
   },
   {
-    field: 'status',
-    label: '状态',
+    field: 'businessRange',
+    label: '注册地址',
+  },
+  {
+    field: 'businessRange',
+    label: '经营范围',
   },
   {
     field: 'license',