MES-WEB-LayUI.git

parent: 96fa25e0 | 补丁 | 提交 | ignore whitespace

yusijie

2022-11-25 b440a2e25dcbbf4747e6dcb359b6314b4d59275a

产品与器具

3个文件已修改

	WebTM/WebTM.csproj	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/基础资料/Gy_MateMould.html	132 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/基础资料/Gy_MateMouldList.html	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -111,6 +111,8 @@
    <Content Include="views\Baseset\åºç¡èµæ\Gy_QCCheckProjectListView.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_RoutingBillList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_RoutingGroup.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_TechnologyParameterList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_TechParameterUnitList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_WarehouseListNew.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_WasterWHList.html" />
    <Content Include="views\Baseset\åºç¡èµæ\Gy_WHList.html" />
@@ -187,7 +189,7 @@
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_TechnologyParameterUnit_Add_Edit_.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_TechnologyParameter_Add_Edit_.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_TechParamByProcList.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_TechParamByProcList_Add_Edit_.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_TechParamByProc.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_WorkCenterDyCol.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_WorkPayType.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_WorkStationList.html" />

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MateMould.html

@@ -61,6 +61,7 @@
                                                <input type="radio" name="FixedItems" value="SMater" title="ç©æ">
                                                <input type="radio" name="FixedItems" value="SRelation" title="æ¨¡å·">
                                                <input type="radio" name="FixedItems" value="SUnit" title="åä½" checked>
                                                <input type="radio" name="FixedItems" value="SFree" title="èªç±" checked>
                                            </div>
                                        </div>
                                    </div>
@@ -296,29 +297,34 @@
                    , data = checkStatus.data;
                //æ°å¢è¡è¡¨æ ¼æ°æ®
                var NewRow = {
                    "HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HRelationIDCol": "",
                    "HRelationNumberCol": "", "HRelationNameCol": "", "HUnitIDCol": "", "HUnitNumberCol": "", "HUnitNameCol": "",
                    "HBeginDateCol": "", "HEndDateCol": "", "HRemarkCol": ""
                    "HMaterIDCol": "", "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HRelationIDCol": "",
                    "æ¨¡å·ä»£ç ": "", "æ¨¡å·åç§°": "", "HUnitIDCol": "", "åä½ä»£ç ": "", "åä½åç§°": "",
                    "å¼å§æ¥æ": "", "ç»ææ¥æ": "", "å¤æ³¨": ""
                };
                switch (obj.event) {
                    case 'btn-AddLine':
                        var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
                        if (FixedItems == "SUnit") {
                        if (FixedItems == "SFree") {

                        }
                        else if (FixedItems == "SUnit") {
                            NewRow.HUnitIDCol = $("#HUnitID").val();
                            NewRow.åä½åç§° = $("#HUnitName").val();
                            NewRow.åä½ä»£ç  = $("#HUnitNumber").val();
                        }
                        else if (FixedItems == "SMater") {
                            NewRow.HMaterIDCol = $("#HMaterID").val();
                            NewRow.HMaterNumberCol = $("#HMaterNumber").val();
                            NewRow.HMaterNameCol = $("#HMaterName").val();
                            NewRow.HMaterModelCol = $("#HMaterModel").val();
                            NewRow.ç©æä»£ç  = $("#HMaterNumber").val();
                            NewRow.ç©æåç§° = $("#HMaterName").val();
                            NewRow.è§æ ¼åå· = $("#HMaterModel").val();
                        }
                        else if (FixedItems == "SRelation") {
                            NewRow.HRelationIDCol = $("#HRelationID").val();
                            NewRow.HRelationNumberCol = $("#HRelationNumber").val();
                            NewRow.HRelationNameCol = $("#HRelationName").val();
                            NewRow.æ¨¡å·ä»£ç  = $("#HRelationNumber").val();
                            NewRow.æ¨¡å·åç§° = $("#HRelationName").val();
                        }
                        NewRow.HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
                        NewRow.HEndDateCol = "2100-01-01";
                        NewRow.å¼å§æ¥æ = Format(new Date(), "yyyy-MM-dd");
                        NewRow.ç»ææ¥æ = "2100-01-01";
                        table.cache["mainTable"].push(NewRow);
                        option.data = table.cache["mainTable"];
                        table.render(option);
@@ -415,16 +421,16 @@
                                    }
                                    obj.update({
                                        HMaterIDCol: checkStatus.data[0].HItemID
                                        , HMaterNumberCol: checkStatus.data[0].ç©æä»£ç 
                                        , HMaterNameCol: checkStatus.data[0].ç©æ
                                        , HMaterModelCol: checkStatus.data[0].è§æ ¼åå·
                                        , ç©æä»£ç : checkStatus.data[0].ç©æä»£ç 
                                        , ç©æåç§°: checkStatus.data[0].ç©æ
                                        , è§æ ¼åå·: checkStatus.data[0].è§æ ¼åå·
                                    });
                                    var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
                                    if (FixedItems == "SRelation") {
                                        obj.update({
                                            HRelationIDCol: $("#HRelationID").val()
                                            , HRelationNumberCol: $("#HRelationNumber").val()
                                            , HRelationNameCol: $("#HRelationName").val()
                                            , æ¨¡å·ä»£ç : $("#HRelationNumber").val()
                                            , æ¨¡å·åç§°: $("#HRelationName").val()
                                        });
                                    }
                                    layer.close(layer.index);
@@ -454,16 +460,16 @@
                                    }
                                    obj.update({
                                        HRelationIDCol: checkStatus.data[0].HItemID
                                        , HRelationNumberCol: checkStatus.data[0].æ¨¡å·ä»£ç 
                                        , HRelationNameCol: checkStatus.data[0].æ¨¡å·
                                        , æ¨¡å·ä»£ç : checkStatus.data[0].æ¨¡å·ä»£ç 
                                        , æ¨¡å·åç§°: checkStatus.data[0].æ¨¡å·
                                    });
                                    var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
                                    if (FixedItems == "SMater") {
                                        obj.update({
                                            HMaterIDCol: $("#HMaterID").val()
                                            , HMaterNumberCol: $("#HMaterNumber").val()
                                            , HMaterNameCol: $("#HMaterName").val()
                                            , HMaterModelCol: $("#HMaterModel").val()
                                            , ç©æä»£ç : $("#HMaterNumber").val()
                                            , ç©æåç§°: $("#HMaterName").val()
                                            , è§æ ¼åå·: $("#HMaterModel").val()
                                        });
                                    }
                                    layer.close(layer.index);
@@ -493,8 +499,8 @@
                                    }
                                    obj.update({
                                        HUnitIDCol: checkStatus.data[0].HItemID
                                        , HUnitNumberCol: checkStatus.data[0].HNumber
                                        , HUnitNameCol: checkStatus.data[0].HName
                                        , åä½ä»£ç : checkStatus.data[0].HNumber
                                        , åä½åç§°: checkStatus.data[0].HName
                                    });
                                    layer.close(layer.index);
                                }
@@ -531,11 +537,14 @@
                        layer.msg("ç¬¬" + indexRow + "è¡ï¼æ¨¡å·ä¸è½ä¸ºç©ºï¼", { icon: 7, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                        return;
                    }
                    if (!sSubTable[i].HUnitNumberCol) {
                    if (!sSubTable[i].åä½ä»£ç ) {
                        var indexRow = i + 1;
                        layer.msg("ç¬¬" + indexRow + "è¡ï¼åä½ä¸è½ä¸ºç©ºï¼", { icon: 7, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                        return;
                    }
                }
                if (!data.field.HItemID) {
                    OperationType = 1.1
                }
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
@@ -697,9 +706,9 @@
            //åå§åè¡¨æ ¼
            function set_InitGrid() {
                rowdata = [{
                    "HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HRelationIDCol": "",
                    "HRelationNumberCol": "", "HRelationNameCol": "", "HUnitIDCol": "", "HUnitNumberCol": "", "HUnitNameCol": "",
                    "HBeginDateCol": "", "HEndDateCol": "", "HRemarkCol": ""
                    "HMaterIDCol": "", "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HRelationIDCol": "",
                    "æ¨¡å·ä»£ç ": "", "æ¨¡å·åç§°": "", "HUnitIDCol": "", "åä½ä»£ç ": "", "åä½åç§°": "",
                    "å¼å§æ¥æ": "", "ç»ææ¥æ": "", "å¤æ³¨": ""
                }];
                option = {
                    elem: '#mainTable'
@@ -707,54 +716,9 @@
                    , limit: 500
                    , height: 'full-250'
                    , cellMinWidth: 90
                    //, cols: [[
                    //    { type: 'checkbox' }
                    //    , { field: 'HMaterIDCol', title: 'ç©æID', edit: 'text', hide: true }
                    //    , { field: 'HMaterNumberCol', title: 'ç©æä»£ç ', edit: 'text', event: "HMaterCheck", width: 200 }
                    //    , { field: 'HMaterNameCol', title: 'ç©æåç§°', width: 200 }
                    //    , { field: 'HMaterModelCol', title: 'è§æ ¼åå·', width: 200 }
                    //    , { field: 'HRelationIDCol', title: 'æ¨¡å·ID', edit: 'text', hide: true }
                    //    , { field: 'HRelationNumberCol', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: "HRelationCheck" }
                    //    , { field: 'HRelationNameCol', title: 'æ¨¡å·åç§°' }
                    //    , { field: 'HUnitIDCol', title: 'åä½ID', edit: 'text', hide: true }
                    //    , { field: 'HUnitNumberCol', title: 'åä½ä»£ç ', edit: 'text', event: "HUnitCheck" }
                    //    , { field: 'HUnitNameCol', title: 'åä½åç§°' }
                    //    , {
                    //        field: 'HBeginDateCol', title: 'å¼å§æ¥æ', edit: 'text', width: 110
                    //        , templet: function (d) {
                    //            if (d.HBeginDateCol == null) {
                    //                return "";
                    //            }
                    //            return util.toDateString(d.HBeginDateCol, "yyyy-MM-dd");
                    //        }
                    //    }
                    //    , {
                    //        field: 'HEndDateCol', title: 'ç»ææ¥æ', edit: 'text', width: 110
                    //        , templet: function (d) {
                    //            if (d.HEndDateCol == null) {
                    //                return "";
                    //            }
                    //            return util.toDateString(d.HEndDateCol, "yyyy-MM-dd");
                    //        }
                    //    }
                    //    , { field: 'HRemarkCol', title: 'å¤æ³¨', edit: 'text' }
                    //    , { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
                    //]]
                    //, done: function (res, curr, count) {
                    //    option.data = res.data;
                    //    $('.layui-form-select').find('input').unbind("blur");
                    //    $('tr').each(function (e) {
                    //        var $cr = $(this);
                    //        var dataIndex = $cr.attr("data-index");

                    //    });
                    //}
                    //, text: {
                    //    none: 'æ æ°æ®ï¼'
                    //}
                };
                //rowdata[0].HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
                //rowdata[0].HEndDateCol = "2100-01-01";
                //rowdata[0].å¼å§æ¥æ = Format(new Date(), "yyyy-MM-dd");
                //rowdata[0].ç»ææ¥æ = "2100-01-01";
                //option.data = rowdata;
                //table.render(option);
                ////å·æ°è¡¨æ ¼æ°æ®
@@ -767,24 +731,6 @@
                    url: GetWEBURL() + "/Gy_MateMould/GetMateMouldValue",
                    type: "GET",
                    data: { "HItemID": HItemID },
                    //success: function (result) {
                    //    if (result.count == 1) {
                    //        var data = result.data;
                    //        $("#HItemID").val(data[0].HItemID);
                    //        $("#HUnitID").val(data[0].HUnitID);
                    //        $("#HUnitName").val(data[0].HUnitName);
                    //        $("#æ¨¡å·äº§åå¯¹åºè¡¨ä»£ç ").val(data[0].æ¨¡å·äº§åå¯¹åºè¡¨ä»£ç );
                    //        option.data = data;
                    //        table.render(option);
                    //        for (var i = 1; i <= option.data.length; i++) {
                    //            $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
                    //        }
                    //        form.render('select');
                    //    }
                    //    else {
                    //        layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
                    //    }
                    //}
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
@@ -807,7 +753,7 @@
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, edit: 'text' });
                                    }
                                }
                            }

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MateMouldList.html

@@ -102,7 +102,7 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-circle"></i>éåº</button>
@@ -295,31 +295,6 @@
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    //    , { field: 'HMaterID', title: 'HMaterID', sort: true, hide: true }
                    //    , { field: 'HRelationID', title: 'HRelationID', sort: true, hide: true }
                    //    , { field: 'HUnitID', title: 'HSourceID', sort: true, hide: true }
                    //    , { field: 'æ¨¡å·äº§åå¯¹åºè¡¨ä»£ç ', title: 'æ¨¡å·äº§åå¯¹åºè¡¨ä»£ç ', width: 120 }
                    //    , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
                    //    , { field: 'ç©æåç§°', title: 'ç©æåç§°' }
                    //    , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
                    //    , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ' }
                    //    , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°' }
                    //    , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ' }
                    //    , { field: 'è®¡éåä½åç§°', title: 'è®¡éåä½åç§°' }
                    //    , { field: 'æ¹æ¡ç±»å', title: 'æ¹æ¡ç±»å' }
                    //    , { field: 'æ¨¡ç©´æ°', title: 'æ¨¡ç©´æ°' }
                    //    , { field: 'å¼å§æ¥æ', title: 'å¼å§æ¥æ' }
                    //    , { field: 'ç»ææ¥æ', title: 'ç»ææ¥æ' }
                    //    , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
                    //    , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ' }
                    //    , { field: 'å¶åäºº', title: 'å¶åäºº' }
                    //    , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ' }
                    //    , { field: 'å¤æ³¨', title: 'å¤æ³¨' }
                    //    , { field: 'ä½¿ç¨æ è®°', title: 'ä½¿ç¨æ è®°' }
                    //]]
                };
            }
            //#endregion
@@ -449,15 +424,13 @@
                if (checkStatus.data.length === 1) {
                    var ItemID = data[0].HItemID.toString();
                    layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
                        console.log(ItemID)
                        var wait = layer.load();
                        //é»è¾å é¤æ¹æ³
                        $.ajax({
                            url: GetWEBURL() + 'DeltetGy_TechnologyParameter',
                            url: GetWEBURL() + 'DeltetGy_MateMould',
                            type: "GET",
                            data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
                            data: { "HItemID": ItemID },
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                        // å¾å°frameç´¢å¼

			@@ -111,6 +111,8 @@
			<Content Include="views\Baseset\åºç¡èµæ\Gy_QCCheckProjectListView.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_RoutingBillList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_RoutingGroup.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_TechnologyParameterList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_TechParameterUnitList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_WarehouseListNew.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_WasterWHList.html" />
			<Content Include="views\Baseset\åºç¡èµæ\Gy_WHList.html" />
			@@ -187,7 +189,7 @@
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_TechnologyParameterUnit_Add_Edit_.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_TechnologyParameter_Add_Edit_.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_TechParamByProcList.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_TechParamByProcList_Add_Edit_.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_TechParamByProc.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_WorkCenterDyCol.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_WorkPayType.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_WorkStationList.html" />

			@@ -61,6 +61,7 @@
			<input type="radio" name="FixedItems" value="SMater" title="ç©æ">
			<input type="radio" name="FixedItems" value="SRelation" title="æ¨¡å·">
			<input type="radio" name="FixedItems" value="SUnit" title="åä½" checked>
			<input type="radio" name="FixedItems" value="SFree" title="èªç±" checked>
			</div>
			</div>
			</div>
			@@ -296,29 +297,34 @@
			, data = checkStatus.data;
			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HRelationIDCol": "",
			"HRelationNumberCol": "", "HRelationNameCol": "", "HUnitIDCol": "", "HUnitNumberCol": "", "HUnitNameCol": "",
			"HBeginDateCol": "", "HEndDateCol": "", "HRemarkCol": ""
			"HMaterIDCol": "", "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HRelationIDCol": "",
			"æ¨¡å·ä»£ç ": "", "æ¨¡å·åç§°": "", "HUnitIDCol": "", "åä½ä»£ç ": "", "åä½åç§°": "",
			"å¼å§æ¥æ": "", "ç»ææ¥æ": "", "å¤æ³¨": ""
			};
			switch (obj.event) {
			case 'btn-AddLine':
			var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
			if (FixedItems == "SUnit") {
			if (FixedItems == "SFree") {

			}
			else if (FixedItems == "SUnit") {
			NewRow.HUnitIDCol = $("#HUnitID").val();
			NewRow.åä½åç§° = $("#HUnitName").val();
			NewRow.åä½ä»£ç = $("#HUnitNumber").val();
			}
			else if (FixedItems == "SMater") {
			NewRow.HMaterIDCol = $("#HMaterID").val();
			NewRow.HMaterNumberCol = $("#HMaterNumber").val();
			NewRow.HMaterNameCol = $("#HMaterName").val();
			NewRow.HMaterModelCol = $("#HMaterModel").val();
			NewRow.ç©æä»£ç = $("#HMaterNumber").val();
			NewRow.ç©æåç§° = $("#HMaterName").val();
			NewRow.è§æ ¼åå· = $("#HMaterModel").val();
			}
			else if (FixedItems == "SRelation") {
			NewRow.HRelationIDCol = $("#HRelationID").val();
			NewRow.HRelationNumberCol = $("#HRelationNumber").val();
			NewRow.HRelationNameCol = $("#HRelationName").val();
			NewRow.æ¨¡å·ä»£ç = $("#HRelationNumber").val();
			NewRow.æ¨¡å·åç§° = $("#HRelationName").val();
			}
			NewRow.HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
			NewRow.HEndDateCol = "2100-01-01";
			NewRow.å¼å§æ¥æ = Format(new Date(), "yyyy-MM-dd");
			NewRow.ç»ææ¥æ = "2100-01-01";
			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];
			table.render(option);
			@@ -415,16 +421,16 @@
			}
			obj.update({
			HMaterIDCol: checkStatus.data[0].HItemID
			, HMaterNumberCol: checkStatus.data[0].ç©æä»£ç
			, HMaterNameCol: checkStatus.data[0].ç©æ
			, HMaterModelCol: checkStatus.data[0].è§æ ¼åå·
			, ç©æä»£ç : checkStatus.data[0].ç©æä»£ç
			, ç©æåç§°: checkStatus.data[0].ç©æ
			, è§æ ¼åå·: checkStatus.data[0].è§æ ¼åå·
			});
			var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
			if (FixedItems == "SRelation") {
			obj.update({
			HRelationIDCol: $("#HRelationID").val()
			, HRelationNumberCol: $("#HRelationNumber").val()
			, HRelationNameCol: $("#HRelationName").val()
			, æ¨¡å·ä»£ç : $("#HRelationNumber").val()
			, æ¨¡å·åç§°: $("#HRelationName").val()
			});
			}
			layer.close(layer.index);
			@@ -454,16 +460,16 @@
			}
			obj.update({
			HRelationIDCol: checkStatus.data[0].HItemID
			, HRelationNumberCol: checkStatus.data[0].æ¨¡å·ä»£ç
			, HRelationNameCol: checkStatus.data[0].æ¨¡å·
			, æ¨¡å·ä»£ç : checkStatus.data[0].æ¨¡å·ä»£ç
			, æ¨¡å·åç§°: checkStatus.data[0].æ¨¡å·
			});
			var FixedItems = $('input:radio[name="FixedItems"]:checked').val();
			if (FixedItems == "SMater") {
			obj.update({
			HMaterIDCol: $("#HMaterID").val()
			, HMaterNumberCol: $("#HMaterNumber").val()
			, HMaterNameCol: $("#HMaterName").val()
			, HMaterModelCol: $("#HMaterModel").val()
			, ç©æä»£ç : $("#HMaterNumber").val()
			, ç©æåç§°: $("#HMaterName").val()
			, è§æ ¼åå·: $("#HMaterModel").val()
			});
			}
			layer.close(layer.index);
			@@ -493,8 +499,8 @@
			}
			obj.update({
			HUnitIDCol: checkStatus.data[0].HItemID
			, HUnitNumberCol: checkStatus.data[0].HNumber
			, HUnitNameCol: checkStatus.data[0].HName
			, åä½ä»£ç : checkStatus.data[0].HNumber
			, åä½åç§°: checkStatus.data[0].HName
			});
			layer.close(layer.index);
			}
			@@ -531,11 +537,14 @@
			layer.msg("ç¬¬" + indexRow + "è¡ï¼æ¨¡å·ä¸è½ä¸ºç©ºï¼", { icon: 7, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if (!sSubTable[i].HUnitNumberCol) {
			if (!sSubTable[i].åä½ä»£ç ) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼åä½ä¸è½ä¸ºç©ºï¼", { icon: 7, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			}
			if (!data.field.HItemID) {
			OperationType = 1.1
			}
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			@@ -697,9 +706,9 @@
			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			rowdata = [{
			"HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HRelationIDCol": "",
			"HRelationNumberCol": "", "HRelationNameCol": "", "HUnitIDCol": "", "HUnitNumberCol": "", "HUnitNameCol": "",
			"HBeginDateCol": "", "HEndDateCol": "", "HRemarkCol": ""
			"HMaterIDCol": "", "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HRelationIDCol": "",
			"æ¨¡å·ä»£ç ": "", "æ¨¡å·åç§°": "", "HUnitIDCol": "", "åä½ä»£ç ": "", "åä½åç§°": "",
			"å¼å§æ¥æ": "", "ç»ææ¥æ": "", "å¤æ³¨": ""
			}];
			option = {
			elem: '#mainTable'
			@@ -707,54 +716,9 @@
			, limit: 500
			, height: 'full-250'
			, cellMinWidth: 90
			//, cols: [[
			// { type: 'checkbox' }
			// , { field: 'HMaterIDCol', title: 'ç©æID', edit: 'text', hide: true }
			// , { field: 'HMaterNumberCol', title: 'ç©æä»£ç ', edit: 'text', event: "HMaterCheck", width: 200 }
			// , { field: 'HMaterNameCol', title: 'ç©æåç§°', width: 200 }
			// , { field: 'HMaterModelCol', title: 'è§æ ¼åå·', width: 200 }
			// , { field: 'HRelationIDCol', title: 'æ¨¡å·ID', edit: 'text', hide: true }
			// , { field: 'HRelationNumberCol', title: 'æ¨¡å·ä»£ç ', edit: 'text', event: "HRelationCheck" }
			// , { field: 'HRelationNameCol', title: 'æ¨¡å·åç§°' }
			// , { field: 'HUnitIDCol', title: 'åä½ID', edit: 'text', hide: true }
			// , { field: 'HUnitNumberCol', title: 'åä½ä»£ç ', edit: 'text', event: "HUnitCheck" }
			// , { field: 'HUnitNameCol', title: 'åä½åç§°' }
			// , {
			// field: 'HBeginDateCol', title: 'å¼å§æ¥æ', edit: 'text', width: 110
			// , templet: function (d) {
			// if (d.HBeginDateCol == null) {
			// return "";
			// }
			// return util.toDateString(d.HBeginDateCol, "yyyy-MM-dd");
			// }
			// }
			// , {
			// field: 'HEndDateCol', title: 'ç»ææ¥æ', edit: 'text', width: 110
			// , templet: function (d) {
			// if (d.HEndDateCol == null) {
			// return "";
			// }
			// return util.toDateString(d.HEndDateCol, "yyyy-MM-dd");
			// }
			// }
			// , { field: 'HRemarkCol', title: 'å¤æ³¨', edit: 'text' }
			// , { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			//]]
			//, done: function (res, curr, count) {
			// option.data = res.data;
			// $('.layui-form-select').find('input').unbind("blur");
			// $('tr').each(function (e) {
			// var $cr = $(this);
			// var dataIndex = $cr.attr("data-index");

			// });
			//}
			//, text: {
			// none: 'æ æ°æ®ï¼'
			//}
			};
			//rowdata[0].HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
			//rowdata[0].HEndDateCol = "2100-01-01";
			//rowdata[0].å¼å§æ¥æ = Format(new Date(), "yyyy-MM-dd");
			//rowdata[0].ç»ææ¥æ = "2100-01-01";
			//option.data = rowdata;
			//table.render(option);
			////å·æ°è¡¨æ ¼æ°æ®
			@@ -767,24 +731,6 @@
			url: GetWEBURL() + "/Gy_MateMould/GetMateMouldValue",
			type: "GET",
			data: { "HItemID": HItemID },
			//success: function (result) {
			// if (result.count == 1) {
			// var data = result.data;
			// $("#HItemID").val(data[0].HItemID);
			// $("#HUnitID").val(data[0].HUnitID);
			// $("#HUnitName").val(data[0].HUnitName);
			// $("#æ¨¡å·äº§åå¯¹åºè¡¨ä»£ç ").val(data[0].æ¨¡å·äº§åå¯¹åºè¡¨ä»£ç );
			// option.data = data;
			// table.render(option);
			// for (var i = 1; i <= option.data.length; i++) {
			// $('#isEntrust' + i + '').find("option[value='" + option.data[i - 1].isEntrust + "']").attr("selected", true);
			// }
			// form.render('select');
			// }
			// else {
			// layer.msg(result.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// }
			//}
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			@@ -807,7 +753,7 @@
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, edit: 'text' });
			}
			}
			}

			@@ -102,7 +102,7 @@
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-circle"></i>éåº</button>
			@@ -295,31 +295,6 @@
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			//, cols: [[
			// { type: 'checkbox', fixed: 'left' }
			// , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
			// , { field: 'HMaterID', title: 'HMaterID', sort: true, hide: true }
			// , { field: 'HRelationID', title: 'HRelationID', sort: true, hide: true }
			// , { field: 'HUnitID', title: 'HSourceID', sort: true, hide: true }
			// , { field: 'æ¨¡å·äº§åå¯¹åºè¡¨ä»£ç ', title: 'æ¨¡å·äº§åå¯¹åºè¡¨ä»£ç ', width: 120 }
			// , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
			// , { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			// , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
			// , { field: 'æ¨¡å·ä»£ç ', title: 'æ¨¡å·ä»£ç ' }
			// , { field: 'æ¨¡å·åç§°', title: 'æ¨¡å·åç§°' }
			// , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ' }
			// , { field: 'è®¡éåä½åç§°', title: 'è®¡éåä½åç§°' }
			// , { field: 'æ¹æ¡ç±»å', title: 'æ¹æ¡ç±»å' }
			// , { field: 'æ¨¡ç©´æ°', title: 'æ¨¡ç©´æ°' }
			// , { field: 'å¼å§æ¥æ', title: 'å¼å§æ¥æ' }
			// , { field: 'ç»ææ¥æ', title: 'ç»ææ¥æ' }
			// , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
			// , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ' }
			// , { field: 'å¶åäºº', title: 'å¶åäºº' }
			// , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ' }
			// , { field: 'å¤æ³¨', title: 'å¤æ³¨' }
			// , { field: 'ä½¿ç¨æ è®°', title: 'ä½¿ç¨æ è®°' }
			//]]
			};
			}
			//#endregion
			@@ -449,15 +424,13 @@
			if (checkStatus.data.length === 1) {
			var ItemID = data[0].HItemID.toString();
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			console.log(ItemID)
			var wait = layer.load();
			//é»è¾å é¤æ¹æ³
			$.ajax({
			url: GetWEBURL() + 'DeltetGy_TechnologyParameter',
			url: GetWEBURL() + 'DeltetGy_MateMould',
			type: "GET",
			data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
			data: { "HItemID": ItemID },
			success: function (result) {
			console.log('gouba' + result);
			if (result.count == 1) {
			layer.msg(result.Message, { icon: 1 }, function () {
			// å¾å°frameç´¢å¼