Merge remote-tracking branch 'origin/master'

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

@@ -230,7 +230,7 @@ export default {
                     let row=value[i][0],cell=value[i][1];
                     let sd=luckysheet.getCellValue(row,cell,{type:"ps"});
                     if(sd===null){
-                        luckysheet.setCellValue(row, cell, {bg: "#FF0000"})
+                        luckysheet.setCellValue(row, cell, {bg: "#e85f5f"})
                         luckysheet.setCellValue(row, cell, {
                             ps: { //批注
                                 "left": 92, //批注框左边距
@@ -294,59 +294,72 @@ export default {
                     let as=0;
                     let d1=window.luckysheet.transToData(ddd.celldata);
                     let d2=window.luckysheet.transToData(exportJson.sheets[0].celldata);
+                    debugger
                     name1=exportJson.sheets[0].name;
                     let array=[];
                     let r=this.row-1;
-                    for(let i=r;i<d1.length;i++) {
-                        for (let j = 0; j <=d1[0].length; j++) {
+                    try {
+                        for(let i=r;i<d1.length;i++) {
+                            for (let j = 0; j <=d1[0].length; j++) {
 
-                            if(d1[i][j]===null){
-                                break
-                            }
-                            if (d1[i][j].m===undefined && d2[i][j].m===undefined){
+                                if(d1[i][j]==null){
+                                    break
+                                }
+                                if(d2[i][j]==null){
+                                    break
+                                }
+                                if (d1[i][j].m==undefined && d2[i][j].m==undefined){
 
-                            }else if (d1[i][j].m===undefined || d2[i][j].m===undefined){
-                                luckysheet.setCellValue(i, j, {bg: "#FF0000"})
-                                as++
-                                array.push([i,j]);
-                            }else {
-                                if (d1[i][j].m!== d2[i][j].m) {
-                                    luckysheet.setCellValue(i, j, {bg: "#FF0000"})
-                                    //查看是否有标签
-                                    /*luckysheet.setCellValue(i, j, {
-                                            ps: { //批注
-                                                "left": 92, //批注框左边距
-                                                "top": 10, //批注框上边距
-                                                "width": 91, //批注框宽度
-                                                "height": 48, //批注框高度
-                                                "value": this.dep+"表有误", //批准内容
-                                                "isshow": false //批注框为显示状态
-                                            }
-                                        })*/
+                                }else if (d1[i][j].m==undefined || d2[i][j].m==undefined){
+                                    luckysheet.setCellValue(i, j, {bg: "#e85f5f"})
                                     as++
                                     array.push([i,j]);
+                                }else {
+                                    if (d1[i][j].m!= d2[i][j].m) {
+                                        luckysheet.setCellValue(i, j, {bg: "#e85f5f"})
+                                        //查看是否有标签
+                                        /*luckysheet.setCellValue(i, j, {
+                                                ps: { //批注
+                                                    "left": 92, //批注框左边距
+                                                    "top": 10, //批注框上边距暖色
+
+                                                    "width": 91, //批注框宽度
+                                                    "height": 48, //批注框高度
+                                                    "value": this.dep+"表有误", //批准内容
+                                                    "isshow": false //批注框为显示状态
+                                                }
+                                            })*/
+                                        as++
+                                        array.push([i,j]);
+                                    }
                                 }
                             }
                         }
-                    }
-                    map.set(name1,array);
-                    if(as>0){
-                        this.$message({
-                            message: "导入完成,本次导入共发现"+as+"条不同数据",
-                            type: "warning"});
-                    }else{
+                        map.set(name1,array);
+                        if(as>0){
+                            this.$message({
+                                message: "导入完成,本次导入共发现"+as+"条不同数据",
+                                type: "warning"});
+                        }else{
+                            this.$message({
+                                message: "导入完成,本次导入未发现不同数据",
+                                type: "success"});
+                        }
+
+                    }catch (err){
                         this.$message({
-                            message: "导入完成,本次导入未发现不同数据",
-                            type: "success"});
+                            message: "导入失败,导入文件与对比文件有所不匹",
+                            type: "error"});
                     }
 
+
                 }
             )
         },
         /** 导出设置 */
         handleExport: debounce(function() {
             // 处理点击事件
-            exportExcel(luckysheet.getAllSheets(),fileName)
+            exportExcel(luckysheet.getAllSheets(),fileName+"(对比后数据)")
         }, 500), // 设置延迟时间，单位为毫秒
     }
 // 配置项111