Merge branch 'master' of http://git.mes123.com/zhouyx/mes-ui

components/page/import/detailExcel.vue

@@ -83,13 +83,13 @@ export default {
             tabData.forEach(ele => {
                 let objData = {}
                 tabColum.forEach(el => {
-                    objData[el.title] = ele[el.key]
+                    objData[el.title] = ele[el.key].replace(/\s/g, "")
                 })
                 arrData.push(objData)
             })
             //处理title和key一致
             tabColum.forEach(el => {
-                el.key = el.title
+                el.key = el.title.replace(/\s/g, "")
             })
 
             this.columnsImport = tabColum;

components/page/import/process.vue

@@ -374,8 +374,8 @@ export default {
             });
             headers.forEach((elHead) => {
                 let headObj = {};
-                headObj.title = elHead;
-                headObj.key = elHead;
+                headObj.title = elHead.replace(/\s/g, "");
+                headObj.key = elHead.replace(/\s/g, "");
                 headersNow.push(headObj);
             });
             this.columnsImport = headersNow;
@@ -384,7 +384,7 @@ export default {
                 var obj = {};
                 var currentline = lines[i].split(",");
                 for (var j = 0; j < headers.length; j++) {
-                    obj[headers[j]] = currentline[j];
+                    obj[headers[j]] = currentline[j].replace(/\s/g, "");
                 }
                 result.push(obj);
             }