From e5262b098150bb7855a83435a8ec9419539d5130 Mon Sep 17 00:00:00 2001
From: cjl <qiankunpingtai@163.com>
Date: Wed, 23 Jan 2019 16:51:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=BA=8F=E5=88=97=E5=8F=B7?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/materials/material.html | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index ae5112cb..63c791e6 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -93,7 +93,7 @@
                     <tr>
                         <td style="width:80px;">序列号</td>
                         <td style="padding:5px;width:180px;">
-                            <select name="enableSerialNumber" id="enableSerialNumber" class="easyui-combobox" style="width:152px;height: 20px">
+                            <select name="enableSerialNumber" id="enableSerialNumber" style="width:152px;height: 20px">
                                 <option value="1">启用</option>
                                 <option value="0">禁用</option>
                             </select>
@@ -1160,7 +1160,9 @@
         $('#materialFM input').val(""); //将输入框全部清空
 
         bindMProperty(); //根据商品属性绑定
-        $("#enableSerialNumber").combobox('setValue','0');
+        // $("#enableSerialNumber").combobox('setValue','0');
+        $("#enableSerialNumber").val('0');
+
         $('#materialDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加商品信息');
         $(".window-mask").css({width: webW, height: webH});
         $("#Name").val("").focus();
@@ -1286,7 +1288,7 @@
         basicList.LowPrice = $("#basicLowPrice").val();
         basicList.PresetPriceOne = $("#basicPresetPriceOne").val();
         basicList.PresetPriceTwo = $("#basicPresetPriceTwo").val();
-        basicList.enableSerialNumber=$("#enableSerialNumber").combobox('getValue');
+        basicList.enableSerialNumber=$("#enableSerialNumber").val();
         otherList.Unit = $("#otherUnit").text();
         otherList.RetailPrice = $("#otherRetailPrice").val();
         otherList.LowPrice = $("#otherLowPrice").val();
@@ -1360,7 +1362,8 @@
         $("#Color").focus().val(materialInfo[11]);
         // console.log("enableSerialNumber:"+(materialInfo[24]=='true'?'1':'0'));
         // console.log("enableSerialNumber:"+materialInfo[24]);
-        $("#enableSerialNumber").combobox('setValue',materialInfo[24]=='true'?'1':'0');
+        // $("#enableSerialNumber").combobox('setValue',materialInfo[24]=='true'?'1':'0');
+        $("#enableSerialNumber").val(materialInfo[24]=='true'?'1':'0');
         // console.log($("#enableSerialNumber").val());
 
         var categoryName = ""; //类型名称