物料转换bug修改

ruoyi-ui/src/views/login.vue

@@ -131,7 +131,6 @@ export default {
             Cookies.remove('rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
-              debugger
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
           }).catch(() => {
             this.loading = false;

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

@@ -32,6 +32,9 @@
                     <el-option label="吕矿" :value="4"></el-option>
                     <el-option label="钱家营矿" :value="5"></el-option>
                     <el-option label="唐山矿" :value="6"></el-option>
+                    <el-option label="宏丰公司矿业" :value="7"></el-option>
+                    <el-option label="云飞公司矿业" :value="8"></el-option>
+                    <el-option label="单侯煤矿" :value="9"></el-option>
                 </el-select>
             </el-form-item>
             <el-form-item>
@@ -373,8 +376,8 @@ export default {
                         "status": 1, //激活状态
                         "order": 0, //工作表的下标
                         "hide": 0,//是否隐藏
-                        "row": 8, //行数
-                        "column": 10, //列数
+                        "row": 50, //行数
+                        "column": 20, //列数
                         "defaultRowHeight": 19, //自定义行高
                         "defaultColWidth": 73, //自定义列宽
                         "celldata": [
@@ -1075,7 +1078,7 @@ export default {
                             }));
                     }
                         break;
-                    //李志昊版
+                    //OK版
                     case 7: {
                         let map = new Map();
                         let smallMat = [];
@@ -1143,36 +1146,36 @@ export default {
                                     }
 
                                     this.NewSixList=SixList*/
-
                                     let SixMateriel=[];
                                     let MaterielCode=[];
                                     let NewMarterielCode=[];
                                     let SixList=[];
                                     let newSmasll =smallMat;
-                                    SixMateriel=response.rows;
-                                    NewMarterielCode= sortArray(SixMateriel)
+                                    SixMateriel=response.rows;NewMarterielCode= sortArray(SixMateriel)
 
+                                    try {
                                         // //转化编码
                                         let p=0;
                                         for(var i=0;i<newSmasll.length;i++){
                                             for (var j = 0; j < NewMarterielCode.length; j++) {
                                                 if(newSmasll[i] !== null){
-                                                if(newSmasll[i].slice(0,NewMarterielCode[j].code.length)==NewMarterielCode[j].code){
-                                                    SixList[i]=NewMarterielCode[j].codes
-                                                    p++
-                                                    break
-                                                }else{
-                                                    SixList[i]='11'
-                                                    p++
+                                                    if (NewMarterielCode[j] && NewMarterielCode[j].code && newSmasll[i].slice(0, NewMarterielCode[j].code.length) == NewMarterielCode[j].code) {
+                                                        SixList[i] = NewMarterielCode[j].codes;
+                                                        p++;
+                                                        break;
+                                                    } else {
+                                                        if (NewMarterielCode[j] && NewMarterielCode[j].code) { // 判断是否存在并具有code属性
+                                                            SixList[i] = '11';
+                                                            p++;
                                                         }
                                                     }
                                                 }
                                             }
-
-                                    let newSixList=SixList
-
-
-
+                                        }
+                                    }catch(err){
+                                        //throw new Error("导入失败,转换编码运行错误,请检查对应规则");
+                                    }
+                                    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) {
@@ -1188,7 +1191,12 @@ export default {
                                                     innerReject(error); // 异步请求出错
                                                 }
                                             }
-
+                                            if(SixList[k]==undefined){
+                                                warn1++; //如果为空,统计为undefined
+                                            }else{
+                                                if(deps[k]==undefined){
+                                                    warn2++;
+                                                }else{
                                                     let key = SixList[k] + '/' + deps[k];
                                                     if (map.has(key)) {
                                                         let oldValues = map.get(key);
@@ -1200,6 +1208,11 @@ export default {
                                                         map.set(key, values);
                                                     }
                                                 }
+                                            }
+
+
+                                        }
+
 
                                     }
 
@@ -1281,18 +1294,30 @@ export default {
                                                 config.borderInfo.push(bord);
                                                 luckysheet.setConfig(config);
                                                 modify = true;
-                                        } else {
+                                            }else{
                                                 warn++;
                                             }
                                     });
                                     if (warn === map.size) {
                                         throw new Error("导入文件与所选模板规则不匹配");
-                                    } else if (warn > 0) {
+                                    }else if (warn > 0) {
                                         this.$message({
-                                            message: "还有" + warn + "条大类未能匹配到",
+                                            message: "还有" + warn + "条大类没匹配到,请仔细检查导入表",
                                             type: "warning"
                                         });
                                     }
+                                    if (warn1 > 0) {
+                                        this.$message({
+                                            message: "有" + warn1 + "条数据编码不存在,请仔细检查导入表",
+                                            type: "error"
+                                        });
+                                    }
+                                    if (warn2 > 0) {
+                                        this.$message({
+                                            message: "有" + warn2 + "条数据部门不存在,请仔细检查导入表",
+                                            type: "error"
+                                        });
+                                    }
                                     // 记录结束时间
                                     const endTime = new Date().getTime();
                                     // 计算执行时间（以毫秒为单位）