Browse Source

修改海关配置申报部分

lvhao 3 weeks ago
parent
commit
83e070ab47

+ 9 - 1
core/CoreApp/controllers/Customsdeclaration.php

@@ -36,6 +36,7 @@ class Customsdeclaration extends Start_Controller {
 			$ename = $this->input->post('ename',true);
 			$zname = $this->input->post('zname',true);
 			$bname = $this->input->post('bname',true);
+			$is_show = $this->input->post('is_show',true);
 			$where = "1=1 ";
 			if($ename)
             {
@@ -49,6 +50,9 @@ class Customsdeclaration extends Start_Controller {
             {
                 $where  .= " and bname = '$bname'";
             }
+			if($is_show){
+				$where  .= " and is_show = '$is_show' ";
+			}
             //数据排序
             $order_str = "px asc";
             if(empty($page))
@@ -61,7 +65,11 @@ class Customsdeclaration extends Start_Controller {
                 $start = ($page - 1)*$perpage;
             }
             //取得信息列表
-            $info_list = $this->customsdeclaration->find_all($where,'id,ename,zname,bname,px',$order_str,$start,$perpage);
+            $info_list = $this->customsdeclaration->find_all($where,'id,ename,zname,bname,px,is_show',$order_str,$start,$perpage);
+			foreach ($info_list as $k => $v) 
+		    {
+                $info_list[$k]['is_show'] = $v['is_show'] == 1 ? '显示' : '隐藏';
+            }
 		    $total = $this->customsdeclaration->find_count($where);
 		    $pagenum = ceil($total/$perpage);
 		    $over = $total-($start+$perpage);

+ 1 - 1
core/CoreApp/libraries/Common.php

@@ -120,7 +120,7 @@ $this->ci = &get_instance();
 	function _customsdeclaration($num=500,$order=NULL)
     {
 	$this->ci->load->_model('Model_customsdeclaration','customsdeclaration');
-    $where = "1 = 1";
+    $where = "is_show = 1";
     $result = $this->ci->customsdeclaration->find_all($where,'*',$order,0,$num);
     return $result;
 	}

+ 8 - 0
template/erp/customsdeclaration.html

@@ -6,6 +6,13 @@
 <li>英文申报品名:<input value="" name="ename" type="text" ></li>
 <li>中文申报品名:<input value="" name="zname" type="text" ></li>
 <li>申报编码:<input value="" name="bname" type="text" ></li>
+<li>是否显示:
+    <select name="is_show" class="select">
+    <option value="">请选择</option>
+    <option value="1">是</option>
+    <option value="2">否</option>
+</select>
+</li>
 <li><span>确 定</span></li>
 </ul>
 <div class="control">
@@ -19,6 +26,7 @@
 <td>中文申报品名</td>
 <td>申报编码</td>
 <td>排序(由小到大)</td>
+<td>显示</td>
 </tr>
 </table>
 </div>

+ 12 - 0
template/erp/customsdeclaration_add.html

@@ -21,12 +21,24 @@
 <em>申报编码:</em>
 <input class="must" value="" name="bname" type="text">
 </div>
+</li>
 <li>
 <div>
 <em>排序:</em>
 <input class="must" value="" name="px" type="text">
 </div>
 </li>
+
+<li>
+    <div>
+    <em>是否显示:</em>
+    <select name="is_show" class="select">
+        <option value="1">是</option>
+        <option value="2">否</option>
+    </select>
+    </div>
+</li>
+
 </div>
 <div style="clear:both;"></div>
 </ul>

+ 11 - 0
template/erp/customsdeclaration_edit.html

@@ -28,6 +28,17 @@
 <input class="must" value="{$customsdeclaration['px']}" name="px" type="text">
 </div>
 </li>
+
+<li>
+    <div>
+    <em>是否显示:</em>
+    <select name="is_show" class="select">
+        <option {if $customsdeclaration['is_show']==1}selected="selected"{/if} value="1">是</option>
+        <option {if $customsdeclaration['is_show']!=1}selected="selected"{/if} value="2">否</option>
+    </select>
+    </div>
+</li>
+
 </div>
 <div style="clear:both;"></div>
 </ul>