|
|
@@ -86,7 +86,7 @@
|
|
|
colspan="8">
|
|
|
原始运单
|
|
|
</th>
|
|
|
- <th class="font-weight-bolder header-3 text-center" colspan="14">
|
|
|
+ <th class="font-weight-bolder header-3 text-center" colspan="15">
|
|
|
情况说明
|
|
|
</th>
|
|
|
@cannot('订单管理-问题件-客户不可见')
|
|
|
@@ -178,15 +178,15 @@
|
|
|
<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="max-width: 500px;min-width: 400px;">快递路由
|
|
|
+ </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">二次客户订单号
|
|
|
@@ -708,7 +708,33 @@
|
|
|
|
|
|
{{--客户编辑 开启--}}
|
|
|
|
|
|
-
|
|
|
+ <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>
|
|
|
@cannot('订单管理-问题件-客户不可见')
|
|
|
<td class="p-0 m-0 child-layer-3" style="min-width:50px;"
|
|
|
v-if="index===0"
|
|
|
@@ -719,45 +745,7 @@
|
|
|
@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"
|
|
|
@@ -1250,7 +1238,6 @@
|
|
|
},
|
|
|
toggleBtnHeight: null,
|
|
|
selectOrderPackage: null,
|
|
|
- selectOrderIssue:null,
|
|
|
},
|
|
|
created() {
|
|
|
let _this = this;
|
|
|
@@ -1521,7 +1508,7 @@
|
|
|
isShowSecondOrderInfo(newValue) {
|
|
|
let _this = this;
|
|
|
setTimeout(function () {
|
|
|
- $('.header-3').attr('colspan', 14 + (newValue ? 6 : 0) + (_this.isShowRejectedBill ? 6 : 0));
|
|
|
+ $('.header-3').attr('colspan', 15 + (newValue ? 6 : 0) + (_this.isShowRejectedBill ? 6 : 0));
|
|
|
}, 2);
|
|
|
},
|
|
|
},
|
ajun