1

ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesSixMinesSummaryTable.java

@@ -51,7 +51,7 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
 
     /** 日期 */
     @Excel(name = "日期")
-    private Date date;
+    private String date;
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -131,11 +131,11 @@ public class ActSuppliesSixMinesSummaryTable extends BaseEntity
         this.createBy = createBy;
     }
 
-    public Date getDate() {
+    public String getDate() {
         return date;
     }
 
-    public void setDate(Date date) {
+    public void setDate(String date) {
         this.date = date;
     }
 

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

@@ -1296,10 +1296,11 @@ export default {
                         }
                     }else {
                         /*导入表*/
-                        /*let jsonDatab = JSON.parse(data[i].historyContent);
+                        debugger
+                        let jsonDatab = JSON.parse(data[i].historyContent);
                         for (let j = 0; j < jsonDatab.length; j++) {
                             let  datab=window.luckysheet.transToData(jsonDatab[j].celldata);
-                        }*/
+                        }
                     }
                 }
             });