diff --git a/src/views/claimAndRefund/constructionSite/constructionSite.vue b/src/views/claimAndRefund/constructionSite/constructionSite.vue
index a2c7db0a..e9a5f29f 100644
--- a/src/views/claimAndRefund/constructionSite/constructionSite.vue
+++ b/src/views/claimAndRefund/constructionSite/constructionSite.vue
@@ -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`,
)
},
},
diff --git a/src/views/material/back/component/addReturn.vue b/src/views/material/back/component/addReturn.vue
index 386118fb..184f3788 100644
--- a/src/views/material/back/component/addReturn.vue
+++ b/src/views/material/back/component/addReturn.vue
@@ -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 => `${match}`)
diff --git a/src/views/material/lease/apply/component/addToolsApply.vue b/src/views/material/lease/apply/component/addToolsApply.vue
index cb82493f..1fc00622 100644
--- a/src/views/material/lease/apply/component/addToolsApply.vue
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@@ -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 => `${match}`);
diff --git a/src/views/material/repair/inventoryScrap/component/queryToolsApply.vue b/src/views/material/repair/inventoryScrap/component/queryToolsApply.vue
index 2085c963..1b7e0616 100644
--- a/src/views/material/repair/inventoryScrap/component/queryToolsApply.vue
+++ b/src/views/material/repair/inventoryScrap/component/queryToolsApply.vue
@@ -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`
);
},
diff --git a/src/views/material/repair/scrapLedger/detail.vue b/src/views/material/repair/scrapLedger/detail.vue
index 12d8324d..bd7f88b4 100644
--- a/src/views/material/repair/scrapLedger/detail.vue
+++ b/src/views/material/repair/scrapLedger/detail.vue
@@ -152,7 +152,7 @@ export default {
// 返回列表页
jumpList() {
- const obj = { path: "/repair/scrapLedger" };
+ const obj = { path: "/scrap/scrapLedger" };
this.$tab.closeOpenPage(obj);
},
diff --git a/src/views/material/repair/scrapLedger/index.vue b/src/views/material/repair/scrapLedger/index.vue
index 29c33b5b..7195b400 100644
--- a/src/views/material/repair/scrapLedger/index.vue
+++ b/src/views/material/repair/scrapLedger/index.vue
@@ -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,
})
},