Merge branch '20241111-空派增加预报时间调整'

src/views/kongPai/components/DetailIconme.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog top="0" width="1200px" title="详情" :visible.sync="dialogVisible" :before-close="detailClose"
+  <el-dialog top="0" width="1300px" title="详情" :visible.sync="dialogVisible" :before-close="detailClose"
     :close-on-click-modal="false">
     <div ref="detailsContentRef" class="details-content">
       <!-- 基本信息 -->
@@ -337,6 +337,7 @@ export default {
     return {
       items: [
         { field: 'ReceiveTimeStr', label: '收货日期' },
+        { field: 'ForecastTime', label: '预报时间' },
         { field: 'CompanyName', label: '客户名称' },
         { field: 'CustomerOrderNo', label: '客户单号' },
         { field: 'SystemNo', label: '行运易单号' },
@@ -362,7 +363,8 @@ export default {
           CustomerConfirmTotal: 0,
           CustomerConfirmBillWeight: 0,
           SplitWeightRate: 0,
-          DeclarationMethod: undefined
+          DeclarationMethod: undefined,
+          ForecastTime: undefined,
         }
       ], // 应收总额
       saveLadding: false,
@@ -719,7 +721,7 @@ export default {
         OrderId: this.itemsData.Id,
         PublicExpressId: this.itemsData.CreateOrderChannelId,
         CustomerId: this.itemsData.CustomerId,
-        TransactionTime: this.itemsData.ReceiveTime,
+        TransactionTime: this.itemsData.ForecastTime || this.itemsData.ReceiveTime,
         ZipCode: this.itemsData.ReceiverZipCode,
         gWeight: this.propsTotalReceivableData[0].CustomerConfirmBillWeight,
       }

src/views/kongPai/components/ViewDetailIconme.vue

@@ -2,7 +2,7 @@
   查看空派收入-明细
  -->
 <template>
-  <el-dialog top="0" width="1200px" title="详情" :visible.sync="dialogVisible" :before-close="detailClose"
+  <el-dialog top="0" width="1300px" title="详情" :visible.sync="dialogVisible" :before-close="detailClose"
     :close-on-click-modal="false">
     <div ref="detailsContentRef" class="details-content">
       <!-- 基本信息 -->
@@ -218,6 +218,7 @@ export default {
       enabledVisible: true,
       items: [
         { field: 'ReceiveTimeStr', label: '收货日期' },
+        { field: 'ForecastTime', label: '预报时间' },
         { field: 'CompanyName', label: '客户名称' },
         { field: 'CustomerOrderNo', label: '客户单号' },
         { field: 'SystemNo', label: '行运易单号' },

src/views/kongPai/income.vue

@@ -173,6 +173,7 @@
         >
           <el-table-column type="selection" width="55" />
           <el-table-column label="收货日期" prop="ReceiveTimeStr" />
+          <el-table-column label="预报时间" prop="ForecastTime" />
           <el-table-column label="客户名称" prop="CompanyName" />
           <el-table-column label="客户单号" prop="CustomerOrderNo" />
           <el-table-column label="行运易" prop="SystemNo" />
@@ -435,6 +436,7 @@ export default {
           CustomerConfirmBillWeight: 0.0,
           SplitWeightRate: 0.0,
           DeclarationMethod: undefined,
+          ForecastTime: undefined,
         },
       ], // 应收总额
       currentInput: {
@@ -680,7 +682,7 @@ export default {
           OrderId: data.Id,
           PublicExpressId: data.CreateOrderChannelId,
           CustomerId: data.CustomerId,
-          TransactionTime: data.ReceiveTime,
+          TransactionTime: data.ForecastTime || data.ReceiveTime,
           gWeight: data.CustomerConfirmBillWeight,
           ZipCode: data.ReceiverZipCode
         }
@@ -715,6 +717,7 @@ export default {
             ApprovalNumber: data.ApprovalNumber,
             SplitWeightRate: data.SplitWeightRate,
             DeclarationMethod: data.DeclarationMethod,
+            ForecastTime: data.ForecastTime,
           });
           // Status=5 只查看
           data.Status === 5 ? this.showViewDetails = true : this.showDetails = true;

src/views/kongPai/settlement.vue

@@ -1030,7 +1030,7 @@ export default {
         OrderId: scope.row.Id,
         PublicExpressId: scope.row.CreateOrderChannelId,
         CustomerId: scope.row.BranchCompanyId,
-        TransactionTime: scope.row.ReceiveTime,
+        TransactionTime: scope.row.ForecastTime || scope.row.ReceiveTime,
         gWeight: scope.row.SettlementConfirmBillWeight,
         ZipCode: scope.row.ReceiverZipCode
       }
@@ -1065,7 +1065,7 @@ export default {
           OrderId: data.Id,
           PublicExpressId: data.CreateOrderChannelId,
           CustomerId: data.CustomerId,
-          TransactionTime: data.ReceiveTime,
+          TransactionTime: scope.row.ForecastTime || data.ReceiveTime,
           gWeight: data.CustomerConfirmBillWeight,
           ZipCode: data.ReceiverZipCode
         }