|
|
@@ -85,12 +85,12 @@
|
|
|
<div class="text-overflow-warp-200">@{{ order.c_contact }}</div>
|
|
|
</td>
|
|
|
<td class="text-muted text-wrap text-letter">
|
|
|
- <div class="text-overflow-warp-200" style="min-width: 150px">@{{ order.c_tel2?order.c_tel2:order.c_tel1 }}</div>
|
|
|
+ <div class="text-overflow-warp-200 w-100">@{{ order.c_tel2?order.c_tel2:order.c_tel1 }}</div>
|
|
|
</td>
|
|
|
<td class="text-nowrap"> @{{ order.c_province }}</td>
|
|
|
<td class="text-nowrap"> @{{ order.c_city }}</td>
|
|
|
<td class="text-nowrap"><div class="text-overflow-warp-200">@{{ order.c_district }}</div></td>
|
|
|
- <td class="text-muted text-wrap text-letter"><div class="text-overflow-warp-200" style="min-width: 200px">@{{ order.c_address1 }}</div></td>
|
|
|
+ <td class="text-muted text-wrap text-letter"><div class="text-overflow-warp-200" style="max-width: 100%">@{{ order.c_address1 }}</div></td>
|
|
|
<td class="text-nowrap">@{{ order.waveno }}</td>
|
|
|
<td class="text-nowrap"> @{{ order.warehouseid }}</td>
|
|
|
<td class="text-nowrap"><span v-if="order.edisendflag2=='Y'">是</span><span v-if="order.edisendflag2=='N'">否</span><span v-if="order.edisendflag2=='W'">错误</span></td>
|
|
|
@@ -98,15 +98,15 @@
|
|
|
<td class="text-center" style="min-width: 900px">
|
|
|
<div :class="commodities[order.orderno]&&commodities[order.orderno].length==1 ? '' : 'up'" :id="'order-'+i">
|
|
|
<div v-for="oracleDOCOrderDetail in commodities[order.orderno]" class="row">
|
|
|
- <div class="col-2">@{{ oracleDOCOrderDetail.sku }}</div>
|
|
|
- <div class="col-2">@{{ oracleDOCOrderDetail.alternate_sku1 }}</div>
|
|
|
- <div class="col-2" @dblclick.stop="replaceText($event)">
|
|
|
+ <div class="col-2 border border-1">@{{ oracleDOCOrderDetail.sku }}</div>
|
|
|
+ <div class="col-2 border border-1">@{{ oracleDOCOrderDetail.alternate_sku1 }}</div>
|
|
|
+ <div class="col-2 border border-1" @dblclick.stop="replaceText($event)">
|
|
|
<div class="w-100 text-overflow-replace-100 text-primary">@{{ oracleDOCOrderDetail.descr_c }}</div>
|
|
|
</div>
|
|
|
- <div class="col-1">@{{ oracleDOCOrderDetail.qtyordered }}</div>
|
|
|
- <div class="col-2">@{{ oracleDOCOrderDetail.lotnum }}</div>
|
|
|
- <div class="col-1 m-0 p-0">@{{ oracleDOCOrderDetail.orderdetailcodename }}</div>
|
|
|
- <div class="col-2">@{{ oracleDOCOrderDetail.checktime }}</div>
|
|
|
+ <div class="col-1 border border-1">@{{ oracleDOCOrderDetail.qtyordered }}</div>
|
|
|
+ <div class="col-2 border border-1">@{{ oracleDOCOrderDetail.lotnum }}</div>
|
|
|
+ <div class="col-1 m-0 p-0 border border-1">@{{ oracleDOCOrderDetail.orderdetailcodename }}</div>
|
|
|
+ <div class="col-2 border border-1">@{{ oracleDOCOrderDetail.checktime }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="row text-center cursor-pointer" v-if="commodities[order.orderno]&&commodities[order.orderno].length>1">
|