修复几个bug

src/views/ecw/order/prepayDeal.vue

@@ -32,14 +32,19 @@
 
        <!-- 单证异常，发货人异常，其他异常 不显示这部分内容 -->
        <div v-if="['order_doc_exception','order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) == -1">
-        <!-- 预付异常,提货异常是针对整个订单的 -->
-        <template v-if="['order_pay_exception','order_pick_up_exception'].indexOf(orderExceptionData.orderExceptionType) > -1">
+        <!-- 预付异常,提货异常,代收货款是针对整个订单的 -->
+        <template v-if="['order_pay_exception','order_pick_up_exception', 'order_cod_exception'].indexOf(orderExceptionData.orderExceptionType) > -1">
           <el-row>
               <el-form-item :label="$t('填单参数')+':'">
                 <template v-if="orderData && orderData.costVO">
                 {{(orderData.costVO.totalNum||0)+$t('箱 ')+(orderData.costVO.totalVolume||0)+'m³ '+(orderData.costVO.totalWeight||0)+'kg '+(orderData.costVO.totalQuantity||0)+$t('个')}}
                 </template>
               </el-form-item>
+              <el-form-item :label="$t('代收金额')+':'">
+                <template v-if="orderData && orderData.costVO">
+                  {{orderExceptionData.orderExceptionAmount}} {{currencyMap[orderExceptionData.orderExceptionCurrencyId]}}
+                </template>
+              </el-form-item>
           </el-row>
           <el-row>
               <el-form-item :label="$t('入仓参数')+':'">
@@ -129,7 +134,10 @@
 
         <el-table-column :label="$t('付款人')">
           <template slot-scope="scope">
-            <span>{{scope.row.consigneeName}}({{$t('收货人')}})</span>
+            <span>
+              // TODO
+              <!-- <dict-tag :type="DICT_TYPE.DRAWEE" :value="order.drawee"></dict-tag> -->
+            </span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('付款状态')" prop="worth">

src/views/ecw/order/special/index.vue

@@ -93,9 +93,9 @@
           prop="address"
           :label="$t('操作')">
           <template v-slot="{row}">
-              <el-button size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="showDiscountItem=row">{{$t('优惠申请')}}</el-button>
-              <el-button size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="showCommissionItem=row">{{$t('佣金规则')}}</el-button>
-              <el-button size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="showAllowanceItem=row">{{$t('管理折扣')}}</el-button>
+              <el-button v-if="row.originalSeaFreight" size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="showDiscountItem=row">{{$t('优惠申请')}}</el-button>
+              <el-button v-if="row.originalSeaFreight" size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="showCommissionItem=row">{{$t('佣金规则')}}</el-button>
+              <el-button v-if="row.originalSeaFreight" size="mini" type="text" v-hasPermi="['ecw:order:update']" @click="showAllowanceItem=row">{{$t('管理折扣')}}</el-button>
           </template>
         </el-table-column>
 

src/views/ecw/product/index.vue

@@ -439,15 +439,17 @@ export default {
       this.reset();
       const id = row.id;
       getProduct(id).then(response => {
-        this.form = response.data;
+        this.form = {...response.data};
         let attrArray = this.form.attrId.split(',');
         for (let index in attrArray) {
           let value = attrArray[index];
           attrArray[index] = parseInt(value);
         }
-        this.form.attrArray = attrArray;
+        this.$nextTick(() =>{
+          this.form.attrArray = attrArray
+        })
         this.open = true;
-        this.title = this.$t("修改商品");
+        this.title = this.$t("修改商品1");
       });
     },