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

src/views/ecw/order/index.vue

@@ -330,6 +330,9 @@
                 <template v-if="scope.row.parentOrderId && scope.row.status < 11">
                   <el-dropdown-item @click.native="splitRevoke(scope.row)" v-hasPermi="['ecw:order:split_revoke']">{{$t('撤销拆单')}}</el-dropdown-item>
                 </template>
+                <template v-if="scope.row.parentOrderId">
+                  <el-dropdown-item @click.native="$router.push('./detail?orderId=' + scope.row.parentOrderId)">{{$t('查看母订单')}}</el-dropdown-item>
+                </template>
 
 
                 <!-- 合单日志，提货日志 -->