报价单详情修复

src/components/CustomerFollow/index.vue

@@ -65,7 +65,8 @@
         <el-row :gutter="10">
           <el-col>
             <el-form-item label="跟进类型" required>
-              <dict-selector ref="dictType" form-type="radio" v-model="customerFollow.form.followType" :type="DICT_TYPE.CUSTOMER_FOLLOW_TYPE"></dict-selector>
+              <!-- <dict-selector ref="dictType" form-type="radio" v-model="customerFollow.form.followType" :type="DICT_TYPE.CUSTOMER_FOLLOW_TYPE"></dict-selector> -->
+              <el-radio v-model="customerFollow.form.followType" label="1">{{$t('投诉回访')}}</el-radio>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -230,7 +231,7 @@ export default {
         "result": undefined,
         "customerId":this.customerId
       }
-      this.$refs.dictType.changeValue(this.customerFollow.form.followType);
+      // this.$refs.dictType.changeValue(this.customerFollow.form.followType);
        this.$refs.dictMethod.changeValue(this.customerFollow.form.followMethod);
     },
     getCustomerFollowList() {

src/views/ecw/offer/detail.vue

@@ -6,7 +6,7 @@
           <div class="offer-header">
               <span style="font-size: 15px;">{{$t('报价单号')}}：{{list.number}}</span>
               <div class="btns">
-            <el-button size="mini" type="primary"  @click="$router.push('edit?id=' + offerId)">{{$t('编辑')}}</el-button>
+            <el-button size="mini" type="primary" v-if="list.status!=5"  @click="$router.push('edit?id=' + offerId)">{{$t('编辑')}}</el-button>
                 <el-button type="primary" v-if="[1,3,7].indexOf(list.status) > -1"  size="mini" @click="handleAdd">{{$t('跟进')}}</el-button>
                 <el-button type="primary"  v-if="[3,7].indexOf(list.status) > -1" size="mini" @click="toResult">{{$t('结果')}}</el-button>
                 <el-button size="mini" v-if="[1,3,7].indexOf(list.status) > -1" type="primary" @click.native="$router.push('/offer/special?offerId=' + offerId)" >{{$t('特价')}}</el-button>
@@ -245,7 +245,11 @@
                 </el-descriptions-item>
                 <el-descriptions-item :label="$t('预计费用')">
                     <template >
-                        <div v-for="item in estimatedCosts" :key="item.currencyId">{{item.amount || 0}}{{currentcyMap[item.currencyId]}}</div>
+                      <div style="display:flex;flex-direction:column">
+                        <div v-for="item in estimatedCosts" :key="item.currencyId">
+                          <span>{{item.amount || 0}}{{currentcyMap[item.currencyId]}}</span>
+                          </div>
+                          </div>
                     </template>
                 </el-descriptions-item>
             </el-descriptions>
@@ -470,6 +474,18 @@
               }
               arr.push(it)
           })
+          this.freightFeeList.forEach(item => {
+              if(!arr.find(items=>items.currencyId==item.currencyId)){
+                  let its = {...item}
+                  // let freights = this.clearanceFeeList.find(fee => fee.currencyId == item.currencyId)
+                  // if(freights){
+                  //     its.amount += freights.amount
+                  // }
+                  arr.push(its)
+              }
+
+          })
+
           return arr
       },
       // 预计费用(原价 - 优惠金额)
@@ -495,8 +511,13 @@
               if(coupon){
                   it.amount = it.amount.minus(coupon.reduceAmount)
               }
-              if(this.list.otherFee && this.list.otherFeeCurrencyId == item.currencyId){
-                  it.amount = it.amount.plus(this.list.otherFee)
+              // if(this.list.otherFee && this.list.otherFeeCurrencyId == item.currencyId){
+              //     it.amount = it.amount.plus(this.list.otherFee)
+              //     withOtherFee = true
+              // }
+              let otherFee = this.otherFeeList.find(fee => fee.currencyId == item.currencyId)
+              if(otherFee){
+                  it.amount += otherFee.amount
                   withOtherFee = true
               }
               // 保价费（美元）
@@ -527,7 +548,17 @@
                     amount: Decimal(this.fee.insuranceFee)
                 })
             }
+            this.otherFeeList.forEach(item => {
+                if(!arr.find(items=>items.currencyId==item.currencyId)){
+                    let its = {...item}
+                    // let freights = this.clearanceFeeList.find(fee => fee.currencyId == item.currencyId)
+                    // if(freights){
+                    //     its.amount += freights.amount
+                    // }
+                    arr.push(its)
+                }
 
+            })
             return arr
       }
     },
@@ -562,7 +593,7 @@
         that.loading = true;
         // 执行查询
         getOrder(id).then(response => {
-          that.orderDat = response.data;
+          that.orderData = response.data;
         });
       },
       getSupplierData(id){
@@ -628,9 +659,9 @@
             that.getChannelData()
           }
           that.calculationPrice()
-          if(that.list.orderId){
-            that.getOrderData(that.list.orderId)
-          }
+          // if(that.list.orderId){
+          //   that.getOrderData(that.list.orderId)
+          // }
           getCustomerContactsSelect({ids: [that.list.consignorId, that.list.consigneeId].join(',')}).then((res) => {
                let consignor = res.data.list.find(item => item.customerContactsId == that.list.consignorId)
                if(consignor) that.consignorData=consignor