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

build/utils.js

@@ -16,9 +16,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-let devModules = ['all']
-// let devModules = ['index', 'statisticalReport']
 // let devModules = ['all']
+// let devModules = ['index', 'statisticalReport', 'appoint']
+let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']
 

src/views/index/components/printReceipt.vue

@@ -57,7 +57,11 @@
               <th style="width: 35%">重量</th>
               <!--              <th style="width: 21%">订单日期</th>-->
             </tr>
-            <tr style="height: 35px" v-for="(item, index) in deliveryOrderMaterialList" :key="index">
+            <tr
+              style="height: 35px"
+              v-for="(item, index) in deliveryOrderMaterialList"
+              :key="index"
+            >
               <td>{{ index + 1 }}</td>
               <td>{{ item.materialName }}</td>
               <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
@@ -175,11 +179,14 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin-left: 690px; font-size: 20px;height: 40px"
+            style="margin: auto; font-size: 20px;height: 40px"
             width="1000px"
             class="tablePart6"
           >
             <tr>
+              <th style="width: 28.5%;">
+                注:此单据共计三联，需签字返回两联。
+              </th>
               <th style="width: 14.5%;text-align: left">签收人及签收时间：</th>
             </tr>
           </table>
@@ -201,14 +208,14 @@
       </div>-->
         <!--设置中间的间隔以及虚线-->
         <div style="height: 50px" v-show="index < 2"></div>
-        <hr width="1500px" style="border:1px dashed black" v-show="index < 2"/>
-        <div style="page-break-after:always" v-show="index ==1 && page"></div>
+        <hr width="1500px" style="border:1px dashed black" v-show="index < 2" />
+        <div style="page-break-after:always" v-show="index == 1 && page"></div>
       </div>
     </div>
     <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
         <i class="el-icon-download"></i>导出(pdf)
       </el-button> -->
-<!--    <el-button type="primary" @click="backScan()">
+    <!--    <el-button type="primary" @click="backScan()">
       <i class="el-icon-back"></i>返回
     </el-button>-->
   </div>
@@ -253,7 +260,7 @@ export default {
       dataList: ['1', '2', '3'],
       timer1: '',
       //分页数据
-      page: '',
+      page: ''
     }
   },
   created() {
@@ -263,7 +270,6 @@ export default {
     /*this.timer1 = setTimeout(this.print,2000);*/
     // 六十秒不操作，自动返回扫码页面
     const timer = setInterval(() => {
-
       this.backScan()
     }, 30000)
     this.$once('hook:beforeDestroy', () => {
@@ -275,11 +281,11 @@ export default {
     async getDeliveryOrder() {
       let orderNumber = this.$route.query.orderNumber
       //空对象设置为null值
-      var deliver={};
+      var deliver = {}
       await this.axios
         .post('/api/v1/tms/getDeliveryOrder?orderNumber=' + orderNumber)
         .then(res => {
-          console.log("查询出来的数据")
+          console.log('查询出来的数据')
           console.log(res.data)
           this.orderNumber = res.data.orderNumber
           this.carrierName = res.data.carrierName
@@ -296,10 +302,10 @@ export default {
           this.deliveryAddress = res.data.deliveryAddress
           this.deliveryOrderMaterialList = res.data.deliveryOrderMaterialList
           this.note = res.data.note
-          console.log("数据的长度"+res.data.deliveryOrderMaterialList.length)
-          if (res.data.deliveryOrderMaterialList.length > 2){
-            this.page=true
-          }else if (res.data.deliveryOrderMaterialList.length ==1){
+          console.log('数据的长度' + res.data.deliveryOrderMaterialList.length)
+          if (res.data.deliveryOrderMaterialList.length > 2) {
+            this.page = true
+          } else if (res.data.deliveryOrderMaterialList.length == 1) {
             this.deliveryOrderMaterialList.push(deliver)
             console.log(this.deliveryOrderMaterialList)
           }

src/views/index/components/printReceipt1.vue

@@ -57,7 +57,11 @@
               <th style="width: 35%">重量</th>
               <!--              <th style="width: 21%">订单日期</th>-->
             </tr>
-            <tr style="height: 35px" v-for="(item, index) in deliveryOrderMaterialList" :key="index">
+            <tr
+              style="height: 35px"
+              v-for="(item, index) in deliveryOrderMaterialList"
+              :key="index"
+            >
               <td>{{ index + 1 }}</td>
               <td>{{ item.materialName }}</td>
               <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
@@ -175,11 +179,14 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin-left: 690px; font-size: 20px;height: 40px"
+            style="margin:auto; font-size: 20px;height: 40px"
             width="1000px"
             class="tablePart6"
           >
             <tr>
+              <th style="width: 28.5%;">
+                注:此单据共计三联，需签字返回两联。
+              </th>
               <th style="width: 14.5%;text-align: left">签收人及签收时间：</th>
             </tr>
           </table>
@@ -206,7 +213,7 @@
     <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
         <i class="el-icon-download"></i>导出(pdf)
       </el-button> -->
-<!--    <el-button type="primary" @click="backScan()">
+    <!--    <el-button type="primary" @click="backScan()">
       <i class="el-icon-back"></i>返回
     </el-button>-->
   </div>
@@ -251,7 +258,7 @@ export default {
       dataList: ['1', '2', '3'],
       timer1: '',
       //分页数据
-      page: '',
+      page: ''
     }
   },
   created() {
@@ -261,7 +268,6 @@ export default {
     /*this.timer1 = setTimeout(this.print,2000);*/
     // 六十秒不操作，自动返回扫码页面
     const timer = setInterval(() => {
-
       this.backScan()
     }, 30000)
     this.$once('hook:beforeDestroy', () => {
@@ -273,11 +279,11 @@ export default {
     async getDeliveryOrder() {
       let orderNumber = this.$route.query.orderNumber
       //空对象设置为null值
-      var deliver={};
+      var deliver = {}
       await this.axios
         .post('/api/v1/tms/getDeliveryOrder?orderNumber=' + orderNumber)
         .then(res => {
-          console.log("查询出来的数据")
+          console.log('查询出来的数据')
           console.log(res.data)
           this.orderNumber = res.data.orderNumber
           this.carrierName = res.data.carrierName
@@ -295,7 +301,7 @@ export default {
           this.deliveryOrderMaterialList = res.data.deliveryOrderMaterialList
           this.note = res.data.note
           //console.log("数据的长度"+res.data.deliveryOrderMaterialList.length)
-          console.log("进入了这个方法")
+          console.log('进入了这个方法')
           // if (res.data.deliveryOrderMaterialList.length > 2){
           //   this.page=true
           // }else if (res.data.deliveryOrderMaterialList.length ==1){
@@ -316,11 +322,11 @@ export default {
     //   // this.axios.post('/api/v1/tms/changeNumber?orderNumber=' + orderNumber)
     // },
     print1() {
-      console.log("进入了打印页面")
+      console.log('进入了打印页面')
       let orderNumber = this.$route.query.orderNumber
       this.axios.post('/api/v1/tms/changeNumber?orderNumber=' + orderNumber)
       window.print()
-      this.$router.push({name:'printScan1',params:{index:'1'}})
+      this.$router.push({ name: 'printScan1', params: { index: '1' } })
       //this.backScan()
     },
     backScan() {

src/views/index/components/printReceipt2.vue

@@ -58,7 +58,11 @@
               <th style="width: 35%">重量</th>
               <!--              <th style="width: 21%">订单日期</th>-->
             </tr>
-            <tr style="height: 35px" v-for="(item, index) in deliveryOrderMaterialList" :key="index">
+            <tr
+              style="height: 35px"
+              v-for="(item, index) in deliveryOrderMaterialList"
+              :key="index"
+            >
               <td>{{ index + 1 }}</td>
               <td>{{ item.materialName }}</td>
               <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
@@ -176,11 +180,14 @@
             border="0"
             cellpadding="10"
             cellspacing="0"
-            style="margin-left: 690px; font-size: 20px;height: 40px"
+            style="margin:auto; font-size: 20px;height: 40px"
             width="1000px"
             class="tablePart6"
           >
             <tr>
+              <th style="width: 28.5%;">
+                注:此单据共计三联，需签字返回两联。
+              </th>
               <th style="width: 14.5%;text-align: left">签收人及签收时间：</th>
             </tr>
           </table>
@@ -207,7 +214,7 @@
     <!-- <el-button style="margin-left: 45%;" type="primary" @click="getPdf()">
         <i class="el-icon-download"></i>导出(pdf)
       </el-button> -->
-<!--    <el-button type="primary" @click="backScan()">
+    <!--    <el-button type="primary" @click="backScan()">
       <i class="el-icon-back"></i>返回
     </el-button>-->
   </div>
@@ -252,7 +259,7 @@ export default {
       dataList: ['1', '2', '3'],
       timer1: '',
       //分页数据
-      page: '',
+      page: ''
     }
   },
   created() {
@@ -262,7 +269,6 @@ export default {
     /*this.timer1 = setTimeout(this.print,2000);*/
     // 六十秒不操作，自动返回扫码页面
     const timer = setInterval(() => {
-
       this.backScan()
     }, 30000)
     this.$once('hook:beforeDestroy', () => {
@@ -274,11 +280,11 @@ export default {
     async getDeliveryOrder() {
       let orderNumber = this.$route.query.orderNumber
       //空对象设置为null值
-      var deliver={};
+      var deliver = {}
       await this.axios
         .post('/api/v1/tms/getDeliveryOrder?orderNumber=' + orderNumber)
         .then(res => {
-          console.log("查询出来的数据")
+          console.log('查询出来的数据')
           console.log(res.data)
           this.orderNumber = res.data.orderNumber
           this.carrierName = res.data.carrierName
@@ -295,10 +301,10 @@ export default {
           this.deliveryAddress = res.data.deliveryAddress
           this.deliveryOrderMaterialList = res.data.deliveryOrderMaterialList
           this.note = res.data.note
-          console.log("数据的长度"+res.data.deliveryOrderMaterialList.length)
-          if (res.data.deliveryOrderMaterialList.length > 2){
-            this.page=true
-          }else if (res.data.deliveryOrderMaterialList.length ==1){
+          console.log('数据的长度' + res.data.deliveryOrderMaterialList.length)
+          if (res.data.deliveryOrderMaterialList.length > 2) {
+            this.page = true
+          } else if (res.data.deliveryOrderMaterialList.length == 1) {
             this.deliveryOrderMaterialList.push(deliver)
             console.log(this.deliveryOrderMaterialList)
           }

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -1705,7 +1705,9 @@ export default {
         '销售订单变更记录',
         '运输订单变更记录'
       ],
-      scrollUpdateSelectFlag: 0
+      scrollUpdateSelectFlag: 0,
+      scrollLeft: 0,
+      scrollLeftFlag: 0
     }
   },
   created() {
@@ -1815,7 +1817,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,
@@ -1828,6 +1830,13 @@ export default {
           this.debounceS = false
         })
       }
+    },
+    scrollLeft: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.scrollLeftFlag = 1
+      }
     }
   },
   destroyed() {
@@ -1846,10 +1855,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
     })
   },

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}条分录重新上传金蝶?`,
         '提示',