luobang 2 년 전
부모
커밋
b4a242206e

+ 1 - 1
build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
 let devModules = ['all']
-// let devModules = ['index', 'statisticalReport']
+// let devModules = ['index', 'statisticalReport', 'appoint']
 // let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']

+ 15 - 3
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -1704,7 +1704,9 @@ export default {
         '销售订单变更记录',
         '运输订单变更记录'
       ],
-      scrollUpdateSelectFlag: 0
+      scrollUpdateSelectFlag: 0,
+      scrollLeft: 0,
+      scrollLeftFlag: 0
     }
   },
   created() {
@@ -1814,7 +1816,7 @@ export default {
           if (val <= 0) {
             val = 0
           }
-          console.log(this.$refs.tableRef.selection, 'selection2')
+          console.log('执行')
           const start = Math.floor(val / 30)
           this.visibleList = this.tableData.slice(
             start,
@@ -1827,6 +1829,13 @@ export default {
           this.debounceS = false
         })
       }
+    },
+    scrollLeft: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.scrollLeftFlag = 1
+      }
     }
   },
   destroyed() {
@@ -1845,10 +1854,13 @@ export default {
       }
     })
     this.$refs.tableRef.bodyWrapper.addEventListener('scroll', e => {
-      console.log(this.scrollTop, 'scrollTop')
+      if (this.scrollLeftFlag == 1 && this.debounceS == true) {
+        this.debounceS = false
+      }
       if (this.debounceS) return
       this.debounceS = true
       this.scrollTop = e.target.scrollTop
+      this.scrollLeft = e.target.scrollLeft
       this.scrollUpdateSelectFlag = 1
     })
   },

+ 17 - 0
src/views/statisticalReport/components/salesLogisticsStatistics/unloadingSteelReports.vue

@@ -530,6 +530,22 @@ export default {
   },
   computed: {},
   methods: {
+    getSaleDateOfReceipt() {
+      let loadTime1 = new Date(
+        new Date(new Date().toLocaleDateString()).getTime() +
+          (3600 * 1000 * 8 - 1)
+      ) // 当天8点前
+      let loadTime2 = new Date(
+        new Date(new Date().toLocaleDateString()).getTime() +
+          (3600 * 1000 * 32 - 1)
+      ) // 次天8点前
+      if (new Date().getTime() - loadTime1 > 0) {
+        this.saleDateOfReceipt = loadTime2
+      } else {
+        this.saleDateOfReceipt = loadTime1
+      }
+      console.log(this.saleDateOfReceipt, 'this.saleDateOfReceipt')
+    },
     //防抖函数--防止用户重复点击
     debounce(func, delay) {
       let timer = null
@@ -630,6 +646,7 @@ export default {
       reader.readAsBinaryString(file.raw) //以二进制方式读取
     },
     addSaleOrder() {
+      this.getSaleDateOfReceipt()
       this.$confirm(
         `确定将所选${this.$refs.tableRef.selection.length}条分录重新上传金蝶?`,
         '提示',