Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into 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

@@ -250,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>
@@ -259,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/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/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('区号')">