fix

xukangle
Showing 3 changed files with 239 additions and 158 deletions
src/api/modules/dataProduct.ts
src/views/data_product/productListing.vue
src/views/data_product/productListingDetail.vue
--- a/src/api/modules/dataProduct.ts
View file @4b6216c
+++ b/src/api/modules/dataProduct.ts
View file @4b6216c
@@ -10,6 +10,15 @@ export const getProductList = (params) => request({
  method: 'get',
  params
 })
+/** 获取数交所产品
+ * @param {Object} params
+ * path: /dam-catalog-table/data-exchange/get-table-select
+*/
+export const getDataExchangeProductList = (params) => request({
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/data-exchange/get-table-select`,
+  method: 'get',
+  params
+})
 /** 获取已添加的数据产品列表 */
 export const getAddedProductList = (params) => request({
--- a/src/views/data_product/productListing.vue
View file @4b6216c
+++ b/src/views/data_product/productListing.vue
View file @4b6216c
@@ -500,8 +500,17 @@ const demandListData: any = ref([
  { companyName: '深数所', listedNum: 16, processNum: 1235 },
  { companyName: '苏数所', listedNum: 16, processNum: 1235 },
 ]);
-const btnClick = (btn) => {
+const btnClick = (item) => {
-  console.log(btn)
+  console.log(item)
+  router.push({
+    name: "productListingDetail",
+    query: {
+      exchangeGuid: item.exchangeGuid,
+      exchangeName: item.exchangeName,
+      type: 'add',
+      groundingPick: '登记得数交所',
+    },
+  });
 }
@@ -578,15 +587,16 @@ const btnClick = (btn) => {
 .list-content {
  display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
  flex-wrap: wrap;
  margin-bottom: 8px;
  padding: 0 8px;
  .card-content {
-    width: calc(33.33% - 10px);
+    width: 300px;
    padding: 16px;
    box-shadow: 0 0 0 1px #d9d9d9;
+    margin-right: 12px;
    .header {
      display: flex;
--- a/src/views/data_product/productListingDetail.vue
View file @4b6216c
+++ b/src/views/data_product/productListingDetail.vue
View file @4b6216c
@@ -15,7 +15,7 @@ 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 } from "@/api/modules/dataProduct";
+import { getProductList, getAddedProductList, getListingDetail, listingSave, listingUpdate, listingSavePortal, getParamsDataList, listingUpdateGateway, getDataExchangeProductList } from "@/api/modules/dataProduct";
 import { getMatchDetail } from "@/api/modules/dataFinance";
 import { useValidator } from '@/hooks/useValidator';
 import { getCamundaDeploymentId } from "@/api/modules/workFlowService";
@@ -95,7 +95,7 @@ const getArea = (node, resolve) => {
    })
  }
 }
+const processInstanceId = ref('');
 const collapseIcon = ref(false);
 const collapseIcon1 = ref(false);
 const collapseIcon2 = ref(false);
@@ -133,6 +133,10 @@ const approveTableInfo: any = ref({
  }
 });
+const exchangeName = computed(() => {
+  return route.query.exchangeName;
+})
 const listingFormRef = ref();
 const subForm = ref({});
 const formInfo = ref({
@@ -182,7 +186,7 @@ const formInfo = ref({
      label: "数据时间范围",
      type: "date-picker",
      field: "dateRange",
-      default: null,
+      default: '',
      placeholder: "开始时间~结束时间",
      clearable: true,
      required: true,
@@ -366,21 +370,12 @@ const formInfo = ref({
    // },
    {
      label: "登记数交所",
-      type: "inputinput",
+      type: "input",
-      placeholder: "请选择",
+      placeholder: "请输入",
-      field: "exchangeGuids",
+      field: "exchangeName",
-      default: [],
+      default: exchangeName,
-      options: exchangeList.value,
-      props: {
-        value: "guid",
-        label: "tenantName",
-      },
-      filterable: true,
      clearable: true,
-      multiple: true,
+      disabled: true,
-      tagsTooltip: true,
-      collapse: true,
-      disabled: false,
      required: true,
      visible: true
    },
@@ -442,7 +437,7 @@ const formInfo = ref({
      accept: '.png, .pdf',
      type: 'upload-file',
      placeholder: '请选择',
-      field: 'qualityReport',
+      field: 'qualityEvaluationFile',
      default: [],
      limit: 1,
      block: false,
@@ -453,13 +448,14 @@ const formInfo = ref({
      label: "质量评估机构",
      type: "select",
      placeholder: "请选择",
-      field: "qualityOrg",
+      field: "qualityEvaluationInstitutionGuid",
      default: '',
      options: [],
      props: {
        value: 'value',
        label: 'label'
      },
+      allowCreate: true,
      filterable: true,
      clearable: true,
      disabled: false,
@@ -470,78 +466,79 @@ const formInfo = ref({
        width: 'calc(33.33% - 20px)!important'
      },
    },
-    // {
+    {
-    //   label: '价值评估报告',
+      label: '价值评估报告',
-    //   tip: '支持扩展名：.png .pdf',
+      tip: '支持扩展名：.png .pdf',
-    //   accept: '.png, .pdf',
+      accept: '.png, .pdf',
-    //   type: 'upload-file',
+      type: 'upload-file',
-    //   placeholder: '请选择',
+      placeholder: '请选择',
-    //   field: 'valueReport',
+      field: 'costAssessmentFile',
-    //   default: [],
+      default: [],
-    //   limit: 1,
+      limit: 1,
-    //   block: false,
+      block: false,
-    //   required: false,
+      required: false,
-    //   visible: true
+      visible: true
-    // },
+    },
-    // {
+    {
-    //   label: "价值评估机构",
+      label: "价值评估机构",
-    //   type: "select",
+      type: "select",
-    //   placeholder: "请选择",
+      placeholder: "请选择",
-    //   field: "valueOrg",
+      field: "costAssessmentInstitutionGuid",
-    //   default: '',
+      default: '',
-    //   options: [],
+      options: [],
-    //   props: {
+      props: {
-    //     value: 'value',
+        value: 'guid',
-    //     label: 'label'
+        label: 'tenantName'
-    //   },
+      },
-    //   filterable: true,
+      allowCreate: true,
-    //   clearable: true,
+      filterable: true,
-    //   disabled: false,
+      clearable: true,
-    //   required: false,
+      disabled: false,
-    //   visible: true
+      required: false,
-    // },
+      visible: true
-    // {
+    },
-    //   label: '承诺函',
+    {
-    //   tip: '支持扩展名：.png .pdf',
+      label: '承诺函',
-    //   accept: '.png, .pdf',
+      tip: '支持扩展名：.png .pdf',
-    //   type: 'upload-file',
+      accept: '.png, .pdf',
-    //   placeholder: '请选择',
+      type: 'upload-file',
-    //   field: 'commitment',
+      placeholder: '请选择',
-    //   templateUrl: 'http://www.baidu.com',
+      field: 'commitmentLetter',
-    //   default: [],
+      templateUrl: 'http://www.baidu.com',
-    //   limit: 1,
+      default: [],
-    //   block: true,
+      limit: 1,
-    //   required: false,
+      block: true,
-    //   visible: true
+      required: false,
-    // },
+      visible: true
-    // {
+    },
-    //   label: '授权文件',
+    {
-    //   tip: '支持扩展名：.png .pdf',
+      label: '授权文件',
-    //   accept: '.png, .pdf',
+      tip: '支持扩展名：.png .pdf',
-    //   type: 'upload-file',
+      accept: '.png, .pdf',
-    //   placeholder: '请选择',
+      type: 'upload-file',
-    //   field: 'authorization',
+      placeholder: '请选择',
-    //   templateUrl: 'http://www.baidu.com',
+      field: 'accreditFile',
-    //   default: [],
+      templateUrl: 'http://www.baidu.com',
-    //   limit: 1,
+      default: [],
-    //   block: true,
+      limit: 1,
-    //   required: false,
+      block: true,
-    //   visible: true
+      required: false,
-    // },
+      visible: true
-    // {
+    },
-    //   label: '商品详细介绍（签章版）',
+    {
-    //   tip: '支持扩展名：.png .pdf',
+      label: '商品详细介绍（签章版）',
-    //   accept: '.png, .pdf',
+      tip: '支持扩展名：.png .pdf',
-    //   type: 'upload-file',
+      accept: '.png, .pdf',
-    //   placeholder: '请选择',
+      type: 'upload-file',
-    //   field: 'productDetail',
+      placeholder: '请选择',
-    //   templateUrl: 'http://www.baidu.com',
+      field: 'productDetail',
-    //   default: [],
+      templateUrl: 'http://www.baidu.com',
-    //   limit: 1,
+      default: [],
-    //   block: true,
+      limit: 1,
-    //   required: false,
+      block: true,
-    //   visible: true
+      required: false,
-    // },
+      visible: true
+    },
    {
      label: "",
      type: "input",
@@ -689,6 +686,15 @@ const getProducts = () => {
  })
 }
+const getTableInfo = () => {
+  getDataExchangeProductList({}).then((res: any) => {
+    if (res.code == proxy.$passCode) {
+      let data = res.data || [];
+      formInfo.value.items[0].options = data;
+    }
+  })
+}
 const getProductDetail = () => {
  flowDetailLoading.value = true;
  getListingDetail({ guid }).then((res: any) => {
@@ -696,6 +702,8 @@ const getProductDetail = () => {
    if (res.code == proxy.$passCode) {
      const data = res.data || {}
      flowDetail.value = data;
+      deploymentId.value = data.approveVO.camundaDeploymentId
+      processInstanceId.value = data.approveVO.camundaInstanceId
      console.log(data, '-----------------');
      let coverageArea = data.coverageArea || [];
      if (data.coverageArea?.[0]?.[0] == 'all') {
@@ -804,71 +812,112 @@ const submitForm = (btn, formEl, tosub = false) => {
      params.caseNumber = formInfo.value.items.at(5).defaultValue || formInfo.value.items.at(4).default;
      params.timeAreaStart = params.dateRange ? params.dateRange[0] : '';
      params.timeAreaEnd = params.dateRange ? params.dateRange[1] : '';
-      params.groundingPick = [route.query.groundingPick];
      // 删除dateRange字段
      delete params.dateRange;
      flowDetailLoading.value = true;
-      if (detailType == 'add') {
+      if (!route.query.exchangeGuid) {
-        params.immediateApprove = btn.value == 'submit' ? true : false;
+        if (detailType == 'add') {
-        listingSavePortal(params).then((res: any) => {
+          params.immediateApprove = btn.value == 'submit' ? true : false;
-          if (res.code == proxy.$passCode) {
+          listingSavePortal(params).then((res: any) => {
-            ElMessage({
+            if (res.code == proxy.$passCode) {
-              type: "success",
+              ElMessage({
-              message: '提交成功',
+                type: "success",
-            });
+                message: '提交成功',
-            flowDetailLoading.value = false;
+              });
-            userStore.setTabbar(userStore.tabbar.filter((tab: any) => tab.fullPath !== fullPath));
+              flowDetailLoading.value = false;
-            assetStore.set(true);
+              userStore.setTabbar(userStore.tabbar.filter((tab: any) => tab.fullPath !== fullPath));
-            router.push({
+              assetStore.set(true);
-              name: "productListing",
+              router.push({
-              query: {},
+                name: "productListing",
-            });
+                query: {},
-          } else {
+              });
+            } else {
+              ElMessage({
+                type: "error",
+                message: res.msg,
+              });
+              flowDetailLoading.value = false;
+            }
+          }).catch((res) => {
            ElMessage({
              type: "error",
-              message: res.msg,
+              message: '提交失败',
            });
            flowDetailLoading.value = false;
-          }
-        }).catch((res) => {
-          ElMessage({
-            type: "error",
-            message: '提交失败',
          });
-          flowDetailLoading.value = false;
+        } else {
-        });
+          params.guid = guid;
-      } else {
+          params.immediateApprove = btn.value == 'submit' ? true : false;
-        params.guid = guid;
+          listingUpdateGateway(params).then((res: any) => {
-        params.immediateApprove = btn.value == 'submit' ? true : false;
+            if (res.code == proxy.$passCode) {
-        listingUpdateGateway(params).then((res: any) => {
+              ElMessage({
-          if (res.code == proxy.$passCode) {
+                type: "success",
-            ElMessage({
+                message: '提交成功',
-              type: "success",
+              });
-              message: '提交成功',
+              flowDetailLoading.value = false;
-            });
+              userStore.setTabbar(userStore.tabbar.filter((tab: any) => tab.fullPath !== fullPath));
-            flowDetailLoading.value = false;
+              assetStore.set(true);
-            userStore.setTabbar(userStore.tabbar.filter((tab: any) => tab.fullPath !== fullPath));
+              router.push({
-            assetStore.set(true);
+                name: "productListing",
-            router.push({
+                query: {},
-              name: "productListing",
+              });
-              query: {},
+            } else {
-            });
+              ElMessage({
-          } else {
+                type: "error",
+                message: res.msg,
+              });
+              flowDetailLoading.value = false;
+            }
+          }).catch((res) => {
            ElMessage({
              type: "error",
-              message: res.msg,
+              message: '提交失败',
            });
            flowDetailLoading.value = false;
-          }
-        }).catch((res) => {
-          ElMessage({
-            type: "error",
-            message: '提交失败',
          });
-          flowDetailLoading.value = false;
+        }
-        });
+      } else {
+        if (detailType == 'add') {
+          // 上架交易所
+          params.immediateApprove = btn.value == 'submit' ? true : false;
+          params.accreditFile = params.accreditFile.length ? { name: params.accreditFile[0].name, url: params.accreditFile[0].url } : {};
+          params.commitmentLetter = params.commitmentLetter.length ? { name: params.commitmentLetter[0].name, url: params.commitmentLetter[0].url } : {};
+          params.costAssessmentFile = params.costAssessmentFile.length ? { name: params.costAssessmentFile[0].name, url: params.costAssessmentFile[0].url } : {};
+          params.productDetail = params.productDetail.length ? { name: params.productDetail[0].name, url: params.productDetail[0].url } : {};
+          params.qualityEvaluationFile = params.qualityEvaluationFile.length ? { name: params.qualityEvaluationFile[0].name, url: params.qualityEvaluationFile[0].url } : {};
+          params.registrationCertificate = params.registrationCertificate.length ? { name: params.registrationCertificate[0].name, url: params.registrationCertificate[0].url } : {};
+          params.exchangeGuid = route.query.exchangeGuid;
+          console.log(params, '-----------------');
+          // listingSave(params).then((res: any) => {
+          //   if (res.code == proxy.$passCode) {
+          //     ElMessage({
+          //       type: "success",
+          //       message: '提交成功',
+          //     });
+          //     flowDetailLoading.value = false;
+          //     userStore.setTabbar(userStore.tabbar.filter((tab: any) => tab.fullPath !== fullPath));
+          //     assetStore.set(true);
+          //     router.push({
+          //       name: "productListing",
+          //       query: {},
+          //     });
+          //   } else {
+          //     ElMessage({
+          //       type: "error",
+          //       message: res.msg,
+          //     });
+          //     flowDetailLoading.value = false;
+          //   }
+          // }).catch((res) => {
+          //   ElMessage({
+          //     type: "error",
+          //     message: '提交失败',
+          //   });
+          //   flowDetailLoading.value = false;
+          // });
+        }
      }
    } else {
      nextTick(() => {
        const isError = document.getElementsByClassName('is-error');
@@ -929,6 +978,7 @@ const btnClick = (btn) => {
 }
 const setFormItems = (row: any = null, isDetail = false) => {
+  console.log(row, '--------1---------');
  formInfo.value.items.map((item: any) => {
    if (item.field == 'productImg') {
      item.default = row ? (row.productPic ? [row.productPic] : row[item.field] || []) : []
@@ -978,18 +1028,25 @@ const setFormItems = (row: any = null, isDetail = false) => {
      } else {
        item.default = row ? row[item.field] : (item.default || '')
      }
-    } else if (item.field == 'dateRange') {
+    }
+    else if (item.field == 'dateRange') {
      item.default = row ? [row.timeAreaStart, row.timeAreaEnd] : null;
-    } else {
-      item.default = row ? row[item.field] : (item.default || '')
    }
+    // else {
+    //   if (item && item.hasOwnProperty('default')) {
+    //     item.default = row ? row[item.field] : (item.default || '');
+    //   } else {
+    //     console.warn(`Item does not have the 'default' property`);
+    //   }
+    // }
  })
 }
 const selectChange = async (val, row, info) => {
  if (row.field == 'damName') {
    const data = row.options.filter(o => o.damName == val);
-    let coverageArea = data.length ? (data[0].coverageArea || []) : [];
+    console.log(data, '-----------------');
+    let coverageArea = (data.length && data[0].coverageArea) ? data[0].coverageArea : [];
    await setFormItems({ ...info, coverageArea: coverageArea });
    formInfo.value.items.at(0).default = val;
    formInfo.value.items.at(1).default = data.length ? data[0].damType : '';
@@ -1002,7 +1059,7 @@ const selectChange = async (val, row, info) => {
    formInfo.value.items.at(-1).default = data.length ? data[0].damGuid : '';
    formInfo.value.items.at(-3).required = data[0].damType != '1' && data[0].damType != '2';
    formInfo.value.items.at(-4).required = data[0].damType != '1' && data[0].damType != '2';
-    if (data.length && data[0].coverageArea?.[0]?.[0] != 'all') {
+    if (data.length && data[0].coverageArea?.[0]?.[0] != 'all' && data[0].coverageArea) {
      let p: any = [];
      data[0].coverageArea.forEach(area => {
        if (p.includes(area[0])) {
@@ -1132,9 +1189,9 @@ onActivated(() => {
        break;
    }
  };
-  if (detailType == 'add' || detailType == 'edit') {
+  // if ((detailType == 'add' || detailType == 'edit') && !route.query.exchangeGuids) {
-    getProducts();
+  //   getProducts();
-  };
+  // };
 })
 const deploymentId = ref('');
@@ -1144,7 +1201,7 @@ onBeforeMount(() => {
  // case 1: 数交易所 case 2: 门户
  if (route.query.case == '2') {
    formInfo.value.items.forEach(item => {
-      if (item.field == 'damCode' || item.field == 'exchangeGuids' || item.field == 'registrationCertificate' || item.field == 'qualityReport' || item.field == 'qualityOrg' || item.field == 'valueReport' || item.field == 'valueOrg' || item.field == 'commitment' || item.field == 'authorization' || item.field == 'productDetail') {
+      if (item.field == 'damCode' || item.field == 'exchangeGuids' || item.field == 'registrationCertificate' || item.field == 'qualityEvaluationFile' || item.field == 'qualityEvaluationInstitutionGuid' || item.field == 'costAssessmentFile' || item.field == 'costAssessmentInstitutionGuid' || item.field == 'commitmentLetter' || item.field == 'accreditFile' || item.field == 'productDetail') {
        item.visible = false;
      }
    })
@@ -1234,7 +1291,7 @@ onBeforeMount(() => {
  getSingleList({ pageIndex: -1, pageSize: -1, tenantType: "12505" }).then((res: any) => {
    if (res.code == proxy.$passCode) {
      qualityEvaluationData.value = res.data.records || [];
-      let item = formInfo.value.items.find(item => item.field == 'qualityOrg');
+      let item = formInfo.value.items.find(item => item.field == 'qualityEvaluationInstitutionGuid');
      item && (item.options = qualityEvaluationData.value);
    } else {
      proxy.$ElMessage.error(res.msg);
@@ -1244,12 +1301,17 @@ onBeforeMount(() => {
  getSingleList({ pageIndex: -1, pageSize: -1, tenantType: "12504" }).then((res: any) => {
    if (res.code == proxy.$passCode) {
      costAssessmentData.value = res.data.records || [];
-      let item = formInfo.value.items.find(item => item.field == 'valueOrg');
+      let item = formInfo.value.items.find(item => item.field == 'costAssessmentInstitutionGuid');
      item && (item.options = costAssessmentData.value);
    } else {
      proxy.$ElMessage.error(res.msg);
    }
  })
+  if (route.query.exchangeGuid) {
+    getTableInfo();
+  } else {
+    getProducts();
+  }
 })
 </script>
@@ -1471,7 +1533,7 @@ onBeforeMount(() => {
          <div class="list_panel">
            <div class="table_panel_wrap">
              <!-- <Table :tableInfo="approveTableInfo" /> -->
-              <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :definitionId="''">
+              <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId">
              </ApprovalProcess>
            </div>
          </div>