Merge branch 'dev'

src/views/ecw/myCustomerService/index.vue

@@ -22,12 +22,6 @@
       <el-form-item :label="$t('客户类别')" prop="level">
         <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE"  v-model="queryParams.type"></dict-selector>
       </el-form-item>
-      <el-form-item :label="$t('客户经理')" prop="customerService">
-        <el-select clearable  v-model="queryParams.customerService" :placeholder="$t('请选择客户经理')" clearable size="small">
-          <el-option v-for="dict in customerServiceList"
-                     :key="dict.id" :label="dict.nickname" :value="dict.id"/>
-        </el-select>
-      </el-form-item>
       <el-form-item :label="$t('客户来源')" prop="source">
         <el-select clearable  v-model="queryParams.source" :placeholder="$t('请选择客户来源')" clearable size="small">
           <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"

src/views/ecw/order/components/warehouseDetails.vue

@@ -121,11 +121,11 @@
   <div v-if="type === 2">
     <p>申请理由</p>
     <div>
-      <dict-tag   :type="DICT_TYPE.FEE_TYPE" :value="FeeDetails.feeType" />
+      <dict-tag   :type="DICT_TYPE.FEE_TYPE" :value="FeeDetails.feeType" />，
       {{FeeDetails.applicationFee}}
-      <dict-tag   :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" :value="FeeDetails.applicationFeeCurrency" />
-      <dict-tag  :value="FeeDetails.payType"  :type="DICT_TYPE.PAYMENT_TYPE" ></dict-tag>
-      {{FeeDetails.remarks}}
+      <dict-tag   :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" :value="FeeDetails.applicationFeeCurrency" />，
+      <dict-tag  :value="FeeDetails.payType"  :type="DICT_TYPE.PAYMENT_TYPE" ></dict-tag>，
+      【{{FeeDetails.remarks}}】
     </div>
   </div>
   <div v-if="type === 3">

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('入仓参数')+':'">
@@ -79,8 +84,9 @@
 
         <el-row :span="12">
           <el-form-item :label="$t('异常描述')+':'">
-            <dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="orderExceptionData.orderExceptionType" />
+            <!-- <dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="orderExceptionData.orderExceptionType" /> -->
             <!-- {{orderExceptionData.orderExceptionDescVO?orderExceptionData.orderExceptionDescVO.descZh:'无'}} -->
+            {{$l(orderExceptionData.orderExceptionDescVO, 'desc')}}
           </el-form-item>
           <el-button v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" type="primary" plain icon="el-icon-plus" style="margin-left: 200px;"  @click="handleAdd">新增收款单</el-button>
         </el-row>
@@ -128,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">
@@ -241,7 +250,7 @@
             <el-form-item :label="$t('处理结果')+':'" required>
               <el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择" clearable>
                 <template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
-                  <el-option v-if="orderFee && orderFee.result && orderFee.result.indexOf(dict.value) > -1" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
+                  <el-option :disabled="orderFee && orderFee.result && orderFee.result.indexOf(dict.value) ==-1" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
                 </template>
               </el-select>
             </el-form-item>
@@ -250,7 +259,7 @@
             <el-form-item :label="$t('处理结果')+':'" required>
               <el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择" clearable>
                 <template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
-                  <el-option :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
+                  <el-option :disabled="dict.value=='pending'"  :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
                 </template>
               </el-select>
             </el-form-item>

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/order/warehousing/index.vue

@@ -68,7 +68,8 @@
         v-slot="{row}"
         :label="$t('状态')">
         <dict-tag v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.diffType" :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS" :value="row.warehouseInInfoVO.diffType" class="red" :class="{green: row.warehouseInInfoVO.diffType === 4}"/>
-        <span class="red" v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.cartonsNumDiff">{{ row.warehouseInInfoVO.cartonsNumDiff }}{{$t('箱')}}</span>
+        <span class="red" v-else-if="row.warehouseInInfoVO && row.warehouseInInfoVO.cartonsNumDiff">{{ row.warehouseInInfoVO.cartonsNumDiff }}{{$t('箱')}}</span>
+        <span v-else>{{ $t('待入仓') }}</span>
       </el-table-column>
       <el-table-column
         prop="address"

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");
       });
     },
 

src/views/member/user/underReview.vue

@@ -19,7 +19,6 @@
 
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('公司名称')" align="center" prop="enterpriseName" />
       <el-table-column :label="$t('用户昵称')" align="center" prop="nickname" />
       <el-table-column :label="$t('真实姓名')" align="center" prop="identityName" />
       <el-table-column  align="center" :label="$t('区号')">