From a8ce806c8a81f685fa9fafaa453820197ced9961 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 10 十二月 2024 10:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/basicInfo/ProductImport.vue | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/web/src/views/modules/basicInfo/ProductImport.vue b/web/src/views/modules/basicInfo/ProductImport.vue
index 188a729..b1b4d38 100644
--- a/web/src/views/modules/basicInfo/ProductImport.vue
+++ b/web/src/views/modules/basicInfo/ProductImport.vue
@@ -1,5 +1,5 @@
<template>
- <zt-dialog ref="dialog" title="瀵煎叆浜у搧妯″瀷" :hasConfirm="false" append-to-body>
+ <zt-dialog ref="dialog" title="瀵煎叆浜у搧缁撴瀯鏍�" :hasConfirm="false" :editAble="false" append-to-body>
<el-form>
<zt-form-item style="width:100%;" label="" prop="remark">
<el-upload
@@ -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