Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/TMS/components/domesticMine/wagonLoadAdd.vue

@@ -388,10 +388,10 @@ export default {
         this.isLoading = false;
         return;
       }
-      let error=selection.find(item=>!item.purchaseOrderId || 
-      !item.purchaseOrderNo || 
-      !item.batchId || 
-      !item.materialId || 
+      let error=selection.find(item=>!item.purchaseOrderId ||
+      !item.purchaseOrderNo ||
+      !item.batchId ||
+      !item.materialId ||
       !item.supplierId);
       if(error){
         this.$message({
@@ -646,8 +646,8 @@ export default {
             let tableRow = {
               sendStation: workbook.Sheets[workbook.SheetNames[0]]["B" + i].v,
               arrivalStation:workbook.Sheets[workbook.SheetNames[0]]["C" + i].v,
-              sendDate: that.formatDate(workbook.Sheets[workbook.SheetNames[0]]["D" + i].v),
-              arrivalDate: that.formatDate(workbook.Sheets[workbook.SheetNames[0]]["E" + i].v),
+              sendDate: that.formatExcelDate(workbook.Sheets[workbook.SheetNames[0]]["D" + i].v),
+              arrivalDate: that.formatExcelDate(workbook.Sheets[workbook.SheetNames[0]]["E" + i].v),
               unloadPoint: workbook.Sheets[workbook.SheetNames[0]]["F" + i].v,
               productName: workbook.Sheets[workbook.SheetNames[0]]["G" + i].v,
               wagonNo: workbook.Sheets[workbook.SheetNames[0]]["J" + i].v,
@@ -704,6 +704,7 @@ export default {
     },
     formatDate(numb, format) {
       const time = new Date((numb - 1) * 24 * 3600000 + 1)
+      console.log("time:",time);
       time.setYear(time.getFullYear() - 70)
       const year = time.getFullYear() + ''
       const month = time.getMonth() + 1 + ''
@@ -713,6 +714,17 @@ export default {
       }
       return year + '年' + (month < 10 ? '0' + month : month)+ '月' + (date < 10 ? '0' + date : date) + '日'
     },
+    formatExcelDate(numb, format) {
+      const time = new Date((numb - 25567) * 24 * 3600000 - 5 * 60 * 1000 - 43 * 1000 - 24 * 3600000 - 8 * 3600000)
+      time.setYear(time.getFullYear())
+      const year = time.getFullYear() + ''
+      const month = time.getMonth() + 1 + ''
+      const date = time.getDate() + ''
+      if (format && format.length === 1) {
+        return year + format + month + format + date
+      }
+      return year + '年' + (month < 10 ? '0' + month : month)+ '月' + (date < 10 ? '0' + date : date) + '日'
+    },
     //点击行勾选
     rowClick(row, column, event) {
       console.log("selected:",row);