|
|
@@ -83,7 +83,7 @@
|
|
|
<tr class="tr-yellow align-center">
|
|
|
<th class=" font-weight-bolder header-1"></th>
|
|
|
<th class="td-yellow font-weight-bolder original-class table-head-warning header-2 text-center"
|
|
|
- colspan="9">
|
|
|
+ colspan="8">
|
|
|
原始运单
|
|
|
</th>
|
|
|
<th class="font-weight-bolder header-3 text-center" colspan="14">
|
|
|
@@ -136,9 +136,7 @@
|
|
|
<th class="tow-layer align-middle td-yellow" rowspan="2"
|
|
|
style="max-width: 150px;min-width: 150px;">原始运单号
|
|
|
</th>
|
|
|
- <th class="tow-layer align-middle td-yellow" rowspan="2"
|
|
|
- style="max-width: 500px;min-width: 400px;">快递路由
|
|
|
- </th>
|
|
|
+
|
|
|
{{--原始商品明细 开始--}}
|
|
|
<th class="tow-layer align-middle td-yellow" v-show="isShowOrderInfo" rowspan="2"
|
|
|
style="min-width: 200px">收货人名称
|
|
|
@@ -178,12 +176,17 @@
|
|
|
style="min-width: 450px">返回商品明细
|
|
|
</th>
|
|
|
<th class="three-layer bg-whit align-middle" rowspan="2" style="min-width: 180px">情况说明</th>
|
|
|
- <th class="three-layer align-middle" rowspan="2" style="min-width: 115px">问题类别</th>
|
|
|
- <th class="three-layer align-middle" colspan="4" style="min-width: 155px">处理结果</th>
|
|
|
+ <th class="three-layer align-middle" rowspan="2" style="min-width: 115px">问题类别</th>
|
|
|
+ <th class="three-layer align-middle" colspan="4" style="min-width: 155px">处理结果</th>
|
|
|
@cannot('订单管理-问题件-客户不可见')
|
|
|
<th class="three-layer align-middle" rowspan="2"
|
|
|
style="width:50px">@{{ isShowSecondOrderInfo ? '隐藏':'展开' }}
|
|
|
</th>
|
|
|
+
|
|
|
+ <th class="three-layer align-middle " rowspan="2"
|
|
|
+ style="max-width: 500px;min-width: 400px;"
|
|
|
+ v-show="isShowSecondOrderInfo">快递路由
|
|
|
+ </th>
|
|
|
<th class="three-layer align-middle" rowspan="2"
|
|
|
style="min-width: 120px;"
|
|
|
v-show="isShowSecondOrderInfo">二次客户订单号
|
|
|
@@ -201,6 +204,7 @@
|
|
|
v-show="isShowSecondOrderInfo">二次商品明细
|
|
|
</th>
|
|
|
@endcannot
|
|
|
+
|
|
|
{{--原始商品明细 结束--}}
|
|
|
@cannot('订单管理-问题件-客户自定义订单号')
|
|
|
<th class="three-layer align-middle" rowspan="2" style="min-width: 120px">自定义订单号</th>
|
|
|
@@ -418,33 +422,6 @@
|
|
|
</button>
|
|
|
</template>
|
|
|
</td>
|
|
|
- <td>
|
|
|
- <div class="alert alert-light " v-for="(item,i) in orderIssue.order.packages">
|
|
|
- <div class="text-left">
|
|
|
- <span v-text="item.logistic_number"></span>
|
|
|
- <span class="float-right" v-if="item['transfer_status'].length === 0">暂无路由信息</span>
|
|
|
- <button type="button" class="btn btn-sm btn-outline-primary float-right" v-if="item['transfer_status'].length > 0 && selectOrderPackage!==item.id" @click="selectOrderPackage = item.id">展开</button>
|
|
|
- <button type="button" class="btn btn-sm btn-outline-primary float-right" v-if="selectOrderPackage === item.id" @click="selectOrderPackage = null">收起</button>
|
|
|
- </div>
|
|
|
- <div class="text-left" v-if="selectOrderPackage === item.id">
|
|
|
- <div v-for="transfer in item['transfer_status']">
|
|
|
- <div >
|
|
|
- <hr>
|
|
|
- <span class="mr-1 text-monospace">时间:</span>
|
|
|
- <span v-text="transfer['accept_time']"></span>
|
|
|
- </div>
|
|
|
- <div>
|
|
|
- <span class="mr-1 text-monospace">到达地:</span>
|
|
|
- <span v-text="transfer['accept_address']"></span>
|
|
|
- </div>
|
|
|
- <div>
|
|
|
- <span class="mr-1 text-monospace">详情:</span>
|
|
|
- <span v-text="transfer['remark']"></span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </td>
|
|
|
|
|
|
{{--商品明细 开始--}}
|
|
|
<td class="td-yellow child-layer-2-hide text-wrap text-letter"
|
|
|
@@ -730,7 +707,9 @@
|
|
|
{{--情况说明 结束--}}
|
|
|
|
|
|
{{--客户编辑 开启--}}
|
|
|
- @cannot('订单管理-问题件-客户不可见')
|
|
|
+
|
|
|
+
|
|
|
+ @cannot('订单管理-问题件-客户不可见')
|
|
|
<td class="p-0 m-0 child-layer-3" style="min-width:50px;"
|
|
|
v-if="index===0"
|
|
|
:rowspan="orderIssues.length">
|
|
|
@@ -740,6 +719,45 @@
|
|
|
@click="toggleSeCondeOrder"
|
|
|
v-text="isShowSecondOrderInfo ? '隐藏运单列' : '展开运单列'"></span>
|
|
|
</td>
|
|
|
+ <td v-show="isShowSecondOrderInfo">
|
|
|
+ <div v-if=""></div>
|
|
|
+ <div v-show="selectOrderIssue !== orderIssue.id">
|
|
|
+ <div>
|
|
|
+ <button class="btn btn-sm btn-outline-primary" @click="selectOrderIssue = orderIssue.id">展开</button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div v-show="selectOrderIssue === orderIssue.id">
|
|
|
+ <div class="alert alert-light " v-for="(item,i) in orderIssue.order.packages">
|
|
|
+ <div class="text-left">
|
|
|
+ <span v-text="item.logistic_number"></span>
|
|
|
+ <span class="float-right" v-if="item['transfer_status'].length === 0">暂无路由信息</span>
|
|
|
+ <button type="button" class="btn btn-sm btn-outline-primary float-right" v-if="item['transfer_status'].length > 0 && selectOrderPackage!==item.id" @click="selectOrderPackage = item.id">展开</button>
|
|
|
+ <button type="button" class="btn btn-sm btn-outline-primary float-right" v-if="selectOrderPackage === item.id" @click="selectOrderPackage = null">收起</button>
|
|
|
+ </div>
|
|
|
+ <div class="text-left" v-if="selectOrderPackage === item.id">
|
|
|
+ <div v-for="transfer in item['transfer_status']">
|
|
|
+ <div >
|
|
|
+ <hr>
|
|
|
+ <span class="mr-1 text-monospace">时间:</span>
|
|
|
+ <span v-text="transfer['accept_time']"></span>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <span class="mr-1 text-monospace">到达地:</span>
|
|
|
+ <span v-text="transfer['accept_address']"></span>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <span class="mr-1 text-monospace">详情:</span>
|
|
|
+ <span v-text="transfer['remark']"></span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <button class="btn btn-sm btn-outline-primary" @click="selectOrderIssue = null">收起</button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ </td>
|
|
|
<td class="child-layer-3-hide" v-show="isShowSecondOrderInfo">
|
|
|
@can('订单管理-问题件-编辑')
|
|
|
<input class="form-control form-control-sm"
|
|
|
@@ -837,8 +855,8 @@
|
|
|
v-if="orderIssue.second_order.amounts > 0"
|
|
|
:id="'secondOrderBtn'+orderIssue.id"
|
|
|
:data-target="'#secondOrder'+orderIssue.id"
|
|
|
- @click="toggleSecond(orderIssue.id,orderIssue.secondeOrderItems)">
|
|
|
- 商品@{{ orderIssue.second_order.amounts }}件,点击展开
|
|
|
+ @click="toggleSecond(orderIssue.id,orderIssue.secondeOrderItems)"
|
|
|
+ v-text="'商品' + orderIssue.second_order.amounts + '件,点击展开' ">
|
|
|
</button>
|
|
|
</template>
|
|
|
</td>
|
|
|
@@ -1232,6 +1250,7 @@
|
|
|
},
|
|
|
toggleBtnHeight: null,
|
|
|
selectOrderPackage: null,
|
|
|
+ selectOrderIssue:null,
|
|
|
},
|
|
|
created() {
|
|
|
let _this = this;
|
|
|
@@ -1490,7 +1509,7 @@
|
|
|
},
|
|
|
isShowOrderInfo(newValue) {
|
|
|
setTimeout(function () {
|
|
|
- $('.header-2').attr('colspan', 9 + (newValue ? 9 : 0));
|
|
|
+ $('.header-2').attr('colspan', 8 + (newValue ? 9 : 0));
|
|
|
}, 2);
|
|
|
},
|
|
|
isShowRejectedBill(newValue) {
|
ajun