Parcourir la source

提交数据 已修改

lvhao il y a 11 heures
Parent
commit
a51be3847a

+ 25 - 2
core/CoreApp/controllers/Typeclass.php

@@ -62,6 +62,7 @@ class Typeclass extends Start_Controller {
 			$id = $this->input->post('id',true);
 			$spare = $this->input->post('spare',true);
 			$jm = $this->input->post('jm',true);
+			$ysdj = $this->input->post('ysdj',true);
 			$content = $this->input->post('content',true);
 			$hq = $this->input->post('hq',true);
 			$order_str = "sequence asc,title asc";
@@ -89,6 +90,9 @@ class Typeclass extends Start_Controller {
             {
                 $where  .= " and title like '%$title%'";
             }
+			if(!empty($ysdj)){
+				$where .= " and ysdj = ".$ysdj." ";
+			}
 			if($id)
             {
                 $where  .= " and id = '$id'";
@@ -123,7 +127,11 @@ class Typeclass extends Start_Controller {
                 $start = ($page - 1)*$perpage;
             }
             //取得信息列表
-            $info_list = $this->typeclass->find_all($where,'id,classtitle,title,spare,bqsku,jm,zh,yzh,content,bm,hq,is_check,sequence,time',$order_str,$start,$perpage);
+            $info_list = $this->typeclass->find_all($where,'id,classtitle,title,spare,bqsku,jm,zh,yzh,ysdj,content,bm,hq,is_check,sequence,time',$order_str,$start,$perpage);
+
+			$dj_list = $this->typeclass->find_all("classid = 13");
+			$dj_list = array_column($dj_list,'title','id');
+			
 			foreach ($info_list as $key=>$value) 
 		    {
 				$u = $this->typeclass->read($value['id']);
@@ -140,6 +148,12 @@ class Typeclass extends Start_Controller {
 				{
 					$info_list[$key]['hq'] = "";
 				}
+
+				if(isset($dj_list[$value['ysdj']])){
+					$info_list[$key]['ysdj'] = $dj_list[$value['ysdj']];
+				}else{
+					$info_list[$key]['ysdj'] = "";
+				}
 				if($value['is_check'] == 0){
 					$info_list[$key]['is_check'] = "否";
 				}else
@@ -433,7 +447,10 @@ class Typeclass extends Start_Controller {
                 $where  .= " and hq = '$hq'";
             }
             //取得信息列表
-            $info_list = $this->typeclass->find_all($where,'classid,title,spare,bqsku,jm,zh,yzh,content,sequence,time',$order_str);
+            $info_list = $this->typeclass->find_all($where,'classid,title,spare,bqsku,jm,zh,yzh,ysdj,content,sequence,time',$order_str);
+
+			$ysdj_list = $this->typeclass->find_all("classid = 13");
+			$ysdj_list = array_column($ysdj_list,'title','id');
 			foreach ($info_list as $key=>$value) 
 		    {
 				$c = $this->classid->read($value['classid']);
@@ -441,6 +458,11 @@ class Typeclass extends Start_Controller {
 				{
 					$info_list[$key]['classid'] = $c['title'];
 				}
+				if(isset($ysdj_list[$value['ysdj']])){
+					$info_list[$key]['ysdj'] = $ysdj_list[$value['ysdj']];
+				}else{
+					$info_list[$key]['ysdj'] = "";
+				}
 				$info_list[$key]['time'] = date('Y-m-d H:i:s',$value['time']);
 			}
             $title = "SKU"; 
@@ -453,6 +475,7 @@ class Typeclass extends Start_Controller {
 			<td>用友料号</td>
 			<td>仓库品名</td>
 			<td>用友品名</td>
+			<td>等级</td>
 			<td>备注</td>
 			<td>排序</td>
 			<td>添加时间</td>

+ 7 - 1
template/erp/typeclass.html

@@ -10,6 +10,11 @@
 <li>店铺SKU:<input value="" name="spare" type="text" ></li>
 <li>仓库品名:<input value="" name="zh" type="text" ></li>
 <li>用友料号:<input value="" name="jm" type="text" ></li>
+<li>等级:
+	<select name="ysdj" class="select">
+	<option value="">选择等级</option>{loop typeclass(13) as $val}
+	<option value="{$val['id']}">{$val['title']}</option>{/loop}</select>
+</li>
 <li>备注:<input value="" name="content" type="text" ></li>
 <li>允许获取:<select name="hq" class="select">
 <option value="">全部</option>
@@ -36,6 +41,7 @@
 <td>用友料号</td>
 <td>仓库品名</td>
 <td>用友品名</td>
+<td>等级</td>
 <td>备注</td>
 <td>编码</td>
 <td>独立站获取</td>
@@ -109,7 +115,7 @@ $(".cztphq").click(function() {
 				$(".ts p").html(c.msg);
                 $(".ts").fadeIn();
                 setTimeout('$(".ts").fadeOut()', 900);
-				$.each(c.del,function(f,b){ $("#"+b).find("td:eq(7)").html("是") });
+				$.each(c.del,function(f,b){ $("#"+b).find("td:eq(11)").html("是") });
                 return false;
             } else {
                 $(".ts p").html(c.msg);

+ 6 - 0
template/erp/typeclass_cx.html

@@ -8,6 +8,11 @@
 <option value="{$val['id']}">{$val['title']}</option>{/loop}</select></li>
 <li>店铺SKU:<input value="" name="spare" type="text" ></li>
 <li>仓库品名:<input value="" name="zh" type="text" ></li>
+<li>等级:
+	<select name="ysdj" class="select">
+	<option value="">选择等级</option>{loop typeclass(13) as $val}
+	<option value="{$val['id']}">{$val['title']}</option>{/loop}</select>
+</li>
 <li>备注:<input value="" name="content" type="text" ></li>
 <li><span>确 定</span></li>
 <li style="padding-left:20px;">测试SKU:<input value="" name="sku" type="text" style="width:380px;text-align: left;"></li>
@@ -23,6 +28,7 @@
 <td>用友料号</td>
 <td>仓库品名</td>
 <td>用友品名</td>
+<td>等级</td>
 <td>备注</td>
 <td>编码</td>
 <td>获取</td>