物料转换bug修改

ruoyi-ui/src/views/system/supplies/index.vue

@@ -559,7 +559,7 @@ export default {
                 LuckyExcel.transformExcelToLucky(evt, exportJson => {
                     this.summary(exportJson)
                         .then(async() => {
-                            this.submit(exportJson);
+                           this.submit(exportJson);
                         })
                         .catch(error => {
                             this.$message({
@@ -1152,7 +1152,6 @@ export default {
                                     let SixList=[];
                                     let newSmasll =smallMat;
                                     SixMateriel=response.rows;NewMarterielCode= sortArray(SixMateriel)
-
                                     try {
                                         // //转化编码
                                         let p=0;
@@ -1178,21 +1177,26 @@ export default {
                                     var warn1 = 0,warn2 = 0;
                                     for (let i = parseFloat(sysRulez[0].re) + 1, k = 0; i < data.length; i++, k++) {
                                         let values = [];
-                                        if (data[i][key_i] != null) {
+                                        if (data[i][key_i] && data[i][key_i] != null) {
                                             for (let j = 0; j < value.length; j++) {
                                                 try {
-                                                    let a = parseFloat(data[i][value[j]].v);
-                                                    values.push(a);
+                                                    if(data[i][value[j]] && data[i][value[j]]!=null){
+                                                        let a = parseFloat(data[i][value[j]].v);
+                                                        values.push(a);
+                                                    }else{
+                                                        warn1++;
+                                                    }
                                                 } catch (err) {
                                                     this.$message({
-                                                        message: "导入失败,导入文件不匹",
+                                                        message: "导入失败,导入文件错误,请自己检查导入表",
                                                         type: "error"
                                                     });
                                                     innerReject(error); // 异步请求出错
                                                 }
                                             }
+
                                             if(SixList[k]==undefined){
-                                                warn1++; //如果为空,统计为undefined
+                                               // warn1++; //如果为空,统计为undefined
                                             }else{
                                                 if(deps[k]==undefined){
                                                     warn2++;
@@ -1215,7 +1219,6 @@ export default {
 
 
                                     }
-
                                     //循环得到汇总结果
                                     if (map.size === 0) {
                                         throw new Error("导入失败,导入文件错误");
@@ -1307,15 +1310,21 @@ export default {
                                         });
                                     }
                                     if (warn1 > 0) {
+                                        if (warn2 > 0) {
+                                            this.$message({
+                                                message: "有" + warn1 + "条数据的编码不存在和" + warn2 + "条数据的部门不存在,请仔细检查导入表",
+                                                type: "warning"
+                                            });
+                                        }else{
+                                            this.$message({
+                                                message: "有" + warn1 + "条数据的编码不存在,请仔细检查导入表",
+                                                type: "warning"
+                                            });
+                                        }
+                                    } else if (warn2 > 0) {
                                         this.$message({
-                                            message: "有" + warn1 + "条数据编码不存在,请仔细检查导入表",
-                                            type: "error"
-                                        });
-                                    }
-                                    if (warn2 > 0) {
-                                        this.$message({
-                                            message: "有" + warn2 + "条数据部门不存在,请仔细检查导入表",
-                                            type: "error"
+                                            message: "有" + warn2 + "条数据的部门不存在,请仔细检查导入表",
+                                            type: "warning"
                                         });
                                     }
                                     // 记录结束时间
@@ -1339,7 +1348,7 @@ export default {
                             }));
                     }
                         break;
-                    //张凯林版本
+                    //不能用版本
                     /*case 7: {
                         let map = new Map();
                         let smallMat = [];