123

core/CoreApp/controllers/Transfer.php

@@ -657,6 +657,7 @@ class Transfer extends Start_Controller {
 			$transfer = $this->input->post('transfer',true);
 			$lx = $this->input->post('lx',true);
 			$type = $this->input->post('type',true);
+			$jiaji = $this->input->post('jiaji',true);
 			$xztime = $this->input->post('xztime',true);
 			$timetk = $this->input->post('timetk',true);
 			$timetj = $this->input->post('timetj',true);
@@ -686,6 +687,15 @@ class Transfer extends Start_Controller {
 					$where  .= " and ordernumber != ''";
 				}
             }
+            if($jiaji){
+                if($jiaji == 1){
+                    $where  .= " and is_jiaji = 0";
+                }
+                if($jiaji == 2){
+                    $where  .= " and is_jiaji = 2";
+                }
+                
+            }
             //数据排序
             $order_str = "id desc";
             if(empty($page))
@@ -744,7 +754,7 @@ class Transfer extends Start_Controller {
 				}
 			}
             //取得信息列表
-            $info_list = $this->systemtransfer->find_all($where,'id,number,pm,shipremarks,printtime,time',$order_str,$start,$perpage);
+            $info_list = $this->systemtransfer->find_all($where,'id,number,is_jiaji,pm,shipremarks,printtime,time',$order_str,$start,$perpage);
 			$transfer = $this->transfer->find_all();
 			$t = array();
 			foreach ($transfer as $v)
@@ -755,6 +765,11 @@ class Transfer extends Start_Controller {
 			 //格式化数据
             foreach ($info_list as $key=>$value)
 		    {
+		        if($value['is_jiaji'] == 2){
+		            $info_list[$key]['is_jiaji'] = "<a href='javascript:void(0)' style='color:red'>加急</a>";
+		        }else{
+		            $info_list[$key]['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'],'|'));
@@ -1730,10 +1745,18 @@ class Transfer extends Start_Controller {
 
 			$final_list = [];
 			foreach ($list as $key => $value) {
+			    
 
 				$info = $this->systemtransfer->read($value['fid']);
 				$final_list[$key]['id'] = $value['id'];
 				$final_list[$key]['number'] = isset($info['number'])?$info['number']:'';
+			
+				if($info['is_jiaji'] == 2){
+		            $final_list[$key]['is_jiaji'] = "<a href='javascript:void(0)' style='color:red'>加急</a>";
+		        }else{
+		            $final_list[$key]['is_jiaji'] = "常规";
+		        }
+			
 				$final_list[$key]['pm'] = $info['pm'];
 				$final_list[$key]['shipremarks'] = $info['shipremarks'];
 				$final_list[$key]['printtime'] = date('Y-m-d H:i:s',$info['printtime']);

template/erp/transfer_linqi.html

@@ -46,6 +46,7 @@
 <td><label onClick="swapCheck()"><input name="checkbox" type="checkbox" class="regular-checkbox"></label></td>
 
 <td>编码</td>
+<td>加急</td>
 <td>品名</td>
 <td>备注</td>
 <td>打印时间</td>
@@ -84,10 +85,11 @@ function custom(){
 $(".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","25%");
-$(this).find('td:eq(3)').css("width","28%");
-$(this).find('td:eq(4)').css("width","13%");
-$(this).find('td:eq(5)').css("width","20%");
+$(this).find('td:eq(2)').css("width","3%");
+$(this).find('td:eq(3)').css("width","20%");
+$(this).find('td:eq(4)').css("width","25%");
+$(this).find('td:eq(5)').css("width","13%");
+$(this).find('td:eq(6)').css("width","25%");
 });}
 
 $(function(){

template/erp/transfer_operate.html

@@ -35,6 +35,12 @@
 <option value="1">备货单</option>
 </select>
 </li>
+<li>加急单：<select name="jiaji" class="select">
+<option value="">请选择</option>
+<option value="1">否</option>
+<option value="2">是</option>
+</select>
+</li>
 <li>编号：<input value="" name="number" type="text"></li>
 <li><select name="xztime" class="select">
 <option value="time">扫描时间</option><option value="printtime">布标打印时间</option>
@@ -76,6 +82,7 @@
 <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>
@@ -125,10 +132,11 @@ function custom(){
 $(".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","25%");
-$(this).find('td:eq(3)').css("width","28%");
-$(this).find('td:eq(4)').css("width","13%");
-$(this).find('td:eq(5)').css("width","20%");
+$(this).find('td:eq(2)').css("width","5%");
+$(this).find('td:eq(3)').css("width","25%");
+$(this).find('td:eq(4)').css("width","28%");
+$(this).find('td:eq(5)').css("width","13%");
+$(this).find('td:eq(6)').css("width","20%");
 });}
 window.onload = function() { 
 if(typeof $("select[name='printer']").length < 1) return;