fix
Showing
1 changed file
with
33 additions
and
30 deletions
| ... | @@ -180,19 +180,21 @@ const toSearch = (val: any, clear: boolean = false) => { | ... | @@ -180,19 +180,21 @@ 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 | |||
| 184 | tableInfo.value.isEdit = false | ||
| 183 | getTableData(); | 185 | getTableData(); |
| 184 | }; | 186 | }; |
| 185 | // 查公司 | 187 | // 查公司 |
| 186 | const documentList = async () => { | 188 | // const documentList = async () => { |
| 187 | const res = await getDocumentList({ | 189 | // const res = await getDocumentList({ |
| 188 | daName: tableSelectInfo.value.selectValue, | 190 | // daName: tableSelectInfo.value.selectValue, |
| 189 | isCompany: true, | 191 | // isCompany: true, |
| 190 | type: 1 | 192 | // type: 1 |
| 191 | }) | 193 | // }) |
| 192 | companyOption.value = res.data || [] | 194 | // companyOption.value = res.data || [] |
| 193 | 195 | ||
| 194 | return Promise.resolve() | 196 | // return Promise.resolve() |
| 195 | } | 197 | // } |
| 196 | // const params = { | 198 | // const params = { |
| 197 | // daName: row.damName, | 199 | // daName: row.damName, |
| 198 | // type: 1, | 200 | // type: 1, |
| ... | @@ -240,6 +242,7 @@ const getTableData = () => { | ... | @@ -240,6 +242,7 @@ const getTableData = () => { |
| 240 | const createOneData = () => { | 242 | const createOneData = () => { |
| 241 | if (companyOption.value.length > 0) { | 243 | if (companyOption.value.length > 0) { |
| 242 | findTab(true) | 244 | findTab(true) |
| 245 | columnInfoReset() | ||
| 243 | assetsOption.value = [] | 246 | assetsOption.value = [] |
| 244 | const currentDate = dayjs().format('YYYY-MM-DD'); | 247 | const currentDate = dayjs().format('YYYY-MM-DD'); |
| 245 | tableInfo.value.flag = "create" | 248 | tableInfo.value.flag = "create" |
| ... | @@ -285,7 +288,7 @@ const columnDel = (row) => { | ... | @@ -285,7 +288,7 @@ const columnDel = (row) => { |
| 285 | if (res?.code === proxy.$passCode) { | 288 | if (res?.code === proxy.$passCode) { |
| 286 | ElMessage.success("删除成功") | 289 | ElMessage.success("删除成功") |
| 287 | getTableData() | 290 | getTableData() |
| 288 | documentList() | 291 | // documentList() |
| 289 | columnCancel() | 292 | columnCancel() |
| 290 | findTab(false) | 293 | findTab(false) |
| 291 | tableRef.value.columnInfo = {} | 294 | tableRef.value.columnInfo = {} |
| ... | @@ -356,7 +359,7 @@ const columnEdit = (row) => { | ... | @@ -356,7 +359,7 @@ const columnEdit = (row) => { |
| 356 | tableSelectInfo.value.companyGuid = row.companyGuid | 359 | tableSelectInfo.value.companyGuid = row.companyGuid |
| 357 | assetsOption.value = [] | 360 | assetsOption.value = [] |
| 358 | addAssetsOption(null, row, true) | 361 | addAssetsOption(null, row, true) |
| 359 | addCompanyOption(row) | 362 | // addCompanyOption(row) |
| 360 | //getAssetsList() | 363 | //getAssetsList() |
| 361 | const info = { ...row } | 364 | const info = { ...row } |
| 362 | tableInfo.value.currentId = info.guid | 365 | tableInfo.value.currentId = info.guid |
| ... | @@ -481,25 +484,25 @@ const addAssetsOption = (values, row, flag = false) => { | ... | @@ -481,25 +484,25 @@ const addAssetsOption = (values, row, flag = false) => { |
| 481 | 484 | ||
| 482 | }) | 485 | }) |
| 483 | } | 486 | } |
| 484 | const addCompanyOption = (row) => { | 487 | // const addCompanyOption = (row) => { |
| 485 | let flag = true | 488 | // let flag = true |
| 486 | documentList().then(() => { | 489 | // documentList().then(() => { |
| 487 | const obj = { | 490 | // const obj = { |
| 488 | tenantName: row.companyName, | 491 | // tenantName: row.companyName, |
| 489 | tenantGuid: row.companyGuid | 492 | // tenantGuid: row.companyGuid |
| 490 | } | 493 | // } |
| 491 | const arr = companyOption.value | 494 | // const arr = companyOption.value |
| 492 | arr.forEach((item) => { | 495 | // arr.forEach((item) => { |
| 493 | if (item.tenantGuid === row.companyGuid) { | 496 | // if (item.tenantGuid === row.companyGuid) { |
| 494 | flag = false | 497 | // flag = false |
| 495 | } | 498 | // } |
| 496 | }) | 499 | // }) |
| 497 | if (flag) { | 500 | // if (flag) { |
| 498 | arr.unshift(obj) | 501 | // arr.unshift(obj) |
| 499 | companyOption.value = arr | 502 | // companyOption.value = arr |
| 500 | } | 503 | // } |
| 501 | }) | 504 | // }) |
| 502 | } | 505 | // } |
| 503 | onBeforeMount(() => { | 506 | onBeforeMount(() => { |
| 504 | //getTableData() | 507 | //getTableData() |
| 505 | // getAssetsList() | 508 | // getAssetsList() | ... | ... |
-
Please register or sign in to post a comment