lvhao 4 часов назад
Родитель
Сommit
1629a22c01
2 измененных файлов с 5 добавлено и 4 удалено
  1. 2 1
      core/CoreApp/controllers/Scanimgs.php
  2. 3 3
      template/erp/scanimgs.html

+ 2 - 1
core/CoreApp/controllers/Scanimgs.php

@@ -104,8 +104,9 @@ class Scanimgs extends Start_Controller {
                 $img_str .= "</div>";
 				$final_list[] = [
                     'id' => $value['id'],
+					"shop" =>isset($shop_list[$value['shop']])?$shop_list[$value['shop']]:'',
                     'number'=>$value['number'],
-                    "shop" =>isset($shop_list[$value['shop']])?$shop_list[$value['shop']]:'',
+                    
                     "imgs" => $img_str,
                     "addtime" => date("Y-m-d H:i:s",$value['addtime']),
                     "updatetime" => date("Y-m-d H:i:s",$value['updatetime']),

+ 3 - 3
template/erp/scanimgs.html

@@ -14,7 +14,7 @@
 <li>订单编号:<input value="" name="number" type="text"  ></li>
 
 <li>最后扫描时间:
-<li><input id="timetk"  value="{date('Y-m-d',time()-3*24*3600)} 0:00" name="timetk" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})"  style="width:110px !important;">
+<li><input id="timetk"  value="{date('Y-m-d',time()-2*24*3600)} 0:00" name="timetk" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})"  style="width:110px !important;">
 至&nbsp;&nbsp;&nbsp;&nbsp; <input id="timetj" value="{date('Y-m-d',time()+24*3600)} 0:00" name="timetj" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})"   style="width:110px !important;"></li>
 <li><span>确 定</span></li>
 </ul>
@@ -22,8 +22,8 @@
 <table class="datatitle data" border="0" style="border-collapse:collapse;">
 <tr>
 <td><label onClick="swapCheck()"><input name="checkbox" type="checkbox" class="regular-checkbox"></label></td>
-<td>编号</td>
 <td>所属店铺</td>
+<td>编号</td>
 <td>扫描信息</td>
 <td>添加时间</td>
 <td>更新时间</td>
@@ -36,7 +36,7 @@
 </div>
 <!-- 对话框元素,默认是隐藏的 -->
 <dialog id="image-dialog" role="dialog" aria-modal="true">
-<img id="dialog-img" src="" alt="">
+<img id="dialog-img" src="" alt="" style="max-width: 90%;max-height: 90%;"/>
 <button id="close-btn">×</button>
 </dialog>