修改

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,6 +294,7 @@ 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;
@@ -301,23 +302,27 @@ export default {
                         for(let i=r;i<d1.length;i++) {
                             for (let j = 0; j <=d1[0].length; j++) {
 
-                                if(d1[i][j]===null){
+                                if(d1[i][j]==null){
                                     break
                                 }
-                                if (d1[i][j].m===undefined && d2[i][j].m===undefined){
+                                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"})
+                                }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: "#FF0000"})
+                                    if (d1[i][j].m!= d2[i][j].m) {
+                                        luckysheet.setCellValue(i, j, {bg: "#e85f5f"})
                                         //查看是否有标签
                                         /*luckysheet.setCellValue(i, j, {
                                                 ps: { //批注
                                                     "left": 92, //批注框左边距
-                                                    "top": 10, //批注框上边距
+                                                    "top": 10, //批注框上边距暖色
+
                                                     "width": 91, //批注框宽度
                                                     "height": 48, //批注框高度
                                                     "value": this.dep+"表有误", //批准内容