lvhao 1 kuukausi sitten
vanhempi
commit
2fd9db6cea
2 muutettua tiedostoa jossa 9 lisäystä ja 1 poistoa
  1. 8 1
      core/CoreApp/controllers/Color.php
  2. 1 0
      template/erp/color.html

+ 8 - 1
core/CoreApp/controllers/Color.php

@@ -526,12 +526,13 @@ class Color extends Start_Controller {
 			$content = $this->input->get('content',true);
 			$warehouse = $this->input->get('warehouse',true);
 			$type = $this->input->get('type',true);
-			$developer = $this->input->post('developer',true);
+			$developer = $this->input->get('developer',true);
 			$state = $this->input->get('state',true);
 			$timetk = $this->input->get('timetk',true);
 			$timetj = $this->input->get('timetj',true);
 			$timetk = strtotime($timetk);
 			$timetj = strtotime($timetj);
+			$sid = $this->input->get('sid',true);
 			$where = "1=1";
 			if($title)
             {
@@ -561,9 +562,15 @@ class Color extends Start_Controller {
             {
                 $where  .= " and time > '$timetk' and time < '$timetj'";
             }
+			if($sid)
+            {
+                $where  .= " and id in (".trim($sid,',').") ";
+            }
+			
 			//数据排序
             $order_str = "id desc";
 			$info_list = $this->color->find_all($where,'id,title,state,type,color,lowe,content,img,developer,craft_process,time');
+			
 			foreach ($info_list as $key=>$value) 
 		    {
 		        if(empty($value['developer'])){

+ 1 - 0
template/erp/color.html

@@ -112,6 +112,7 @@ $(".excel2").click(function() {
 		var str = $(this).val().replace(/\#/g,"%23");
         f = f + $(this).attr("name") + "=" + str + "&";
     });
+   
 	$("input:hidden").each(function() {
         f = f + $(this).attr("name") + "=" + $(this).val() + "&";
     });