6dbdc3cb by xukangle

fix

1 parent f95ccf4e
......@@ -15,9 +15,8 @@ export const getProductList = (params) => request({
* 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`,
url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/data-exchange/get-table-select?exchangeGuid=${params.exchangeGuid}`,
method: 'get',
params
})
/** 获取已添加的数据产品列表 */
......
......@@ -704,14 +704,16 @@ const getProducts = () => {
}
const getTableInfo = () => {
getDataExchangeProductList({}).then((res: any) => {
getDataExchangeProductList({
exchangeGuid: route.query.exchangeGuid
}).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)
})
// data = data.filter((item: any) => {
// return !pageLIstInfo.value.find((pageItem: any) => pageItem.damGuid == item.damGuid)
// })
formInfo.value.items[0].options = data;
}
})
......
......@@ -40,7 +40,6 @@ const selectRef = ref()
const columnEdit = (row) => {
if (!tableInfo.value.isEdit) {
columnInfo.value = { ...row }
emits("columnEdit", { ...row })
}
......
......@@ -180,8 +180,12 @@ const toSearch = (val: any, clear: boolean = false) => {
} else {
page.value.daName = val.daName;
}
tableRef.value.columnInfo = {}
if (tableInfo.value.isEdit) {
tableInfo.value.isEdit = false
tableInfo.value.currentId = "0"
columnInfoReset()
tableInfo.value.flag = 'create'
}
getTableData();
};
// 查公司
......@@ -240,6 +244,7 @@ const getTableData = () => {
}
const createOneData = () => {
if (companyOption.value.length > 0) {
findTab(true)
columnInfoReset()
......@@ -247,7 +252,7 @@ const createOneData = () => {
const currentDate = dayjs().format('YYYY-MM-DD');
tableInfo.value.flag = "create"
//const arr:any = []
tableInfo.value.data.unshift({
const newData = {
guid: BASE_ID,
companyName: "",
daName: "",
......@@ -260,7 +265,9 @@ const createOneData = () => {
companyGuid: "",
registerGuid: "",
damGuid: ""
})
};
tableInfo.value.data = [newData, ...tableInfo.value.data];
console.log('新建了嘛', tableInfo.value.data, columnInfo.value)
//tableInfo.value.data = arr
tableInfo.value.currentId = BASE_ID
tableInfo.value.isEdit = true
......
......@@ -896,7 +896,7 @@ const handleChangeTime = (val) => {
<div class="left-pd"></div>
<div class="header-title">数据服务资产情况</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"
@tableBtnClick="tableBtnClick" />
<el-skeleton v-show="assetTableInfo.loading1" :rows="6" animated />
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!