|
|
@@ -99,23 +99,23 @@
|
|
|
<th class="one-layer align-middle" rowspan="2" style=" min-width: 50px;">序号</th>
|
|
|
<th class="one-layer align-middle" rowspan="2" style=" min-width: 70px;">ID</th>
|
|
|
@cannot('订单管理-问题件-客户不可见')
|
|
|
- <th class="one-layer align-middle" rowspan="2" style=" min-width: 75px;">新退件状态</th>
|
|
|
+ <th class="one-layer align-middle" rowspan="2" style=" max-width: 55px;min-width: 55px">新退件状态</th>
|
|
|
@can("订单管理-问题件-置顶")
|
|
|
<th class="one-layer align-middle" rowspan="2" style=" min-width: 75px;">置顶</th>
|
|
|
@endcan
|
|
|
<th class="one-layer align-middle" rowspan="2" style=" min-width: 100px;">退单状态</th>
|
|
|
@endcannot
|
|
|
- <th class="one-layer align-middle" rowspan="2" style="min-width: 120px">最终状态</th>
|
|
|
+ <th class="one-layer align-middle" rowspan="2" style="min-width: 90px">最终状态</th>
|
|
|
@cannot('订单管理-问题件-客户不可见')
|
|
|
- <th class="tow-layer align-middle td-yellow" rowspan="2" style="min-width: 165px;">登记日期</th>
|
|
|
+ <th class="tow-layer align-middle td-yellow" rowspan="2" style="max-width: 95px;min-width: 95px;">登记日期</th>
|
|
|
@endcannot
|
|
|
|
|
|
- <th class="tow-layer align-middle td-yellow" rowspan="2" style="min-width: 165px;">订单日期</th>
|
|
|
- <th class="tow-layer align-middle td-yellow" rowspan="2" style="min-width: 100px;">客户</th>
|
|
|
- <th class="tow-layer align-middle td-yellow" rowspan="2" style="min-width: 200px;">店铺</th>
|
|
|
- <th class="tow-layer align-middle td-yellow" rowspan="2" style="min-width: 200px;">客户订单号</th>
|
|
|
- <th class="tow-layer align-middle td-yellow" rowspan="2" style="min-width: 100px;">原始承运商</th>
|
|
|
- <th class="tow-layer align-middle td-yellow" rowspan="2" style="min-width: 150px;">原始运单号</th>
|
|
|
+ <th class="tow-layer align-middle td-yellow" rowspan="2" style="max-width: 95px;min-width: 95px;">订单日期</th>
|
|
|
+ <th class="tow-layer align-middle td-yellow" rowspan="2" style="max-width: 100px;min-width: 100px;">客户</th>
|
|
|
+ <th class="tow-layer align-middle td-yellow" rowspan="2" style="max-width: 120px;min-width: 120px;">店铺</th>
|
|
|
+ <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: 100px;min-width: 100px;">原始承运商</th>
|
|
|
+ <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" v-show="isShowOrderInfo" rowspan="2"
|
|
|
style="min-width: 200px">收货人名称</th>
|
|
|
@@ -131,12 +131,12 @@
|
|
|
style="min-width:300px">收货人地址</th>
|
|
|
<th class="tow-layer align-middle td-yellow" v-show="isShowOrderInfo" colspan="3"
|
|
|
style="min-width:300px">原始商品明细</th>
|
|
|
- <th class="tow-layer align-middle td-yellow" rowspan="2" style="min-width:50px">@{{
|
|
|
+ <th class="tow-layer align-middle td-yellow" rowspan="2" style="max-width:50px">@{{
|
|
|
isShowOrderInfo? '隐藏':'展开' }}</th>
|
|
|
{{--原始商品明细 结束--}}
|
|
|
|
|
|
{{--原始商品明细 开始--}}
|
|
|
- <th class="three-layer align-middle" rowspan="2" style="min-width:50px">@{{ isShowRejectedBill
|
|
|
+ <th class="three-layer align-middle" rowspan="2" style="max-width:50px">@{{ isShowRejectedBill
|
|
|
? '隐藏':'展开' }}</th>
|
|
|
<th class="three-layer align-middle" rowspan="2" v-show="isShowRejectedBill"
|
|
|
style="min-width:265px">退回单号</th>
|
|
|
@@ -184,9 +184,9 @@
|
|
|
<th v-show="isShowRejectedBill" style="min-width: 50px">是否正品</th>
|
|
|
<th v-show="isShowRejectedBill" style="min-width: 100px">备注</th>
|
|
|
@endcannot
|
|
|
- <th style="min-width: 120px">说明</th>
|
|
|
- <th style="min-width: 100px">操作者</th>
|
|
|
- <th style="min-width: 170px">时间</th>
|
|
|
+ <th style="max-width: 135px">说明</th>
|
|
|
+ <th style="max-width: 55px">操作者</th>
|
|
|
+ <th style="max-width: 135px">时间</th>
|
|
|
<th></th>
|
|
|
@cannot('订单管理-问题件-客户不可见')
|
|
|
<th v-show="isShowSecondOrderInfo" style="min-width: 100px">条码</th>
|
|
|
@@ -269,15 +269,15 @@
|
|
|
</td>
|
|
|
|
|
|
@cannot('订单管理-问题件-客户不可见')
|
|
|
- <td class="toptd td-yellow child-layer-2">
|
|
|
+ <td class="toptd td-yellow child-layer-2 m-0 p-0 pt-1">
|
|
|
<div v-if="orderIssue.remark"
|
|
|
class="bg-light-yellow text-danger top text-left position-absolute"
|
|
|
data-toggle="tooltip" style="opacity: 0.1;z-index: 1">置顶备注:@{{ orderIssue.remark }}</div>
|
|
|
- @{{ orderIssue.created_at }}
|
|
|
+ @{{ orderIssue.created_at }}
|
|
|
</td>
|
|
|
@endcannot
|
|
|
|
|
|
- <td class="td-yellow child-layer-2">
|
|
|
+ <td class="td-yellow child-layer-2 m-0 p-0 pt-1">
|
|
|
@cannot('订单管理-问题件-客户不可见')
|
|
|
@else
|
|
|
<div v-if="orderIssue.top" class="bg-light-yellow text-danger top text-left"
|
|
|
@@ -338,8 +338,7 @@
|
|
|
<td>
|
|
|
<p class="text-truncate text-primary m-0 p-0 tooltipTarget"
|
|
|
style="width: 100px;cursor:pointer;text-decoration: underline"
|
|
|
- title="双击展开" @dblclick="nowrapText($event)">@{{ item.commodity.name
|
|
|
- }}</p>
|
|
|
+ title="双击展开" @dblclick="nowrapText($event)">@{{ item.commodity.name }}</p>
|
|
|
<p class="text-nowrap m-0 p-0 tooltipTarget"
|
|
|
style="display: none;cursor:pointer" @dblclick="truncateText($event)"
|
|
|
title="双击收起">@{{ item.commodity.name }}</p>
|
|
|
@@ -476,10 +475,10 @@
|
|
|
<input type="hidden" name="id" :value="orderIssue.id">
|
|
|
<div style="width: 45px"></div>
|
|
|
<div class="form-inline m-2">
|
|
|
- <input type="text" name="content" class="form-control" style="width: 300px"
|
|
|
+ <input type="text" name="content" class="form-control m-0 p-0" style="width: 275px"
|
|
|
required>
|
|
|
- <button type="button" class="btn btn-primary ml-2"
|
|
|
- @click="addOrderIssueLog('AddLog_'+orderIssue.id,orderIssue)">添加
|
|
|
+ <button type="button" class="btn btn-primary ml-2 m-0 p-0"
|
|
|
+ @click="addOrderIssueLog('AddLog_'+orderIssue.id,orderIssue)" style="width: 50px">添加
|
|
|
</button>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -496,11 +495,11 @@
|
|
|
@click="removeFocusing($event)" v-on:mouseover="showDelBtn($event)"
|
|
|
v-on:mouseleave="hideDelBtn($event)">
|
|
|
<template v-if="logIndex<2||orderIssue.log_is_show===true">
|
|
|
- <td style="min-width: 200px">@{{ log.content }}</td>
|
|
|
- <td class="text-muted" style="min-width: 120px">
|
|
|
+ <td style="max-width: 175px;min-width: 175px;">@{{ log.content }}</td>
|
|
|
+ <td class="text-muted" style="max-width: 55px;min-width: 55px;">
|
|
|
<span v-if="log.user">@{{ log.user.name}}</span>
|
|
|
</td>
|
|
|
- <td class="text-muted" style="min-width: 170px">@{{ log.created_at }}</td>
|
|
|
+ <td class="text-muted" style="max-width: 95px;min-width: 95px;">@{{ log.created_at }}</td>
|
|
|
@can('订单管理-问题件-处理结果删除')
|
|
|
<td style="" class="m-0 p-0 border-0">
|
|
|
<button type="button"
|
|
|
@@ -2136,6 +2135,14 @@
|
|
|
listenTBodyResize(){
|
|
|
this.$set(this,'toggleBtnHeight',document.getElementById('tbody').clientHeight);
|
|
|
},
|
|
|
+ },
|
|
|
+ filters:{
|
|
|
+ date:function(value) {
|
|
|
+ if (value !== null) {
|
|
|
+ return moment(value).format('yyyy-MM-DD');
|
|
|
+ }
|
|
|
+ return value
|
|
|
+ },
|
|
|
}
|
|
|
})
|
|
|
// modal 隐藏时修改 input 为空
|