1

core/CoreApp/controllers/Transfer.php

@@ -836,20 +836,17 @@ class Transfer extends Start_Controller {
 			 //格式化数据
             foreach ($info_list as $key=>$value)
 		    {
-
-				$is_jiaji = '';
 		        if($value['is_jiaji'] == 2){
-		            $is_jiaji = "<a href='javascript:void(0)' style='color:red'>加急</a>";
+		            $info_list[$key]['is_jiaji'] = "<a href='javascript:void(0)' style='color:red'>加急</a>";
 		        }else{
-		            $is_jiaji = "常规";
+		            $info_list[$key]['is_jiaji'] = "常规";
 		        }
 				if(empty($value['ycrk_type'])){
-					$is_jiaji .= "<br/><a href='javascript:void(0)' onclick='addYcrk(".$value['id'].")'><l style='color:#000' >异常入库</l></a>";
+					 $info_list[$key]['ycrk_type'] = "<p style='background-color: #f0f0f0 !important;color:#000 !important' onclick='addYcrk(".$value['id'].")'>异常入库</p>";
 				}else{
-					$is_jiaji .= "";
+					$info_list[$key]['ycrk_type'] = "";
 				}
 
-				$info_list[$key]['is_jiaji'] = $is_jiaji;
 				$dd = $this->systemtransfer->read($value['id']);
 				$info_list[$key]['printtime'] = date('Y-m-d H:i:s',$value['printtime']);
 				$rk = explode('|',trim($dd['rk'],'|'));
@@ -918,7 +915,7 @@ class Transfer extends Start_Controller {
 				}
 				$info_list[$key]['time'] = trim($info_list[$key]['time'],'<br>');
 				unset($info_list[$key]['ctime12']);
-				unset($info_list[$key]['ycrk_type']);
+				
 				
             }
 			

template/erp/transfer_operate.html

@@ -113,6 +113,7 @@
 <td>备注</td>
 <td>打印时间</td>
 <td>操作时间</td>
+<td>操作</td>
 </tr>
 </table>
 </div>
@@ -159,10 +160,11 @@ $(".data tr").each(function() {
 $(this).find('td:eq(0)').css("width","1%");
 $(this).find('td:eq(1)').css("width","10%");
 $(this).find('td:eq(2)').css("width","6%");
-$(this).find('td:eq(3)').css("width","24%");
-$(this).find('td:eq(4)').css("width","27%");
+$(this).find('td:eq(3)').css("width","21%");
+$(this).find('td:eq(4)').css("width","24%");
 $(this).find('td:eq(5)').css("width","13%");
-$(this).find('td:eq(6)').css("width","19%");
+$(this).find('td:eq(6)').css("width","18%");
+$(this).find('td:eq(7)').css("width","8%");
 });}
 window.onload = function() { 
 if(typeof $("select[name='printer']").length < 1) return;