diff --git a/ruoyi-ui/src/views/system/supplies/indexupload.vue b/ruoyi-ui/src/views/system/supplies/indexupload.vue index 534cd87e07424ef6b0bc0026ccf8fb00f6fff67a..6571691fa1f56543cddb2e295dd2418b45ec9d4c 100644 --- a/ruoyi-ui/src/views/system/supplies/indexupload.vue +++ b/ruoyi-ui/src/views/system/supplies/indexupload.vue @@ -247,10 +247,12 @@ export default { for(let i=0;i<value.length;i++){ let row=value[i][0]-1,cell=this.stringTonum(value[i][1])-1; //let row=value[i][0]-1,cell=value[i][1]-1; - let sd=luckysheet.getCellValue(row,cell,{type:"ps"}); - if(sd===null){ - luckysheet.setCellValue(row, cell, {bg: "#e85f5f"}) - luckysheet.setCellValue(row, cell, { + let sd=luckysheet.getCellValue(row,cell,{type:"bg"}); + //用批注进行比较的时候把下é¢çš„!==判æ–去掉 + //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, //æ‰¹æ³¨æ¡†ä¸Šè¾¹è· @@ -259,11 +261,11 @@ export default { "value": key+"表有误", //批准内容 "isshow": false //æ‰¹æ³¨æ¡†ä¸ºæ˜¾ç¤ºçŠ¶æ€ } - }) + })*/ maper.set("("+(row+1)+","+value[i][1]+")",1); }else{ - let sd=luckysheet.getCellValue(row,cell,{type:"ps"}).value; - luckysheet.setCellValue(row, cell, { + //let sd=luckysheet.getCellValue(row,cell,{type:"ps"}).value; + /*luckysheet.setCellValue(row, cell, { ps: { //批注 "left": 92, //æ‰¹æ³¨æ¡†å·¦è¾¹è· "top": 10, //æ‰¹æ³¨æ¡†ä¸Šè¾¹è· @@ -272,7 +274,7 @@ export default { "value": sd+'\nï¼›'+key+"表有误", //批准内容 "isshow": false //æ‰¹æ³¨æ¡†ä¸ºæ˜¾ç¤ºçŠ¶æ€ } - }) + })*/ maper.set("("+(row+1)+","+value[i][1]+")",maper.get("("+(row+1)+","+value[i][1]+")")+1); } } @@ -288,7 +290,11 @@ export default { } } //生æˆå¤šå°‘æ¡æ•°æ®æ·»åŠ å¤šå°‘è¡Œ - for (let i=0;i<=maper.size+map.size;i++){ + let asd=maper.size+map.size; + if(row+asd>=num){ + for (let i=0;i<=row+asd-num;i++){ + luckysheet.insertRow(row + 1); + } luckysheet.insertRow(row + 1); } row=row+1;