|
|
@@ -102,6 +102,15 @@
|
|
|
<th style="min-width: 200px">客户单号</th>
|
|
|
<th style="min-width: 120px">承运人</th>
|
|
|
<th style="min-width: 120px">快递单号</th>
|
|
|
+ <th style="min-width: 35px;max-width: 35px" v-text="receivingInfo ? '隐藏' :'展开' ">展开</th>
|
|
|
+ <template v-if="receivingInfo">
|
|
|
+ <th style="min-width: 120px">收货人名称</th>
|
|
|
+ <th style="min-width: 120px">收货人电话</th>
|
|
|
+ <th style="min-width: 120px">省</th>
|
|
|
+ <th style="min-width: 120px">市</th>
|
|
|
+ <th style="min-width: 120px">区</th>
|
|
|
+ <th style="min-width: 120px">收货人地址</th>
|
|
|
+ </template>
|
|
|
<th style="min-width: 120px">当前处理人</th>
|
|
|
<th style="min-width: 150px">情况说明</th>
|
|
|
<th style="min-width: 50px;max-width: 50px" v-text="hideRejectedBills ? '隐藏' :'展开' ">展开</th>
|
|
|
@@ -296,6 +305,26 @@
|
|
|
v-for="logistic_number in item.logistic_numbers"
|
|
|
v-text="logistic_number"></span>
|
|
|
</td>
|
|
|
+ <td class="p-0 m-0" style="width:30px;" v-if="i===0"
|
|
|
+ :rowspan="workOrders.length">
|
|
|
+ <span class="btn"
|
|
|
+ id="rejected_bill_btn"
|
|
|
+ style="max-width: 50px"
|
|
|
+ :class="receivingInfo ? 'btn-outline-info':'btn-outline-secondary'"
|
|
|
+ @click="toggleReceivingInfo()" :style="{'min-height':toggleBtnHeight+'px'}"
|
|
|
+ v-text="receivingInfo ? '隐藏收货信息' : '展开收货信息'">
|
|
|
+ </span>
|
|
|
+ </td>
|
|
|
+ <template v-if="receivingInfo">
|
|
|
+ <td v-text="item.consignee_name"></td>
|
|
|
+ <td class="text-muted text-wrap text-letter">
|
|
|
+ <div class="text-overflow-warp-200 warp-min-200" v-text="item.consignee_phone"></div>
|
|
|
+ </td>
|
|
|
+ <td v-text="item.province"></td>
|
|
|
+ <td v-text="item.city"></td>
|
|
|
+ <td v-text="item.district"></td>
|
|
|
+ <td v-text="item.address"></td>
|
|
|
+ </template>
|
|
|
<td v-text="item.status"></td>
|
|
|
<td v-text="item.result_explain ? item.result_explain: item.remark"></td>
|
|
|
<td class="p-0 m-0 w-50" style="width:30px;" v-if="i===0"
|
|
|
@@ -775,6 +804,7 @@
|
|
|
],
|
|
|
commodityEqualsMap: [],
|
|
|
hideRejectedBills: false,
|
|
|
+ receivingInfo:false,
|
|
|
tableHeader: null,
|
|
|
toggleBtnHeight: 0,
|
|
|
batchOthers: {
|
|
|
@@ -1346,6 +1376,12 @@
|
|
|
workOrder.owner_name = workOrder.owner ? workOrder.owner.name : '';
|
|
|
workOrder.logisitc_name = workOrder.logistic ? workOrder.logistic.name : '';
|
|
|
workOrder.order_client_code = workOrder.order ? workOrder.order.client_code : '';
|
|
|
+ workOrder.consignee_name = workOrder.order ? workOrder.order.consignee_name : '';
|
|
|
+ workOrder.consignee_phone = workOrder.order ? workOrder.order.consignee_phone : '';
|
|
|
+ workOrder.province = workOrder.order ? workOrder.order.province : '';
|
|
|
+ workOrder.city = workOrder.order ? workOrder.order.city : '';
|
|
|
+ workOrder.district = workOrder.order ? workOrder.order.district : '';
|
|
|
+ workOrder.address = workOrder.order ? workOrder.order.address : '';
|
|
|
workOrder.order_commodities = this.groupOrderPackageCommodities(workOrder);
|
|
|
workOrder.is_issue_order = workOrder.order_issue !== null;
|
|
|
if (workOrder.order_issue !== null) workOrder.order_issue.log_is_show = 'order_issue' in workOrder;
|
|
|
@@ -4055,6 +4091,9 @@
|
|
|
toggleRejectedBill() {
|
|
|
this.hideRejectedBills = !this.hideRejectedBills;
|
|
|
},
|
|
|
+ toggleReceivingInfo(){
|
|
|
+ this.receivingInfo = !this.receivingInfo;
|
|
|
+ },
|
|
|
showBatchCustomRejectedStatus() {
|
|
|
if (this.checkData.length === 0) {
|
|
|
this.errorTempTip('请勾选需要修改的工单')
|
