666

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

@@ -219,9 +219,9 @@ export default {
                     data1=exportJson.sheets[0];
                     let suffixArr = exportJson.info.name.split('.');
                     fileName = suffixArr[0];
-                    this.row='';
                 }
             )
+
         },
         /** 生成标签*/
         addToMap(){
@@ -293,6 +293,7 @@ export default {
                 luckysheet.setCellValue(k,cell,key);
                 luckysheet.setCellValue(k,cell+1 ,a);
                 k++
+            }
             /*let k=0;
             map.forEach((value,key)=>{
                 let num=luckysheet.getSheet().data[0].length;
@@ -310,7 +311,7 @@ export default {
                     k++
 
             })
-*/          }
+*/
         },
         handleFileChange1(evt) {
             if (this.row==="") {
@@ -358,14 +359,23 @@ export default {
                                 if(d2[i][j]==null){
                                     break
                                 }
-                                if (d1[i][j].m==undefined && d2[i][j].m==undefined){
+                                if(d1[i][j].v==0 && d2[i][j].v==undefined){
+                                    break
+                                }
+                                if(d1[i][j].v==0 && d2[i][j].v==null){
+                                    break
+                                }
+                                if(d1[i][j].v==0 && d2[i][j].v==0){
+                                    break
+                                }
+                                if (d1[i][j].v==undefined && d2[i][j].v==undefined){
 
-                                }else if (d1[i][j].m==undefined || d2[i][j].m==undefined){
+                                }else if (d1[i][j].v==undefined || d2[i][j].v==undefined){
                                     luckysheet.setCellValue(i, j, {bg: "#e85f5f"})
                                     as++
                                     array.push([i+1,j+1]);
                                 }else {
-                                    if (d1[i][j].m!= d2[i][j].m) {
+                                    if (d1[i][j].v!= d2[i][j].v) {
                                         luckysheet.setCellValue(i, j, {bg: "#e85f5f"})
                                         //查看是否有标签
                                         /*luckysheet.setCellValue(i, j, {