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

src/views/ecw/order/cargoControl.vue

@@ -113,31 +113,31 @@
         <template slot-scope="scope">
           <!--控货中,已入仓-->
           <template v-if="[0,2].indexOf(scope.row.cargoControlStatus) > -1 && scope.row.sumNum > 0">
-            <el-button type="text"  size="mini" @click="showReleaseOrderId=scope.row.orderId">{{$t('放货')}}</el-button>
-            <el-button type="text"  size="mini" @click="showTransferOrder = scope.row" >{{$t('控货权转移')}}</el-button>
+            <el-button type="text"  size="mini" @click="showReleaseOrderId=scope.row.orderId" v-hasPermi="['ecw:cargo_control:release']">{{$t('放货')}}</el-button>
+            <el-button type="text"  size="mini" @click="showTransferOrder = scope.row"  v-hasPermi="['ecw:cargo_control:transfer']">{{$t('控货权转移')}}</el-button>
           </template>
 
           <!--部分控货-->
           <template v-if="scope.row.cargoControlStatus == 2">
-            <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('修改')}}</el-button>
-            <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('取消')}}</el-button>
-            <el-button type="text"  size="mini" @click="review(scope.row)" v-if="scope.row.isToReview">{{$t('放货复核')}}</el-button>
+            <el-button type="text"  size="mini" @click="toDetail(scope.row)"  v-hasPermi="['ecw:cargo_control:update']">{{$t('修改')}}</el-button>
+            <el-button type="text"  size="mini" @click="toDetail(scope.row)"  v-hasPermi="['ecw:cargo_control:cancel']">{{$t('取消')}}</el-button>
+            <el-button type="text"  size="mini" @click="review(scope.row)" v-if="scope.row.isToReview" v-hasPermi="['ecw:cargo_control:review']">{{$t('放货复核')}}</el-button>
           </template>
 
           <!--已全部放货，但是未复核-->
           <template v-if="scope.row.cargoControlStatus == 1 && scope.row.isToReview">
-            <el-button type="text"  size="mini" @click="review(scope.row)">{{$t('放货复核')}}</el-button>
-            <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('修改')}}</el-button>
-            <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('取消')}}</el-button>
+            <el-button type="text"  size="mini" @click="review(scope.row)" v-hasPermi="['ecw:cargo_control:review']">{{$t('放货复核')}}</el-button>
+            <el-button type="text"  size="mini" @click="toDetail(scope.row)"  v-hasPermi="['ecw:cargo_control:update']">{{$t('修改')}}</el-button>
+            <el-button type="text"  size="mini" @click="toDetail(scope.row)"  v-hasPermi="['ecw:cargo_control:cancel']">{{$t('取消')}}</el-button>
           </template>
 
           <!--已完成放货,且没有待复核；真正的放货完成-->
           <template v-if="scope.row.cargoControlStatus == 1 && !scope.row.isToReview">
             <!-- <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('查看')}}</el-button> -->
-            <el-button type="text"  size="mini" @click="cargoTransfer(scope.row)" >{{$t('调货')}}</el-button>
-            <el-button type="text"  size="mini" @click="showFallbackOrder=scope.row" v-if="scope.row.isReleaseAfterGoods">{{$t('反复核')}}</el-button>
+            <el-button type="text"  size="mini" @click="cargoTransfer(scope.row)"  v-hasPermi="['ecw:cargo_control:cargo_transfer']">{{$t('调货')}}</el-button>
+            <el-button type="text"  size="mini" @click="showFallbackOrder=scope.row" v-if="scope.row.isReleaseAfterGoods" v-hasPermi="['ecw:cargo_control:fallback']">{{$t('反复核')}}</el-button>
           </template>       
-          <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('查看')}}</el-button>
+          <el-button type="text"  size="mini" @click="toDetail(scope.row)"  v-hasPermi="['ecw:cargo_control:show']">{{$t('查看')}}</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/ecw/order/detail.vue

@@ -211,15 +211,16 @@
           <el-timeline v-if="order.orderTimeVOList && order.orderTimeVOList.length" :reverse="true">
             <el-timeline-item v-for="(activity, index) in order.orderTimeVOList" :key="index" :timestamp="activity.timestamp">
               {{ activity.titleZh }}
+              <div>{{$l(activity, 'remarks')}}</div>
             </el-timeline-item>
           </el-timeline>
           <el-result v-else icon="info " :title="$t('暂无数据')" :subTitle="$t('暂无订单动态数据')" />
         </el-tab-pane>
         <el-tab-pane :label="$t('运单资料/提货单')" name="three">
           <!--inWarehouseState 1待入库，2多了，3少了，4到齐-->
-          <el-button type="text" @click="showWarehouseReceipt=true" :disabled="order.inWarehouseState == 0 && order.shipmentState == 0">{{$t('查看入仓单')}}</el-button>
-          <el-button type="text" @click.native="showLadingBill=true" :disabled="!order.ladingState">{{$t('查看提货单')}}</el-button>
-          <el-button :disabled="!order.packingListUrl" type="text" @click="downloadPackingList">{{$t('装箱单')}}</el-button>
+          <el-button v-hasPermi="['ecw:order:show_receipt']" type="text" @click="showWarehouseReceipt=true" :disabled="order.inWarehouseState == 0 && order.shipmentState == 0">{{$t('查看入仓单')}}</el-button>
+          <el-button v-hasPermi="['ecw:order:show_landing']" type="text" @click.native="showLadingBill=true" :disabled="!order.ladingState">{{$t('查看提货单')}}</el-button>
+          <el-button v-hasPermi="['ecw:order:show_packing']" :disabled="!order.packingListUrl" type="text" @click="downloadPackingList">{{$t('装箱单')}}</el-button>
         </el-tab-pane>
         <el-tab-pane :label="$t('费用明细')" name="four">
           <el-table :data="feeList">