Merge branch 'develop' into dev_20241202_xukangle

xukangle
Showing 5 changed files with 130 additions and 34 deletions
src/views/data_asset/qualityEvaluate.vue
src/views/data_asset/registerCatalogDetail.vue
src/views/data_asset/registerDetail.vue
src/views/data_asset/registerStart.vue
src/views/data_product/productListingDetail.vue
--- a/src/views/data_asset/qualityEvaluate.vue
View file @e449fb9
+++ b/src/views/data_asset/qualityEvaluate.vue
View file @e449fb9
@@ -420,7 +420,12 @@ const dialogBtnClick = (btn, info) => {
            daName: currTableData.value.daName,
            immediateApprove: true,
            evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
-            qualityEvaluationFile: info.qualityEvaluationFile || []
+            qualityEvaluationFile: info.qualityEvaluationFile?.map(file => {
+              return {
+                name: file.name,
+                url: file.url
+              }
+            }) || []
          }).then((res: any) => {
            dialogInfo.value.footer.btns[1].loading = false;
            if (res?.code == proxy.$passCode) {
@@ -440,7 +445,12 @@ const dialogBtnClick = (btn, info) => {
            daName: daInfo.damName,
            immediateApprove: true,
            evaluationAgencyGuid: res.data?.[1]?.candidateUsers?.[0]?.staffGuid,
-            qualityEvaluationFile: info.qualityEvaluationFile || []
+            qualityEvaluationFile: info.qualityEvaluationFile?.map(file => {
+              return {
+                name: file.name,
+                url: file.url
+              }
+            }) || []
          }).then((res: any) => {
            dialogInfo.value.footer.btns[1].loading = false;
            if (res?.code == proxy.$passCode) {
@@ -608,7 +618,12 @@ const passDialogBtnClick = (btn, info) => {
      evaluationRangeStart: info.evaluationRange[0],
      evaluationRangeEnd: info.evaluationRange[1],
      evaluationNote: info.evaluationNote,
-      evaluationFile:  info.evaluationFile || [],
+      evaluationFile:  info.evaluationFile?.map(file => {
+              return {
+                name: file.name,
+                url: file.url
+              }
+            }) || [],
    }).then((res: any) => {
      passDialogInfo.value.footer.btns[1].loading = false;
      if (res?.code == proxy.$passCode) {
--- a/src/views/data_asset/registerCatalogDetail.vue
View file @e449fb9
+++ b/src/views/data_asset/registerCatalogDetail.vue
View file @e449fb9
@@ -596,7 +596,12 @@ const passDialogBtnClick = (btn, info) => {
        evaluationRangeStart: info.evaluationRange[0],
        evaluationRangeEnd: info.evaluationRange[1],
        evaluationNote: info.evaluationNote,
-        evaluationFile: info.evaluationFile || []
+        evaluationFile: info.evaluationFile?.map(file => {
+              return {
+                name: file.name,
+                url: file.url
+              }
+            }) || []
      }).then((res: any) => {
        passDialogInfo.value.footer.btns[1].loading = false;
        submitPromise.value = null;
@@ -903,7 +908,7 @@ const rejectDialogBtnClick = (btn, info) => {
          </div>
    </ContentWrap>
    <ContentWrap id="id-qualityEvaluate" v-if="route.query.type == 'qualityEvaluate' && evaDetailInfo.qualityScore != null" title="质量评价"
-          description="资产质量评价信息" style="margin-top: 15px">
+          description="资产质量评价信息" style="margin: 16px 16px 16px">
          <div class="list_panel">
            <div class="list_item">
              <span class="item_label">质量得分:</span>
--- a/src/views/data_asset/registerDetail.vue
View file @e449fb9
+++ b/src/views/data_asset/registerDetail.vue
View file @e449fb9
@@ -26,7 +26,7 @@ import {
 import { passFlowData, rejectFlowData, revokeFlowData } from "@/api/modules/workFlowService";
 import useDataAssetStore from "@/store/modules/dataAsset";
 import { changeNum, getDownloadUrl, download } from '@/utils/common';
-import { onUploadFilePreview, onUploadFileDownload, setFileName } from '@/api/modules/common';
+import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common';
 const assetStore = useDataAssetStore();
@@ -511,7 +511,7 @@ const toolBtns: any = computed(() => {
  }
  let approveVO = detailInfo.value.approveVO;
  let staffGuid = userData.staffGuid;
-  if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids&&approveVO.approveStaffGuids.indexOf(staffGuid) > -1) {
+  if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids && approveVO.approveStaffGuids.indexOf(staffGuid) > -1) {
    btnsArr.push(...[{ label: "通过", value: "pass", type: 'primary' }, { label: "驳回", value: "reject", type: 'danger', plain: true }]);
  }
  if (approveVO && approveVO.approveState == 'A' && approveVO.staffGuid == staffGuid) {
@@ -928,7 +928,12 @@ const passDialogBtnClick = (btn, info) => {
        evaluationRangeStart: info.evaluationRange[0],
        evaluationRangeEnd: info.evaluationRange[1],
        evaluationNote: info.evaluationNote,
-        evaluationFile: info.evaluationFile || [],
+        evaluationFile: info.evaluationFile?.map(file => {
+          return {
+            name: file.name,
+            url: file.url
+          }
+        }) || [],
      }).then((res: any) => {
        submitPromise.value = null;
        if (res?.code == proxy.$passCode) {
@@ -1116,7 +1121,8 @@ const formattedDate = (dateVal) => {
              <span class="title_text">已撤销</span>
            </div>
          </div>
-          <div class="panel_body" v-if="detailInfo.approveVO?.approveState != 'A' && detailInfo.approveVO?.approveState != 'C'">
+          <div class="panel_body"
+            v-if="detailInfo.approveVO?.approveState != 'A' && detailInfo.approveVO?.approveState != 'C'">
            <div class="results_list">
              <div class="list_item">
                <span class="item_label">审批人:</span>
@@ -1375,7 +1381,7 @@ const formattedDate = (dateVal) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ setFileName(item.name) }}</div>
+                  <div class="file-name">{{ item.name }}</div>
                  <div :style="{ right: '36px' }"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'"
                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
@@ -1384,9 +1390,9 @@ const formattedDate = (dateVal) => {
              </span>
            </div>
            <div class="list_item is_block isFile" :style="{ width: '40%' }"
-              v-if="(detailType != 'asset' || assetDetailInfo.isEvaluationAssessment == 'Y') && assetDetailInfo.registerAttachment?.qualityEvaluationFile?.length">
+              v-if="((detailType != 'asset' || assetDetailInfo.isEvaluationAssessment == 'Y') && assetDetailInfo.registerAttachment?.qualityEvaluationFile?.length) || (evaDetailInfo?.qualityEvaluationFile?.length > 0)">
              <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">数据质量评价收集</span>
-              <span v-for="(item) in (assetDetailInfo.registerAttachment?.qualityEvaluationFile || [])"
+              <span v-for="(item) in (evaDetailInfo?.qualityEvaluationFile || assetDetailInfo.registerAttachment?.qualityEvaluationFile || [])"
                class="item_value" :style="{ 'padding-left': '0px' }">
                <div class="file-operate">
                  <template
@@ -1490,7 +1496,7 @@ const formattedDate = (dateVal) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ setFileName(item.name) }}</div>
+                  <div class="file-name">{{ item.name }}</div>
                  <div :style="{ right: '36px' }"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'"
                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
@@ -1528,7 +1534,7 @@ const formattedDate = (dateVal) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ setFileName(item.name) }}</div>
+                  <div class="file-name">{{ item.name }}</div>
                  <div :style="{ right: '36px' }"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'"
                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
@@ -1569,7 +1575,7 @@ const formattedDate = (dateVal) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ setFileName(item.name) }}</div>
+                  <div class="file-name">{{ item.name }}</div>
                  <div :style="{ right: '36px' }" class="file-preview"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'"
                    @click="onUploadFilePreview(item)">查看</div>
@@ -1607,7 +1613,7 @@ const formattedDate = (dateVal) => {
                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'">
                    <img class="file-img" src="../../assets/images/jpg.png" />
                  </template>
-                  <div class="file-name">{{ setFileName(item.name) }}</div>
+                  <div class="file-name">{{ item.name }}</div>
                  <div :style="{ right: '36px' }"
                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'"
                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
--- a/src/views/data_asset/registerStart.vue
View file @e449fb9
+++ b/src/views/data_asset/registerStart.vue
View file @e449fb9
@@ -1934,10 +1934,30 @@ const saveDraft = () => {
  let uploadFormInline = uploadFormRef.value.formInline;
  let registerAttachment: any = {
    //   fileHash: uploadFormInline.fileHash,
-    registerLetter: uploadFormInline['registerLetter']?.map(u => u.url) || [],
+    registerLetter: uploadFormInline['registerLetter']?.map(u => {
-    evaluationFile: uploadFormInline['evaluationFile']?.map(u => u.url) || [],
+      return {
-    assessmentFile: uploadFormInline['assessmentFile']?.map(u => u.url) || [],
+        url: u.url,
-    commitmentLetter: uploadFormInline['commitmentLetter']?.map(u => u.url) || [],
+        name: u.name
+      }
+    }) || [],
+    evaluationFile: uploadFormInline['evaluationFile']?.map(u =>  {
+      return {
+        url: u.url,
+        name: u.name
+      }
+    }) || [],
+    assessmentFile: uploadFormInline['assessmentFile']?.map(u =>  {
+      return {
+        url: u.url,
+        name: u.name
+      }
+    }) || [],
+    commitmentLetter: uploadFormInline['commitmentLetter']?.map(u =>  {
+      return {
+        url: u.url,
+        name: u.name
+      }
+    }) || [],
  }
  if (qualityEvaluationInstitution.value) {
    registerAttachment.qualityEvaluationInstitution = qualityEvaluationInstitution.value
@@ -2022,10 +2042,30 @@ const save = () => {
              let uploadFormInline = uploadFormRef.value.formInline;
              let registerAttachment: any = {
                // fileHash: uploadFormInline.fileHash,
-                registerLetter: uploadFormInline['registerLetter']?.map(u => u.url) || [],
+                registerLetter: uploadFormInline['registerLetter']?.map(u =>  {
-                evaluationFile: uploadFormInline['evaluationFile']?.map(u => u.url) || [],
+      return {
-                assessmentFile: uploadFormInline['assessmentFile']?.map(u => u.url) || [],
+        url: u.url,
-                commitmentLetter: uploadFormInline['commitmentLetter']?.map(u => u.url) || [],
+        name: u.name
+      }
+    }) || [],
+                evaluationFile: uploadFormInline['evaluationFile']?.map(u =>  {
+      return {
+        url: u.url,
+        name: u.name
+      }
+    }) || [],
+                assessmentFile: uploadFormInline['assessmentFile']?.map(u =>  {
+      return {
+        url: u.url,
+        name: u.name
+      }
+    }) || [],
+                commitmentLetter: uploadFormInline['commitmentLetter']?.map(u =>  {
+      return {
+        url: u.url,
+        name: u.name
+      }
+    }) || [],
              }
              if (qualityEvaluationInstitution.value) {
                registerAttachment.qualityEvaluationInstitution = qualityEvaluationInstitution.value
--- a/src/views/data_product/productListingDetail.vue
View file @e449fb9
+++ b/src/views/data_product/productListingDetail.vue
View file @e449fb9
@@ -913,11 +913,26 @@ const submitForm = (btn, formEl, tosub = false) => {
          console.log(params, '--------上架交易所 ---------');
          params.immediateApprove = btn.value == 'submit' ? true : false;
          params.registrationCertificate = params.registrationCertificateInfo.length ? { name: params.registrationCertificateInfo[0].name, url: params.registrationCertificateInfo[0].url } : {};
-          params.accreditFile = params.accreditFileInfo.length ? [params.accreditFileInfo[0].url] : '';
+          params.accreditFile = params.accreditFileInfo.length ? [{
-          params.commitmentLetter = params.commitmentLetterInfo.length ? [params.commitmentLetterInfo[0].url] : [];
+            url: params.accreditFileInfo[0].url,
-          params.assessmentFile = params.costAssessmentFileInfo.length ? [params.costAssessmentFileInfo[0].url] : [];
+            name: params.accreditFileInfo[0].name
-          params.productDetail = params.productDetailInfo.length ? [params.productDetailInfo[0].url] : [];
+          }] : '';
-          params.evaluationFile = params.qualityEvaluationFileInfo.length ? [params.qualityEvaluationFileInfo[0].url] : [];
+          params.commitmentLetter = params.commitmentLetterInfo.length ? [{
+            url: params.commitmentLetterInfo[0].url,
+            name: params.commitmentLetterInfo[0].name
+          }] : [];
+          params.assessmentFile = params.costAssessmentFileInfo.length ? [{
+            url: params.costAssessmentFileInfo[0].url,
+            name: params.costAssessmentFileInfo[0].name
+          }] : [];
+          params.productDetail = params.productDetailInfo.length ? [{
+            url: params.productDetailInfo[0].url,
+            name: params.productDetailInfo[0].name
+          }] : [];
+          params.evaluationFile = params.qualityEvaluationFileInfo.length ? [{
+            url: params.qualityEvaluationFileInfo[0].url,
+            name: params.qualityEvaluationFileInfo[0].name
+          }] : [];
          params.exchangeGuid = route.query.exchangeGuid;
          params.qualityEvaluationInstitutionGuid = qualityEvaluationData.value.find((item: any) => item.tenantName == params.qualityEvaluationInstitution)?.guid || '';
          params.costAssessmentInstitutionGuid = costAssessmentData.value.find((item: any) => item.tenantName == params.costAssessmentInstitution)?.guid || '';
@@ -962,11 +977,26 @@ const submitForm = (btn, formEl, tosub = false) => {
          params.guid = guid;
          params.immediateApprove = btn.value == 'submit' ? true : false;
          params.registrationCertificate = params.registrationCertificateInfo.length ? { name: params.registrationCertificateInfo[0].name, url: params.registrationCertificateInfo[0].url } : {};
-          params.accreditFile = params.accreditFileInfo.length ? [params.accreditFileInfo[0].url] : null;
+          params.accreditFile = params.accreditFileInfo.length ? [{
-          params.commitmentLetter = params.commitmentLetterInfo.length ? [params.commitmentLetterInfo[0].url] : [];
+            url: params.accreditFileInfo[0].url,
-          params.assessmentFile = params.costAssessmentFileInfo.length ? [params.costAssessmentFileInfo[0].url] : [];
+            name: params.accreditFileInfo[0].name
-          params.productDetail = params.productDetailInfo.length ? [params.productDetailInfo[0].url] : [];
+          }] : null;
-          params.evaluationFile = params.qualityEvaluationFileInfo.length ? [params.qualityEvaluationFileInfo[0].url] : [];
+          params.commitmentLetter = params.commitmentLetterInfo.length ? [{
+            url: params.commitmentLetterInfo[0].url,
+            name: params.commitmentLetterInfo[0].name
+          }] : [];
+          params.costAssessmentFile = params.costAssessmentFileInfo.length ? [{
+            url: params.costAssessmentFileInfo[0].url,
+            name: params.costAssessmentFileInfo[0].name
+          }] : [];
+          params.productDetail = params.productDetailInfo.length ? [{
+            url: params.productDetailInfo[0].url,
+            name: params.productDetailInfo[0].name
+          }] : [];
+          params.evaluationFile = params.qualityEvaluationFileInfo.length ? [{
+            url: params.qualityEvaluationFileInfo[0].url,
+            name: params.qualityEvaluationFileInfo[0].name
+          }] : [];
          params.exchangeGuid = route.query.exchangeGuid;
          params.qualityEvaluationInstitutionGuid = qualityEvaluationData.value.find((item: any) => item.tenantName == params.qualityEvaluationInstitution)?.guid || '';
          params.costAssessmentInstitutionGuid = costAssessmentData.value.find((item: any) => item.tenantName == params.costAssessmentInstitution)?.guid || '';