验收修改

lihua
Showing 5 changed files with 108 additions and 106 deletions
src/views/data_asset/dataDelivery.vue
src/views/data_asset/registerCatalogDetail.vue
src/views/data_product/productListing.vue
src/views/data_product/productListingDetail.vue
src/views/data_smart_contract/smartContractDetail.vue
--- a/src/views/data_asset/dataDelivery.vue
View file @9642ed3
+++ b/src/views/data_asset/dataDelivery.vue
View file @9642ed3
@@ -217,19 +217,19 @@ const tableInfo = ref({
      let deliveryStatus = row.deliveryStatus;
      if (deliveryStatus == 2) {//已交付有删除按钮
        btns.push({
-          value: 'del', label: '删除', click: (scope) => {
+          value: 'del', label: '销毁', click: (scope) => {
-            proxy.$openMessageBox("此操作将永久删除, 是否继续?", () => {
+            proxy.$openMessageBox("此操作将永久销毁数据, 是否继续?", () => {
              deleteDeliveryContract([scope.row.guid]).then((res: any) => {
                if (res?.code == proxy.$passCode) {
                  page.value.curr = 1;
                  getTableData();
-                  proxy.$ElMessage.success('删除成功');
+                  proxy.$ElMessage.success('销毁成功');
                } else {
                  res?.msg && proxy.$ElMessage.error(res?.msg);
                }
              });
            }, () => {
-              proxy.$ElMessage.info("已取消");
+              proxy.$ElMessage.info("已取消销毁");
            })
          }
        });
--- a/src/views/data_asset/registerCatalogDetail.vue
View file @9642ed3
+++ b/src/views/data_asset/registerCatalogDetail.vue
View file @9642ed3
@@ -117,7 +117,9 @@ const processInstanceId = ref('');
 const registerDetailTableInfo = ref({
  id: 'register-data-table',
  rowKey: 'guid',
-  height: 220,
+  height: 'auto',
+  minPanelHeight: '60px',
+  minHeight: '60px',
  loading: false,
  fields: [{ label: "序号", type: "index", width: 56, align: "center" },
  { label: "事项", field: "title", width: 160, align: "left" },
--- a/src/views/data_product/productListing.vue
View file @9642ed3
+++ b/src/views/data_product/productListing.vue
View file @9642ed3
@@ -20,7 +20,6 @@ import { getDamTypesList } from "@/api/modules/dataAsset";
 import {
  changeNum,
 } from "@/utils/common";
-import { chunk } from "@/api/modules/common";
 import { passFlowData, rejectFlowData, revokeFlowData, isMyFirstNode } from "@/api/modules/workFlowService";
 const { proxy } = getCurrentInstance() as any;
@@ -634,15 +633,16 @@ onBeforeMount(() => {
      proxy.$ElMessage.error(res.msg);
    }
  })
-  getParamsList({
+  // 连接器没有通过和驳回，不需要审批通过时填写合规信息。
-    dictType: "数据产品上架审批合规信息",
+  // getParamsList({
-  }).then((res: any) => {
+  //   dictType: "数据产品上架审批合规信息",
-    if (res.code == proxy.$passCode) {
+  // }).then((res: any) => {
-      assetsSafeInfo.value = res.data || [];
+  //   if (res.code == proxy.$passCode) {
-    } else {
+  //     assetsSafeInfo.value = res.data || [];
-      proxy.$ElMessage.error(res.msg);
+  //   } else {
-    }
+  //     proxy.$ElMessage.error(res.msg);
-  })
+  //   }
+  // })
 })
 const assetsSafeInfo = ref<any>()
@@ -929,7 +929,7 @@ const rejectDialogBtnClick = (btn, info) => {
        @tableSwitchBeforeChange="tableSwitchBeforeChange" />
    </div>
    <el-dialog v-model="dialogVisible" :title="dialogTitle" width="550px" :close-on-click-modal="false">
-      <Form ref="listingFormRef" :itemList="formInfo.items" :rules="formInfo.rules" />
+      <!-- <Form ref="listingFormRef" :itemList="formInfo.items" :rules="formInfo.rules" /> -->
      <el-input type="textarea" :rows="3" maxlength="100" v-model="approveSuggest" resize="none"
        :placeholder="dynamicPlaceholder" />
      <template #footer>
--- a/src/views/data_product/productListingDetail.vue
View file @9642ed3
+++ b/src/views/data_product/productListingDetail.vue
View file @9642ed3
@@ -470,34 +470,48 @@ const formInfo = ref<any>({
    //   required: false,
    //   visible: true
    // },
-    // {
+    {
-    //   label: '承诺函',
+      label: '承诺函',
-    //   tip: '支持扩展名：.png .pdf',
+      tip: '支持扩展名：.png .pdf',
-    //   accept: '.png, .pdf',
+      accept: '.png, .pdf',
-    //   type: 'upload-file',
+      type: 'upload-file',
-    //   placeholder: '请选择',
+      placeholder: '请选择',
-    //   field: 'commitmentLetterInfo',
+      field: 'commitmentLetterInfo',
     // templateUrl: '',
-    //   default: [],
+      default: [],
-    //   limit: 1,
+      limit: 1,
-    //   block: true,
+      block: true,
-    //   required: true,
+      required: true,
-    //   visible: true
+      visible: true
-    // },
+    },
-    // {
+    {
-    //   label: '授权文件',
+      label: '授权文件',
-    //   tip: '支持扩展名：.png .pdf',
+      tip: '支持扩展名：.png .pdf',
-    //   accept: '.png, .pdf',
+      accept: '.png, .pdf',
-    //   type: 'upload-file',
+      type: 'upload-file',
-    //   placeholder: '请选择',
+      placeholder: '请选择',
-    //   field: 'accreditFileInfo',
+      field: 'accreditFileInfo',
    //  templateUrl: '',
-    //   default: [],
+      default: [],
-    //   limit: 1,
+      limit: 1,
-    //   block: true,
+      block: true,
-    //   required: true,
+      required: true,
-    //   visible: true
+      visible: true
-    // },
+    },
+    {
+      label: '其它证明文件',
+      tip: '支持扩展名：.png .pdf .rar .zip',
+      accept: '.png, .pdf, .rar, .zip',
+      type: 'upload-file',
+      placeholder: '请选择',
+      field: 'productDetailInfo',
+    //  templateUrl: '',
+      default: [],
+      limit: 1,
+      block: true,
+      required: false,
+      visible: true
+    },
    // {
    //   label: '商品详细介绍（签章版）',
    //   tip: '支持扩展名：.png .pdf',
@@ -609,31 +623,31 @@ const formInfo = ref<any>({
    //   },
    // ],
    // 校验承诺函
-    // commitmentLetterInfo: [
+    commitmentLetterInfo: [
-    //   {
+      {
-    //     validator: (rule: any, value: any, callback: any) => {
+        validator: (rule: any, value: any, callback: any) => {
-    //       let formInline = listingFormRef.value.formInline;
+          let formInline = listingFormRef.value.formInline;
-    //       if (!value?.length) {
+          if (!value?.length) {
-    //         callback(new Error('请上传承诺函'))
+            callback(new Error('请上传承诺函'))
-    //       } else {
+          } else {
-    //         callback();
+            callback();
-    //       }
+          }
-    //     }, trigger: 'change'
+        }, trigger: 'change'
-    //   },
+      },
-    // ],
+    ],
   // 校验授权文件
-    // accreditFileInfo: [
+    accreditFileInfo: [
-    //   {
+      {
-    //     validator: (rule: any, value: any, callback: any) => {
+        validator: (rule: any, value: any, callback: any) => {
-    //       let formInline = listingFormRef.value.formInline;
+          let formInline = listingFormRef.value.formInline;
-    //       if (!value?.length) {
+          if (!value?.length) {
-    //         callback(new Error('请上传授权文件'))
+            callback(new Error('请上传授权文件'))
-    //       } else {
+          } else {
-    //         callback();
+            callback();
-    //       }
+          }
-    //     }, trigger: 'change'
+        }, trigger: 'change'
-    //   },
+      },
-    // ],
+    ],
    // // 校验商品详细介绍
    // productDetailInfo: [
    //   {
@@ -694,9 +708,9 @@ const getProductDetail = async () => {
      // if (res.data.commitmentLetter && res.data.commitmentLetter.length) {
      //   flowDetail.value.commitmentLetter = { name: res.data.commitmentLetter[0].name, url: res.data.commitmentLetter[0].url }
      // }
-      // if (res.data.accreditFile && res.data.accreditFile.length) {
+      if (res.data.accreditFile && res.data.accreditFile.length) {
-      //   flowDetail.value.accreditFile = { name: res.data.accreditFile[0].name, url: res.data.accreditFile[0].url }
+        flowDetail.value.accreditFile = { name: res.data.accreditFile[0].name, url: res.data.accreditFile[0].url }
-      // }
+      }
      // if (res.data.productDetail && res.data.productDetail.length) {
      //   flowDetail.value.productDetail = { name: res.data.productDetail[0].name, url: res.data.productDetail[0].url }
      // }
@@ -1105,23 +1119,6 @@ const selectChange = async (val, row, info) => {
    currProductInfo.value = dataInfo;
    let coverageArea = (data.length && data[0].coverageArea) ? data[0].coverageArea : [];
    await setFormItems({ ...info, ...dataInfo, coverageArea: coverageArea,  content: dataInfo.propertyDescription || dataInfo.sceneDescription || info.content });
-    // formInfo.value.items.forEach((item: any) => {
-    //     if (item.field == 'costAssessmentFileInfo') {
-    //       item.default =  data?.[0]?.assessmentFile || [];
-    //     } else if (item.field == 'qualityEvaluationFileInfo') {
-    //       item.default = data?.[0]?.evaluationFile || [];
-    //     } else if (item.field == 'qualityEvaluationFileInfo') {
-    //       item.default = data?.[0]?.evaluationFile || [];
-    //     } else if (item.field == 'commitmentLetterInfo') {
-    //       item.default = data?.[0]?.commitmentLetter || [];
-    //     } else if (item.field == 'qualityEvaluationInstitution') {
-    //       item.default = data?.[0]?.qualityEvaluationInstitution || '';
-    //     }  else if (item.field == 'costAssessmentInstitution') {
-    //       item.default = data?.[0]?.costAssessmentInstitution || '';
-    //     } else if (item.field == 'pricingWay') {
-    //       item.default = data?.[0]?.pricingWay || '';
-    //     }
-    // });
    // formInfo.value.items.at(0).default = val;
    formInfo.value.items.at(1).default = data.length ? data[0].damType : '';
@@ -1217,7 +1214,7 @@ onBeforeMount(async () => {
  // case 1: 数交易所 case 2: 门户
  if (route.query.case == '2') {
    formInfo.value.items.forEach(item => {
-      if (item.field == 'productCode' || item.field == 'damCode' || item.field == 'exchangeName' || item.field == 'registrationCertificateInfo' || item.field == 'qualityEvaluationFileInfo' || item.field == 'qualityEvaluationInstitution' || item.field == 'costAssessmentFileInfo' || item.field == 'costAssessmentInstitution' || item.field == 'commitmentLetterInfo' || item.field == 'accreditFileInfo' || item.field == 'productDetailInfo') {
+      if (item.field == 'productCode' || item.field == 'damCode' || item.field == 'exchangeName' || item.field == 'registrationCertificateInfo' || item.field == 'qualityEvaluationFileInfo' || item.field == 'qualityEvaluationInstitution' || item.field == 'costAssessmentFileInfo' || item.field == 'costAssessmentInstitution') {
        item.visible = false;
      }
    })
@@ -1225,18 +1222,18 @@ onBeforeMount(async () => {
  if (detailType && detailType != 'add') {
    getProductDetail();
  }
-  if (detailType == 'detail') {
+  // if (detailType == 'detail') {
-    getParamsList({
+  //   getParamsList({
-      dictType: "数据产品上架审批合规信息",
+  //     dictType: "数据产品上架审批合规信息",
-    }).then((res: any) => {
+  //   }).then((res: any) => {
-      if (res.code == proxy.$passCode) {
+  //     if (res.code == proxy.$passCode) {
-        assetsSafeInfo.value = res.data || [];
+  //       assetsSafeInfo.value = res.data || [];
-      } else {
+  //     } else {
-        proxy.$ElMessage.error(res.msg);
+  //       proxy.$ElMessage.error(res.msg);
-      }
+  //     }
-    })
+  //   })
-    // return; //详情不需要调用以下接口
+  //   // return; //详情不需要调用以下接口
-  }
+  // }
  if (detailType != 'detail') {
    await getTableData();
    if (route.query.exchangeGuid) {
@@ -1843,7 +1840,10 @@ const viewProductDetail = () => {
          <div class="list_panel" v-else>
            <div class="list_item">
              <span class="item_label">数据产品名称:</span>
-              <span class="item_value link" @click="viewProductDetail">{{ flowDetail.damName || '--' }}</span>
+              <span class="item_value link" @click="viewProductDetail">
+                <ellipsis-tooltip :content="flowDetail.damName || '--'"
+                class-name="w100f mr8-i" :refName="'tooltipOver' + 'damName'"></ellipsis-tooltip>
+              </span>
            </div>
            <div class="list_item">
              <span class="item_label">资产类型:</span>
@@ -1869,7 +1869,7 @@ const viewProductDetail = () => {
              <span class="item_label">定价方式:</span>
              <span class="item_value">{{ priceWayInfo || '--' }}</span>
            </div>
-            <div v-show="flowDetail.dataSource != '1'" class="list_item">
+            <div v-show="flowDetail.dataSource != '1' && priceWayInfo != '面议'" class="list_item">
              <span class="item_label">定价金额:</span>
              <span class="item_value">{{ prcieInfo || '--' }}</span>
            </div>
@@ -1974,7 +1974,7 @@ const viewProductDetail = () => {
          </div>
        </div>
      </div>
-      <div class="panel_wrap"
+      <!-- <div class="panel_wrap"
        v-if="(detailType == 'detail') && flowDetail.complianceInfo && Object.keys(flowDetail.complianceInfo).length > 0">
        <div class="panel_header">
          <div class="header_title">
@@ -2035,7 +2035,7 @@ const viewProductDetail = () => {
            </div>
          </div>
        </div>
-      </div>
+      </div> -->
      <div class="panel_wrap" v-if="detailType == 'detail' && dGuid !== undefined">
        <div class="panel_header">
          <div class="header_title">
--- a/src/views/data_smart_contract/smartContractDetail.vue
View file @9642ed3
+++ b/src/views/data_smart_contract/smartContractDetail.vue
View file @9642ed3
@@ -1438,19 +1438,19 @@ onActivated(() => {
          <el-table ref="execContractTableRef" :data="execContractTableInfo.data" :highlight-current-row="true" stripe
            v-loading="execContractTableInfo.loading" border height="100%" tooltip-effect="light" row-key="guid" :style="{
              width: '100%',
-              height: '300px',
+              height: '350px',
              display: 'inline-block',
            }">
            <el-table-column type="expand">
              <template #default="scope">
                <div class="h-title mt6">履约证明</div>
                <div class="list_panel" style="width: 1200px;">
-                  <div class="list_item">
+                  <div class="list_item is_block">
                    <span class="item_label">日志摘要:</span>
                    <span class="item_value"><ellipsis-tooltip :content="scope.row?.contractProof?.logHash || '--'"
                        class-name="w100f mr8-i" :refName="'tooltipOver' + 'logHash'"></ellipsis-tooltip></span>
                  </div>
-                  <div class="list_item">
+                  <div class="list_item is_block">
                    <span class="item_label">区块链交易ID:</span>
                    <span class="item_value row"><ellipsis-tooltip
                        :content="scope.row?.contractProof?.blockchainTx || '--'" class-name="w100f mr8-i"