修改对比判断的范围

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

@@ -252,16 +252,16 @@ export default {
                     //let sd=luckysheet.getCellValue(row,cell,{type:"ps"});
                     if(sd===null || sd!=="#e85f61"){
                         luckysheet.setCellValue(row, cell, {bg: "#e85f61"})
-                     /*  luckysheet.setCellValue(row, cell, {
-                            ps: { //批注
-                                "left": 92, //批注框左边距
-                                "top": 10, //批注框上边距
-                                "width": 91, //批注框宽度
-                                "height": 48, //批注框高度
-                                "value": key+"表有误", //批准内容
-                                "isshow": false //批注框为显示状态
-                            }
-                        })*/
+                        /*  luckysheet.setCellValue(row, cell, {
+                               ps: { //批注
+                                   "left": 92, //批注框左边距
+                                   "top": 10, //批注框上边距
+                                   "width": 91, //批注框宽度
+                                   "height": 48, //批注框高度
+                                   "value": key+"表有误", //批准内容
+                                   "isshow": false //批注框为显示状态
+                               }
+                           })*/
                         maper.set("("+(row+1)+","+value[i][1]+")",1);
                     }else{
                         //let sd=luckysheet.getCellValue(row,cell,{type:"ps"}).value;
@@ -347,11 +347,13 @@ export default {
                     let as=0;
                     let d1=window.luckysheet.transToData(ddd.celldata);
                     let d2=window.luckysheet.transToData(exportJson.sheets[0].celldata);
+                    let r1=d1.length,r2=d2.length,c1=d1[0].length,c2=d2[0].length;
+                    let row=(r1<=r2)?r1:r2;
+                    let cell=(c1<=c2)?c1:c2;
                     let array=[];
                     let r=this.row-1;
-                    try {
-                        for(let i=r;i<d1.length;i++) {
-                            for (let j = 0; j <=d1[0].length; j++) {
+                        for(let i=r;i<row;i++) {
+                            for (let j = 0; j <cell; j++) {
                                 //第一个表的单元格为null直接跳出
                                 if(d1[i][j]==null ){
                                     continue
@@ -438,11 +440,7 @@ export default {
                                 type: "success"});
                         }
 
-                    }catch (err){
-                        this.$message({
-                            message: "导入失败,导入文件与对比文件有所不匹",
-                            type: "error"});
-                    }
+
 
 
                 }

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

@@ -244,9 +244,12 @@ export default {
                     let as=0;
                     let d1=window.luckysheet.transToData(ddd.celldata);
                     let d2=window.luckysheet.transToData(exportJson.sheets[0].celldata);
+                    let r1=d1.length,r2=d2.length,c1=d1[0].length,c2=d2[0].length;
+                    let row=(r1<=r2)?r1:r2;
+                    let cell=(c1<=c2)?c1:c2;
                     try {
-                        for(let i=0;i<d1.length;i++) {
-                            for (let j = 0; j <=d1[0].length; j++) {
+                        for(let i=0;i<row;i++) {
+                            for (let j = 0; j <cell; j++) {
                                 //第一个表的单元格为null直接跳出
                                 if(d1[i][j]==null ){
                                     continue