1

core/CoreApp/controllers/Goodimglibrary.php

@@ -425,6 +425,7 @@ class Goodimglibrary extends Start_Controller {
             $hairnumber = trim($hairnumber);
 
             $jm = $this->input->post("jm",true);
+            $kuwei_set = $this->input->post("kuwei_set",true);
           
             if(empty($page))
 		    {
@@ -494,6 +495,10 @@ class Goodimglibrary extends Start_Controller {
                 $where .= ' AND jm  LIKE "%'.trim($jm).'%"  ';
             }
 
+            if($kuwei_set > -1){
+                $where .= ' AND kuwei_set = '.$kuwei_set.' ';
+            }
+
             $is_able_edit = 0;
             if(in_array($user_id,[10,28])){
                 $is_able_edit = 1;
@@ -511,7 +516,14 @@ class Goodimglibrary extends Start_Controller {
                 $info_list[$k]['title'] = $v['title']."  <i class='fa fa-copy' data-text='".$v['title']."' onclick='fuzhi(this)' style='background-color:#FFE4C4'></i>";
                 $info_list[$k]['zh'] = $v['zh']."  <i class='fa fa-copy' data-text='".$v['zh']."' onclick='fuzhi(this)' style='background-color:#FFE4C4'></i>";
                 $info_list[$k]['jm'] = $v['jm']."  <i class='fa fa-copy' data-text='".$v['jm']."' onclick='fuzhi(this)' style='background-color:#FFE4C4'></i>";
-
+                $kuwei = "";
+                if(!empty($v['kuwei'])){
+                    $tmp_str = json_decode($v['kuweo'],true);
+                    if(!empty($tmp_str['xc'])){
+                        $kuwei = $tmp_str['xc'];
+                    }
+                }
+                $info_list[$k]['kuwei'] = $kuwei;
             }
 			
             $total = $this->goods->find_count($where);

template/erp/goodimglibrary_noimg.html

@@ -54,6 +54,12 @@
 <li>商品名称：<input value="" name="title" type="text" style="width:350px"></li>
 <li>仓库品名：<input value="" name="zh" type="text" style="width:350px"></li>
 <li>u9料号：<input value="" name="jm" type="text" style="width:250px"></li>
+<li>人发头套编号：<select name="hairnumber" class="select">
+    <option value="-1">请选择</option>
+    <option value="0">未设置</option>
+    <option value="1">已设置</option>
+    </select>
+</li>
 <li><span>确 定</span></li>
 
 </ul>
@@ -70,6 +76,7 @@
 <td>商品名称</td>
 <td>仓库品名</td>
 <td>u9料号</td>
+<td>库位</td>
 </tr>
 </table>
 </div>
@@ -94,11 +101,11 @@ var customon = 1;
 function custom(){
 $(".data tr").each(function() {
 $(this).find('td:eq(0)').css("width","1%");
-$(this).find('td:eq(1)').css("width","20%");
-$(this).find('td:eq(2)').css("width","25%");
-$(this).find('td:eq(3)').css("width","25%");
-$(this).find('td:eq(4)').css("width","20%");
-
+$(this).find('td:eq(1)').css("width","18%");
+$(this).find('td:eq(2)').css("width","23%");
+$(this).find('td:eq(3)').css("width","23%");
+$(this).find('td:eq(4)').css("width","18%");
+$(this).find('td:eq(5)').css("width","12%");