Merge branch 'develop' into release-test

@@ -15,9 +15,8 @@ export const getProductList = (params) => request({
  * path: /dam-catalog-table/data-exchange/get-table-select
  * path: /dam-catalog-table/data-exchange/get-table-select
 */
 */
 export const getDataExchangeProductList = (params) => request({
 export const getDataExchangeProductList = (params) => request({
-  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/data-exchange/get-table-select`,
+  url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/data-exchange/get-table-select?exchangeGuid=${params.exchangeGuid}`,
   method: 'get',
   method: 'get',
-  params
 })
 })
 
 
 /** 获取已添加的数据产品列表 */
 /** 获取已添加的数据产品列表 */

@@ -132,6 +132,14 @@ const handleCreate = () => {
   formItems.value[1].default = [];
   formItems.value[1].default = [];
   dialogInfo.value.visible = true;
   dialogInfo.value.visible = true;
   dialogInfo.value.type = '';
   dialogInfo.value.type = '';
+  getCamundaDeploymentId('10018', userData.tenantGuid, userData.staffGuid).then((res: any) => {
+    if (res.code == proxy.$passCode) {
+      deploymentId.value = res.data;
+    } else {
+      deploymentId.value = '';
+      proxy.$ElMessage.error(res.msg);
+    }
+  })
 }
 }
 
 
 const page = ref({
 const page = ref({

@@ -191,7 +191,7 @@ const getTenantDetail = () => {
       if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
       if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
         item.default = tenantDetail.value[item.field];
         item.default = tenantDetail.value[item.field];
       } else if (item.field == 'businessLicenseJson') {
       } else if (item.field == 'businessLicenseJson') {
-        item.default = tenantDetail.value[item.field] || [];
+        item.default = tenantDetail.value[item.field] ? JSON.parse(tenantDetail.value[item.field]) : [];
         if (!item.default.length) {
         if (!item.default.length) {
           item.visible = false;
           item.visible = false;
         } else {
         } else {
@@ -350,7 +350,7 @@ const setPropertyFormItemsValue = (info) => {
     } else if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
     } else if (item.field == 'address' || item.field == 'socialCreditCode' || item.field == 'registrationDate' || item.field == 'businessLicenseStartDate' || item.field == 'businessLicenseEndDate') {//在会员详情处获取。
       item.default = tenantDetail.value[item.field];
       item.default = tenantDetail.value[item.field];
     } else if (item.field == 'businessLicenseJson') {
     } else if (item.field == 'businessLicenseJson') {
-      item.default = tenantDetail.value[item.field] || [];
+      item.default = tenantDetail.value[item.field] ? JSON.parse(tenantDetail.value[item.field]) : [];
       if (!item.default.length) {
       if (!item.default.length) {
         item.visible = false;
         item.visible = false;
       } else {
       } else {

@@ -192,6 +192,16 @@ const handleCreate = () => {
   formItems.value[5].default = [];
   formItems.value[5].default = [];
   dialogInfo.value.visible = true;
   dialogInfo.value.visible = true;
   dialogInfo.value.type = '';
   dialogInfo.value.type = '';
+  if (!deploymentId.value) {
+    getCamundaDeploymentId('10019', userData.tenantGuid, userData.staffGuid).then((res: any) => {
+      if (res.code == proxy.$passCode) {
+        deploymentId.value = res.data;
+      } else {
+        deploymentId.value = '';
+        proxy.$ElMessage.error(res.msg);
+      }
+    })
+  }
 }
 }
 
 
 const page = ref({
 const page = ref({

@@ -68,16 +68,17 @@ const tableInfo = ref({
   id: "mapping-table",
   id: "mapping-table",
   fields: [
   fields: [
     { label: "序号", type: "index", width: 56, align: "center", fixed: "left" },
     { label: "序号", type: "index", width: 56, align: "center", fixed: "left" },
-    { label: "数据产品编号", field: "damCode", width: 200 },
-    { label: "数据产品名称", field: "damName", width: 200 },
+    { label: "数据产品编号", field: "damCode", width: 180 },
+    { label: "数据产品名称", field: "damName", width: 180 },
     {
     {
-      label: "产品类型", field: "damTypeName", width: 160
+      label: "产品类型", field: "damTypeName", width: 100
     },
     },
     {
     {
       label: "是否公共数据", field: "isPublicData", width: 120, getName: (scope) => {
       label: "是否公共数据", field: "isPublicData", width: 120, getName: (scope) => {
         return scope.row.isPublicData == 'Y' ? '是' : '否';
         return scope.row.isPublicData == 'Y' ? '是' : '否';
       }
       }
     },
     },
+    { label: "数交所名称", field: "exchangeName", width: 140 },
     {
     {
       label: "审核状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => {
       label: "审核状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => {
         const approveVO = scope.row.approveVO || {}
         const approveVO = scope.row.approveVO || {}

@@ -704,14 +704,16 @@ const getProducts = () => {
 }
 }
 
 
 const getTableInfo = () => {
 const getTableInfo = () => {
-  getDataExchangeProductList({}).then((res: any) => {
+  getDataExchangeProductList({
+    exchangeGuid: route.query.exchangeGuid
+  }).then((res: any) => {
     if (res.code == proxy.$passCode) {
     if (res.code == proxy.$passCode) {
       let data = res.data || [];
       let data = res.data || [];
       // 进行去重 去掉data 中在pageLIstInfo.value中已有的数据
       // 进行去重 去掉data 中在pageLIstInfo.value中已有的数据
 
 
-      data = data.filter((item: any) => {
-        return !pageLIstInfo.value.find((pageItem: any) => pageItem.damGuid == item.damGuid)
-      })
+      // data = data.filter((item: any) => {
+      //   return !pageLIstInfo.value.find((pageItem: any) => pageItem.damGuid == item.damGuid)
+      // })
       formInfo.value.items[0].options = data;
       formInfo.value.items[0].options = data;
     }
     }
   })
   })

@@ -30,7 +30,9 @@ const tableDataLoading = computed(() => {
 });
 });
 const data = computed(() => props?.tableInfo?.data)
 const data = computed(() => props?.tableInfo?.data)
 const tableInfo = computed(() => props?.tableInfo || {})
 const tableInfo = computed(() => props?.tableInfo || {})
+
 const columnInfo = ref({ ...props?.columnInfo?.value })
 const columnInfo = ref({ ...props?.columnInfo?.value })
+
 const isEdit = computed(() => props?.tableInfo?.isEdit)
 const isEdit = computed(() => props?.tableInfo?.isEdit)
 const flag = computed(() => props?.tableInfo?.flag)
 const flag = computed(() => props?.tableInfo?.flag)
 const page = computed(() => props?.page)
 const page = computed(() => props?.page)
@@ -40,7 +42,6 @@ const selectRef = ref()
 const columnEdit = (row) => {
 const columnEdit = (row) => {
   if (!tableInfo.value.isEdit) {
   if (!tableInfo.value.isEdit) {
     columnInfo.value = { ...row }
     columnInfo.value = { ...row }
-
     emits("columnEdit", { ...row })
     emits("columnEdit", { ...row })
   }
   }
 
 

@@ -180,19 +180,25 @@ const toSearch = (val: any, clear: boolean = false) => {
   } else {
   } else {
     page.value.daName = val.daName;
     page.value.daName = val.daName;
   }
   }
+  if (tableInfo.value.isEdit) {
+    tableInfo.value.isEdit = false
+    tableInfo.value.currentId = "0"
+    columnInfoReset()
+    tableInfo.value.flag = 'create'
+  }
   getTableData();
   getTableData();
 };
 };
 // 查公司
 // 查公司
-const documentList = async () => {
-  const res = await getDocumentList({
-    daName: tableSelectInfo.value.selectValue,
-    isCompany: true,
-    type: 1
-  })
-  companyOption.value = res.data || []
+// const documentList = async () => {
+//   const res = await getDocumentList({
+//     daName: tableSelectInfo.value.selectValue,
+//     isCompany: true,
+//     type: 1
+//   })
+//   companyOption.value = res.data || []
 
 
-  return Promise.resolve()
-}
+//   return Promise.resolve()
+// }
 // const params = {
 // const params = {
 //   daName: row.damName,
 //   daName: row.damName,
 //   type: 1,
 //   type: 1,
@@ -238,13 +244,32 @@ const getTableData = () => {
 }
 }
 
 
 const createOneData = () => {
 const createOneData = () => {
+
   if (companyOption.value.length > 0) {
   if (companyOption.value.length > 0) {
     findTab(true)
     findTab(true)
+    columnInfoReset()
+    tableRef.value.columnInfo = {
+      companyGuid: "",
+      companyName: "",
+      daCode: "",
+      daName: "",
+      damGuid: "",
+      effectiveDate: "",
+      guid: "",
+      intableMoney: "",
+      intableTime: "",
+      issuingEntityGuid: "",
+      issuingEntityName: "",
+      registerGuid: "",
+      registerTime: "",
+      updateTime: "",
+      updateUserName: "",
+    }
     assetsOption.value = []
     assetsOption.value = []
     const currentDate = dayjs().format('YYYY-MM-DD');
     const currentDate = dayjs().format('YYYY-MM-DD');
     tableInfo.value.flag = "create"
     tableInfo.value.flag = "create"
     //const arr:any = []
     //const arr:any = []
-    tableInfo.value.data.unshift({
+    const newData = {
       guid: BASE_ID,
       guid: BASE_ID,
       companyName: "",
       companyName: "",
       daName: "",
       daName: "",
@@ -257,7 +282,8 @@ const createOneData = () => {
       companyGuid: "",
       companyGuid: "",
       registerGuid: "",
       registerGuid: "",
       damGuid: ""
       damGuid: ""
-    })
+    };
+    tableInfo.value.data = [newData, ...tableInfo.value.data];
     //tableInfo.value.data = arr
     //tableInfo.value.data = arr
     tableInfo.value.currentId = BASE_ID
     tableInfo.value.currentId = BASE_ID
     tableInfo.value.isEdit = true
     tableInfo.value.isEdit = true
@@ -285,7 +311,7 @@ const columnDel = (row) => {
         if (res?.code === proxy.$passCode) {
         if (res?.code === proxy.$passCode) {
           ElMessage.success("删除成功")
           ElMessage.success("删除成功")
           getTableData()
           getTableData()
-          documentList()
+          // documentList()
           columnCancel()
           columnCancel()
           findTab(false)
           findTab(false)
           tableRef.value.columnInfo = {}
           tableRef.value.columnInfo = {}
@@ -356,7 +382,7 @@ const columnEdit = (row) => {
   tableSelectInfo.value.companyGuid = row.companyGuid
   tableSelectInfo.value.companyGuid = row.companyGuid
   assetsOption.value = []
   assetsOption.value = []
   addAssetsOption(null, row, true)
   addAssetsOption(null, row, true)
-  addCompanyOption(row)
+  // addCompanyOption(row)
   //getAssetsList()
   //getAssetsList()
   const info = { ...row }
   const info = { ...row }
   tableInfo.value.currentId = info.guid
   tableInfo.value.currentId = info.guid
@@ -481,25 +507,25 @@ const addAssetsOption = (values, row, flag = false) => {
 
 
   })
   })
 }
 }
-const addCompanyOption = (row) => {
-  let flag = true
-  documentList().then(() => {
-    const obj = {
-      tenantName: row.companyName,
-      tenantGuid: row.companyGuid
-    }
-    const arr = companyOption.value
-    arr.forEach((item) => {
-      if (item.tenantGuid === row.companyGuid) {
-        flag = false
-      }
-    })
-    if (flag) {
-      arr.unshift(obj)
-      companyOption.value = arr
-    }
-  })
-}
+// const addCompanyOption = (row) => {
+//   let flag = true
+//   documentList().then(() => {
+//     const obj = {
+//       tenantName: row.companyName,
+//       tenantGuid: row.companyGuid
+//     }
+//     const arr = companyOption.value
+//     arr.forEach((item) => {
+//       if (item.tenantGuid === row.companyGuid) {
+//         flag = false
+//       }
+//     })
+//     if (flag) {
+//       arr.unshift(obj)
+//       companyOption.value = arr
+//     }
+//   })
+// }
 onBeforeMount(() => {
 onBeforeMount(() => {
   //getTableData()
   //getTableData()
   // getAssetsList()
   // getAssetsList()

@@ -896,7 +896,7 @@ const handleChangeTime = (val) => {
             <div class="left-pd"></div>
             <div class="left-pd"></div>
             <div class="header-title">数据服务资产情况</div>
             <div class="header-title">数据服务资产情况</div>
           </div>
           </div>
-          <div style="height: calc(100% - 40px);">
+          <div style="height: calc(100% - 80px);">
             <Table class="drak-table" ref="assetTableRef" v-show="!assetTableInfo.loading1" :tableInfo="assetTableInfo"
             <Table class="drak-table" ref="assetTableRef" v-show="!assetTableInfo.loading1" :tableInfo="assetTableInfo"
               @tableBtnClick="tableBtnClick" />
               @tableBtnClick="tableBtnClick" />
             <el-skeleton v-show="assetTableInfo.loading1" :rows="6" animated />
             <el-skeleton v-show="assetTableInfo.loading1" :rows="6" animated />