From 151bf79074de1d8b572aa6de6e65cdfdb3fd5faf Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 10 Jan 2025 09:06:13 +0800
Subject: [PATCH] md

---
 .../emisTmsCostFee/emisTmsCostFeeForm.vue     | 39 +++++++++++++------
 .../emis/emisWaybill/OrderDetailReadOnly.vue  | 14 +++----
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue b/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
index b532d245..8a12d1eb 100644
--- a/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
+++ b/src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
@@ -235,8 +235,8 @@
         </el-row>
       </el-form>
       <div style="text-align: center;margin-bottom: 10px;">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button type="primary" @click="submitFormAndContinue" >保存并继续录入</el-button>
+        <el-button type="primary" :loading="isDoing" @click="submitForm">确 定</el-button>
+        <el-button type="primary" :loading="isDoing" @click="submitFormAndContinue" >保存并继续录入</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
 
@@ -263,6 +263,7 @@ export default {
       emisTmsCostFeeOptions: [],
       // 遮罩层
       loading: true,
+      isDoing:false,
       // 表单参数
       form: {},
       // 表单校验
@@ -438,15 +439,31 @@ export default {
     submitForm(isContinue) {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          addEmisTmsCostFee(this.form).then(response => {
-            this.$modal.msgSuccess("新增成功");
-            if(isContinue==true){
-                this.form.feeType=null;
-                this.form.costFee=null;
-            }else{
-              this.$emit("on-changed");
-            }
-          });
+          if (this.form.id != null) {
+            this.isDoing=true;
+            updateEmisTmsCostFee(this.form).then(response => {
+              this.isDoing=false;
+              this.$modal.msgSuccess("保存成功");
+              if(isContinue==true){
+                  this.form.feeType=null;
+                  this.form.costFee=null;
+              }else{
+                this.$emit("on-changed");
+              }
+            });
+          }else{
+            this.isDoing=true;
+            addEmisTmsCostFee(this.form).then(response => {
+              this.isDoing=false;
+              this.$modal.msgSuccess("新增成功");
+              if(isContinue==true){
+                  this.form.feeType=null;
+                  this.form.costFee=null;
+              }else{
+                this.$emit("on-changed");
+              }
+            });
+          }
         }
       });
     },
diff --git a/src/views/emis/emisWaybill/OrderDetailReadOnly.vue b/src/views/emis/emisWaybill/OrderDetailReadOnly.vue
index 29729c49..b990d291 100644
--- a/src/views/emis/emisWaybill/OrderDetailReadOnly.vue
+++ b/src/views/emis/emisWaybill/OrderDetailReadOnly.vue
@@ -38,11 +38,11 @@
                               color: white;"> {{ $t('收') }} - {{ form.reciever.countryName }} {{ form.reciever.provinceName }} - {{ form.dispatchUnderlingSiteName }}</span>
           </div>
 
-          <div style="    font-size: 12px;
-    font-weight: bold;
-    color: black;
-    border: 1px solid #e6ebf5;
-    margin-top: 10px;    min-height: 90px;">
+          <div style="font-size: 12px;
+            font-weight: bold;
+            color: black;
+            border: 1px solid #e6ebf5;
+            margin-top: 10px;    min-height: 90px;">
              <div>{{ form.reciever.name }} {{ form.reciever.phone }}</div>
               <div>{{ form.reciever.countryName }} {{ form.reciever.provinceName }} {{ form.reciever.cityName }} {{ form.reciever.countyName }} {{ form.reciever.address }}</div>
               <div>{{ form.reciever.company }}</div>
@@ -76,7 +76,7 @@
             <!-- <el-descriptions-item label="合同号"  :span="4">{{ form.custOrderId }}</el-descriptions-item> -->
             <!-- <el-descriptions-item label="专属取件员">{{ form.takePieceEmployeeName }}/{{ form.operateEmployeeName }}</el-descriptions-item> -->
             <!-- <el-descriptions-item label="录单员">{{ form.registerManName }}</el-descriptions-item> -->
-            <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  label="月结客户" >{{ form.customerName }}</el-descriptions-item>
+            <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  label="月结客户" >{{ form.custName }}</el-descriptions-item>
             <!-- <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item> -->
             <el-descriptions-item label="销售联系人">{{ form.salesmen }}</el-descriptions-item>
     </el-descriptions>
@@ -261,7 +261,7 @@
               <dict-tag :options="dict.type.emis_payment_type" :value="form.paymentType"/>
             </el-descriptions-item>
             <!-- <el-descriptions-item label="费用币种">{{ form.currency }}</el-descriptions-item> -->
-            <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  label="月结客户" :span="4">{{ form.customerName }}</el-descriptions-item>
+            <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  label="月结客户" :span="4">{{ form.custName }}</el-descriptions-item>
             <!-- <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
             <el-descriptions-item label="销售联系人" :span="3">{{ form.salesmen }}</el-descriptions-item> -->
             <el-descriptions-item label="费用明细" :span="4">