From 448202dc2cf4532992348fef7d990566c5f81870 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 28 Mar 2025 09:08:59 +0800
Subject: [PATCH] md

---
 .../emis/emisWaybill/waybillDetailReadOnly.vue   |  1 +
 src/views/emis/emisWaybill/waybillGot.vue        |  6 ++++++
 src/views/emis/emisWaybill/waybillModify.vue     |  6 ++++++
 src/views/emis/emisWaybill/waybillRecord.vue     |  6 ++++++
 .../emis/emisWaybillAjustApply/adjustPanel.vue   | 16 ++++++++++++++++
 5 files changed, 35 insertions(+)

diff --git a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
index 14df0fa3..5acd3358 100644
--- a/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
+++ b/src/views/emis/emisWaybill/waybillDetailReadOnly.vue
@@ -218,6 +218,7 @@
             <el-descriptions-item label="运费(CNY)" :span="4"><span style="color:red;font-weight:bold;font-size:15px">{{ form.freight }}</span></el-descriptions-item>
 
             <el-descriptions-item label="费用备注" :span="4">{{ form.feeRemark }}</el-descriptions-item>
+            <el-descriptions-item label="代收备注" :span="4">{{ form.codFeeDesc }}</el-descriptions-item>
 
 
       </el-descriptions>
diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue
index 72e8ae95..8b65ad4e 100644
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@@ -716,6 +716,11 @@
                             show-word-limit placeholder=""  oninput="value=value.replace(/[\r|\n]/g,'')" >
                         </el-input>
                       </el-form-item>
+                      <el-form-item  :label="$t('代收款')" prop="codFeeDesc" label-width="70px">
+                            <el-input v-model="form.codFeeDesc"  maxlength="50"
+                            show-word-limit placeholder=""  oninput="value=value.replace(/[\r|\n]/g,'')" >
+                        </el-input>
+                      </el-form-item>
                     </el-col>
 
                     <el-col :span="24" v-if="action=='add' || action=='preAdd'  || action=='got' ">
@@ -1663,6 +1668,7 @@ methods: {
       blOverWeight: null,
       overWeightNumber: null,
       feeRemark: null,
+      codFeeDesc:null,
       realValue: null,
       takePieceEmployeeCode: null,
       sendSiteCode: null,
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index b3adc827..a3131090 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -716,6 +716,11 @@
                             show-word-limit placeholder=""  oninput="value=value.replace(/[\r|\n]/g,'')" >
                         </el-input>
                       </el-form-item>
+                      <el-form-item  :label="$t('代收备注')" prop="codFeeDesc" label-width="70px">
+                            <el-input v-model="form.codFeeDesc"  maxlength="50"
+                            show-word-limit placeholder=""  oninput="value=value.replace(/[\r|\n]/g,'')" >
+                        </el-input>
+                      </el-form-item>
                     </el-col>
 
                     <el-col :span="24" v-if="action=='add' || action=='preAdd'  || action=='got' ">
@@ -1647,6 +1652,7 @@ methods: {
       blOverWeight: null,
       overWeightNumber: null,
       feeRemark: null,
+      codFeeDesc:null,
       realValue: null,
       takePieceEmployeeCode: null,
       sendSiteCode: null,
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index 112985d4..8a4b5478 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -717,6 +717,11 @@
                             show-word-limit placeholder=""  oninput="value=value.replace(/[\r|\n]/g,'')" >
                         </el-input>
                       </el-form-item>
+                      <el-form-item  :label="$t('代收备注')" prop="codFeeDesc" label-width="70px">
+                            <el-input v-model="form.codFeeDesc"  maxlength="50"
+                            show-word-limit placeholder=""  oninput="value=value.replace(/[\r|\n]/g,'')" >
+                        </el-input>
+                      </el-form-item>
                     </el-col>
 
                     <el-col :span="24" v-if="action=='add' || action=='preAdd'  || action=='got' ">
@@ -1654,6 +1659,7 @@ methods: {
       blOverWeight: null,
       overWeightNumber: null,
       feeRemark: null,
+      codFeeDesc:null,
       realValue: null,
       takePieceEmployeeCode: null,
       sendSiteCode: null,
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index e38cc158..2269742f 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -757,6 +757,22 @@
                   </el-row>
               </el-col>
 
+              <el-col :span="24"  v-if="applyType&&(applyTypeArr.includes('9')||applyTypeArr.includes('41'))">
+                  <el-row :gutter="0" class="md-row">
+                    <el-col :span="3" class="md-title">
+                      <span>代收备注调整</span>
+                    </el-col>
+                    <el-col :span="7" class="md-value">
+                      <span >{{billDetail.codFeeDesc}}</span>
+                    </el-col>
+                    <el-col :span="14">
+                      <el-form-item  :label="$t('代收备注')" prop="codFeeDesc" >
+                        <el-input v-model="form.codFeeDesc" type="textarea" placeholder=""/>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+              </el-col>
+
 
 
             </el-row>