Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/order/detail.vue

@@ -43,7 +43,7 @@
       </el-row>
       <el-descriptions class="margin-top" border :column="1" :labelStyle="{width:'150px'}">
         <el-descriptions-item :label="$t('付款人')">
-         
+
           <el-link v-if="order.drawee == 3" @click.native="showDarweeDialog=true" type="primary">自定义</el-link>
           <dict-tag v-else :type="DICT_TYPE.DRAWEE" :value="order.drawee"></dict-tag>
         </el-descriptions-item>
@@ -273,7 +273,7 @@
         <el-col :span="12">
           <div>{{feeDetail.charging ? $t('全包价') : $t('运费')}}</div>
           <div v-for="item in feeDetail.freight">
-            {{item.label}}: {{item.value}} 
+            {{item.label}}: {{item.value}}
             <template v-if="item.currency">
               {{currencyMap[item.currency]}} / {{unitMap[item.volume]}} <span v-if="item.remark">【{{item.remark}}】</span>
             </template>
@@ -425,7 +425,8 @@ export default {
         {field: 'liquidFreightPrice', label: this.$t('液体加价')},
         {field: 'electrifiedFreightPrice', label: this.$t('带电加价')},
         {field: 'discountFreightPrice', label: this.$t('优惠活动减免')},
-        {field: 'plainCommission', label: this.$t('明佣')}
+        {field: 'plainCommission', label: this.$t('明佣')},
+        {field: 'hiddenCommission', label: this.$t('暗佣')}
       ]
 
       // 品牌加价
@@ -477,7 +478,7 @@ export default {
           })
         }
       })
-    
+
 
       freight.push({
         label: '价格更新时间',

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

@@ -91,6 +91,22 @@
       </el-table-column>
     </el-table>
 
+    <el-card v-if="order.parentOrderId" style="margin-top: 20px">
+      <div slot="header" class="clearfix">
+        <span style="font-size: 18px">{{$t('标签箱号')}}</span>
+      </div>
+
+      <div v-for="(item, index) in label.orderLabelDtoList" :key="index" style="margin-bottom: 10px">
+        <el-input-number v-model="item.start" controls-position="right"></el-input-number> -
+        <el-input-number v-model="item.end" controls-position="right"></el-input-number>
+        <el-button icon="el-icon-minus" circle v-show="index !== 0" @click="label.orderLabelDtoList.splice(index, 1)" style="margin-left: 10px"></el-button>
+        <el-button icon="el-icon-plus" circle @click="handleLabelAdd(index)"></el-button>
+      </div>
+      <div style="text-align: center">
+        <el-button type="primary" @click="handleLabelSubmit">{{$t('修改箱号')}}</el-button>
+      </div>
+    </el-card>
+
     <h2 v-if="orderSpecialNeeds.length > 0">{{$t('特殊需求')}}</h2>
     <el-form ref="form" :model="form" label-width="120px">
       <el-form-item :label="item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value" style="width: 400px">
@@ -126,20 +142,6 @@
           <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form.urls" ></image-and-video-upload>
         </div>
       </el-card>
-
-      <template v-if="order.parentOrderId && isEdit">
-        <h2>{{$t('标签箱号')}}</h2>
-
-        <div v-for="(item, index) in label.orderLabelDtoList" :key="index" style="margin-bottom: 10px">
-          <el-input-number v-model="item.start" controls-position="right"></el-input-number> -
-          <el-input-number v-model="item.end" controls-position="right"></el-input-number>
-          <el-button icon="el-icon-minus" circle v-show="index !== 0" @click="label.orderLabelDtoList.splice(index, 1)" style="margin-left: 10px"></el-button>
-          <el-button icon="el-icon-plus" circle @click="handleLabelAdd(index)"></el-button>
-        </div>
-        <div style="text-align: center">
-          <el-button type="primary" @click="handleLabelSubmit">{{$t('修改箱号')}}</el-button>
-        </div>
-      </template>
       <div style="text-align: center;margin-top: 15px" v-if="!isEdit">
         <el-button @click="escapeBol = true;" type="primary">{{$t('转异')}}</el-button>
         <el-button type="primary" @click="finishVisible = true">{{$t('完成入仓')}}</el-button>

src/views/ecw/productPrice/batchEdit.vue

@@ -10,7 +10,7 @@
           {{$t('价格设置')}}
           <span>
             <!-- <el-checkbox label="" @change="form.needPay=$event ? 1 : 0">{{$t('预付')}}</el-checkbox> -->
-            <el-checkbox label="" @change="form.stepPrice=$event ? 1 : 0">{{$t('阶梯订单')}}</el-checkbox>
+            <el-checkbox label="" @change="form.stepPrice=$event ? 1 : 0">{{$t('阶梯价格')}}</el-checkbox>
           </span>
         </div>
         <el-form-item :label="$t('预付')" prop="needPay" >