二次加工管理-样式修改

resources/views/process/index.blade.php

@@ -385,18 +385,16 @@
                             </tr>
                         </table>
                         <div v-else :style="[{background: (!processOne.id || processOne.is_multi_row)  ? (!processOne.id) ? '#e8eef6' :'rgb(246, 238, 232)' : (processOne.processesContents.length>0 ? ((processOne.processesContents[0].type=='成品单') ? '#e8eef6' : 'rgb(246, 238, 232)') :'')}
-                        ,{'-webkit-transform':'scale('+(1/Math.ceil(arrayFilter(processOne.processesContents,processOne).length/4))+')'},{height: (35*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/4))+'px'}
-                        ,{width: (100*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/4))+'%'},{'margin-left': (-100*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/4))-1)/2)+'%'}
-                        ,{'margin-top': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/4))-1)/2)+'px'},{'margin-bottom': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/4))-1)/2)+'px'}]">
-                            <div v-for="(processesContent,i) in arrayFilter(processOne.processesContents,processOne)"  class=" row  p-0" style="float: left;margin-right: 20px;font-size:1vw;-webkit-transform-origin: 0" :style="[{opacity:1/0.7},
-                            {'margin-left': arrayFilter(processOne.processesContents,processOne).length >4 ? (1*parseInt(arrayFilter(processOne.processesContents,processOne).length/2))+'px' : '0px'}]">
+                        ,{'-webkit-transform':'scale('+(1/Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))+')'},{height: (35*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))+'px'}
+                        ,{width: (100*Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))+'%'},{'margin-left': (-100*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))-1)/2)+'%'}
+                        ,{'margin-top': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))-1)/2)+'px'},{'margin-bottom': (-35*((Math.ceil(arrayFilter(processOne.processesContents,processOne).length/3))-1)/2)+'px'}]">
+                            <div v-for="(processesContent,i) in arrayFilter(processOne.processesContents,processOne)"  class=" row  p-0" style="float: left;margin-right: 20px;-webkit-transform-origin: 0" :style="[{opacity:1/0.7},
+                            {'margin-left': arrayFilter(processOne.processesContents,processOne).length >3 ? (1*parseInt(arrayFilter(processOne.processesContents,processOne).length/3))+'px' : '0px'}]">
                                 <span>@{{ processesContent.bill_type }}</span>&nbsp;&nbsp;
                                 <span>@{{ processesContent.wms_code }}</span>&nbsp;&nbsp;
                                 <span>@{{ processesContent.amount }}</span>&nbsp;&nbsp;
-                                <span>
-                                    <small v-if="processesContent.commodity && processesContent.commodity.barcodes.length>0">
-                                        @{{ processesContent.commodity.barcodes[0].code }}
-                                    </small>
+                                <span v-if="processesContent.commodity && processesContent.commodity.barcodes.length>0">
+                                    @{{ processesContent.commodity.barcodes[0].code }}
                                 </span>&nbsp;&nbsp;
                                 <span :title="processesContent.sign_mark?processesContent.sign_mark:processesContent.commodity_name" class="text-muted tooltipTarget" style="max-width:100px;overflow:hidden;">@{{ processesContent.sign_mark?processesContent.sign_mark:processesContent.commodity_name }}</span>
                             </div>

resources/views/process/show.blade.php

@@ -9,49 +9,55 @@
     </li>
     @endcomponent
 </span>
-<div id="body" class="d-none card card-body container text-nowrap">
-    <div class="col offset-1 row">
-        <label class="col-2 text-primary" for="code">任务号：</label>
-        <span id="code" class="col-8 offset-1">@{{ process.code }}</span>
-    </div>
-    <div class="col offset-1 row">
-        <label class="col-2 text-primary" for="code">货主：</label>
-        <span id="code" class="col-8 offset-1">@{{ process.owner_name }}</span>
-    </div>
-    <div class="col offset-1 row">
-        <label class="col-2 text-primary" for="code">加工类型：</label>
-        <span id="code" class="col-8 offset-1 text-danger font-weight-bold">@{{ process.process_method_name }}</span>
-    </div>
-    <div class="col offset-1 row">
-        <label class="col-2 text-dark" for="code">预期数量：</label>
-        <span id="code" class="col-8 offset-1 text-muted">@{{ process.amount }}</span>
-    </div>
-    <div class="col offset-1 row">
-        <label class="col-2 text-dark" for="code">单价：</label>
-        <span id="code" class="col-8 offset-1 text-muted">@{{ process.unit_price }}</span>
-    </div>
-    <div class="col offset-1 row">
-        <label class="col-2 text-dark" for="code">完成数量：</label>
-        <span id="code" class="col-8 offset-1 text-muted">@{{ process.completed_amount }}</span>
-    </div>
-    <div class="col offset-1 row">
-        <label class="col-2 text-dark" for="code">建单日期：</label>
-        <span id="code" class="col-8 offset-1 text-muted">@{{ process.created_at }}</span>
+<div id="body" class="d-none  card card-body container-fluid text-nowrap">
+    <div class="row">
+        <div class="col-sm-3">
+            <label class="text-muted col-3" for="code">任务号：</label>
+            <span class="col-8 offset-1" id="code">@{{ process.code }}</span>
+        </div>
+        <div class="col-sm-3">
+            <label class="text-muted col-3" for="owner_name">客户名称：</label>
+            <span id="owner_name" class="col-8 offset-1">@{{ process.owner_name }}</span>
+        </div>
+        <div class="col-sm-3">
+            <label class="text-muted col-3" for="status">状态：</label>
+            <span id="status" class="col-8 offset-1">@{{ process.status }}</span>
+        </div>
+        <div class="col-sm-3">
+            <label class="text-muted col-3" for="created_at">建单日期：</label>
+            <span id="created_at" class="col-8 offset-1">@{{ process.created_at }}</span>
+        </div>
     </div>
-    <div class="col offset-1 row">
-        <label class="col-2 text-dark" for="code">状态：</label>
-        <span id="code" class="col-8 offset-1 text-success font-weight-bold">@{{ process.status }}</span>
+    <div class="row">
+        <div class="col-sm-3">
+            <label class="text-primary col-3" for="process_method_name">加工类型：</label>
+            <span id="process_method_name" class="col-8 offset-1 text-danger font-weight-bold">@{{ process.process_method_name }}</span>
+        </div>
+        <div class="col-sm-3">
+            <label class="text-primary col-3" for="amount">预期数量：</label>
+            <span id="amount" class="col-8 offset-1">@{{ process.amount }}</span>
+        </div>
+        <div class="col-sm-3">
+            <label class="text-primary col-3" for="completed_amount">完成数量：</label>
+            <span id="completed_amount" class="col-8 offset-1  text-dark font-weight-bold">@{{ process.completed_amount }}</span>
+        </div>
+        <div class="col-sm-3">
+            <label class="text-primary col-3" for="unit_price">单价：</label>
+            <span id="unit_price" class="col-8 offset-1">@{{ process.unit_price }}</span>
+        </div>
     </div>
-    <div class="col offset-1 row">
-        <label class="col-2 text-dark" for="code">备注：</label>
-        <span id="code" class="col-8 offset-1 text-muted" style="white-space: normal;max-width: 200px">@{{ process.remark }}</span>
+    <div class="row">
+        <div class="col-sm-12  ">
+            <label class="col-3 text-dark" for="remark">备注：</label>
+            <span id="remark" class="col-10 offset-1" style="white-space: normal;">@{{ process.remark }}</span>
+        </div>
     </div>
-    <div class="col row mt-0 mb-0 p-0 small w-100" style="margin-left: -18px;">
+    <div class="col-sm row  w-100" >
         <table class="table table-sm table-bordered table-bordered w-100" style="background-color: #efe3d9;">
             <tr>
-                <th>类型<span class="badge badge-sm bg-warning">原料单</span></th>
-                <th>单据号</th>
-                <th>本单数量</th>
+                <th>类型</th>
+                <th>单据号<span class="badge badge-sm badge-pill bg-warning small">原料单</span></th>
+                <th>数量</th>
                 <th>商品条码</th>
                 <th>商品名称</th>
             </tr>
@@ -70,9 +76,9 @@
         </table>
         <table class="table table-sm table-bordered table-bordered w-100" style="background-color: #ccd7dc;">
             <tr>
-                <th>类型<span class="badge badge-sm bg-warning">成品单</span></th>
-                <th>单据号</th>
-                <th>本单数量</th>
+                <th>类型</th>
+                <th>单据号<span class="badge badge-sm bg-warning small">成品单</span></th>
+                <th>数量</th>
                 <th>商品条码</th>
                 <th>商品名称</th>
             </tr>
@@ -90,10 +96,10 @@
             </tr>
         </table>
     </div>
-    <div class="col offset-1 row">
+    <div class="col  row">
         <label class="col-2 text-dark" for="tutorials">教程：</label>
-        <span class="col-8 offset-1 text-danger font-weight-bold" v-if="process.tutorials.length<1">暂无</span>
-        <div v-else id="tutorials" class="col-8 offset-1 text-muted" style="white-space: normal">
+        <span class="col-8  text-danger font-weight-bold" v-if="process.tutorials.length<1">暂无</span>
+        <div v-else id="tutorials" class="col-8  text-muted" style="white-space: normal">
             <b @click="tutorialShow(tutorial.id)" style="cursor: pointer;text-decoration:underline" class="text-primary" v-for="tutorial in process.tutorials">@{{ tutorial.name }}<br></b>
         </div>
     </div>