Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/coupon/edit.vue

@@ -282,9 +282,9 @@ export default {
 			couponList: [], // 优惠券列表
 			couponIds:[],
 			fee:{
-				1: [{type:1},{type:1}], // 运费
-				2: [{type:2},{type:2}], // 清关费
-				3: [{}] // 优惠券专用
+				1: [],
+				2: [],
+				3: []
 			}
 		};
 	},
@@ -402,12 +402,15 @@ export default {
 
 				if(this.form.discountDetailedVOs){
 					/* this[['clearanceFeeList', 'freightFeeList', 'discountList'][]] */
-						this.fee[this.form.costType] = this.form.discountDetailedVOs
+					// this.fee[this.form.costType] = this.form.discountDetailedVOs.filter(item => item.type ==  this.form.costType)
 				}
-					if(this.costType != this.form.costType){
+				this.form.discountDetailedVOs.forEach(item => {
+					this.fee[item.type].push(item)
+				})
+				/* if(this.costType != this.form.costType){
 					console.error(`费用类型冲突，计算出来的类型为${this.costType},接口费用类型为${res.data.costType}，类型为${res.data.type}`)
 					this.$alert(this.$t('费用类型冲突'))
-					}
+				} */
 				// 非优惠券需要查询出优惠券作为叠加备选
 				if(this.form.type != 1){
 					this.getCouponSelect()
@@ -417,8 +420,15 @@ export default {
 				if(this.$route.query.action == 'copy'){
 					this.form.couponId = null
 				}
+			})
+		}
+		// 不是编辑查看则给默认的费用表格
+		else{
+			this.fee = {
+				1: [{type:1},{type:1}], // 运费
+				2: [{type:2},{type:2}], // 清关费
+				3: [{}] // 优惠券专用
 			}
-			);
 		}
         this.reset()
 	},

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/Release.vue

@@ -49,7 +49,7 @@
         </div>
         <el-table :data="[formData]" border class="release-table">
           <el-table-column :label="$t('控货箱数')">
-              {{detail.sumNum}}
+              {{detail.sumNum - detail.releaseNum	}}
           </el-table-column>
           <el-table-column :label="$t('放货箱数')">
             <template slot-scope="{row}">

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/detail.vue

@@ -201,10 +201,14 @@
               {{objective.titleZh || '-'}}
             </el-table-column>
             <el-table-column :label="$t('品名')" prop="titleZh"></el-table-column>
-            <el-table-column :label="$t('箱数')" prop="num"></el-table-column>
+            <el-table-column :label="$t('箱数')" prop="num">
+              <template slot-scope="{row}">
+                {{row.num || '-'}}
+              </template>
+            </el-table-column>
             <el-table-column :label="$t('体积/重量')">
               <template slot-scope="{row}">
-               {{row.volume}} / {{row.weight}}
+               {{row.volume || '-'}} / {{row.weight || '-'}}
               </template>
             </el-table-column>
             <el-table-column :label="$t('收款类型')">

src/views/ecw/order/prepayDeal.vue

@@ -79,8 +79,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>
@@ -241,7 +242,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 +251,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/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('区号')">