lvhao hai 2 días
pai
achega
6031f11fde

+ 8 - 2
core/CoreApp/controllers/Whlabel_bh.php

@@ -222,7 +222,7 @@ class Whlabel_bh extends Start_Controller {
 				$ck[$v['id']] = $v['title'];
 			}
             //取得信息列表
-            $info_list = $this->whlabel_bh->find_all($where,'id,orderinfo,title,shipremarks,bhnum,printnum,num,time,cscg',$order_str,$start,$perpage);
+            $info_list = $this->whlabel_bh->find_all($where,'id,orderinfo,title,shipremarks,bhnum,printnum,num,time,extra_type',$order_str,$start,$perpage);
 			foreach ($info_list as $key=>$value) 
 		    {
 				$d = $this->whlabel_bh->read($value['id']);
@@ -232,7 +232,12 @@ class Whlabel_bh extends Start_Controller {
 				$info_list[$key]['printnum'] = $printnum;
 				$info_list[$key]['num'] = $value['bhnum']-$printnum;
 				$info_list[$key]['time'] = date('Y-m-d',$value['time']).'<br>'.date('H:i:s',$value['time']);
-				$info_list[$key]['cscg'] =  "<span data-id='".$value['id']."' data-num='".$value['bhnum']."' class='whlabel_bh_print'>打印布标</span>";
+				if($value['extra_type'] == 1){
+					$info_list[$key]['extra_type'] =  "<span data-id='".$value['id']."' data-num='".$value['bhnum']."' class='whlabel_bh_print'>打印布标</span>";
+				}else{
+					$info_list[$key]['extra_type'] = "";
+				}
+				
 		    }
 		    $total = $this->whlabel_bh->find_count($where);
 		    $pagenum = ceil($total/$perpage);
@@ -474,6 +479,7 @@ class Whlabel_bh extends Start_Controller {
 			$post['time'] = $time;//操作时间
 			$post['printnum'] = $time;
 			$post['type'] = 0;
+			$post['extra_type'] = (int)trim($post['extra_type'],',');
 			
 			//传输料号开始
 			$lc = 0;

+ 8 - 1
template/erp/whlabel_bh_add.html

@@ -500,7 +500,14 @@
 <em>调拨数量:</em>
 <b>0</b>
 </li>
-
+<li>
+<em>美国销售:</em>
+<select name="extra_type" class="select">
+	<option value="0">否</option>
+	<option value="1">是</option>
+</select>
+</li>
+	
 
 <li class="length">
 <em>备注:</em>

+ 16 - 2
template/erp/whlabel_bh_edit.html

@@ -432,7 +432,7 @@
 </div>
 {/if}
 <div class="datalist postgift">
-<li class="length">
+<li>
 <em>标 题:</em>
 <input class="must" value="{$whlabel_bh['orderinfo']}" name="orderinfo" type="text">
 </li>
@@ -505,6 +505,13 @@
 <em>调拨数量:</em>
 <b>{$whlabel_bh['dbnum']}</b>
 </li>
+<li>
+    <em>美国销售:</em>
+    <select name="extra_type" class="select">
+        <option {if $whlabel_bh['extra_type'] == 0}selected="selected"{/if} value="0">否</option>
+        <option {if $whlabel_bh['extra_type'] == 1}selected="selected"{/if} value="1">是</option>
+    </select>
+</li>
 
 <li class="length">
 <em>备注:</em>
@@ -626,12 +633,19 @@
 <em>库存数量:</em>
 <b>{$whlabel_bh['kcnum']}</b>
 </li>
-
 <li>
 <em>调拨数量:</em>
 <b>{$whlabel_bh['dbnum']}</b>
 
 </li>
+<li>
+    <em>美国销售:</em>
+    <select name="extra_type" class="select">
+        <option {if $whlabel_bh['extra_type'] == 0}selected="selected"{/if} value="0">否</option>
+        <option {if $whlabel_bh['extra_type'] == 1}selected="selected"{/if} value="1">是</option>
+    </select>
+</li>
+
 
 <li class="length">
 <em>备注:</em>