修改打印列表页面

core/CoreApp/controllers/Systemprint.php

@@ -351,6 +351,7 @@ class Systemprint extends Start_Controller {
 			$sfxh = $this->input->post('sfxh',true);
 			$lowe = $this->input->post('lowe',true);
 			$color = $this->input->post('color',true);
+			$is_jiaji = $this->input->post('is_jiaji',true);
 			$timetk = strtotime($timetk);
 			$timetj = strtotime($timetj);
 			$where = (isset($_SESSION['api']))?"(state = '207' or state = '209') and (".rtrim($fgshop,'or').") and (".rtrim($wtype,'or').")":"id = '0'";
@@ -464,52 +465,58 @@ class Systemprint extends Start_Controller {
 
 			$field = 'id,shop,orderinfo,number,express,waybill,print,printtype,printnumber,printtime,shipremarks,is_jiaji';
 
-			$where_jiaji = $where." and is_jiaji = 1 ";
+			if(($is_jiaji == 1)||($is_jiaji == -1)){
+				$where_jiaji = $where." and is_jiaji = 1 ";
 
-			$dlz_ret_jj = $this->indexData('fullorder',$start,$perpage,$where_jiaji,$field,$order_str);
-			
-			$info_list_jj = $dlz_ret_jj['list'];
-			$dlz_jj = $dlz_ret_jj['total'];
-
-			$tt_ret_jj = $this->indexData('fullordertt',$start,$perpage,$where_jiaji,$field,$order_str);
-			$info_listtt_jj = $tt_ret_jj['list'];
-			$tt_jj = $tt_ret_jj['total'];
-
-			$amz_ret_jj = $this->indexData('fullorderamz',$start,$perpage,$where_jiaji,$field,$order_str);
-			$info_listamz_jj = $amz_ret_jj['list'];
-			$amz_jj = $amz_ret_jj['total'];
-
-			$smt_ret_jj = $this->indexData('fullordersmt',$start,$perpage,$where_jiaji,$field,$order_str);
-			$info_listsmt_jj = $smt_ret_jj['list'];
-			$smt_jj = $smt_ret_jj['total'];
-
-			$xw_ret_jj = $this->indexData('fullorderxw',$start,$perpage,$where_jiaji,$field,$order_str);
-			$info_listxw_jj = $xw_ret_jj['list'];
-			$xw_jj = $xw_ret_jj['total'];
+				$dlz_ret_jj = $this->indexData('fullorder',$start,$perpage,$where_jiaji,$field,$order_str);
+				
+				$info_list_jj = $dlz_ret_jj['list'];
+				$dlz_jj = $dlz_ret_jj['total'];
+	
+				$tt_ret_jj = $this->indexData('fullordertt',$start,$perpage,$where_jiaji,$field,$order_str);
+				$info_listtt_jj = $tt_ret_jj['list'];
+				$tt_jj = $tt_ret_jj['total'];
+	
+				$amz_ret_jj = $this->indexData('fullorderamz',$start,$perpage,$where_jiaji,$field,$order_str);
+				$info_listamz_jj = $amz_ret_jj['list'];
+				$amz_jj = $amz_ret_jj['total'];
+	
+				$smt_ret_jj = $this->indexData('fullordersmt',$start,$perpage,$where_jiaji,$field,$order_str);
+				$info_listsmt_jj = $smt_ret_jj['list'];
+				$smt_jj = $smt_ret_jj['total'];
+	
+				$xw_ret_jj = $this->indexData('fullorderxw',$start,$perpage,$where_jiaji,$field,$order_str);
+				$info_listxw_jj = $xw_ret_jj['list'];
+				$xw_jj = $xw_ret_jj['total'];
+	
+			}
 
+			
 			/****************************执行非加急的************************************/ 
+			if(($is_jiaji == 0) || ($is_jiaji == -1)){
+				$where_nojj = $where." and is_jiaji = 0 ";
 
-			$where_nojj = $where." and is_jiaji = 0 ";
-
-			$dlz_ret = $this->indexData('fullorder',$start,$perpage,$where_nojj,$field,$order_str);
-			$info_list = $dlz_ret['list'];
-			$dlz = $dlz_ret['total'];
-
-			$tt_ret = $this->indexData('fullordertt',$start,$perpage,$where_nojj,$field,$order_str);
-			$info_listtt = $tt_ret['list'];
-			$tt = $tt_ret['total'];
-
-			$amz_ret = $this->indexData('fullorderamz',$start,$perpage,$where_nojj,$field,$order_str);
-			$info_listamz = $amz_ret['list'];
-			$amz = $amz_ret['total'];
-
-			$smt_ret = $this->indexData('fullordersmt',$start,$perpage,$where_nojj,$field,$order_str);
-			$info_listsmt = $smt_ret['list'];
-			$smt = $smt_ret['total'];
-
-			$xw_ret = $this->indexData('fullorderxw',$start,$perpage,$where_nojj,$field,$order_str);
-			$info_listxw = $xw_ret['list'];
-			$xw = $xw_ret['total'];
+				$dlz_ret = $this->indexData('fullorder',$start,$perpage,$where_nojj,$field,$order_str);
+				$info_list = $dlz_ret['list'];
+				$dlz = $dlz_ret['total'];
+	
+				$tt_ret = $this->indexData('fullordertt',$start,$perpage,$where_nojj,$field,$order_str);
+				$info_listtt = $tt_ret['list'];
+				$tt = $tt_ret['total'];
+	
+				$amz_ret = $this->indexData('fullorderamz',$start,$perpage,$where_nojj,$field,$order_str);
+				$info_listamz = $amz_ret['list'];
+				$amz = $amz_ret['total'];
+	
+				$smt_ret = $this->indexData('fullordersmt',$start,$perpage,$where_nojj,$field,$order_str);
+				$info_listsmt = $smt_ret['list'];
+				$smt = $smt_ret['total'];
+	
+				$xw_ret = $this->indexData('fullorderxw',$start,$perpage,$where_nojj,$field,$order_str);
+				$info_listxw = $xw_ret['list'];
+				$xw = $xw_ret['total'];
+			}
+			
            
 			$total = $dlz+$tt+$amz+$smt+$xw+$dlz_jj+$tt_jj+$amz_jj+$smt_jj+$xw_jj;
 

template/erp/systemprint.html

@@ -30,13 +30,20 @@
 <option value="{$val['id']}">{$val['title']}</option>
 {/loop}</select>
 </li>
-<li>
+<!-- <li>
 产品分类：<select name="ckfl" class="select">
 <option value="">请选择</option>
 {loop typeclass(37,100) as $val}
 <option value="{$val['id']}">{$val['title']}</option>
 {/loop}</select>
-</li>
+</li> -->
+<li>
+    是否加急：<select name="sfxh" class="select">
+    <option value="-1">请选择</option>
+    <option value="1">是</option>
+    <option value="0">否</option>
+    </select>
+    </li>
 <li>
 是否现货：<select name="sfxh" class="select">
 <option value="">请选择</option>
@@ -44,13 +51,14 @@
 <option value="0">无现货</option>
 </select>
 </li>
-<li>搜索品名：<input value="" name="so" type="text" style="width:260px"></li>
 <li>颜色：<select name="color" class="select">
-<option value="">请选择</option>{loop typeclassyc(8) as $val}
-<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>{/loop}</select></li>
-<li>曲度：<select name="lowe" class="select">
-<option value="">请选择</option>{loop typeclassyc(15) as $val}
-<option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>{/loop}</select></li>
+    <option value="">请选择</option>{loop typeclassyc(8) as $val}
+    <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>{/loop}</select></li>
+    <li>曲度：<select name="lowe" class="select">
+    <option value="">请选择</option>{loop typeclassyc(15) as $val}
+    <option value="{$val['id']}">{$val['title']} - {$val['zh']}</option>{/loop}</select></li>
+<li>搜索品名：<input value="" name="so" type="text" style="width:260px"></li>
+
 <li>打印时间：<input id="timetk" value="{date('Y-m-d',time()-30*24*3600)} 19:00" name="timetk" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})" readonly>
 至&nbsp;&nbsp;&nbsp;&nbsp; <input id="timetj" value="{date('Y-m-d',time())} 19:00" name="timetj" type="text" onClick="laydate({istime: true,format:'YYYY-MM-DD hh:mm'})" readonly></li>
 <li><span>确 定</span></li>