导入总成

vue/src/components/ImportTxt/index.vue

@@ -474,12 +474,13 @@ export default {
     beforeAvatarUpload(file) {
       var FileExt = file.name.replace(/.+\./, "");
       if (["txt"].indexOf(FileExt.toLowerCase()) === -1) {
-        this.$message({
+        // this.$message({
-          type: "warning",
+        //   type: "warning",
-          message: "只支持txt文本类型文件！",
+        //   message: "只支持txt文本类型文件！",
-        });
+        // });
-        this.isFileType = "0";
+        // this.isFileType = "0";
-        return false;
+        // return false;
+		this.isFileType = "1";
       } else {
         this.isFileType = "1";
       }

vue/src/views/pg-fis/basedate/assemblyCfg/index.vue

@@ -40,13 +40,13 @@
 					</el-form-item>
 					<!-- <el-divider class="divider1" ></el-divider> -->
 					<el-form-item style="margin-bottom: 0px; ">
-						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleCreate" disabled>新增
+						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleCreate"  disabled>新增
 						</el-button>
-						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate" disabled>修改
+						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-edit" @click="handleUpdate"  disabled>修改
 						</el-button>
 						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-delete" @click="handleDelete" disabled>删除
 						</el-button>
-						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleImportSAP" disabled>导入（SAP对接）
+						<el-button class="filter-item" size="mini" type="primary" icon="el-icon-plus" @click="handleImportSAP" >导入（SAP对接）
 						</el-button>
 					</el-form-item>
 				</el-form>
@@ -198,6 +198,7 @@
 	import permission from "@/directive/permission/index.js";
 	import CRMTableHead from "../../components/CRMTableHead";
 	import importExcel from "@/components/ImportTxt";
+	//import importExcel from "@/components/ImportExcel";
 	import Lockr from "lockr";
 	import moment from "moment";
 	import Detail from "./detail.vue";