fix

xukangle
Showing 2 changed files with 43 additions and 14 deletions
src/views/data_product/productListingDetail.vue
src/views/security_menu/index.vue
--- a/src/views/data_product/productListingDetail.vue
View file @066e499
+++ b/src/views/data_product/productListingDetail.vue
View file @066e499
@@ -15,10 +15,11 @@ import { changeNum } from '@/utils/common';
 import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common';
 import { getAreaData, getServiceTenants, getSingleList } from "@/api/modules/queryService";
 import { getApproveList, getTenantApprove, registerApproveAllow, registerApproveBackup, getParamsList, getServiceDetail } from "@/api/modules/dataAsset";
-import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, listingSavePortal, getParamsDataList, listingUpdateGateway, getDataExchangeProductList, getTemplateFile } from "@/api/modules/dataProduct";
+import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, listingSavePortal, getParamsDataList, listingUpdateGateway, getDataExchangeProductList, getTemplateFile, getListingList } from "@/api/modules/dataProduct";
 import { getMatchDetail } from "@/api/modules/dataFinance";
 import { useValidator } from '@/hooks/useValidator';
 import { getCamundaDeploymentId } from "@/api/modules/workFlowService";
+import { da } from "element-plus/es/locale";
 const { required } = useValidator();
 const route = useRoute();
@@ -704,6 +705,11 @@ const getTableInfo = () => {
  getDataExchangeProductList({}).then((res: any) => {
    if (res.code == proxy.$passCode) {
      let data = res.data || [];
+      // 进行去重 去掉data 中在pageLIstInfo.value中已有的数据
+      data = data.filter((item: any) => {
+        return !pageLIstInfo.value.find((pageItem: any) => pageItem.damGuid == item.damGuid)
+      })
      formInfo.value.items[0].options = data;
    }
  })
@@ -1090,7 +1096,7 @@ const btnClick = (btn) => {
    } else {
      userStore.setTabbar(userStore.tabbar.filter((tab: any) => tab.fullPath !== fullPath));
      router.push({
-        name: "productListingCheck",
+        name: "productListing",
        query: {},
      });
    }
@@ -1341,7 +1347,7 @@ onActivated(() => {
 const deploymentId = ref('');
 const qualityEvaluationData = ref<any>('');
 const costAssessmentData = ref<any>('');
-onBeforeMount(() => {
+onBeforeMount(async () => {
  // case 1: 数交易所 case 2: 门户
  if (route.query.case == '2') {
    formInfo.value.items.forEach(item => {
@@ -1350,7 +1356,12 @@ onBeforeMount(() => {
      }
    })
  }
+  await getTableData();
+  if (route.query.exchangeGuid) {
+    getTableInfo();
+  } else {
+    getProducts();
+  }
  getParentAreaPromise.value = getAreaData({ parentId: null }).then((res: any) => {
    if (res?.code == proxy.$passCode) {
      parentAreaData.value = res.data ?? [];
@@ -1452,15 +1463,27 @@ onBeforeMount(() => {
    }
  })
  if (route.query.exchangeGuid) {
-    getTableInfo();
-  } else {
-    getProducts();
-  }
-  if (route.query.exchangeGuid) {
    getTemplateInfo();
  }
 })
+const pageLIstInfo = ref<any>();
+const getTableData = async () => {
+  const res: any = await getListingList({
+    pageIndex: 1,
+    pageSize: -1,
+  });
+  if (res.code == proxy.$passCode) {
+    pageLIstInfo.value = res.data.records || [];
+  } else {
+    ElMessage({
+      type: "error",
+      message: res.msg,
+    });
+  }
+}
 // 获取模板信息
 const getTemplateInfo = () => {
  getTemplateFile({ tenantGuid: route.query.exchangeGuid }).then((res: any) => {
@@ -2102,12 +2125,17 @@ const prcieInfo = computed(() => {
    <div class="tool_btns" v-if="detailType == 'add' || detailType == 'edit' || detailType == 'redit'">
      <div class="btns">
        <el-button @click="btnClick({ value: 'cancel' })">返回</el-button>
-        <el-button @click="btnClick({ value: 'draft' })"
+        <!-- <el-button @click="btnClick({ value: 'draft' })"
-          v-if="route.query.type == 'add' || route.query.type == 'edit'">保存草稿</el-button>
+          v-if="route.query.type == 'add' || route.query.type == 'edit'">保存草稿</el-button> -->
        <el-button type="primary" @click="btnClick({ value: 'submit' })">提交流程</el-button>
      </div>
    </div>
-    <div class="tool_btns" v-else-if="detailType == 'check'">
+    <div class="tool_btns" v-else-if="detailType == 'detail'">
+      <div class="btns">
+        <el-button @click="btnClick({ value: 'cancel' })">关闭</el-button>
+      </div>
+    </div>
+    <div class=" tool_btns" v-else-if="detailType == 'check'">
      <div class="btns">
        <el-button plain @click="btnClick({ value: 'cancel' })">关闭</el-button>
        <el-button type="primary" @click="btnClick({ value: 'pass' })"
--- a/src/views/security_menu/index.vue
View file @066e499
+++ b/src/views/security_menu/index.vue
View file @066e499
@@ -6,6 +6,7 @@
 import { onUploadFilePreview } from '@/api/modules/common';
 import { getComplianceInfoPageList, updateComplianceInfo } from '@/api/modules/securityMenu';
 import TableTools from '@/components/Tools/table_tools.vue';
+import { TableColumnWidth } from '@/utils/enum';
 import { ElMessage } from 'element-plus';
 const { proxy } = getCurrentInstance() as any;
 const dialogLabelFormRef = ref();
@@ -68,7 +69,7 @@ const tableInfo = ref({
        return scope.row.entryComplianceProgram?.length > 0 ? '预览' : '--';
      }
    },
-    { label: "操作时间", field: "updateTime", width: 120 },
+    { label: "操作时间", field: "updateTime", width: TableColumnWidth.DATETIME },
  ],
  data: tableDataList.value,
  page: {
@@ -353,7 +354,7 @@ const getTableData = () => {
    .main_wrap {
      height: 100%;
-      padding: 11px 16px 0 16px;
+      padding: 11px 8px 0 8px;
      .main_wrap-top-area {
        display: flex;