Ver código fonte

调整打卡码尺寸等样式

LD 5 anos atrás
pai
commit
51dcde11f4

+ 2 - 1
resources/views/inventory/statement/changeInventory.blade.php

@@ -26,6 +26,7 @@
                     <input type="date" name="date_start" style="max-width: 150px" class="form-control form-control-sm tooltipTarget" title="选择显示指定日期的起始时间"
                            v-model="filterData.date_start" :class="filterData.created_at_start?'bg-warning':''">
                     <select v-model="filterData.range" name="range" @change="submit" title="查询内容的日期范围" class="form-control form-control-sm tooltipTarget m-2">
+                        <option value="">日期范围</option>
                         <option value="1">近一天</option>
                         <option value="3">近三天</option>
                         <option value="7" selected>近七天</option>
@@ -161,7 +162,7 @@
             data:{
                 oracleActTransactingLogs:{!! $oracleActTransactingLogs !!},
                 page:Number('{{$page}}'),
-                filterData:{date_start:'',date_end:'',SKU:'',paginate:"50",TOLocation:'',range:'',
+                filterData:{date_start:'',date_end:'',SKU:'',paginate:"50",TOLocation:'',range:'1',
                     LotAtt05:'',LotAtt02_start:'',LotAtt02_end:'',descr_c:'',ALTERNATE_SKU1:'',export:''},
                 owners:[
                     @foreach($owners as $owner)

+ 2 - 3
resources/views/maintenance/userWorkgroup/create.blade.php

@@ -38,12 +38,11 @@
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="remark" class="col-2 col-form-label text-right">需要录入备注</label>
+                        <label for="remark" class="col-2 col-form-label text-right">进组时需要备注</label>
                         <div class="col-8">
                             <select id="remark" type="text" class="form-control @error('remark') is-invalid @enderror" name="remark" autocomplete="off"  >
-                                <option></option>
                                 <option value="是">是</option>
-                                <option value="否">否</option>
+                                <option value="否" selected>否</option>
                             </select>
                             @error('remark')
                             <span class="invalid-feedback" role="alert">

+ 2 - 2
resources/views/maintenance/userWorkgroup/edit.blade.php

@@ -37,12 +37,12 @@
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="remark" class="col-2 col-form-label text-right">需要录入备注</label>
+                        <label for="remark" class="col-2 col-form-label text-right">进组时需要备注</label>
                         <div class="col-8">
                             <select id="remark" type="text" class="form-control @error('remark') is-invalid @enderror" name="remark" autocomplete="off"  >
                                 <option :value="userWorkgroup.remark">@{{ userWorkgroup.remark }}</option>
                                 <option value="是">是</option>
-                                <option value="否">否</option>
+                                <option value="否" selected>否</option>
                             </select>
                             @error('remark')
                             <span class="invalid-feedback" role="alert">

+ 1 - 1
resources/views/maintenance/userWorkgroup/index.blade.php

@@ -18,7 +18,7 @@
                         <th>仓库</th>
                         <th>名称</th>
                         <th>录入时间</th>
-                        <th>需要录入备注</th>
+                        <th>进组时需要备注</th>
                         <th>操作</th>
                     </tr>
                     <tr v-for="userWorkgroup in userWorkgroups">

+ 2 - 2
resources/views/personnel/checking-in/QRcode.blade.php

@@ -28,8 +28,8 @@
 {{--                </div>--}}
                     <div class="row">
                         <div class="col text-center" style="float:left;">
-                            <img id="img" class="img-thumbnail" style="margin-top: 20px" :src="userWorkgroup.url" />
-                            <p class="m-2 h5 text-center" >@{{ userWorkgroup.name }}工作组</p>
+                            <img id="img" class="img-thumbnail" style="margin-top: 20px" :src="userWorkgroup.url" width="35%"/>
+                            <p class="m-2 h1 text-center" >@{{ userWorkgroup.name }}工作组</p>
                         </div>
                     </div>
             </div>

+ 1 - 1
resources/views/personnel/checking-in/getQRcode.blade.php

@@ -9,7 +9,7 @@
         <div class="card col-md-10 offset-md-1 p-0">
             <div class="card-body">
                 <div class="list-group list-group-horizontal-lg align-content-center">
-                <a target="_blank" class="btn col-md-2 btn-outline-primary"  :href="('{{url('personnel/checking-in/importAndExportQRCode')}}')" >进出场打卡</a>
+                <a target="_blank" class="btn col-md-2 btn-outline-primary ml-5"  style="transform: scale(1.5)" :href="('{{url('personnel/checking-in/importAndExportQRCode')}}')" >进出场打卡</a>
                 </div>
                 <br>
                 <div class="card-header"><h3 style="color: red">组二维码</h3>

+ 3 - 3
resources/views/personnel/checking-in/importAndExportQRCode.blade.php

@@ -20,9 +20,9 @@
                 </div>
 
                 <div class="row">
-                    <div class="col-6 text-center" v-for="importAndExportQRCode in importAndExportQRCodes">
-                            <img id="img" class="img-thumbnail"  :src="importAndExportQRCode.url" />
-                        <p class="font-weight-bold m-2 h5 text-center" style="color: red">@{{ importAndExportQRCode.source }}</p>
+                    <div class="col-6 text-center" v-for="importAndExportQRCode in importAndExportQRCodes" >
+                            <img id="img" class="img-thumbnail img-fluid"  :src="importAndExportQRCode.url" width="75%"/>
+                        <p class="font-weight-bold m-2 h1 text-center" style="color: red">@{{ importAndExportQRCode.source }}</p>
                     </div>
                 </div>
             </div>

+ 1 - 1
resources/views/personnel/laborReport/index.blade.php

@@ -156,7 +156,7 @@
                 </table>
         <div class="text-info h5 btn btn">{{$laborReports->count()}}/@{{ sum }}</div>
         <div>{{$laborReports->appends($request)->links()}}</div>
-        {{--      选择晚饭时长弹框      --}}
+        {{--      选择晚饭时长弹框       --}}
         <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">