From f9826e954583b04ce627afa00154910cfe4dc5f9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 23 Feb 2025 16:53:42 +0800
Subject: [PATCH] md

---
 src/api/emis/emisTmsCostFee.js                |  9 ++++++++
 .../emisTmsCostFee/EmisTmsCostFeeList.vue     | 21 ++++++++++++++++---
 src/views/emis/emisWaybill/waybillRecord.vue  |  4 ++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/api/emis/emisTmsCostFee.js b/src/api/emis/emisTmsCostFee.js
index 491f5473..186655e0 100644
--- a/src/api/emis/emisTmsCostFee.js
+++ b/src/api/emis/emisTmsCostFee.js
@@ -26,6 +26,15 @@ export function addEmisTmsCostFee(data) {
   })
 }
 
+// 重新计算运单利润
+export function reCalcSplitCostFee(costNo) {
+  return request({
+    url: '/emis/emisTmsCostFee/reCalcSplitCostFee',
+    method: 'post',
+    data: {costNo:costNo}
+  })
+}
+
 // 修改TMS运输成本账单
 export function updateEmisTmsCostFee(data) {
   return request({
diff --git a/src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue b/src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue
index 2a7bb9be..26b0304b 100644
--- a/src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue
+++ b/src/views/emis/emisTmsCostFee/EmisTmsCostFeeList.vue
@@ -179,7 +179,13 @@
       <el-table-column :label="$t('发件地')" align="center" prop="sendPlace" min-width="100" />
       <el-table-column :label="$t('目的地')" align="center" prop="destPlace" min-width="100" />
       <el-table-column :label="$t('包裹数')" align="center" prop="realPieceNumber" min-width="100" />
-
+      <el-table-column :label="$t('是否计算')" align="center" prop="blHasCalc" min-width="100" >
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.blHasCalc=='1'" type="success">已计算</el-tag>
+            <el-tag v-if="scope.row.blHasCalc=='0'" type="danger">未计算</el-tag>
+          </template>
+       </el-table-column>
+       <el-table-column :label="$t('时间计算')" align="center" prop="calcDate" min-width="170"/>
       <!-- <el-table-column :label="$t('成本费')" align="center" prop="costFee" min-width="100" /> -->
       <!-- <el-table-column :label="$t('总票数')" align="center" prop="sendPieceSum" min-width="100" /> -->
       <!-- <el-table-column :label="$t('总件数')" align="center" prop="pieceNumber" min-width="100" /> -->
@@ -212,7 +218,7 @@
 </template>
 
 <script>
-import { listEmisTmsCostFee, getEmisTmsCostFee, delEmisTmsCostFee, addEmisTmsCostFee, updateEmisTmsCostFee } from "@/api/emis/emisTmsCostFee";
+import { listEmisTmsCostFee, getEmisTmsCostFee,reCalcSplitCostFee, delEmisTmsCostFee, addEmisTmsCostFee, updateEmisTmsCostFee } from "@/api/emis/emisTmsCostFee";
 import EmisTmsCostFeeForm from '@/views/emis/emisTmsCostFee/emisTmsCostFeeForm';
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
 import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';
@@ -281,7 +287,16 @@ export default {
         this.loading = false;
       });
     },
-    handleReCalcProfit(){
+    async handleReCalcProfit(){
+      if(this.selectList&&this.selectList.length>0){
+        for(let i=0;i<this.selectList.length;i++){
+          let item=this.selectList[i];
+          let res=await reCalcSplitCostFee(item.costNo);
+        }
+        this.$modal.msgSuccess("重算成功");
+      }else{
+        this.$modal.msgError("请先选择成本");
+      }
 
     },
 
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index cd85b541..112985d4 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -23,7 +23,7 @@
                     <el-form-item :label="$t('运单号')" prop="billCode"  >
                       <div style="display:inline-flex">
                           <div>
-                            <el-input v-model="form.billCode" placeholder="" @blur="onBillCodeChange" style="font-weight:600;color:black" :disabled="this.action=='got'" />
+                            <el-input v-model="form.billCode" placeholder="" maxlength="20" show-word-limit  @blur="onBillCodeChange" style="font-weight:600;color:black" :disabled="this.action=='got'" />
                           </div>
                           <div style="padding-left:5px"> <el-checkbox v-model="form.blSelfBillCode" style="font-size:400;margin-right:10px;font-size:10px" :disabled="this.action=='got'" @change="checked=>handleBillCodeChange(checked)" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">{{ $t('电子主单') }}</span></el-checkbox></div>
                           <!-- <div style="padding-left:5px"> <el-checkbox v-model="form.blVirtual" style="font-size:400;margin-right:10px;font-size:10px" :disabled="this.action=='got'"  :true-label="'1'" :false-label="'0'"><span style="font-size:10px">{{ $t('虚拟单') }}</span></el-checkbox></div> -->
@@ -45,7 +45,7 @@
                       <div style="display:inline-flex">
                           <div>
                             <el-form :disabled="false" @submit.native.prevent>
-                              <el-input v-model="form.billCode" :placeholder="$t('单号输入后按回车')" @keyup.enter.native="handleScanInput"  :disabled="false" style="font-weight:600;color:black" >
+                              <el-input v-model="form.billCode" maxlength="20" show-word-limit :placeholder="$t('单号输入后按回车')" @keyup.enter.native="handleScanInput"  :disabled="false" style="font-weight:600;color:black" >
                                 <i slot="suffix" class="iconfont">&#xe656;</i>
                               </el-input>
                             </el-form>