修

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']
+// let devModules = ['all']
 // let devModules = ['index', 'ADMINISTRATORS']
 
 if (pathSrc.indexOf('node_modules') > -1) {

src/views/index/components/printReceipt1.vue

@@ -55,7 +55,8 @@
               <th style="width: 17.5%; text-align: center">规格型号</th>
               <th style="width: 5%">件数</th>
               <th style="width: 6%">重量</th>
-              <th style="width: 20%">过磅时间</th>
+              <th style="width: 20%" v-if="orderTimeFlag != null">订单日期</th>
+              <th style="width: 20%" v-else>过磅时间</th>
               <th style="width: 24%">摘要</th>
               <!--              <th style="width: 21%">订单日期</th>-->
             </tr>
@@ -69,7 +70,8 @@
               <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
               <td>{{ item.materialNumber }}</td>
               <td>{{ item.materialWeight }}</td>
-              <td>{{ item.netWeightTime }}</td>
+              <td v-if="orderTimeFlag != null">{{ item.orderDate }}</td>
+              <td v-else>{{ item.netWeightTime }}</td>
               <td>{{ item.saleRemark }}</td>
               <!--              <td>{{ item.makeDate }}</td>-->
             </tr>
@@ -230,6 +232,7 @@ export default {
   name: 'Login',
   data() {
     return {
+      orderTimeFlag: null,
       orderNumber: '',
       consignee: '',
       town: '',
@@ -304,6 +307,7 @@ export default {
           this.deliveryAddress = res.data.deliveryAddress
           this.deliveryOrderMaterialList = res.data.deliveryOrderMaterialList
           this.note = res.data.note
+          this.orderTimeFlag = res.data.orderTimeFlag || null
           //console.log("数据的长度"+res.data.deliveryOrderMaterialList.length)
           console.log('进入了这个方法')
           // if (res.data.deliveryOrderMaterialList.length > 2){

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

@@ -1906,6 +1906,10 @@ export default {
         {
           value: '销售订单号',
           lable: '销售订单号'
+        },
+        {
+          value: '收款公司',
+          lable: '收款公司'
         }
       ],
       input1: null,
@@ -1934,6 +1938,10 @@ export default {
         {
           value: '销售订单号',
           lable: '销售订单号'
+        },
+        {
+          value: '收款公司',
+          lable: '收款公司'
         }
       ],
       pickerOptions: {
@@ -2271,7 +2279,9 @@ export default {
         '金蝶分录ID',
         '订单变更时间',
         '销售订单变更记录',
-        '运输订单变更记录'
+        '运输订单变更记录',
+        '收款公司',
+        '理论件数'
       ],
       scrollUpdateSelectFlag: 0,
       scrollLeft: 0,
@@ -5021,6 +5031,7 @@ export default {
       let receiveAddress = null
       obj.receiveAddress = null
       obj.saleNo = null
+      obj.receiveCustomer = null
       if (this.startTime && this.endTime) {
         startTime = sjTime(this.startTime)
         endTime = sjTime(this.endTime)
@@ -5049,6 +5060,8 @@ export default {
         obj.receiveAddress = receiveAddress
       } else if (this.screen == '销售订单号') {
         obj.saleNo = this.input
+      } else if (this.screen == '收款公司') {
+        obj.receiveCustomer = this.input
       } else {
         remark = this.input
       }
@@ -5085,6 +5098,8 @@ export default {
         this.input1 != ''
       ) {
         obj.saleNo = this.input1
+      } else if (this.screen1 == '收款公司') {
+        obj.receiveCustomer = this.input1
       } else if (this.input1 != null && this.input1 != '') {
         remark = this.input1
       }

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

@@ -50,6 +50,7 @@
             :span-method="objectSpanMethod"
             :row-style="{ height: '30px' }"
             :cell-style="returnClassName"
+            height="680px"
             style="width: 100%;font-size: 18px"
           >
             <el-table-column