bug修复
This commit is contained in:
parent
5e37447903
commit
17526ed048
|
|
@ -1177,11 +1177,11 @@ export default {
|
|||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download(
|
||||
'system/dict/type/export',
|
||||
'/material/workSite//export',
|
||||
{
|
||||
...this.queryParams,
|
||||
},
|
||||
`type_${new Date().getTime()}.xlsx`,
|
||||
`工地直转_${new Date().getTime()}.xlsx`,
|
||||
)
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1283,6 +1283,7 @@ export default {
|
|||
},
|
||||
// 高亮文本
|
||||
highlightText(text, keyword) {
|
||||
console.log("vvvvvvvvvvv",text,keyword)
|
||||
if (!keyword) return text
|
||||
const reg = new RegExp(keyword, 'gi')
|
||||
return text.replace(reg, match => `<span class="highlight-text">${match}</span>`)
|
||||
|
|
|
|||
|
|
@ -1100,6 +1100,7 @@ export default {
|
|||
|
||||
// 高亮文本
|
||||
highlightText(text, keyword) {
|
||||
console.log("yyyyyyyyyyyyy",text,keyword)
|
||||
if (!keyword) return text;
|
||||
const reg = new RegExp(keyword, 'gi');
|
||||
return text.replace(reg, match => `<span class="highlight-text">${match}</span>`);
|
||||
|
|
|
|||
|
|
@ -294,8 +294,8 @@ export default {
|
|||
|
||||
const currentTime = formatTime(new Date());
|
||||
this.download(
|
||||
"/material/lease_apply_info/exportDetails",
|
||||
{ id: this.id },
|
||||
"/material/scrap_apply_details/exportDetails",
|
||||
{'taskId':this.taskId,'keyWord':this.maForm.keyWord},
|
||||
`盘点报废详情_${currentTime}.xlsx`
|
||||
);
|
||||
},
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ export default {
|
|||
|
||||
// 返回列表页
|
||||
jumpList() {
|
||||
const obj = { path: "/repair/scrapLedger" };
|
||||
const obj = { path: "/scrap/scrapLedger" };
|
||||
this.$tab.closeOpenPage(obj);
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ import { getToken } from '@/utils/auth'
|
|||
console.log(row)
|
||||
let query = { "month":row.month,isView:"true" }
|
||||
this.$tab.closeOpenPage({
|
||||
path: '/repair/scrapLedgerDetail',
|
||||
path: '/scrap/scrapLedgerDetail',
|
||||
query,
|
||||
})
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue