6dbdc3cb by xukangle

fix

1 parent f95ccf4e
...@@ -15,9 +15,8 @@ export const getProductList = (params) => request({ ...@@ -15,9 +15,8 @@ export const getProductList = (params) => request({
15 * path: /dam-catalog-table/data-exchange/get-table-select 15 * path: /dam-catalog-table/data-exchange/get-table-select
16 */ 16 */
17 export const getDataExchangeProductList = (params) => request({ 17 export const getDataExchangeProductList = (params) => request({
18 url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/data-exchange/get-table-select`, 18 url: `${import.meta.env.VITE_API_NEW_PORTAL}/dam-catalog-table/data-exchange/get-table-select?exchangeGuid=${params.exchangeGuid}`,
19 method: 'get', 19 method: 'get',
20 params
21 }) 20 })
22 21
23 /** 获取已添加的数据产品列表 */ 22 /** 获取已添加的数据产品列表 */
......
...@@ -704,14 +704,16 @@ const getProducts = () => { ...@@ -704,14 +704,16 @@ const getProducts = () => {
704 } 704 }
705 705
706 const getTableInfo = () => { 706 const getTableInfo = () => {
707 getDataExchangeProductList({}).then((res: any) => { 707 getDataExchangeProductList({
708 exchangeGuid: route.query.exchangeGuid
709 }).then((res: any) => {
708 if (res.code == proxy.$passCode) { 710 if (res.code == proxy.$passCode) {
709 let data = res.data || []; 711 let data = res.data || [];
710 // 进行去重 去掉data 中在pageLIstInfo.value中已有的数据 712 // 进行去重 去掉data 中在pageLIstInfo.value中已有的数据
711 713
712 data = data.filter((item: any) => { 714 // data = data.filter((item: any) => {
713 return !pageLIstInfo.value.find((pageItem: any) => pageItem.damGuid == item.damGuid) 715 // return !pageLIstInfo.value.find((pageItem: any) => pageItem.damGuid == item.damGuid)
714 }) 716 // })
715 formInfo.value.items[0].options = data; 717 formInfo.value.items[0].options = data;
716 } 718 }
717 }) 719 })
......
...@@ -40,7 +40,6 @@ const selectRef = ref() ...@@ -40,7 +40,6 @@ const selectRef = ref()
40 const columnEdit = (row) => { 40 const columnEdit = (row) => {
41 if (!tableInfo.value.isEdit) { 41 if (!tableInfo.value.isEdit) {
42 columnInfo.value = { ...row } 42 columnInfo.value = { ...row }
43
44 emits("columnEdit", { ...row }) 43 emits("columnEdit", { ...row })
45 } 44 }
46 45
......
...@@ -180,8 +180,12 @@ const toSearch = (val: any, clear: boolean = false) => { ...@@ -180,8 +180,12 @@ const toSearch = (val: any, clear: boolean = false) => {
180 } else { 180 } else {
181 page.value.daName = val.daName; 181 page.value.daName = val.daName;
182 } 182 }
183 tableRef.value.columnInfo = {} 183 if (tableInfo.value.isEdit) {
184 tableInfo.value.isEdit = false 184 tableInfo.value.isEdit = false
185 tableInfo.value.currentId = "0"
186 columnInfoReset()
187 tableInfo.value.flag = 'create'
188 }
185 getTableData(); 189 getTableData();
186 }; 190 };
187 // 查公司 191 // 查公司
...@@ -240,6 +244,7 @@ const getTableData = () => { ...@@ -240,6 +244,7 @@ const getTableData = () => {
240 } 244 }
241 245
242 const createOneData = () => { 246 const createOneData = () => {
247
243 if (companyOption.value.length > 0) { 248 if (companyOption.value.length > 0) {
244 findTab(true) 249 findTab(true)
245 columnInfoReset() 250 columnInfoReset()
...@@ -247,7 +252,7 @@ const createOneData = () => { ...@@ -247,7 +252,7 @@ const createOneData = () => {
247 const currentDate = dayjs().format('YYYY-MM-DD'); 252 const currentDate = dayjs().format('YYYY-MM-DD');
248 tableInfo.value.flag = "create" 253 tableInfo.value.flag = "create"
249 //const arr:any = [] 254 //const arr:any = []
250 tableInfo.value.data.unshift({ 255 const newData = {
251 guid: BASE_ID, 256 guid: BASE_ID,
252 companyName: "", 257 companyName: "",
253 daName: "", 258 daName: "",
...@@ -260,7 +265,9 @@ const createOneData = () => { ...@@ -260,7 +265,9 @@ const createOneData = () => {
260 companyGuid: "", 265 companyGuid: "",
261 registerGuid: "", 266 registerGuid: "",
262 damGuid: "" 267 damGuid: ""
263 }) 268 };
269 tableInfo.value.data = [newData, ...tableInfo.value.data];
270 console.log('新建了嘛', tableInfo.value.data, columnInfo.value)
264 //tableInfo.value.data = arr 271 //tableInfo.value.data = arr
265 tableInfo.value.currentId = BASE_ID 272 tableInfo.value.currentId = BASE_ID
266 tableInfo.value.isEdit = true 273 tableInfo.value.isEdit = true
......
...@@ -896,7 +896,7 @@ const handleChangeTime = (val) => { ...@@ -896,7 +896,7 @@ const handleChangeTime = (val) => {
896 <div class="left-pd"></div> 896 <div class="left-pd"></div>
897 <div class="header-title">数据服务资产情况</div> 897 <div class="header-title">数据服务资产情况</div>
898 </div> 898 </div>
899 <div style="height: calc(100% - 40px);"> 899 <div style="height: calc(100% - 80px);">
900 <Table class="drak-table" ref="assetTableRef" v-show="!assetTableInfo.loading1" :tableInfo="assetTableInfo" 900 <Table class="drak-table" ref="assetTableRef" v-show="!assetTableInfo.loading1" :tableInfo="assetTableInfo"
901 @tableBtnClick="tableBtnClick" /> 901 @tableBtnClick="tableBtnClick" />
902 <el-skeleton v-show="assetTableInfo.loading1" :rows="6" animated /> 902 <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!