临时提交 - 分单问题

src/views/main/BookingLedger/detail/components/sedOrder.vue

@@ -209,29 +209,29 @@ export default {
     parSedOrderList: {
       handler(nval, oval) {
         // this.inLoading = true
-        if (this.id !== this.details.id) { return false }
-        // console.log('== 父组件中传参分单发生变化 ==', nval, this.id, this.details.id, nval.length > 0 ? nval[0].hblno : '== 分单号为空 ==')
-        this.inSecLoad = true
-        const _data = JSON.parse(JSON.stringify(nval))
-        if (_data.length > 0) {
-          if (!_data[this.editIndex].bookingEDIExt) {
-            _data[this.editIndex].bookingEDIExt = {
-              weiTuoFang: '',
-              ediAttn: '',
-              ediAttnTel: '',
-              ediAttnMail: ''
-            }
-          }
-          this.editDetails = _data[this.editIndex]
-          setTimeout(() => {
-            this.inSecLoad = false
-          }, 1500)
-        } else {
-          this.editDetails = null
-          setTimeout(() => {
-            this.inSecLoad = false
-          }, 1500)
-        }
+        // if (this.id !== this.details.id) { return false }
+        // // console.log('== 父组件中传参分单发生变化 ==', nval, this.id, this.details.id, nval.length > 0 ? nval[0].hblno : '== 分单号为空 ==')
+        // this.inSecLoad = true
+        // const _data = JSON.parse(JSON.stringify(nval))
+        // if (_data.length > 0) {
+        //   if (!_data[this.editIndex].bookingEDIExt) {
+        //     _data[this.editIndex].bookingEDIExt = {
+        //       weiTuoFang: '',
+        //       ediAttn: '',
+        //       ediAttnTel: '',
+        //       ediAttnMail: ''
+        //     }
+        //   }
+        //   this.editDetails = _data[this.editIndex]
+        //   setTimeout(() => {
+        //     this.inSecLoad = false
+        //   }, 1500)
+        // } else {
+        //   this.editDetails = null
+        //   setTimeout(() => {
+        //     this.inSecLoad = false
+        //   }, 1500)
+        // }
       },
       deep: true
     },
@@ -277,10 +277,15 @@ export default {
   },
   methods: {
     init(data = {}) {
-      // console.log('== 分单初始化 ==', data)
+      console.log('== 分单初始化 ==', data)
       let _this = this
-      if (this.parSedOrderList.length > 0) {
+      if (Object.keys(data).length > 0) {
+        this.sedOrderList = JSON.parse(JSON.stringify(data))
+      } else if (this.parSedOrderList.length > 0) {
         this.sedOrderList = JSON.parse(JSON.stringify(this.parSedOrderList))
+      }
+      if (this.sedOrderList.length > 0) {
+        // this.sedOrderList = JSON.parse(JSON.stringify(this.parSedOrderList))
         this.sedOrderList.map((item, index) => {
           item.isNoSave = false
           // console.log('初始获取列表，保存状态', index, item.isNoSave)
@@ -303,7 +308,7 @@ export default {
           setTimeout(() => {
             _this.$refs.goodsTable.init()
           }, 2000)
-          // console.log('分单加载完成', this.inSecLoad)
+          console.log('分单加载完成', this.inSecLoad)
         }, 200)
       }
     },

src/views/main/BookingLedger/detail/index.vue

@@ -459,7 +459,9 @@ export default {
         setTimeout(() => {
           if (this.bookingDetails.hbList && this.bookingDetails.hbList.length > 0) {
             this.Showtabs = true
-            this.$refs.sedOrder.init(this.bookingDetails.hbList)
+            // if (this.$refs.sedOrder) {
+            //   this.$refs.sedOrder.init(this.bookingDetails.hbList)
+            // }
           } else {
             this.Showtabs = false
           }
@@ -491,7 +493,9 @@ export default {
         setTimeout(() => {
           if (this.bookingDetails.hbList && this.bookingDetails.hbList.length > 0) {
             this.Showtabs = true
-            this.$refs.sedOrder.init(this.bookingDetails.hbList)
+            // if (this.$refs.sedOrder) {
+            //   this.$refs.sedOrder.init(this.bookingDetails.hbList)
+            // }
           } else {
             this.Showtabs = false
           }
@@ -517,7 +521,9 @@ export default {
         setTimeout(() => {
           if (this.bookingDetails.hbList && this.bookingDetails.hbList.length > 0) {
             this.Showtabs = true
-            this.$refs.sedOrder.init(this.bookingDetails.hbList)
+            // if (this.$refs.sedOrder) {
+            //   this.$refs.sedOrder.init(this.bookingDetails.hbList)
+            // }
           } else {
             this.Showtabs = false
           }
@@ -961,9 +967,13 @@ export default {
 
     changeTab(e) {
       console.log('== 切换主单分单 ==', e)
+      const _this = this
       this.tabActiveKey = e
-      // debugger
-      this.$refs.sedOrder.init()
+      console.log(_this.bookingDetails)
+      setTimeout(() => {
+        // debugger
+        _this.$refs.sedOrder.init(_this.bookingDetails.hbList)
+      }, 1200)
     },
 
     changeMainTab(e) {
@@ -1068,10 +1078,8 @@ export default {
       this.bookingDetails.hbList = [data]
       this.tabActiveKey = '2'
       this.Showtabs = true
-      setTimeout(() => {
-        // debugger
-        this.$refs.sedOrder.init()
-      }, 800)
+      // debugger
+      this.$refs.sedOrder.init(data.hbList)
     },
     changeHBFun(data) {
       const arr = []

src/views/main/BookingLedger/detail/modules/mailingInfo.vue

@@ -286,7 +286,7 @@
                     <a-date-picker
                       style="min-width:100px"
                       show-time
-                      format="YYYY-MM-DD HH"
+                      format="YYYY-MM-DD HH:00"
                       v-model="details.closingdate"
                       @change="closingdateChange"
                     >
@@ -306,7 +306,7 @@
                     <a-date-picker
                       style="min-width:100px"
                       show-time
-                      format="YYYY-MM-DD HH"
+                      format="YYYY-MM-DD HH:00"
                       v-model="details.closedocdate"
                       @change="closedocdateChange"
                     >
@@ -326,7 +326,7 @@
                     <a-date-picker
                       style="min-width:100px"
                       show-time
-                      format="YYYY-MM-DD HH"
+                      format="YYYY-MM-DD HH:00"
                       v-model="details.closevgmdate"
                       @change="closevgmdateChange"
                     >