From ea744c63bf10f14fe5a51addf37083c384093e21 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 17:16:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/basicInfo/ProductImport.vue | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/web/src/views/modules/basicInfo/ProductImport.vue b/web/src/views/modules/basicInfo/ProductImport.vue
index 6397668..4f7a586 100644
--- a/web/src/views/modules/basicInfo/ProductImport.vue
+++ b/web/src/views/modules/basicInfo/ProductImport.vue
@@ -31,9 +31,6 @@
<el-table-column prop="lineNumber" label="閿欒琛屾暟"/>
</el-table>
</el-form>
- <!--<template slot="footer">-->
- <!--<zt-button type="primary" style="float:left" @click="exportExcelModel()">瀵煎嚭Excel瀵煎叆妯℃澘</zt-button>-->
- <!--</template>-->
</zt-dialog>
</template>
@@ -157,6 +154,7 @@
}
)
} else {
+ clearInterval(this.timer)
}
}
}
--
Gitblit v1.9.1