lvhao 11 часов назад
Родитель
Сommit
32d8ce71a2
2 измененных файлов с 8 добавлено и 7 удалено
  1. 6 6
      core/CoreApp/controllers/Whlabel_bh.php
  2. 2 1
      template/erp/whlabel_bh_operate.html

+ 6 - 6
core/CoreApp/controllers/Whlabel_bh.php

@@ -2227,7 +2227,7 @@ class Whlabel_bh extends Start_Controller {
                 $start = ($page - 1)*$perpage;
             }
             //取得信息列表
-            $info_list = $this->whlabel_bh_transfer->find_all($where,'id,orderinfo,pm,shipremarks,ts,printtime,time,ycrk_type',$order_str,$start,$perpage);
+            $info_list = $this->whlabel_bh_transfer->find_all($where,'id,orderinfo,pm,shipremarks,ts,printtime,time',$order_str,$start,$perpage);
 			$transfer = $this->transfer->find_all();
 			$t = array();$ot = array();
 			foreach ($transfer as $v)
@@ -2251,11 +2251,11 @@ class Whlabel_bh extends Start_Controller {
 				}
 
 				$info_list[$key]['time'] = trim($tmp_operate_str,'<br>');
-				if(empty($value['ycrk_type'])){
-					$info_list[$key]['ycrk_type'] = "<p style='background-color: #f0f0f0 !important;color:#000 !important' onclick='addYcrk(".$value['id'].")'>异常入库</p>";
-				}else{
-					$info_list[$key]['ycrk_type'] = "";
-				}
+				// if(empty($value['ycrk_type'])){
+				// 	$info_list[$key]['ycrk_type'] = "<p style='background-color: #f0f0f0 !important;color:#000 !important' onclick='addYcrk(".$value['id'].")'>异常入库</p>";
+				// }else{
+				// 	$info_list[$key]['ycrk_type'] = "";
+				// }
             }
 		    $total = $this->whlabel_bh_transfer->find_count($where);
 		    $pagenum = ceil($total/$perpage);

+ 2 - 1
template/erp/whlabel_bh_operate.html

@@ -78,7 +78,7 @@
 <td>数量</td>
 <td>打印时间</td>
 <td>操作时间</td>
-<td>操作</td>
+<!-- <td>操作</td> -->
 </tr>
 </table>
 </div>
@@ -378,6 +378,7 @@ $(".tjsx_xz").click(function() {
 
 
 function addYcrk(id){
+    return;
     $(".boundtj div p:eq(0)").html('<label>类 型:<select name="type" class="select"><option value="1">配货入库</option><option value="2">成品库入库</option><option value="3">外销单入库</option></select></label> <input type="hidden" name="id" value="'+id+'" />');
     $(".boundtj div p:eq(1)").html("<font class='obaddgo' onclick='doAddYcrk()'>确 定</font><font class='esc' onclick='escDo()'>取 消</font>");
     $(".boundtj").show();