diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 8f53413b..08ea4d6b 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -32,13 +32,6 @@
                 <input name="searchModel" id="searchModel" style="width:80px;"/>
             </td>
             <td>&nbsp;</td>
-            <td>类别：</td>
-            <td>
-                <select name="searchCategoryId_f" id="searchCategoryId_f" style="width:100px;"></select>
-                <select name="searchCategoryId_s" id="searchCategoryId_s" style="width:100px;"></select>
-                <select name="searchCategoryId_t" id="searchCategoryId_t" style="width:100px;"></select>
-            </td>
-            <td>&nbsp;</td>
             <td>
                 <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
                 <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
@@ -82,18 +75,17 @@
                     <tr>
                         <td style="height:30px;">类别</td>
                         <td style="padding:5px" colspan="3">
-                            <select name="CategoryId_f" id="CategoryId_f" style="width:152px;height: 20px"></select>
-                            <select name="CategoryId_s" id="CategoryId_s" style="width:152px;height: 20px"></select>
-                            <select name="CategoryId_t" id="CategoryId_t" style="width:152px;height: 20px"></select>
-                            <label id="mTypeName"></label>
-                            <a href="#" id="mTypeChange">修改</a>
+                            <input name="parentName" id="parentName"   style="width: 180px;height: 20px" readonly="readonly"/>
+                            <a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForSelectMaterialCategory">
+                                <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left"></span></span></a>
+                            <input name="parentid" id="parentid" type="hidden"/>
                         </td>
                         <td></td>
                     </tr>
                     <tr>
                         <td style="width:80px;">序列号</td>
                         <td style="padding:5px;width:180px;">
-                            <select name="enableSerialNumber" id="enableSerialNumber" style="width:152px;height: 20px">
+                            <select name="enableSerialNumber" id="enableSerialNumber" style="width: 180px;height: 20px">
                                 <option value="1">启用</option>
                                 <option value="0">禁用</option>
                             </select>
@@ -276,662 +268,513 @@
         </div>
     </form>
 </div>
-<script type="text/javascript">
-    var materialCategoryList = null;
-    var materialID = null;
-    var parentid_search = null;
-    var lei = null;
-    var types = "";
-    var setCategoryId = "1";
-    var cid = 1;
-    var multiple = 0;  //倍数
-    var mPropertyList = null; //商品属性列表
-    var mPropertyListShort = ""; //商品属性列表-传值
-    //初始化界面
-    $(function () {
+<div id="forSelectMaterialCategoryDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
+     closed="true" modal="true" cache="false" collapsible="false" closable="true">
+    <script type="text/javascript">
+        var materialCategoryList = null;
+        var types = "";
+        var setCategoryId = "1";
+        var cid = 1;
+        var multiple = 0;  //倍数
+        var mPropertyList = null; //商品属性列表
+        var mPropertyListShort = ""; //商品属性列表-传值
+        //初始化界面
+        $(function () {
+            //初始化系统基础信息
+            initMProperty();
+            initSystemData(1);
+            initSelectInfo("search_first");
+            initSelectInfo("edit_first");
+            manyUnitFun();
+            priceKeyUp();//价格触发事件
+            initMPropertyShort(); //初始化商品属性
+            initTableData();
+            ininPager();
+            initForm();
+            bindEvent();
+        });
+
         //初始化系统基础信息
-        initMProperty();
-        initSystemData(1);
-        initSelectInfo("search_first");
-        initSelectInfo("edit_first");
-        manyUnitFun();
-        priceKeyUp();//价格触发事件
-        initMPropertyShort(); //初始化商品属性
-        initTableData();
-        ininPager();
-        initForm();
-        bindEvent();
-    });
-
-    //初始化系统基础信息
-    function initMProperty() {
-        $.ajax({
-            type: "get",
-            url: "/materialProperty/list",
-            dataType: "json",
-            data: ({
-                currentPage: 1,
-                pageSize: 100
-            }),
-            success: function (res) {
-                if(res && res.code === 200){
-                    if(res.data && res.data.page) {
-                        mPropertyList = res.data.page.rows; //属性列表
+        function initMProperty() {
+            $.ajax({
+                type: "get",
+                url: "/materialProperty/list",
+                dataType: "json",
+                data: ({
+                    currentPage: 1,
+                    pageSize: 100
+                }),
+                success: function (res) {
+                    if(res && res.code === 200){
+                        if(res.data && res.data.page) {
+                            mPropertyList = res.data.page.rows; //属性列表
+                        }
                     }
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('查询提示', '查询信息异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    }
-
-    function initSystemData(parentid_search) {
-        $.ajax({
-            type: "get",
-            url: "/materialCategory/getAllList",
-            data: ({
-                parentId: parentid_search
-            }),
-            //设置为同步
-            async: false,
-            dataType: "json",
-            success: function (res) {
-                if(res && res.code === 200){
-                    materialCategoryList = res.data;
-                } else {
-                    $.messager.alert('提示', '查找系统基础信息异常,请与管理员联系！', 'error');
+                },
+                //此处添加错误处理
+                error: function () {
+                    $.messager.alert('查询提示', '查询信息异常，请稍后再试！', 'error');
                     return;
                 }
-            }
-        });
-    }
-
-    //初始化页面选项卡
-    function initSelectInfo(lei) {
-        var options = "";
-
-        if (materialCategoryList != null) {
-            options = "";
-            for (var i = 0; i < materialCategoryList.length; i++) {
-                var materialCategory = materialCategoryList[i];
-                if (0 == i) {
-                    mcId = materialCategory.id;
-                }
-                options += '<option value="' + materialCategory.id + '">' + materialCategory.name + '</option>';
-                if (lei == "search_second" || lei == "type_second" || lei == "search_three") {
-                    types += materialCategory.id + ',';
-                }
-            }
-            if (lei == "search_first") {
-                $("#searchCategoryId_f").empty().append('<option value="">全部</option>').append(options);
-            }
-            else if (lei == "search_second") {
-                $("#searchCategoryId_s").empty().append('<option value="">全部</option>').append(options);
-            }
-            else if (lei == "search_three") {
-                $("#searchCategoryId_t").empty().append('<option value="">全部</option>').append(options);
-            }
-            else if (lei == "edit_first") {
-                $("#CategoryId_f").empty().append('<option value="">全部</option>').append(options);
-            }
-            else if (lei == "edit_second") {
-                $("#CategoryId_s").empty().append('<option value="">全部</option>').append(options);
-            }
-            else if (lei == "edit_three") {
-                $("#CategoryId_t").empty().append('<option value="">全部</option>').append(options);
-            }
-        }
-    }
-
-    //一级目录-查询方法
-    var searchFirst = function () {
-        var parentid_search = $("#searchCategoryId_f").val();
-        if (parentid_search != '') {
-            types += parentid_search + ',';
-            initSystemData(parentid_search);
-            initSelectInfo("search_second");
-
-            var arr = types.split(',');
-            for (var i = 0; i < arr.length; i++) {
-                if (arr[i] != '' && arr[i] != parentid_search) {
-                    initSystemData(arr[i]);
-                    initSelectInfo("type_second");
-                }
-            }
-            types = types.substring(0, types.length - 1);
-            setCategoryId = types;
-            types = "";
-        }
-        else {
-            setCategoryId = "1";
-            $("#searchCategoryId_s").empty().append('<option value="">全部</option>');
-            $("#searchCategoryId_t").empty().append('<option value="">全部</option>');
-        }
-    }
-    //一级目录-查询事件
-    $("#searchCategoryId_f").change(
-        function () {
-            searchFirst();
-        }
-    );
-    //二级目录-查询方法
-    var searchSecond = function () {
-        var parentid_search = $("#searchCategoryId_s").val();
-        if (parentid_search != '') {
-            initSystemData(parentid_search);
-            initSelectInfo("search_three");
-            types = types.substring(0, types.length - 1);
-            setCategoryId = types;
-            types = "";
-        }
-        else {
-            searchFirst();
-            $("#searchCategoryId_t").empty().append('<option value="">全部</option>');
-        }
-    }
-    //二级目录-查询事件
-    $("#searchCategoryId_s").change(
-        function () {
-            searchSecond();
-        }
-    );
-    //三级目录-查询事件
-    $("#searchCategoryId_t").change(
-        function () {
-            var parentid_search = $("#searchCategoryId_t").val();
-            if (parentid_search != '') {
-                types = parentid_search;
-                setCategoryId = types;
-                types = "";
-            }
-            else {
-                searchSecond();
-            }
-        }
-    );
-    //一级目录-编辑
-    $("#CategoryId_f").change(
-        function () {
-            var CategoryId_f = $("#CategoryId_f").val();
-            if (CategoryId_f != '') {
-                initSystemData(CategoryId_f);
-                initSelectInfo("edit_second");
-            }
-        }
-    );
-    //二级目录-编辑
-    $("#CategoryId_s").change(
-        function () {
-            var CategoryId_s = $("#CategoryId_s").val();
-            if (CategoryId_s != '') {
-                initSystemData(CategoryId_s);
-                initSelectInfo("edit_three");
-            }
-        }
-    );
-
-    //防止表单提交重复
-    function initForm() {
-        $('#materialFM').form({
-            onSubmit: function () {
-                return false;
-            }
-        });
-    }
-
-    //多单位勾选
-    function manyUnitFun() {
-        $("#manyUnitCheck").off("click").on("click", function () {
-            if ($(this).prop("checked") == true) {
-                //当前为选中状态
-                $("#Unit").hide();
-                $("#manyUnit").show();
-                $(".first-select-unit").show();
-                $(".price-list").show();
-                $(".price-one").hide();
-                $(".price-two").hide();
-
-                $("#Unit").val(""); //清除单位的填写内容
-                $("#RetailPrice").val("");
-                $("#LowPrice").val("");
-                $("#PresetPriceOne").val("");
-                $("#PresetPriceTwo").val("");
-            }
-            else {
-                //当前为不选中状态
-                $("#Unit").show();
-                $("#manyUnit").hide();
-                $(".first-select-unit").hide();
-                $(".price-list").hide();
-                $(".price-one").show();
-                $(".price-two").show();
-
-                $("#manyUnit").val(""); //清除多单位的下拉框
-                $("#FirstOutUnit").val("");
-                $("#FirstInUnit").val("");
-                $("#basicUnit").text("");
-                $("#basicRetailPrice").val("");
-                $("#basicLowPrice").val("");
-                $("#basicPresetPriceOne").val("");
-                $("#basicPresetPriceTwo").val("");
-                $("#otherUnit").text("");
-                $("#otherRetailPrice").val("");
-                $("#otherLowPrice").val("");
-                $("#otherPresetPriceOne").val("");
-                $("#otherPresetPriceTwo").val("");
-
-            }
-        });
-    }
-
-    //价格触发事件
-    function priceKeyUp() {
-        $("#basicRetailPrice").off("keyup").on("keyup", function () {
-            if (multiple) {
-                $("#otherRetailPrice").val($(this).val() * multiple);
-            }
-        });
-        $("#basicLowPrice").off("keyup").on("keyup", function () {
-            if (multiple) {
-                $("#otherLowPrice").val($(this).val() * multiple);
-            }
-        });
-        $("#basicPresetPriceOne").off("keyup").on("keyup", function () {
-            if (multiple) {
-                $("#otherPresetPriceOne").val($(this).val() * multiple);
-            }
-        });
-        $("#basicPresetPriceTwo").off("keyup").on("keyup", function () {
-            if (multiple) {
-                $("#otherPresetPriceTwo").val($(this).val() * multiple);
-            }
-        });
-    }
-
-    //初始化商品属性
-    function initMPropertyShort() {
-        $.ajax({
-            type: "get",
-            url: "/materialProperty/list",
-            dataType: "json",
-            async: false,
-            data: ({
-                currentPage: 1,
-                pageSize: 100
-            }),
-            success: function (res) {
-                if(res && res.code === 200){
-                    if(res.data && res.data.page) {
-                        var thisRows = res.data.page.rows; //属性列表
-                        for (var i = 0; i < thisRows.length; i++) {
-                            if (thisRows[i].enabled) {
-                                mPropertyListShort += thisRows[i].nativename + ",";
-                            }
-                        }
-                        if (mPropertyListShort) {
-                            mPropertyListShort = mPropertyListShort.substring(0, mPropertyListShort.length - 1);
-                        }
-                    }
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('查询提示', '查询信息异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    }
-
-    //初始化表格数据
-    function initTableData() {
-        //改变宽度和高度
-        $("#searchPanel").panel({width: webW - 2});
-        $("#tablePanel").panel({width: webW - 2});
-        $('#tableData').datagrid({
-            //title:'商品列表',
-            //iconCls:'icon-save',
-            //width:700,
-            height: heightInfo,
-            nowrap: false,
-            rownumbers: false,
-            //动画效果
-            animate: false,
-            //选中单行
-            singleSelect: true,
-            collapsible: false,
-            selectOnCheck: false,
-            //fitColumns:true,
-            //单击行是否选中
-            //checkOnSelect : false,
-            pagination: true,
-            //交替出现背景
-            striped: true,
-            //loadFilter: pagerFilter,
-            pageSize: initPageSize,
-            pageList: initPageNum,
-            columns: [[
-                {field: 'id', width: 35, align: "center", checkbox: true},
-                {
-                    title: '操作', field: 'op', align: "center", width: 60, formatter: function (value, rec) {
-                        var str = '';
-                        var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.model + 'AaBb' + rec.color + 'AaBb' + rec.unit + 'AaBb' + rec.retailprice
-                            + 'AaBb' + rec.lowprice + 'AaBb' + rec.presetpriceone + 'AaBb' + rec.presetpricetwo + 'AaBb' + rec.remark + 'AaBb' + rec.standard
-                            + 'AaBb' + rec.color + 'AaBb' + rec.packing + 'AaBb' + rec.safetystock + 'AaBb' + rec.categoryid + 'AaBb' + rec.categoryName
-                            + 'AaBb' + rec.unitid + 'AaBb' + rec.unitName + 'AaBb' + rec.firstoutunit + 'AaBb' + rec.firstinunit
-                            + 'AaBb' + rec.mfrs + 'AaBb' + rec.otherfield1 + 'AaBb' + rec.otherfield2 + 'AaBb' + rec.otherfield3+ 'AaBb' + rec.enableSerialNumber;
-                        str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterial(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
-                        str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteMaterial(' + rec.id + ');"/>';
-                        return str;
-                    }
-                },
-                {title: '品名', field: 'name', width: 100},
-                {title: '型号', field: 'model', width: 80},
-                {title: '扩展信息', field: 'materialOther', width: 150},
-                {title: '单位', field: 'unit', width: 60},
-                {title: '安全存量', field: 'safetystock', width: 70},
-                {
-                    title: '库存', field: 'abc', width: 70, formatter: function (value, rec) {
-                        var monthTime = getNowFormatMonth();
-                        var mId = rec.id; //商品id
-                        var thisStock = 0;
-                        //查询库存
-                        $.ajax({
-                            type: "get",
-                            url: '/depotItem/findStockNumByMaterialId',
-                            data: {
-                                materialId: mId,
-                                monthTime: monthTime,
-                                currentPage: 1,
-                                pageSize: 10
-                            },
-                            dataType: "json",
-                            success: function (res) {
-                                if(res && res.code === 200) {
-                                    if (res.data && res.data.page && res.data.page[0]) {
-                                        thisStock = res.data.page[0].thisSum - 0;
-                                        if (thisStock > 0) {
-                                            $("#tablePanel .class-" + rec.id).text(thisStock); //延迟加载库存数据
-                                            $("#tablePanel .class-" + rec.id).css("color", "blue").css("text-decoration", "underline").css("cursor", "pointer");
-                                            $("#tablePanel .class-" + rec.id).off("click").on("click", function () {
-                                                $('#materialDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;查看出入库明细');
-                                                $(".window-mask").css({width: webW, height: webH});
-                                                initMaterialDetailData(mId);
-                                                getMaterialInOutList(mId, 1, initPageSize);
-                                                ininMaterialDetailPager(mId);
-                                            });
-                                        }
-                                    }
-                                }
-                            },
-                            error: function () {
-                                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                            }
-                        });
-                        return "<span class='class-" + rec.id + "'>" + thisStock + "</span>";
-                    }
-                },
-                {title: '零售价', field: 'retailprice', width: 60},
-                {title: '最低售价', field: 'lowprice', width: 70},
-                {title: '预计采购价', field: 'presetpriceone', width: 70},
-                {title: '批发价', field: 'presetpricetwo', width: 70},
-                {
-                    title: '状态', field: 'enabled', width: 50, align: "center", formatter: function (value) {
-                        return value ? "启用" : "禁用";
-                    }
-                },
-                {
-                    title: '序列号', field: 'enableSerialNumber', width: 70, align: "center", formatter: function (value) {
-                        return value=='1' ? "启用" : "禁用";
-                    }
-                }
-            ]],
-            toolbar: [
-                {
-                    id: 'addMaterial',
-                    text: '增加',
-                    iconCls: 'icon-add',
-                    handler: function () {
-                        addMaterial();
-                    }
-                },
-                '-',
-                {
-                    id: 'deleteMaterial',
-                    text: '删除',
-                    iconCls: 'icon-remove',
-                    handler: function () {
-                        batDeleteMaterial();
-                    }
-                },
-                '-',
-                {
-                    id: 'setEnable',
-                    text: '启用',
-                    iconCls: 'icon-ok',
-                    handler: function () {
-                        setEnableFun();
-                    }
-                },
-                '-',
-                {
-                    id: 'setDisEnable',
-                    text: '禁用',
-                    iconCls: 'icon-no',
-                    handler: function () {
-                        setDisEnableFun();
-                    }
-                },
-                '-',
-                {
-                    id: 'setInput',
-                    text: '导入',
-                    iconCls: 'icon-excel',
-                    handler: function () {
-                        setInputFun();
-                    }
-                },
-                '-',
-                {
-                    id: 'setOutput',
-                    text: '导出',
-                    iconCls: 'icon-excel',
-                    handler: function () {
-                        setOutputFun();
-                    }
-                }
-            ],
-            onLoadError: function () {
-                $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-        showMaterialDetails(1, initPageSize);
-    }
-
-    //初始化表格数据
-    function initMaterialDetailData(mId) {
-        $('#materialTableData').datagrid({
-            height: heightInfo,
-            nowrap: false,
-            rownumbers: false,
-            //动画效果
-            animate: false,
-            //选中单行
-            singleSelect: true,
-            collapsible: false,
-            selectOnCheck: false,
-            //单击行是否选中
-            checkOnSelect: false,
-            //交替出现背景
-            striped: true,
-            pagination: true,
-            pageSize: initPageSize,
-            pageList: initPageNum,
-            columns: [[
-                {
-                    title: '单据编号', field: 'Number', width: 150,
-                    formatter: function (value, row) {
-                        return "<a class='n-link' onclick=\"newTab('" + row.Number + "','../materials/bill_detail.html?n=" + row.Number + "&type=" + row.Type + "','')\">"
-                            + row.Number + "</a>";
-                    }
-                },
-                {title: '类型', field: 'Type', width: 100},
-                {title: '数量', field: 'BasicNumber', width: 80},
-                {title: '日期', field: 'OperTime', width: 180}
-            ]],
-            onLoadError: function () {
-                $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-    }
-
-    //分页信息处理
-    function ininMaterialDetailPager(mId) {
-        try {
-            var opts = $("#materialTableData").datagrid('options');
-            var pager = $("#materialTableData").datagrid('getPager');
-            pager.pagination({
-                onSelectPage: function (pageNum, pageSize) {
-                    opts.pageNumber = pageNum;
-                    opts.pageSize = pageSize;
-                    pager.pagination('refresh', {
-                        pageNumber: pageNum,
-                        pageSize: pageSize
-                    });
-                    getMaterialInOutList(mId, pageNum, pageSize);
-                }
             });
         }
-        catch (e) {
-            $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
-        }
-    }
 
-    function getMaterialInOutList(mId, pageNo, pageSize) {
-        $.ajax({
-            type: "get",
-            url: "/depotItem/findDetailByTypeAndMaterialId",
-            dataType: "json",
-            data: ({
-                materialId: mId,
-                currentPage: pageNo,
-                pageSize: pageSize
-            }),
-            success: function (res) {
-                if(res && res.code === 200){
-                    if(res.data && res.data.page) {
-                        $("#materialTableData").datagrid('loadData', res.data.page);
+        function initSystemData(parentid_search) {
+            $.ajax({
+                type: "get",
+                url: "/materialCategory/getAllList",
+                data: ({
+                    parentId: parentid_search
+                }),
+                //设置为同步
+                async: false,
+                dataType: "json",
+                success: function (res) {
+                    if(res && res.code === 200){
+                        materialCategoryList = res.data;
+                    } else {
+                        $.messager.alert('提示', '查找系统基础信息异常,请与管理员联系！', 'error');
+                        return;
+                    }
+                }
+            });
+        }
+
+        //初始化页面选项卡
+        function initSelectInfo(lei) {
+            var options = "";
+
+            if (materialCategoryList != null) {
+                options = "";
+                for (var i = 0; i < materialCategoryList.length; i++) {
+                    var materialCategory = materialCategoryList[i];
+                    if (0 == i) {
+                        mcId = materialCategory.id;
+                    }
+                    options += '<option value="' + materialCategory.id + '">' + materialCategory.name + '</option>';
+                    if (lei == "search_second" || lei == "type_second" || lei == "search_three") {
+                        types += materialCategory.id + ',';
                     }
                 }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                return;
             }
-        });
-    }
-
-    //初始化键盘enter事件
-    $(document).keydown(function (event) {
-        //兼容 IE和firefox 事件
-        var e = window.event || event;
-        var k = e.keyCode || e.which || e.charCode;
-        //兼容 IE,firefox 兼容
-        var obj = e.srcElement ? e.srcElement : e.target;
-        //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
-        if (k == "13" && (obj.id == "CategoryLevel" || obj.id == "Name")) {
-            $("#saveMaterial").click();
         }
-        //搜索按钮添加快捷键
-        if (k == "13" && (obj.id == "searchCategoryId" || (obj.id == "searchName"))) {
-            $("#searchBtn").click();
-        }
-    });
 
-    //分页信息处理
-    function ininPager() {
-        try {
-            var opts = $("#tableData").datagrid('options');
-            var pager = $("#tableData").datagrid('getPager');
-            pager.pagination({
-                onSelectPage: function (pageNum, pageSize) {
-                    opts.pageNumber = pageNum;
-                    opts.pageSize = pageSize;
-                    pager.pagination('refresh',
-                        {
+
+        //防止表单提交重复
+        function initForm() {
+            $('#materialFM').form({
+                onSubmit: function () {
+                    return false;
+                }
+            });
+        }
+
+        //多单位勾选
+        function manyUnitFun() {
+            $("#manyUnitCheck").off("click").on("click", function () {
+                if ($(this).prop("checked") == true) {
+                    //当前为选中状态
+                    $("#Unit").hide();
+                    $("#manyUnit").show();
+                    $(".first-select-unit").show();
+                    $(".price-list").show();
+                    $(".price-one").hide();
+                    $(".price-two").hide();
+
+                    $("#Unit").val(""); //清除单位的填写内容
+                    $("#RetailPrice").val("");
+                    $("#LowPrice").val("");
+                    $("#PresetPriceOne").val("");
+                    $("#PresetPriceTwo").val("");
+                }
+                else {
+                    //当前为不选中状态
+                    $("#Unit").show();
+                    $("#manyUnit").hide();
+                    $(".first-select-unit").hide();
+                    $(".price-list").hide();
+                    $(".price-one").show();
+                    $(".price-two").show();
+
+                    $("#manyUnit").val(""); //清除多单位的下拉框
+                    $("#FirstOutUnit").val("");
+                    $("#FirstInUnit").val("");
+                    $("#basicUnit").text("");
+                    $("#basicRetailPrice").val("");
+                    $("#basicLowPrice").val("");
+                    $("#basicPresetPriceOne").val("");
+                    $("#basicPresetPriceTwo").val("");
+                    $("#otherUnit").text("");
+                    $("#otherRetailPrice").val("");
+                    $("#otherLowPrice").val("");
+                    $("#otherPresetPriceOne").val("");
+                    $("#otherPresetPriceTwo").val("");
+
+                }
+            });
+        }
+
+        //价格触发事件
+        function priceKeyUp() {
+            $("#basicRetailPrice").off("keyup").on("keyup", function () {
+                if (multiple) {
+                    $("#otherRetailPrice").val($(this).val() * multiple);
+                }
+            });
+            $("#basicLowPrice").off("keyup").on("keyup", function () {
+                if (multiple) {
+                    $("#otherLowPrice").val($(this).val() * multiple);
+                }
+            });
+            $("#basicPresetPriceOne").off("keyup").on("keyup", function () {
+                if (multiple) {
+                    $("#otherPresetPriceOne").val($(this).val() * multiple);
+                }
+            });
+            $("#basicPresetPriceTwo").off("keyup").on("keyup", function () {
+                if (multiple) {
+                    $("#otherPresetPriceTwo").val($(this).val() * multiple);
+                }
+            });
+        }
+
+        //初始化商品属性
+        function initMPropertyShort() {
+            $.ajax({
+                type: "get",
+                url: "/materialProperty/list",
+                dataType: "json",
+                async: false,
+                data: ({
+                    currentPage: 1,
+                    pageSize: 100
+                }),
+                success: function (res) {
+                    if(res && res.code === 200){
+                        if(res.data && res.data.page) {
+                            var thisRows = res.data.page.rows; //属性列表
+                            for (var i = 0; i < thisRows.length; i++) {
+                                if (thisRows[i].enabled) {
+                                    mPropertyListShort += thisRows[i].nativename + ",";
+                                }
+                            }
+                            if (mPropertyListShort) {
+                                mPropertyListShort = mPropertyListShort.substring(0, mPropertyListShort.length - 1);
+                            }
+                        }
+                    }
+                },
+                //此处添加错误处理
+                error: function () {
+                    $.messager.alert('查询提示', '查询信息异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
+        }
+
+        //初始化表格数据
+        function initTableData() {
+            //改变宽度和高度
+            $("#searchPanel").panel({width: webW - 2});
+            $("#tablePanel").panel({width: webW - 2});
+            $('#tableData').datagrid({
+                //title:'商品列表',
+                //iconCls:'icon-save',
+                //width:700,
+                height: heightInfo,
+                nowrap: false,
+                rownumbers: false,
+                //动画效果
+                animate: false,
+                //选中单行
+                singleSelect: true,
+                collapsible: false,
+                selectOnCheck: false,
+                //fitColumns:true,
+                //单击行是否选中
+                //checkOnSelect : false,
+                pagination: true,
+                //交替出现背景
+                striped: true,
+                //loadFilter: pagerFilter,
+                pageSize: initPageSize,
+                pageList: initPageNum,
+                columns: [[
+                    {field: 'id', width: 35, align: "center", checkbox: true},
+                    {
+                        title: '操作', field: 'op', align: "center", width: 60, formatter: function (value, rec) {
+                            var str = '';
+                            var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.model + 'AaBb' + rec.color + 'AaBb' + rec.unit + 'AaBb' + rec.retailprice
+                                + 'AaBb' + rec.lowprice + 'AaBb' + rec.presetpriceone + 'AaBb' + rec.presetpricetwo + 'AaBb' + rec.remark + 'AaBb' + rec.standard
+                                + 'AaBb' + rec.color + 'AaBb' + rec.packing + 'AaBb' + rec.safetystock + 'AaBb' + rec.categoryid + 'AaBb' + rec.categoryName
+                                + 'AaBb' + rec.unitid + 'AaBb' + rec.unitName + 'AaBb' + rec.firstoutunit + 'AaBb' + rec.firstinunit
+                                + 'AaBb' + rec.mfrs + 'AaBb' + rec.otherfield1 + 'AaBb' + rec.otherfield2 + 'AaBb' + rec.otherfield3+ 'AaBb' + rec.enableSerialNumber;
+                            str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterial(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
+                            str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteMaterial(' + rec.id + ');"/>';
+                            return str;
+                        }
+                    },
+                    {title: '品名', field: 'name', width: 100},
+                    {title: '型号', field: 'model', width: 80},
+                    {title: '类别', field: 'categoryName', width: 80},
+                    {title: '扩展信息', field: 'materialOther', width: 150},
+                    {title: '单位', field: 'unit', width: 60},
+                    {title: '安全存量', field: 'safetystock', width: 70},
+                    {
+                        title: '库存', field: 'abc', width: 70, formatter: function (value, rec) {
+                            var monthTime = getNowFormatMonth();
+                            var mId = rec.id; //商品id
+                            var thisStock = 0;
+                            //查询库存
+                            $.ajax({
+                                type: "get",
+                                url: '/depotItem/findStockNumByMaterialId',
+                                data: {
+                                    materialId: mId,
+                                    monthTime: monthTime,
+                                    currentPage: 1,
+                                    pageSize: 10
+                                },
+                                dataType: "json",
+                                success: function (res) {
+                                    if(res && res.code === 200) {
+                                        if (res.data && res.data.page && res.data.page[0]) {
+                                            thisStock = res.data.page[0].thisSum - 0;
+                                            if (thisStock > 0) {
+                                                $("#tablePanel .class-" + rec.id).text(thisStock); //延迟加载库存数据
+                                                $("#tablePanel .class-" + rec.id).css("color", "blue").css("text-decoration", "underline").css("cursor", "pointer");
+                                                $("#tablePanel .class-" + rec.id).off("click").on("click", function () {
+                                                    $('#materialDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;查看出入库明细');
+                                                    $(".window-mask").css({width: webW, height: webH});
+                                                    initMaterialDetailData(mId);
+                                                    getMaterialInOutList(mId, 1, initPageSize);
+                                                    ininMaterialDetailPager(mId);
+                                                });
+                                            }
+                                        }
+                                    }
+                                },
+                                error: function () {
+                                    $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
+                                }
+                            });
+                            return "<span class='class-" + rec.id + "'>" + thisStock + "</span>";
+                        }
+                    },
+                    {title: '零售价', field: 'retailprice', width: 60},
+                    {title: '最低售价', field: 'lowprice', width: 70},
+                    {title: '预计采购价', field: 'presetpriceone', width: 70},
+                    {title: '批发价', field: 'presetpricetwo', width: 70},
+                    {
+                        title: '状态', field: 'enabled', width: 50, align: "center", formatter: function (value) {
+                            return value ? "启用" : "禁用";
+                        }
+                    },
+                    {
+                        title: '序列号', field: 'enableSerialNumber', width: 70, align: "center", formatter: function (value) {
+                            return value=='1' ? "启用" : "禁用";
+                        }
+                    }
+                ]],
+                toolbar: [
+                    {
+                        id: 'addMaterial',
+                        text: '增加',
+                        iconCls: 'icon-add',
+                        handler: function () {
+                            addMaterial();
+                        }
+                    },
+                    '-',
+                    {
+                        id: 'deleteMaterial',
+                        text: '删除',
+                        iconCls: 'icon-remove',
+                        handler: function () {
+                            batDeleteMaterial();
+                        }
+                    },
+                    '-',
+                    {
+                        id: 'setEnable',
+                        text: '启用',
+                        iconCls: 'icon-ok',
+                        handler: function () {
+                            setEnableFun();
+                        }
+                    },
+                    '-',
+                    {
+                        id: 'setDisEnable',
+                        text: '禁用',
+                        iconCls: 'icon-no',
+                        handler: function () {
+                            setDisEnableFun();
+                        }
+                    },
+                    '-',
+                    {
+                        id: 'setInput',
+                        text: '导入',
+                        iconCls: 'icon-excel',
+                        handler: function () {
+                            setInputFun();
+                        }
+                    },
+                    '-',
+                    {
+                        id: 'setOutput',
+                        text: '导出',
+                        iconCls: 'icon-excel',
+                        handler: function () {
+                            setOutputFun();
+                        }
+                    }
+                ],
+                onLoadError: function () {
+                    $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
+            showMaterialDetails(1, initPageSize);
+        }
+
+        //初始化表格数据
+        function initMaterialDetailData(mId) {
+            $('#materialTableData').datagrid({
+                height: heightInfo,
+                nowrap: false,
+                rownumbers: false,
+                //动画效果
+                animate: false,
+                //选中单行
+                singleSelect: true,
+                collapsible: false,
+                selectOnCheck: false,
+                //单击行是否选中
+                checkOnSelect: false,
+                //交替出现背景
+                striped: true,
+                pagination: true,
+                pageSize: initPageSize,
+                pageList: initPageNum,
+                columns: [[
+                    {
+                        title: '单据编号', field: 'Number', width: 150,
+                        formatter: function (value, row) {
+                            return "<a class='n-link' onclick=\"newTab('" + row.Number + "','../materials/bill_detail.html?n=" + row.Number + "&type=" + row.Type + "','')\">"
+                                + row.Number + "</a>";
+                        }
+                    },
+                    {title: '类型', field: 'Type', width: 100},
+                    {title: '数量', field: 'BasicNumber', width: 80},
+                    {title: '日期', field: 'OperTime', width: 180}
+                ]],
+                onLoadError: function () {
+                    $.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
+        }
+
+        //分页信息处理
+        function ininMaterialDetailPager(mId) {
+            try {
+                var opts = $("#materialTableData").datagrid('options');
+                var pager = $("#materialTableData").datagrid('getPager');
+                pager.pagination({
+                    onSelectPage: function (pageNum, pageSize) {
+                        opts.pageNumber = pageNum;
+                        opts.pageSize = pageSize;
+                        pager.pagination('refresh', {
                             pageNumber: pageNum,
                             pageSize: pageSize
                         });
-                    showMaterialDetails(pageNum, pageSize);
-                }
-            });
-        }
-        catch (e) {
-            $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
-        }
-    }
-
-    //删除商品信息
-    function deleteMaterial(materialID) {
-        $.messager.confirm('删除确认', '确定要删除此商品信息吗？', function (r) {
-            if (r) {
-                $.ajax({
-                    type: "post",
-                    url: "/material/" + materialID + "/delete",
-                    dataType: "json",
-                    success: function (res) {
-                        if(res && res.code == 200) {
-                            $("#searchBtn").click();
-                        } else {
-                            $.messager.alert('删除提示', '删除商品信息失败，请稍后再试！', 'error');
-                        }
-                    },
-                    //此处添加错误处理
-                    error: function () {
-                        $.messager.alert('删除提示', '删除商品信息异常，请稍后再试！', 'error');
-                        return;
+                        getMaterialInOutList(mId, pageNum, pageSize);
                     }
                 });
             }
-        });
-    }
-
-    //批量删除商品
-    function batDeleteMaterial() {
-        var row = $('#tableData').datagrid('getChecked');
-        if (row.length == 0) {
-            $.messager.alert('删除提示', '没有记录被选中！', 'info');
-            return;
+            catch (e) {
+                $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
+            }
         }
-        if (row.length > 0) {
-            $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条商品信息吗？', function (r) {
-                if (r) {
-                    var ids = "";
-                    for (var i = 0; i < row.length; i++) {
-                        if (i == row.length - 1) {
-                            ids += row[i].id;
-                            break;
+
+        function getMaterialInOutList(mId, pageNo, pageSize) {
+            $.ajax({
+                type: "get",
+                url: "/depotItem/findDetailByTypeAndMaterialId",
+                dataType: "json",
+                data: ({
+                    materialId: mId,
+                    currentPage: pageNo,
+                    pageSize: pageSize
+                }),
+                success: function (res) {
+                    if(res && res.code === 200){
+                        if(res.data && res.data.page) {
+                            $("#materialTableData").datagrid('loadData', res.data.page);
                         }
-                        //alert(row[i].id);
-                        ids += row[i].id + ",";
                     }
+                },
+                //此处添加错误处理
+                error: function () {
+                    $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
+        }
+
+        //初始化键盘enter事件
+        $(document).keydown(function (event) {
+            //兼容 IE和firefox 事件
+            var e = window.event || event;
+            var k = e.keyCode || e.which || e.charCode;
+            //兼容 IE,firefox 兼容
+            var obj = e.srcElement ? e.srcElement : e.target;
+            //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
+            if (k == "13" && (obj.id == "CategoryLevel" || obj.id == "Name")) {
+                $("#saveMaterial").click();
+            }
+            //搜索按钮添加快捷键
+            if (k == "13" && (obj.id == "searchCategoryId" || (obj.id == "searchName"))) {
+                $("#searchBtn").click();
+            }
+        });
+
+        //分页信息处理
+        function ininPager() {
+            try {
+                var opts = $("#tableData").datagrid('options');
+                var pager = $("#tableData").datagrid('getPager');
+                pager.pagination({
+                    onSelectPage: function (pageNum, pageSize) {
+                        opts.pageNumber = pageNum;
+                        opts.pageSize = pageSize;
+                        pager.pagination('refresh',
+                            {
+                                pageNumber: pageNum,
+                                pageSize: pageSize
+                            });
+                        showMaterialDetails(pageNum, pageSize);
+                    }
+                });
+            }
+            catch (e) {
+                $.messager.alert('异常处理提示', "分页信息异常 :  " + e.name + ": " + e.message, 'error');
+            }
+        }
+
+        //删除商品信息
+        function deleteMaterial(materialID) {
+            $.messager.confirm('删除确认', '确定要删除此商品信息吗？', function (r) {
+                if (r) {
                     $.ajax({
                         type: "post",
-                        url: "/material/batchDelete",
+                        url: "/material/" + materialID + "/delete",
                         dataType: "json",
-                        async: false,
-                        data: ({
-                            ids: ids
-                        }),
                         success: function (res) {
-                            if(res && res.code === 200) {
+                            if(res && res.code == 200) {
                                 $("#searchBtn").click();
-                                $(":checkbox").attr("checked", false);
                             } else {
                                 $.messager.alert('删除提示', '删除商品信息失败，请稍后再试！', 'error');
                             }
@@ -945,505 +788,270 @@
                 }
             });
         }
-    }
 
-    //批量启用
-    function setEnableFun() {
-        var row = $('#tableData').datagrid('getChecked');
-        if (row.length == 0) {
-            $.messager.alert('启用提示', '没有记录被选中！', 'info');
-            return;
-        }
-        if (row.length > 0) {
-            $.messager.confirm('启用确认', '确定要启用选中的' + row.length + '条信息吗？', function (r) {
-                if (r) {
-                    var ids = "";
-                    for (var i = 0; i < row.length; i++) {
-                        if (i == row.length - 1) {
-                            ids += row[i].id;
-                            break;
-                        }
-                        ids += row[i].id + ",";
-                    }
-                    $.ajax({
-                        type: "post",
-                        url: "/material/batchSetEnable",
-                        dataType: "json",
-                        async: false,
-                        data: ({
-                            enabled: true,
-                            materialIDs: ids
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200) {
-                                $("#searchBtn").click();
-                                $(":checkbox").attr("checked", false);
-                            } else {
-                                $.messager.alert('启用提示', '启用信息失败，请稍后再试！', 'error');
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('启用提示', '启用信息异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-            });
-        }
-    }
-
-    //批量禁用
-    function setDisEnableFun() {
-        var row = $('#tableData').datagrid('getChecked');
-        if (row.length == 0) {
-            $.messager.alert('禁用提示', '没有记录被选中！', 'info');
-            return;
-        }
-        if (row.length > 0) {
-            $.messager.confirm('禁用确认', '确定要禁用选中的' + row.length + '条信息吗？', function (r) {
-                if (r) {
-                    var ids = "";
-                    for (var i = 0; i < row.length; i++) {
-                        if (i == row.length - 1) {
-                            ids += row[i].id;
-                            break;
-                        }
-                        ids += row[i].id + ",";
-                    }
-                    $.ajax({
-                        type: "post",
-                        url: "/material/batchSetEnable",
-                        dataType: "json",
-                        async: false,
-                        data: ({
-                            enabled: false,
-                            materialIDs: ids
-                        }),
-                        success: function (res) {
-                            if(res && res.code === 200) {
-                                $("#searchBtn").click();
-                                $(":checkbox").attr("checked", false);
-                            } else {
-                                $.messager.alert('禁用提示', '禁用信息失败，请稍后再试！', 'error');
-                            }
-                        },
-                        //此处添加错误处理
-                        error: function () {
-                            $.messager.alert('禁用提示', '禁用信息异常，请稍后再试！', 'error');
-                            return;
-                        }
-                    });
-                }
-            });
-        }
-    }
-
-    //导入数据
-    function setInputFun() {
-        //IE下不允许编辑 input=file的值  解决思路：重新克隆input=file，把这个input元素复制一个，然后将原来的删除。
-        //在IE下复制元素的时候，其中的值是不会被复制的，所以就达到了清空文件域的目的了。
-        //而在Firefox下，其中的值也会被一同复制，清空一下就做到兼容
-        var fileUploadInput = $("#materialFile");
-        fileUploadInput.after(fileUploadInput.clone().val(""));
-        fileUploadInput.remove();
-        $("#isCheck").val(1);
-        $('#importExcelDlg').dialog('open').dialog('setTitle', '导入商品信息');
-        $(".window-mask").css({width: webW - 20, height: webH});
-        $("#materialFile").focus();
-    }
-
-    //导出数据
-    function setOutputFun() {
-        var name = $.trim($("#searchName").val());
-        var model = $.trim($("#searchModel").val());
-        if (setCategoryId != "1") {
-            cid = 2;
-        } else {
-            cid = 1;
-        }
-        window.location.href = "/material/exportExcel?browserType=" + getOs()
-            + "&name=" + name + "&model=" + model + "&categoryId=" + cid + "&categoryIds=" + setCategoryId;
-    }
-
-    //增加
-    var url;
-    var materialID = 0;
-    //保存编辑前的名称/型号/颜色
-    var oldName = "";
-    var oldModel = "";
-    var oldColor = "";
-    var oldUnit = "";
-    var oldManyUnit = "";
-
-    //根据商品属性架子啊
-    function bindMProperty() {
-        var trColor = $(".tr-color").html();
-        trColor = '<tr class="tr-color">' + trColor + '</tr>';
-        var trStandard = $(".tr-standard").html();
-        trStandard = '<tr class="tr-standard">' + trStandard + '</tr>';
-        var trMfrs = $(".tr-mfrs").html();
-        trMfrs = '<tr class="tr-mfrs">' + trMfrs + '</tr>';
-        var trOtherField1 = $(".tr-otherField1").html();
-        trOtherField1 = '<tr class="tr-otherField1">' + trOtherField1 + '</tr>';
-        var trOtherField2 = $(".tr-otherField2").html();
-        trOtherField2 = '<tr class="tr-otherField2">' + trOtherField2 + '</tr>';
-        var trOtherField3 = $(".tr-otherField3").html();
-        trOtherField3 = '<tr class="tr-otherField3">' + trOtherField3 + '</tr>';
-        //表格模板变更
-        $(".tb-other-info").html("");
-        for (var i = 0; i < mPropertyList.length; i++) {
-            if (mPropertyList[i].nativename === "颜色") {
-                $(".tb-other-info").append(trColor);
-                $(".tr-color td").first().text(mPropertyList[i].anothername);
-                if (mPropertyList[i].enabled) {
-                    $(".tr-color").show();
-                }
-                else {
-                    $(".tr-color").hide();
-                }
-            }
-            if (mPropertyList[i].nativename === "规格") {
-                $(".tb-other-info").append(trStandard);
-                $(".tr-standard td").first().text(mPropertyList[i].anothername);
-                if (mPropertyList[i].enabled) {
-                    $(".tr-standard").show();
-                }
-                else {
-                    $(".tr-standard").hide();
-                }
-            }
-            if (mPropertyList[i].nativename === "制造商") {
-                $(".tb-other-info").append(trMfrs);
-                $(".tr-mfrs td").first().text(mPropertyList[i].anothername);
-                if (mPropertyList[i].enabled) {
-                    $(".tr-mfrs").show();
-                }
-                else {
-                    $(".tr-mfrs").hide();
-                }
-            }
-            if (mPropertyList[i].nativename === "自定义1") {
-                $(".tb-other-info").append(trOtherField1);
-                $(".tr-otherField1 td").first().text(mPropertyList[i].anothername);
-                if (mPropertyList[i].enabled) {
-                    $(".tr-otherField1").show();
-                }
-                else {
-                    $(".tr-otherField1").hide();
-                }
-            }
-            if (mPropertyList[i].nativename === "自定义2") {
-                $(".tb-other-info").append(trOtherField2);
-                $(".tr-otherField2 td").first().text(mPropertyList[i].anothername);
-                if (mPropertyList[i].enabled) {
-                    $(".tr-otherField2").show();
-                }
-                else {
-                    $(".tr-otherField2").hide();
-                }
-            }
-            if (mPropertyList[i].nativename === "自定义3") {
-                $(".tb-other-info").append(trOtherField3);
-                $(".tr-otherField3 td").first().text(mPropertyList[i].anothername);
-                if (mPropertyList[i].enabled) {
-                    $(".tr-otherField3").show();
-                }
-                else {
-                    $(".tr-otherField3").hide();
-                }
-            }
-        }
-    }
-
-    function addMaterial() {
-        $('#materialFM input').val(""); //将输入框全部清空
-
-        bindMProperty(); //根据商品属性绑定
-        // $("#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();
-        $("#CategoryId_f").show();
-        $("#CategoryId_s").show();
-        $("#CategoryId_t").show(); //全部显示
-        $("#mTypeName").hide();
-        $("#mTypeChange").hide(); //按钮隐藏
-        $("#CategoryId_s").empty();
-        $("#CategoryId_t").empty(); //清空类型下拉
-
-        $("#manyUnitCheck").prop("checked", false);
-        //当前为不选中状态
-        $("#Unit").show();
-        $("#manyUnit").hide();
-        $(".first-select-unit").hide();
-        $(".price-list").hide();
-        $(".price-one").show();
-        $(".price-two").show();
-        //选中基本资料tab
-        $("#materialFM #tt .tabs li").first().click();
-        oldName = "";
-        oldModel = "";
-        oldColor = "";
-        oldStandard = "";
-        oldMfrs = "";
-        oldOtherField1 = "";
-        oldOtherField2 = "";
-        oldOtherField3 = "";
-        oldUnit = "";
-        oldManyUnit = "";
-        materialID = 0;
-        url = '/material/add';
-    }
-
-    //检查商品名称是否存在 ++ 重名无法提示问题需要跟进
-    function checkIsExist() {
-        var mName = $.trim($("#Name").val());
-        var mModel = $.trim($("#Model").val());
-        var mColor = $.trim($("#Color").val());
-        var mStandard = $.trim($("#Standard").val());
-        var mMfrs = $.trim($("#Mfrs").val());
-        var mOtherField1 = $.trim($("#OtherField1").val());
-        var mOtherField2 = $.trim($("#OtherField2").val());
-        var mOtherField3 = $.trim($("#OtherField3").val());
-        var mUnit = $.trim($("#Unit").val());
-        var mUnitId = $.trim($("#manyUnit").val());
-        //表示是否存在 true == 存在 false = 不存在
-        var flag = false;
-        //开始ajax名称检验，不能重名(新增或编辑)
-        if (materialID == 0 || (materialID != 0 && (mName != oldName || mModel != oldModel
-                || mColor != oldColor || mStandard != oldStandard || mMfrs != oldMfrs
-                || mOtherField1 != oldOtherField1 || mOtherField2 != oldOtherField2 || mOtherField3 != oldOtherField3
-                || mUnit != oldUnit || mUnitId != oldManyUnit))) {
-            $.ajax({
-                type: "get",
-                url: "/material/checkIsExist",
-                dataType: "json",
-                async: false,
-                data: ({
-                    id: materialID,
-                    name: mName,
-                    model: mModel,
-                    color: mColor,
-                    standard: mStandard,
-                    mfrs: mMfrs,
-                    otherField1: mOtherField1,
-                    otherField2: mOtherField2,
-                    otherField3: mOtherField3,
-                    unit: mUnit,
-                    unitId: mUnitId
-                }),
-                success: function (res) {
-                    if(res && res.code === 200) {
-                        if(res.data && res.data.status) {
-                            flag = res.data.status;
-                            if (flag) {
-                                $.messager.alert('提示', '商品信息已经存在', 'info');
-                                return;
-                            }
-                        }
-                    }
-                },
-                //此处添加错误处理
-                error: function () {
-                    $.messager.alert('提示', '检查商品信息是否存在异常，请稍后再试！', 'error');
-                    return;
-                }
-            });
-        }
-        return flag;
-    }
-
-    //保存信息
-    $("#saveMaterial").off("click").on("click", function () {
-        if (!$('#Name').val()) {
-            $.messager.alert('提示', '品名不能为空！', 'warning');
-            return;
-        }
-        if (!$('#Model').val()) {
-            $.messager.alert('提示', '型号不能为空！', 'warning');
-            return;
-        }
-        if (checkIsExist()) {
-            return;
-        }
-        var parent = 1;
-        if ($("#CategoryId_f").val() != "" && $("#CategoryId_f").val() != null) {
-            parent = $("#CategoryId_f").val();
-        }
-        if ($("#CategoryId_s").val() != "" && $("#CategoryId_s").val() != null) {
-            parent = $("#CategoryId_s").val();
-        }
-        if ($("#CategoryId_t").val() != "" && $("#CategoryId_t").val() != null) {
-            parent = $("#CategoryId_t").val();
-        }
-        //构造价格列表json
-        var priceStrategy = [];
-        var basicList = {};
-        var otherList = {};
-        basicList.Unit = $("#basicUnit").text();
-        basicList.RetailPrice = $("#basicRetailPrice").val();
-        basicList.LowPrice = $("#basicLowPrice").val();
-        basicList.PresetPriceOne = $("#basicPresetPriceOne").val();
-        basicList.PresetPriceTwo = $("#basicPresetPriceTwo").val();
-        basicList.enableSerialNumber=$("#enableSerialNumber").val();
-        otherList.Unit = $("#otherUnit").text();
-        otherList.RetailPrice = $("#otherRetailPrice").val();
-        otherList.LowPrice = $("#otherLowPrice").val();
-        otherList.PresetPriceOne = $("#otherPresetPriceOne").val();
-        otherList.PresetPriceTwo = $("#otherPresetPriceTwo").val();
-
-        var basic = {};
-        var other = {};
-        basic.basic = basicList;
-        other.other = otherList;
-        priceStrategy.push(basic);
-        priceStrategy.push(other);
-
-        var objInfo = $("#materialFM").serializeObject();
-        objInfo.UnitId = $("#manyUnit").val();
-        objInfo.CategoryId = parent;
-        objInfo.PriceStrategy = JSON.stringify(priceStrategy);  //价格列表
-        $.ajax({
-            type: "post",
-            url: url,
-            dataType: "json",
-            async: false,
-            data: ({
-                info: JSON.stringify(objInfo)
-            }),
-            success: function(res) {
-                if(res && res.code === 200) {
-                    $('#materialDlg').dialog('close');
-                    //加载完以后重新初始化
-                    var opts = $("#tableData").datagrid('options');
-                    showMaterialDetails(opts.pageNumber, opts.pageSize);
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('提示', '保存商品信息异常，请稍后再试！', 'error');
+        //批量删除商品
+        function batDeleteMaterial() {
+            var row = $('#tableData').datagrid('getChecked');
+            if (row.length == 0) {
+                $.messager.alert('删除提示', '没有记录被选中！', 'info');
                 return;
             }
-        });
-    });
-
-    var mId = 0, mName = "";
-
-    //根据id查询类型信息
-    function findByTypeId(Id) {
-        $.ajax({
-            type: "get",
-            url: "/materialCategory/findById",
-            data: ({
-                id: Id
-            }),
-            //设置为同步
-            async: false,
-            dataType: "json",
-            success: function (res) {
-                if(res && res.code === 200) {
-                    mId = res.data.parentId;
-                    mName = res.data.name;
-                }
+            if (row.length > 0) {
+                $.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条商品信息吗？', function (r) {
+                    if (r) {
+                        var ids = "";
+                        for (var i = 0; i < row.length; i++) {
+                            if (i == row.length - 1) {
+                                ids += row[i].id;
+                                break;
+                            }
+                            //alert(row[i].id);
+                            ids += row[i].id + ",";
+                        }
+                        $.ajax({
+                            type: "post",
+                            url: "/material/batchDelete",
+                            dataType: "json",
+                            async: false,
+                            data: ({
+                                ids: ids
+                            }),
+                            success: function (res) {
+                                if(res && res.code === 200) {
+                                    $("#searchBtn").click();
+                                    $(":checkbox").attr("checked", false);
+                                } else {
+                                    $.messager.alert('删除提示', '删除商品信息失败，请稍后再试！', 'error');
+                                }
+                            },
+                            //此处添加错误处理
+                            error: function () {
+                                $.messager.alert('删除提示', '删除商品信息异常，请稍后再试！', 'error');
+                                return;
+                            }
+                        });
+                    }
+                });
             }
-        });
-    }
+        }
 
-    //编辑信息
-    function editMaterial(materialTotalInfo) {
-        var materialInfo = materialTotalInfo.split("AaBb");
+        //批量启用
+        function setEnableFun() {
+            var row = $('#tableData').datagrid('getChecked');
+            if (row.length == 0) {
+                $.messager.alert('启用提示', '没有记录被选中！', 'info');
+                return;
+            }
+            if (row.length > 0) {
+                $.messager.confirm('启用确认', '确定要启用选中的' + row.length + '条信息吗？', function (r) {
+                    if (r) {
+                        var ids = "";
+                        for (var i = 0; i < row.length; i++) {
+                            if (i == row.length - 1) {
+                                ids += row[i].id;
+                                break;
+                            }
+                            ids += row[i].id + ",";
+                        }
+                        $.ajax({
+                            type: "post",
+                            url: "/material/batchSetEnable",
+                            dataType: "json",
+                            async: false,
+                            data: ({
+                                enabled: true,
+                                materialIDs: ids
+                            }),
+                            success: function (res) {
+                                if(res && res.code === 200) {
+                                    $("#searchBtn").click();
+                                    $(":checkbox").attr("checked", false);
+                                } else {
+                                    $.messager.alert('启用提示', '启用信息失败，请稍后再试！', 'error');
+                                }
+                            },
+                            //此处添加错误处理
+                            error: function () {
+                                $.messager.alert('启用提示', '启用信息异常，请稍后再试！', 'error');
+                                return;
+                            }
+                        });
+                    }
+                });
+            }
+        }
 
-        bindMProperty(); //根据商品属性绑定
+        //批量禁用
+        function setDisEnableFun() {
+            var row = $('#tableData').datagrid('getChecked');
+            if (row.length == 0) {
+                $.messager.alert('禁用提示', '没有记录被选中！', 'info');
+                return;
+            }
+            if (row.length > 0) {
+                $.messager.confirm('禁用确认', '确定要禁用选中的' + row.length + '条信息吗？', function (r) {
+                    if (r) {
+                        var ids = "";
+                        for (var i = 0; i < row.length; i++) {
+                            if (i == row.length - 1) {
+                                ids += row[i].id;
+                                break;
+                            }
+                            ids += row[i].id + ",";
+                        }
+                        $.ajax({
+                            type: "post",
+                            url: "/material/batchSetEnable",
+                            dataType: "json",
+                            async: false,
+                            data: ({
+                                enabled: false,
+                                materialIDs: ids
+                            }),
+                            success: function (res) {
+                                if(res && res.code === 200) {
+                                    $("#searchBtn").click();
+                                    $(":checkbox").attr("checked", false);
+                                } else {
+                                    $.messager.alert('禁用提示', '禁用信息失败，请稍后再试！', 'error');
+                                }
+                            },
+                            //此处添加错误处理
+                            error: function () {
+                                $.messager.alert('禁用提示', '禁用信息异常，请稍后再试！', 'error');
+                                return;
+                            }
+                        });
+                    }
+                });
+            }
+        }
 
-        $("#Name").focus().val(materialInfo[1]);
-        $("#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").val(materialInfo[24]=='1'?'1':'0');
-        // console.log($("#enableSerialNumber").val());
+        //导入数据
+        function setInputFun() {
+            //IE下不允许编辑 input=file的值  解决思路：重新克隆input=file，把这个input元素复制一个，然后将原来的删除。
+            //在IE下复制元素的时候，其中的值是不会被复制的，所以就达到了清空文件域的目的了。
+            //而在Firefox下，其中的值也会被一同复制，清空一下就做到兼容
+            var fileUploadInput = $("#materialFile");
+            fileUploadInput.after(fileUploadInput.clone().val(""));
+            fileUploadInput.remove();
+            $("#isCheck").val(1);
+            $('#importExcelDlg').dialog('open').dialog('setTitle', '导入商品信息');
+            $(".window-mask").css({width: webW - 20, height: webH});
+            $("#materialFile").focus();
+        }
 
-        var categoryName = ""; //类型名称
-        mId = materialInfo[14];
-        mName = materialInfo[15];
-        //拼接类型名称-多级拼接
-        if (mId != 1) {
-            findByTypeId(mId);
-            if (mId != 1) {
-                categoryName = mName + ">" + categoryName;
-                findByTypeId(mId);
-                if (mId != 1) {
-                    categoryName = mName + ">" + categoryName;
-                    findByTypeId(mId);
-                    if (mId != 1) {
-                        categoryName = mName + ">" + categoryName;
-                        findByTypeId(mId);
+        //导出数据
+        function setOutputFun() {
+            var name = $.trim($("#searchName").val());
+            var model = $.trim($("#searchModel").val());
+            if (setCategoryId != "1") {
+                cid = 2;
+            } else {
+                cid = 1;
+            }
+            window.location.href = "/material/exportExcel?browserType=" + getOs()
+                + "&name=" + name + "&model=" + model + "&categoryId=" + cid + "&categoryIds=" + setCategoryId;
+        }
+        //增加
+        var url;
+        var materialID = 0;
+        //保存编辑前的名称/型号/颜色
+        var oldName = "";
+        var oldModel = "";
+        var oldColor = "";
+        var oldUnit = "";
+        var oldManyUnit = "";
+
+        //根据商品属性架子啊
+        function bindMProperty() {
+            var trColor = $(".tr-color").html();
+            trColor = '<tr class="tr-color">' + trColor + '</tr>';
+            var trStandard = $(".tr-standard").html();
+            trStandard = '<tr class="tr-standard">' + trStandard + '</tr>';
+            var trMfrs = $(".tr-mfrs").html();
+            trMfrs = '<tr class="tr-mfrs">' + trMfrs + '</tr>';
+            var trOtherField1 = $(".tr-otherField1").html();
+            trOtherField1 = '<tr class="tr-otherField1">' + trOtherField1 + '</tr>';
+            var trOtherField2 = $(".tr-otherField2").html();
+            trOtherField2 = '<tr class="tr-otherField2">' + trOtherField2 + '</tr>';
+            var trOtherField3 = $(".tr-otherField3").html();
+            trOtherField3 = '<tr class="tr-otherField3">' + trOtherField3 + '</tr>';
+            //表格模板变更
+            $(".tb-other-info").html("");
+            for (var i = 0; i < mPropertyList.length; i++) {
+                if (mPropertyList[i].nativename === "颜色") {
+                    $(".tb-other-info").append(trColor);
+                    $(".tr-color td").first().text(mPropertyList[i].anothername);
+                    if (mPropertyList[i].enabled) {
+                        $(".tr-color").show();
                     }
                     else {
-                        categoryName = mName + ">" + categoryName;
+                        $(".tr-color").hide();
                     }
                 }
-                else {
-                    categoryName = mName + ">" + categoryName;
+                if (mPropertyList[i].nativename === "规格") {
+                    $(".tb-other-info").append(trStandard);
+                    $(".tr-standard td").first().text(mPropertyList[i].anothername);
+                    if (mPropertyList[i].enabled) {
+                        $(".tr-standard").show();
+                    }
+                    else {
+                        $(".tr-standard").hide();
+                    }
+                }
+                if (mPropertyList[i].nativename === "制造商") {
+                    $(".tb-other-info").append(trMfrs);
+                    $(".tr-mfrs td").first().text(mPropertyList[i].anothername);
+                    if (mPropertyList[i].enabled) {
+                        $(".tr-mfrs").show();
+                    }
+                    else {
+                        $(".tr-mfrs").hide();
+                    }
+                }
+                if (mPropertyList[i].nativename === "自定义1") {
+                    $(".tb-other-info").append(trOtherField1);
+                    $(".tr-otherField1 td").first().text(mPropertyList[i].anothername);
+                    if (mPropertyList[i].enabled) {
+                        $(".tr-otherField1").show();
+                    }
+                    else {
+                        $(".tr-otherField1").hide();
+                    }
+                }
+                if (mPropertyList[i].nativename === "自定义2") {
+                    $(".tb-other-info").append(trOtherField2);
+                    $(".tr-otherField2 td").first().text(mPropertyList[i].anothername);
+                    if (mPropertyList[i].enabled) {
+                        $(".tr-otherField2").show();
+                    }
+                    else {
+                        $(".tr-otherField2").hide();
+                    }
+                }
+                if (mPropertyList[i].nativename === "自定义3") {
+                    $(".tb-other-info").append(trOtherField3);
+                    $(".tr-otherField3 td").first().text(mPropertyList[i].anothername);
+                    if (mPropertyList[i].enabled) {
+                        $(".tr-otherField3").show();
+                    }
+                    else {
+                        $(".tr-otherField3").hide();
+                    }
                 }
             }
-            else {
-                categoryName = mName + ">" + categoryName;
-            }
         }
-        else {
-            categoryName = mName + categoryName;
-        }
-        $("#CategoryId_s").empty();
-        $("#CategoryId_t").empty(); //清空类型下拉
-        $("#CategoryId_f").hide();
-        $("#CategoryId_s").hide();
-        $("#CategoryId_t").hide(); //全部隐藏
-        $("#mTypeName").text(categoryName).show(); //类型显示
-        $("#mTypeChange").show(); //按钮显示
-        $("#Packing").focus().val(materialInfo[12]);
-        $("#SafetyStock").focus().val(materialInfo[13]=="undefined" ? "" : materialInfo[13]);
-        $("#Model").val(materialInfo[2]);
-        $("#Standard").val(materialInfo[10] == "undefined" ? "" : materialInfo[10]);
-        $("#Color").val(materialInfo[3] == "undefined" ? "" : materialInfo[3]);
-        $("#Mfrs").val(materialInfo[20] == "undefined" ? "" : materialInfo[20]);
-        $("#OtherField1").val(materialInfo[21] == "undefined" ? "" : materialInfo[21]);
-        $("#OtherField2").val(materialInfo[22] == "undefined" ? "" : materialInfo[22]);
-        $("#OtherField3").val(materialInfo[23] == "undefined" ? "" : materialInfo[23]);
-        $("#Unit").val(materialInfo[4] == "undefined" ? "" : materialInfo[4]);
-        $("#RetailPrice").val(materialInfo[5] == "undefined" ? "" : materialInfo[5]);
-        $("#LowPrice").val(materialInfo[6] == "undefined" ? "" : materialInfo[6]);
-        $("#PresetPriceOne").val(materialInfo[7] == "undefined" ? "" : materialInfo[7]);
-        $("#PresetPriceTwo").val(materialInfo[8] == "undefined" ? "" : materialInfo[8]);
-        $("#Remark").val(materialInfo[9]);
-        $("#manyUnit").val(materialInfo[16]);
-        if (materialInfo[16] != "undefined") {
-            $("#manyUnitCheck").prop("checked", true);
-            //当前为选中状态
-            $("#Unit").hide();
-            $("#manyUnit").show();
-            $(".first-select-unit").show();
-            $(".price-list").show();
-            $(".price-one").hide();
-            $(".price-two").hide();
-            var selectItem = $("#manyUnit").children('option:selected').text();
-            if (selectItem !== "(空)") {
-                var firstOutUnitOptions = selectItem.substring(0, selectItem.indexOf("("));
-                var firstOptions = "";
-                var arr = firstOutUnitOptions.split(",");
-                var basic = '<option value="' + arr[0] + '">' + arr[0] + '</option>';
-                var other = '<option value="' + arr[1] + '">' + arr[1] + '</option>';
-                firstOptions = firstOptions + basic + other;
-                $("#FirstOutUnit").empty().append('<option value="">(空)</option>').append(firstOptions); //首选出库单位
-                $("#FirstInUnit").empty().append('<option value="">(空)</option>').append(firstOptions); //首选入库单位
-                $("#FirstOutUnit").val(materialInfo[18]);//首选出库单位
-                $("#FirstInUnit").val(materialInfo[19]);//首选入库单位
-            }
-        }
-        else {
+
+        function addMaterial() {
+            $('#materialFM input').val(""); //将输入框全部清空
+
+            bindMProperty(); //根据商品属性绑定
+            // $("#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();
             $("#manyUnitCheck").prop("checked", false);
             //当前为不选中状态
             $("#Unit").show();
@@ -1452,209 +1060,431 @@
             $(".price-list").hide();
             $(".price-one").show();
             $(".price-two").show();
+            //选中基本资料tab
+            $("#materialFM #tt .tabs li").first().click();
+            oldName = "";
+            oldModel = "";
+            oldColor = "";
+            oldStandard = "";
+            oldMfrs = "";
+            oldOtherField1 = "";
+            oldOtherField2 = "";
+            oldOtherField3 = "";
+            oldUnit = "";
+            oldManyUnit = "";
+            materialID = 0;
+            url = '/material/add';
         }
-        //单独查询商品的价格列表
-        $.ajax({
-            url: '/material/findById',
-            data: {
-                id: materialInfo[0]
-            },
-            type: "get",
-            dataType: "json",
-            success: function (res) {
-                if (res && res.code === 200 && res.data && res.data[0]) {
-                    var PriceStrategy = res.data[0].pricestrategy;
-                    PriceStrategy = JSON.parse(PriceStrategy);
-                    if (PriceStrategy && PriceStrategy[0] && PriceStrategy[1]) {
-                        //基本单位
-                        $("#basicUnit").text(PriceStrategy[0].basic.Unit);
-                        $("#basicRetailPrice").val(PriceStrategy[0].basic.RetailPrice);
-                        $("#basicLowPrice").val(PriceStrategy[0].basic.LowPrice);
-                        $("#basicPresetPriceOne").val(PriceStrategy[0].basic.PresetPriceOne);
-                        $("#basicPresetPriceTwo").val(PriceStrategy[0].basic.PresetPriceTwo);
-                        //副单位
-                        $("#otherUnit").text(PriceStrategy[1].other.Unit);
-                        $("#otherRetailPrice").val(PriceStrategy[1].other.RetailPrice);
-                        $("#otherLowPrice").val(PriceStrategy[1].other.LowPrice);
-                        $("#otherPresetPriceOne").val(PriceStrategy[1].other.PresetPriceOne);
-                        $("#otherPresetPriceTwo").val(PriceStrategy[1].other.PresetPriceTwo);
-                    }
-                }
-            },
-            error: function () {
 
+        //检查商品名称是否存在 ++ 重名无法提示问题需要跟进
+        function checkIsExist() {
+            var mName = $.trim($("#Name").val());
+            var mModel = $.trim($("#Model").val());
+            var mColor = $.trim($("#Color").val());
+            var mStandard = $.trim($("#Standard").val());
+            var mMfrs = $.trim($("#Mfrs").val());
+            var mOtherField1 = $.trim($("#OtherField1").val());
+            var mOtherField2 = $.trim($("#OtherField2").val());
+            var mOtherField3 = $.trim($("#OtherField3").val());
+            var mUnit = $.trim($("#Unit").val());
+            var mUnitId = $.trim($("#manyUnit").val());
+            //表示是否存在 true == 存在 false = 不存在
+            var flag = false;
+            //开始ajax名称检验，不能重名(新增或编辑)
+            if (materialID == 0 || (materialID != 0 && (mName != oldName || mModel != oldModel
+                || mColor != oldColor || mStandard != oldStandard || mMfrs != oldMfrs
+                || mOtherField1 != oldOtherField1 || mOtherField2 != oldOtherField2 || mOtherField3 != oldOtherField3
+                || mUnit != oldUnit || mUnitId != oldManyUnit))) {
+                $.ajax({
+                    type: "get",
+                    url: "/material/checkIsExist",
+                    dataType: "json",
+                    async: false,
+                    data: ({
+                        id: materialID,
+                        name: mName,
+                        model: mModel,
+                        color: mColor,
+                        standard: mStandard,
+                        mfrs: mMfrs,
+                        otherField1: mOtherField1,
+                        otherField2: mOtherField2,
+                        otherField3: mOtherField3,
+                        unit: mUnit,
+                        unitId: mUnitId
+                    }),
+                    success: function (res) {
+                        if(res && res.code === 200) {
+                            if(res.data && res.data.status) {
+                                flag = res.data.status;
+                                if (flag) {
+                                    $.messager.alert('提示', '商品信息已经存在', 'info');
+                                    return;
+                                }
+                            }
+                        }
+                    },
+                    //此处添加错误处理
+                    error: function () {
+                        $.messager.alert('提示', '检查商品信息是否存在异常，请稍后再试！', 'error');
+                        return;
+                    }
+                });
             }
-        });
-
-        oldName = materialInfo[1];
-        oldModel = materialInfo[2];
-        oldColor = materialInfo[11];
-        oldStandard = materialInfo[10];
-        oldMfrs = materialInfo[20];
-        oldOtherField1 = materialInfo[21];
-        oldOtherField2 = materialInfo[22];
-        oldOtherField3 = materialInfo[23];
-        oldUnit = materialInfo[4];
-        oldManyUnit = materialInfo[16];
-        $('#materialDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品信息');
-        $(".window-mask").css({width: webW, height: webH});
-        materialID = materialInfo[0];
-        //焦点在名称输入框==定焦在输入文字后面
-        $("#Name").val("").focus().val(materialInfo[1]);
-        //选中基本资料tab
-        $("#materialFM #tt .tabs li").first().click();
-        url = '/material/update?id=' + materialInfo[0];
-    }
-
-    $("#mTypeChange").off("click").on("click", function () {
-        $(this).hide();
-        $("#mTypeName").hide();
-        $("#CategoryId_f").show();
-        $("#CategoryId_s").show();
-        $("#CategoryId_t").show(); //全部显示
-    });
-
-    //搜索处理
-    $("#searchBtn").unbind().bind({
-        click: function () {
-            showMaterialDetails(1, initPageSize);
-            var opts = $("#tableData").datagrid('options');
-            var pager = $("#tableData").datagrid('getPager');
-            opts.pageNumber = 1;
-            opts.pageSize = initPageSize;
-            pager.pagination('refresh', {
-                pageNumber: 1,
-                pageSize: initPageSize
-            });
+            return flag;
         }
-    });
 
-
-    function showMaterialDetails(pageNo, pageSize) {
-        var name = $.trim($("#searchName").val());
-        var model = $.trim($("#searchModel").val());
-        if (setCategoryId != "1") {
-            cid = 2;
-        }
-        else {
-            cid = 1;
-        }
-        $.ajax({
-            type: "get",
-            url: "/material/list",
-            dataType: "json",
-            data: ({
-                search: JSON.stringify({
-                    name: name,
-                    model: model,
-                    categoryId: cid,
-                    categoryIds: setCategoryId,
-                    mpList: mPropertyListShort
-                }),
-                currentPage: pageNo,
-                pageSize: pageSize
-            }),
-            success: function (res) {
-                if(res && res.code === 200){
-                    if(res.data && res.data.page) {
-                        $("#tableData").datagrid('loadData', res.data.page);
-                    }
-                }
-            },
-            //此处添加错误处理
-            error: function () {
-                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
+        //保存信息
+        $("#saveMaterial").off("click").on("click", function () {
+            if (!$('#Name').val()) {
+                $.messager.alert('提示', '品名不能为空！', 'warning');
                 return;
             }
+            if (!$('#Model').val()) {
+                $.messager.alert('提示', '型号不能为空！', 'warning');
+                return;
+            }
+            if (checkIsExist()) {
+                return;
+            }
+            //构造价格列表json
+            var priceStrategy = [];
+            var basicList = {};
+            var otherList = {};
+            basicList.Unit = $("#basicUnit").text();
+            basicList.RetailPrice = $("#basicRetailPrice").val();
+            basicList.LowPrice = $("#basicLowPrice").val();
+            basicList.PresetPriceOne = $("#basicPresetPriceOne").val();
+            basicList.PresetPriceTwo = $("#basicPresetPriceTwo").val();
+            basicList.enableSerialNumber=$("#enableSerialNumber").val();
+            otherList.Unit = $("#otherUnit").text();
+            otherList.RetailPrice = $("#otherRetailPrice").val();
+            otherList.LowPrice = $("#otherLowPrice").val();
+            otherList.PresetPriceOne = $("#otherPresetPriceOne").val();
+            otherList.PresetPriceTwo = $("#otherPresetPriceTwo").val();
+
+            var basic = {};
+            var other = {};
+            basic.basic = basicList;
+            other.other = otherList;
+            priceStrategy.push(basic);
+            priceStrategy.push(other);
+
+            var objInfo = $("#materialFM").serializeObject();
+            objInfo.UnitId = $("#manyUnit").val();
+            objInfo.CategoryId =$("#parentid").val();
+            objInfo.PriceStrategy = JSON.stringify(priceStrategy);  //价格列表
+            $.ajax({
+                type: "post",
+                url: url,
+                dataType: "json",
+                async: false,
+                data: ({
+                    info: JSON.stringify(objInfo)
+                }),
+                success: function(res) {
+                    if(res && res.code === 200) {
+                        $('#materialDlg').dialog('close');
+                        //加载完以后重新初始化
+                        var opts = $("#tableData").datagrid('options');
+                        showMaterialDetails(opts.pageNumber, opts.pageSize);
+                    }
+                },
+                //此处添加错误处理
+                error: function () {
+                    $.messager.alert('提示', '保存商品信息异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
         });
-    }
 
-    //重置按钮
-    $("#searchResetBtn").unbind().bind({
-        click: function () {
-            $("#searchName").val("");
-            $("#searchCategoryId_f").val("");
-            $("#searchCategoryId_s").val("");
-            $("#searchCategoryId_t").val("");
-            $("#searchCategoryId_s").empty();
-            $("#searchCategoryId_t").empty(); //清空类型下拉
-            setCategoryId = "1";
-            //加载完以后重新初始化
-            $("#searchBtn").click();
+        var mId = 0, mName = "";
+        //根据id查询类型信息
+        function findByTypeId(Id) {
+            $.ajax({
+                type: "get",
+                url: "/materialCategory/findById",
+                data: ({
+                    id: Id
+                }),
+                //设置为同步
+                async: false,
+                dataType: "json",
+                success: function (res) {
+                    if(res && res.code === 200) {
+                        mId = res.data.parentId;
+                        mName = res.data.name;
+                    }
+                }
+            });
         }
-    });
 
-    //绑定事件
-    function bindEvent() {
-        //下拉绑定事件
-        $.ajax({
-            type: "get",
-            url: "/unit/list",
-            dateType: "json",
-            data: ({
-                currentPage: 1,
-                pageSize: 100
-            }),
-            success: function (res) {
-                res = JSON.parse(res);
-                if(res && res.code === 200){
-                    if(res.data && res.data.page) {
-                        res = res.data.page.rows;
-                        var options = "";
-                        console.log(res.length);
-                        if (res.length) {
-                            for (var i = 0; i < res.length; i++) {
-                                options += '<option value="' + res[i].id + '">' + res[i].uname + '</option>';
-                            }
-                            $("#manyUnit").empty().append('<option value="">(空)</option>').append(options);
-                            //下拉框事件
-                            $("#manyUnit").off("change").on("change", function () {
-                                var selectItem = $(this).children('option:selected').text();
-                                if (selectItem !== "(空)") {
-                                    var firstOutUnitOptions = selectItem.substring(0, selectItem.indexOf("("));
-                                    multiple = selectItem.substring(selectItem.indexOf(":") + 1).replace(")", "");  //倍数
-                                    var firstOptions = "";
-                                    var arr = firstOutUnitOptions.split(",");
-                                    var basic = '<option value="' + arr[0] + '">' + arr[0] + '</option>';
-                                    var other = '<option value="' + arr[1] + '">' + arr[1] + '</option>';
-                                    firstOptions = firstOptions + basic + other;
-                                    $("#FirstOutUnit").empty().append('<option value="">(空)</option>').append(firstOptions); //首选出库单位
-                                    $("#FirstInUnit").empty().append('<option value="">(空)</option>').append(firstOptions); //首选入库单位
-                                    $("#basicUnit").text(arr[0]);
-                                    $("#otherUnit").text(arr[1]);
-                                }
-                            });
+        //编辑信息
+        function editMaterial(materialTotalInfo) {
+            var materialInfo = materialTotalInfo.split("AaBb");
+            bindMProperty(); //根据商品属性绑定
+            $("#Name").focus().val(materialInfo[1]);
+            $("#Color").focus().val(materialInfo[11]);
+            $("#enableSerialNumber").val(materialInfo[24]=='1'?'1':'0');
+            //商品类别id
+            $("#parentid").val(materialInfo[14]);
+            //商品类别名称
+            $("#parentName").val(materialInfo[15]);
+            mId = materialInfo[14];
+            mName = materialInfo[15];
+            $("#Packing").focus().val(materialInfo[12]);
+            $("#SafetyStock").focus().val(materialInfo[13]=="undefined" ? "" : materialInfo[13]);
+            $("#Model").val(materialInfo[2]);
+            $("#Standard").val(materialInfo[10] == "undefined" ? "" : materialInfo[10]);
+            $("#Color").val(materialInfo[3] == "undefined" ? "" : materialInfo[3]);
+            $("#Mfrs").val(materialInfo[20] == "undefined" ? "" : materialInfo[20]);
+            $("#OtherField1").val(materialInfo[21] == "undefined" ? "" : materialInfo[21]);
+            $("#OtherField2").val(materialInfo[22] == "undefined" ? "" : materialInfo[22]);
+            $("#OtherField3").val(materialInfo[23] == "undefined" ? "" : materialInfo[23]);
+            $("#Unit").val(materialInfo[4] == "undefined" ? "" : materialInfo[4]);
+            $("#RetailPrice").val(materialInfo[5] == "undefined" ? "" : materialInfo[5]);
+            $("#LowPrice").val(materialInfo[6] == "undefined" ? "" : materialInfo[6]);
+            $("#PresetPriceOne").val(materialInfo[7] == "undefined" ? "" : materialInfo[7]);
+            $("#PresetPriceTwo").val(materialInfo[8] == "undefined" ? "" : materialInfo[8]);
+            $("#Remark").val(materialInfo[9]);
+            $("#manyUnit").val(materialInfo[16]);
+            if (materialInfo[16] != "undefined") {
+                $("#manyUnitCheck").prop("checked", true);
+                //当前为选中状态
+                $("#Unit").hide();
+                $("#manyUnit").show();
+                $(".first-select-unit").show();
+                $(".price-list").show();
+                $(".price-one").hide();
+                $(".price-two").hide();
+                var selectItem = $("#manyUnit").children('option:selected').text();
+                if (selectItem !== "(空)") {
+                    var firstOutUnitOptions = selectItem.substring(0, selectItem.indexOf("("));
+                    var firstOptions = "";
+                    var arr = firstOutUnitOptions.split(",");
+                    var basic = '<option value="' + arr[0] + '">' + arr[0] + '</option>';
+                    var other = '<option value="' + arr[1] + '">' + arr[1] + '</option>';
+                    firstOptions = firstOptions + basic + other;
+                    $("#FirstOutUnit").empty().append('<option value="">(空)</option>').append(firstOptions); //首选出库单位
+                    $("#FirstInUnit").empty().append('<option value="">(空)</option>').append(firstOptions); //首选入库单位
+                    $("#FirstOutUnit").val(materialInfo[18]);//首选出库单位
+                    $("#FirstInUnit").val(materialInfo[19]);//首选入库单位
+                }
+            }
+            else {
+                $("#manyUnitCheck").prop("checked", false);
+                //当前为不选中状态
+                $("#Unit").show();
+                $("#manyUnit").hide();
+                $(".first-select-unit").hide();
+                $(".price-list").hide();
+                $(".price-one").show();
+                $(".price-two").show();
+            }
+            //单独查询商品的价格列表
+            $.ajax({
+                url: '/material/findById',
+                data: {
+                    id: materialInfo[0]
+                },
+                type: "get",
+                dataType: "json",
+                success: function (res) {
+                    if (res && res.code === 200 && res.data && res.data[0]) {
+                        var PriceStrategy = res.data[0].pricestrategy;
+                        PriceStrategy = JSON.parse(PriceStrategy);
+                        if (PriceStrategy && PriceStrategy[0] && PriceStrategy[1]) {
+                            //基本单位
+                            $("#basicUnit").text(PriceStrategy[0].basic.Unit);
+                            $("#basicRetailPrice").val(PriceStrategy[0].basic.RetailPrice);
+                            $("#basicLowPrice").val(PriceStrategy[0].basic.LowPrice);
+                            $("#basicPresetPriceOne").val(PriceStrategy[0].basic.PresetPriceOne);
+                            $("#basicPresetPriceTwo").val(PriceStrategy[0].basic.PresetPriceTwo);
+                            //副单位
+                            $("#otherUnit").text(PriceStrategy[1].other.Unit);
+                            $("#otherRetailPrice").val(PriceStrategy[1].other.RetailPrice);
+                            $("#otherLowPrice").val(PriceStrategy[1].other.LowPrice);
+                            $("#otherPresetPriceOne").val(PriceStrategy[1].other.PresetPriceOne);
+                            $("#otherPresetPriceTwo").val(PriceStrategy[1].other.PresetPriceTwo);
                         }
                     }
+                },
+                error: function () {
+
                 }
-            },
-            error: function () {
-                $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
-                return;
-            }
-        });
-
-        //导入excel表格
-        $("#saveimport").off("click").on("click", function () {
-            if ($("#materialFile").val().length == 0) {
-                $.messager.alert('提示', '请选择文件！', 'info');
-                return;
-            }
-            $("#importExcelFM").submit();
-            $('#importExcelDlg').dialog('close');
-
-            $.messager.progress({
-                title: '请稍候',
-                msg: '数据处理ing...'
             });
-            setTimeout(function () {
-                $.messager.progress('close');
-                var opts = $("#tableData").datagrid('options');
-                showMaterialDetails(opts.pageNumber, opts.pageSize);
-            }, 3300);
-        });
-    }
 
-</script>
+            oldName = materialInfo[1];
+            oldModel = materialInfo[2];
+            oldColor = materialInfo[11];
+            oldStandard = materialInfo[10];
+            oldMfrs = materialInfo[20];
+            oldOtherField1 = materialInfo[21];
+            oldOtherField2 = materialInfo[22];
+            oldOtherField3 = materialInfo[23];
+            oldUnit = materialInfo[4];
+            oldManyUnit = materialInfo[16];
+            $('#materialDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品信息');
+            $(".window-mask").css({width: webW, height: webH});
+            materialID = materialInfo[0];
+            //焦点在名称输入框==定焦在输入文字后面
+            $("#Name").val("").focus().val(materialInfo[1]);
+            //选中基本资料tab
+            $("#materialFM #tt .tabs li").first().click();
+            url = '/material/update?id=' + materialInfo[0];
+        }
+
+
+        //搜索处理
+        $("#searchBtn").unbind().bind({
+            click: function () {
+                showMaterialDetails(1, initPageSize);
+                var opts = $("#tableData").datagrid('options');
+                var pager = $("#tableData").datagrid('getPager');
+                opts.pageNumber = 1;
+                opts.pageSize = initPageSize;
+                pager.pagination('refresh', {
+                    pageNumber: 1,
+                    pageSize: initPageSize
+                });
+            }
+        });
+
+
+        function showMaterialDetails(pageNo, pageSize) {
+            var name = $.trim($("#searchName").val());
+            var model = $.trim($("#searchModel").val());
+            if (setCategoryId != "1") {
+                cid = 2;
+            }
+            else {
+                cid = 1;
+            }
+            $.ajax({
+                type: "get",
+                url: "/material/list",
+                dataType: "json",
+                data: ({
+                    search: JSON.stringify({
+                        name: name,
+                        model: model,
+                        categoryId: cid,
+                        categoryIds: setCategoryId,
+                        mpList: mPropertyListShort
+                    }),
+                    currentPage: pageNo,
+                    pageSize: pageSize
+                }),
+                success: function (res) {
+                    if(res && res.code === 200){
+                        if(res.data && res.data.page) {
+                            $("#tableData").datagrid('loadData', res.data.page);
+                        }
+                    }
+                },
+                //此处添加错误处理
+                error: function () {
+                    $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
+        }
+
+        //重置按钮
+        $("#searchResetBtn").unbind().bind({
+            click: function () {
+                $("#searchName").val("");
+                setCategoryId = "1";
+                //加载完以后重新初始化
+                $("#searchBtn").click();
+            }
+        });
+
+        //绑定事件
+        function bindEvent() {
+            //下拉绑定事件
+            $.ajax({
+                type: "get",
+                url: "/unit/list",
+                dateType: "json",
+                data: ({
+                    currentPage: 1,
+                    pageSize: 100
+                }),
+                success: function (res) {
+                    res = JSON.parse(res);
+                    if(res && res.code === 200){
+                        if(res.data && res.data.page) {
+                            res = res.data.page.rows;
+                            var options = "";
+                            console.log(res.length);
+                            if (res.length) {
+                                for (var i = 0; i < res.length; i++) {
+                                    options += '<option value="' + res[i].id + '">' + res[i].uname + '</option>';
+                                }
+                                $("#manyUnit").empty().append('<option value="">(空)</option>').append(options);
+                                //下拉框事件
+                                $("#manyUnit").off("change").on("change", function () {
+                                    var selectItem = $(this).children('option:selected').text();
+                                    if (selectItem !== "(空)") {
+                                        var firstOutUnitOptions = selectItem.substring(0, selectItem.indexOf("("));
+                                        multiple = selectItem.substring(selectItem.indexOf(":") + 1).replace(")", "");  //倍数
+                                        var firstOptions = "";
+                                        var arr = firstOutUnitOptions.split(",");
+                                        var basic = '<option value="' + arr[0] + '">' + arr[0] + '</option>';
+                                        var other = '<option value="' + arr[1] + '">' + arr[1] + '</option>';
+                                        firstOptions = firstOptions + basic + other;
+                                        $("#FirstOutUnit").empty().append('<option value="">(空)</option>').append(firstOptions); //首选出库单位
+                                        $("#FirstInUnit").empty().append('<option value="">(空)</option>').append(firstOptions); //首选入库单位
+                                        $("#basicUnit").text(arr[0]);
+                                        $("#otherUnit").text(arr[1]);
+                                    }
+                                });
+                            }
+                        }
+                    }
+                },
+                error: function () {
+                    $.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
+                    return;
+                }
+            });
+
+            //导入excel表格
+            $("#saveimport").off("click").on("click", function () {
+                if ($("#materialFile").val().length == 0) {
+                    $.messager.alert('提示', '请选择文件！', 'info');
+                    return;
+                }
+                $("#importExcelFM").submit();
+                $('#importExcelDlg').dialog('close');
+
+                $.messager.progress({
+                    title: '请稍候',
+                    msg: '数据处理ing...'
+                });
+                setTimeout(function () {
+                    $.messager.progress('close');
+                    var opts = $("#tableData").datagrid('options');
+                    showMaterialDetails(opts.pageNumber, opts.pageSize);
+                }, 3300);
+            });
+        }
+        //查询父级商品类别
+        $("#lookForSelectMaterialCategory").on("click", function () {
+            $('#forSelectMaterialCategoryDlg').dialog({
+                title: '商品类别选择',
+                width: webW/2,
+                height: webH/2,
+                closed: false,
+                cache: false,
+                href: '/pages/materials/materialcategory_forselect.html',
+                modal: true,
+                resizable:true
+            });
+        });
+
+    </script>
+</div>
 </body>
 </html>