Bladeren bron

表头居左,内容边线

Zhouzhendong 5 jaren geleden
bovenliggende
commit
67faca10f4

+ 1 - 1
resources/js/queryForm/header.js

@@ -48,7 +48,7 @@ window.Header = function getHeader(object) {
     }
     function createHeader() {//生成表头列
         let tr = document.createElement("tr");
-        tr.className = "text-center text-nowrap";
+        tr.className = "text-nowrap";
         let firstTr = _targetDom.getElementsByTagName("tr")[0];
         let tds = [];
         if (firstTr)tds = firstTr.children;

+ 9 - 9
resources/views/order/index/delivering.blade.php

@@ -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">

+ 8 - 8
resources/views/rejected/search/general.blade.php

@@ -82,18 +82,18 @@
                         <td style="min-width: 900px">
                             <div class="w-100" :class="rejectedBill.items.length>1 ? 'up' : ''" :id="'rejected-'+rejectedBill.id">
                                 <div class="row" v-for="item in rejectedBill.items">
-                                    <div class="col-2">
+                                    <div class="col-2 border border-1">
                                         <div class="w-100 text-overflow-warp-200">@{{item.barcode_goods}}</div>
                                     </div>
-                                    <div class="col-2">
+                                    <div class="col-2 border border-1">
                                         <div class="w-100 text-overflow-warp-200">@{{item.name_goods}}</div>
                                     </div>
-                                    <div class="col-1">@{{item.amount}}</div>
-                                    <div class="col-1">@{{item.quality_label}}</div>
-                                    <div class="col-2">@{{item.batch_number}}</div>
-                                    <div class="col-1">@{{item.made_at}}</div>
-                                    <div class="col-1">@{{item.validity_at}}</div>
-                                    <div class="col-2">@{{item.remark}}</div>
+                                    <div class="col-1 border border-1">@{{item.amount}}</div>
+                                    <div class="col-1 border border-1">@{{item.quality_label}}</div>
+                                    <div class="col-2 border border-1">@{{item.batch_number}}</div>
+                                    <div class="col-1 border border-1">@{{item.made_at}}</div>
+                                    <div class="col-1 border border-1">@{{item.validity_at}}</div>
+                                    <div class="col-2 border border-1">@{{item.remark}}</div>
                                 </div>
                             </div>
                             <div class="text-center cursor-pointer" v-if="rejectedBill.items.length>1" @click="unfold(rejectedBill.id)">