From fe9b3d68abd517ee4e80ff790539460a1ed34ba0 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 15 Aug 2024 20:45:14 +0800
Subject: [PATCH] md

---
 .../emis/EmisBaseTools/DestinationPicker.vue  |  2 +
 .../SubBillConfirmByMonthList.vue             |  2 -
 .../emisWaybillAjustApply/adjustPanel.vue     | 80 ++++++++++++++-----
 3 files changed, 64 insertions(+), 20 deletions(-)

diff --git a/src/views/emis/EmisBaseTools/DestinationPicker.vue b/src/views/emis/EmisBaseTools/DestinationPicker.vue
index 1bf5cfe7..f28e539f 100644
--- a/src/views/emis/EmisBaseTools/DestinationPicker.vue
+++ b/src/views/emis/EmisBaseTools/DestinationPicker.vue
@@ -88,6 +88,7 @@
         if(!this.defaultItems){
           this.queryData(null,null);
         }else{
+          this.optionItems=[];
           this.optionItems = [...this.defaultItems];
         }
      },
@@ -105,6 +106,7 @@
         };
 
       this.optionItems=[];
+      this.defaultItems=[];
        listSimpleEmisDestination(queryParams).then(response => {
          this.loading = false;
          this.optionItems =response.rows;
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index 47a64a96..d1260fc9 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -226,8 +226,6 @@
          </el-row>
      </div>
 
-
-
      <div slot="statInfo" style="font-size: 13px;">
        总票数:<span class="statInfoValue">{{total}}</span>,
        总运费:<span class="statInfoValue">{{queryStatInfoMap?queryStatInfoMap.totalBillFee:0}}</span>
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index b931118b..5225f970 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -42,7 +42,7 @@
                     </el-col>
                     <el-col :span="14">
                       <el-form-item label="线路" prop="transLine">
-                        <TransLinePicker v-model="form.transLine" :countryCode="billDetail.reciever.country" isInitiated="true"  @onChange="calcBillFee"></TransLinePicker>
+                        <TransLinePicker v-model="form.transLine" :countryCode="billDetail.reciever.country" isInitiated="true"  @onChange="calcBillFee" :disabled="applyTypeArr.includes('4')"></TransLinePicker>
                       </el-form-item>
                     </el-col>
 
@@ -65,6 +65,8 @@
                   </el-row>
               </el-col>
 
+
+
               <el-col :span="24" v-if="applyType&&applyTypeArr.includes('17')" >
                   <el-row :gutter="0" class="md-row">
                     <el-col :span="3" class="md-title">
@@ -81,6 +83,25 @@
                   </el-row>
               </el-col>
 
+
+              <el-col :span="24" v-if="applyType&&applyTypeArr.includes('40')" >
+                  <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.realValue}}</span>
+                    </el-col>
+                    <el-col :span="14">
+                      <el-form-item  :label="$t('缅甸货值调整')" prop="remark" >
+                        <el-input v-model="form.realValue"  style="text-align: right;width: 120px" placeholder="货值" >
+                              <span slot="suffix">(USD)</span>
+                            </el-input>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+              </el-col>
+
               <el-col :span="24" v-if="applyType&&applyTypeArr.includes('37')" >
                   <el-row :gutter="0" class="md-row">
                     <el-col :span="3" class="md-title">
@@ -729,10 +750,48 @@
                         </el-row>
 
                       </el-col>
+
                     </el-row>
               </el-col>
 
+               <!-- v-if="applyType&&applyTypeArr.includes('12')" -->
+               <el-col :span="24"  v-if="applyType&&applyTypeArr.includes('12')">
+                  <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.feeRemark}}</span>
+                    </el-col>
+                    <el-col :span="14">
+                      <el-form-item  :label="$t('费用备注')" prop="feeRemark" >
+                        <el-input v-model="form.feeRemark" type="textarea" placeholder=""/>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+              </el-col>
 
+            </el-row>
+            <!-- ||applyTypeArr.includes('12') -->
+            <el-row v-if="billDetail&&applyType&&(
+              applyTypeArr.includes('38')
+              ||applyTypeArr.includes('37')
+              ||applyTypeArr.includes('36')
+              ||applyTypeArr.includes('30')
+              ||applyTypeArr.includes('20')
+              ||applyTypeArr.includes('15')
+              ||applyTypeArr.includes('19')
+              ||applyTypeArr.includes('9')
+              ||applyTypeArr.includes('10')
+
+              ||applyTypeArr.includes('16')
+              ||applyTypeArr.includes('2')
+              ||applyTypeArr.includes('3')
+              ||applyTypeArr.includes('1')
+              ||applyTypeArr.includes('4')
+              ||applyTypeArr.includes('11')
+
+              )" :gutter="0" style="display: flex;flex-wrap: wrap;border: 1px solid #e6e6e6; padding: 0px;line-height: 35px;">
               <el-col  :span="24" class="feeDesc">
                 <span>运费相关调整变化</span>
               </el-col>
@@ -979,23 +1038,8 @@
                     </el-col>
                   </el-row>
               </el-col>
-              <!-- v-if="applyType&&applyTypeArr.includes('12')" -->
-              <el-col :span="24"  v-if="applyType&&applyTypeArr.length>0">
-                  <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.feeRemark}}</span>
-                    </el-col>
-                    <el-col :span="14">
-                      <el-form-item  :label="$t('费用备注')" prop="feeRemark" >
-                        <el-input v-model="form.feeRemark" type="textarea" placeholder=""/>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-              </el-col>
-        </el-row>
+
+          </el-row>
 
 
       </el-form>