MESWMS-LayUI.git

parent: d513f422 | 补丁 | 提交 | ignore whitespace

zzr99

2021-10-21 14ff5ada0e1b48056553755b1376fc509245ff86

测试器具加设备

6个文件已修改

	WebTM/layuiadmin/Scripts/webConfig.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/Gy_EquipTypeEdit.html	158 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdOutBillList.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBillList.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Sc_MouldMaintainBillList.html	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/设备管理/Sb_EqpRepairCheckBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -6,13 +6,13 @@
    //var WEBURL = "http://localhost:8080/API/";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/lubao";   //é¢æåæ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //æ¨é²æ¬å°éç½®
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ç« ç´«ææ¬å°éç½®
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //ç« ç´«ææ¬å°éç½®
    //var WEBURL = "http://10.1.4.155/API/";   //æ±ä¸°å®¢æ·NEW
    //var WEBURL = "http://47.96.97.237/API/";   //æºäºæå¡å¨
    //var WEBURL = "http://183.129.128.86:9090/API/";   //å¯è´å¥ç¹å®¢æ·æå¡å¨å¤ç½
    //var WEBURL = "http://192.168.1.253:8080/API/";   //å¯è´å¥ç¹å®¢æ·æå¡å¨åç½
    //var WEBURL = "http://220.189.218.154:8092/API/";   //ä¸¸äºåç»´å°æå¡å¨
    var WEBURL = "http://localhost/API/";
    //var WEBURL = "http://localhost/API/";
    return WEBURL
}


 WebTM/views/»ù´¡×ÊÁÏ/¹«ÓÃ»ù´¡×ÊÁÏ/Gy_EquipTypeEdit.html

@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>æ°å¢/ç¼è¾æ¨¡æ²»å·åç±»</title>
    <title>æ°å¢/ç¼è¾è®¾å¤åç±»</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -89,7 +89,6 @@
            var OperationType = 1;//æä½ç±»å
            var closeType = 2;  //å³éç±»å
        } else {
            debugger;
            var OperationType = params[params[0]];//æä½ç±»å
            var linterid = params[params[1]];//æºåid
            var HSouceBillType = params[params[2]];//æºåç±»å
@@ -114,71 +113,6 @@
            //å¸¸è§ç¨æ³

            //#region å·¥å·æé®
            //éåºæé®
            form.on('submit(Exit)', function () {
                Pub_Close(1);
            })

            //ä¿å
            form.on('submit(Saver)', function (data) {//ä¿å
                var refSav = "";
                if (linterid == "" || linterid == null) {
                    refSav = "Add";
                }
                if (linterid != "" && linterid != null) {
                    refSav = "Update";
                }
                //debugger;
                var isEndCheck = document.getElementById("HStopflag").checked;
                data.field.HStopflag = isEndCheck;//å°æ°ç»åå¹¶æåç¬¦ä¸²

                data.field.HItemID = linterid == "" ? 0 : linterid;

                data.field.HParentID = 0;
                data.field.HLevel = $("#HLevel").val() == "" ? 1 : $("#HLevel").val();

                var oMain = JSON.stringify(data.field)

                var sMainSub = oMain + ';' + refSav ;

                $.ajax(
                    {
                        type: "POST",
                        url: GetWEBURL() + "/Gy_EquipType/SaveEquipTypeList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                        async: true,
                        data: { "msg": sMainSub },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                                layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                    $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                    var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
                                    parent.layer.close(index); //åæ§è¡å³é Â  Â  Â  Â  Â Â  Â Â Â  Â 
                                });
                            }
                            else {

                                f_alert(data.Message);
                                console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {

                            f_alert("éè¯¯:" + err);
                            console.log("Reason" + sMainStr);
                        }
                    });
            });

            //#endregion


            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });

            }

            if (OperationType == 3) {
                $.ajax({
                    url: GetWEBURL() + "/Gy_EquipType/Gy_EquipTypeCheckDetai",
@@ -204,6 +138,96 @@

                });
            }
            //éåºæé®
            form.on('submit(Exit)', function () {
                Pub_Close(1);
            })

            //ä¿å
            form.on('submit(Saver)', function (data) {//ä¿å
                //debugger;
                var isEndCheck = document.getElementById("HStopflag").checked;
                data.field.HStopflag = isEndCheck;//å°æ°ç»åå¹¶æåç¬¦ä¸²

                data.field.HItemID = linterid == "" ? 0 : linterid;

                data.field.HParentID = 0;
                data.field.HLevel = $("#HLevel").val() == "" ? 1 : $("#HLevel").val();

                var oMain = JSON.stringify(data.field)

                var sMainSub = oMain + ';' + linterid ;

                if (OperationType == 3) {
                    //ä¿®æ¹
                    $.ajax(
                        {
                            type: "POST",
                            url: GetWEBURL() + "/Gy_EquipType/EditBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                            async: true,
                            data: { "oMain": sMainSub },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                        var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
                                        parent.layer.close(index); //åæ§è¡å³é Â  Â  Â  Â  Â Â  Â Â Â  Â 
                                    });
                                }
                                else {

                                    f_alert(data.Message);
                                    console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
                                }
                                layer.closeAll("loading");
                            },
                            error: function (err) {

                                f_alert("éè¯¯:" + err);
                                console.log("Reason" + sMainStr);
                            }
                        });
                }
                else {
                    //æ°å¢
                    $.ajax(
                        {
                            type: "POST",
                            url: GetWEBURL() + "/Gy_EquipType/AddBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                            async: true,
                            data: { "oMain": sMainSub },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                                    layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
                                        var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
                                        parent.layer.close(index); //åæ§è¡å³é Â  Â  Â  Â  Â Â  Â Â Â  Â 
                                    });
                                }
                                else {
                                    f_alert(data.Message);
                                }
                                layer.closeAll("loading");
                            },
                            error: function (err) {

                                f_alert("éè¯¯:" + err);
                            }
                        });
                }
            });

            //#endregion


            function f_alert(sMsg) {
                layer.alert(sMsg, { icon: 5 });

            }

            
        });
    </script>
</body>

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_Add_MouldProdOutBillList.html

@@ -236,6 +236,7 @@
                    , { field: 'HSPCode', title: 'ä»ä½ä»£ç ', edit: 'text', event: 'HSPCode', width: 100 }
                    , { field: 'HSPName', title: 'ä»ä½', edit: 'text', width: 100 }
                    , { field: 'HRemark', title: 'è¡¨ä½å¤æ³¨', edit: 'text', width: 100 }
                    , { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
                    , { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
                ]]
                , limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
@@ -243,7 +244,7 @@
            //å¤ææ¯å¦æ°å¢
            if (OperationType == 1) {
                //åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": "  ", "HSQProcName": "   ","HProcID":0, "HZRProcName": "  ", "HMRBChecker": "  ", "HRemark": "  ", "HPSProcName": "  ", "HCloseMan": "   " }
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" }];
                option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
                table.render(option);
            }
            else {

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldScrapOutBillList.html

@@ -414,10 +414,10 @@
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var HBillStatus = data[0].HBillStatus.toString();
                    if (HBillStatus != "1") {
                        layer.msg('åæ®ç¶æä¸ä¸ºæªå®¡æ ¸ç¶æ,ä¸åè®¸å é¤ï¼');
                        return false;
                    }
                    //if (HBillStatus != "1") {
                    //    layer.msg('åæ®ç¶æä¸ä¸ºæªå®¡æ ¸ç¶æ,ä¸åè®¸å é¤ï¼');
                    //    return false;
                    //}
                    //é»è¾å é¤æ¹æ³
                    layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
                        $.ajax({

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß¹ÜÀí/Sc_MouldMaintainBillList.html

@@ -102,9 +102,9 @@
                                <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="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>ç¡®è®¤</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
    <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>-->

                            </div>
                        </script>
@@ -123,6 +123,9 @@
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

    <script>
        layui.config({
            base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
@@ -187,14 +190,14 @@
                //if (flag) {
                //    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');
                //    obj.tr.next().find('.layui-form-checkbox').removeClass('layui-form-checked');
                //} 
                //}
                var datas = obj.data; //è·å¾å½åè¡æ°æ®
                var linterid = datas.hmainid;
                $.ajax({
                    url: GetWEBURL() + 'Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
                    type: "GET",
                    data: { "HInterID": linterid },
                    success: function (data1) {  
                    success: function (data1) {
                        if (data1.count == 1) {
                            option1.data = data1.list[0];
                            table1.render(option1);
@@ -264,7 +267,7 @@
                        , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 200 }
                        , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 200 }
                        , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 115, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" } 
                        , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 115, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'å³éäºº', title: 'å³éäºº', width: 200 }
                        , { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"}
                        , { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 200 }

 WebTM/views/Éè±¸¹ÜÀí/Sb_EqpRepairCheckBillList.html

@@ -286,7 +286,7 @@
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "Sb_EqpRepairWorkBill/DeltetEqpRepairCheckBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                            data: { "HInterID": InterID },
                            data: { "HInterID": HInterID },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {

			@@ -6,13 +6,13 @@
			//var WEBURL = "http://localhost:8080/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨é²æ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°éç½®
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //ç« ç´«ææ¬å°éç½®
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW
			//var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			//var WEBURL = "http://183.129.128.86:9090/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨å¤ç½
			//var WEBURL = "http://192.168.1.253:8080/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨åç½
			//var WEBURL = "http://220.189.218.154:8092/API/"; //ä¸¸äºåç»´å°æå¡å¨
			var WEBURL = "http://localhost/API/";
			//var WEBURL = "http://localhost/API/";
			return WEBURL
			}

			@@ -2,7 +2,7 @@
			<html>
			<head>
			<meta charset="utf-8" />
			<title>æ°å¢/ç¼è¾æ¨¡æ²»å·åç±»</title>
			<title>æ°å¢/ç¼è¾è®¾å¤åç±»</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			@@ -89,7 +89,6 @@
			var OperationType = 1;//æä½ç±»å
			var closeType = 2; //å³éç±»å
			} else {
			debugger;
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			@@ -114,71 +113,6 @@
			//å¸¸è§ç¨æ³

			//#region å·¥å·æé®
			//éåºæé®
			form.on('submit(Exit)', function () {
			Pub_Close(1);
			})

			//ä¿å
			form.on('submit(Saver)', function (data) {//ä¿å
			var refSav = "";
			if (linterid == "" \|\| linterid == null) {
			refSav = "Add";
			}
			if (linterid != "" && linterid != null) {
			refSav = "Update";
			}
			//debugger;
			var isEndCheck = document.getElementById("HStopflag").checked;
			data.field.HStopflag = isEndCheck;//å°æ°ç»åå¹¶æåç¬¦ä¸²

			data.field.HItemID = linterid == "" ? 0 : linterid;

			data.field.HParentID = 0;
			data.field.HLevel = $("#HLevel").val() == "" ? 1 : $("#HLevel").val();

			var oMain = JSON.stringify(data.field)

			var sMainSub = oMain + ';' + refSav ;

			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "/Gy_EquipType/SaveEquipTypeList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
			$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
			var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
			parent.layer.close(index); //åæ§è¡å³é Â Â Â Â Â Â Â Â Â Â
			});
			}
			else {

			f_alert(data.Message);
			console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
			}
			layer.closeAll("loading");
			},
			error: function (err) {

			f_alert("éè¯¯:" + err);
			console.log("Reason" + sMainStr);
			}
			});
			});

			//#endregion


			function f_alert(sMsg) {
			layer.alert(sMsg, { icon: 5 });

			}

			if (OperationType == 3) {
			$.ajax({
			url: GetWEBURL() + "/Gy_EquipType/Gy_EquipTypeCheckDetai",
			@@ -204,6 +138,96 @@

			});
			}
			//éåºæé®
			form.on('submit(Exit)', function () {
			Pub_Close(1);
			})

			//ä¿å
			form.on('submit(Saver)', function (data) {//ä¿å
			//debugger;
			var isEndCheck = document.getElementById("HStopflag").checked;
			data.field.HStopflag = isEndCheck;//å°æ°ç»åå¹¶æåç¬¦ä¸²

			data.field.HItemID = linterid == "" ? 0 : linterid;

			data.field.HParentID = 0;
			data.field.HLevel = $("#HLevel").val() == "" ? 1 : $("#HLevel").val();

			var oMain = JSON.stringify(data.field)

			var sMainSub = oMain + ';' + linterid ;

			if (OperationType == 3) {
			//ä¿®æ¹
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "/Gy_EquipType/EditBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "oMain": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
			$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
			var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
			parent.layer.close(index); //åæ§è¡å³é Â Â Â Â Â Â Â Â Â Â
			});
			}
			else {

			f_alert(data.Message);
			console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
			}
			layer.closeAll("loading");
			},
			error: function (err) {

			f_alert("éè¯¯:" + err);
			console.log("Reason" + sMainStr);
			}
			});
			}
			else {
			//æ°å¢
			$.ajax(
			{
			type: "POST",
			url: GetWEBURL() + "/Gy_EquipType/AddBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "oMain": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
			$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
			var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
			parent.layer.close(index); //åæ§è¡å³é Â Â Â Â Â Â Â Â Â Â
			});
			}
			else {
			f_alert(data.Message);
			}
			layer.closeAll("loading");
			},
			error: function (err) {

			f_alert("éè¯¯:" + err);
			}
			});
			}
			});

			//#endregion


			function f_alert(sMsg) {
			layer.alert(sMsg, { icon: 5 });

			}


			});
			</script>
			</body>

			@@ -236,6 +236,7 @@
			, { field: 'HSPCode', title: 'ä»ä½ä»£ç ', edit: 'text', event: 'HSPCode', width: 100 }
			, { field: 'HSPName', title: 'ä»ä½', edit: 'text', width: 100 }
			, { field: 'HRemark', title: 'è¡¨ä½å¤æ³¨', edit: 'text', width: 100 }
			, { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			, limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			@@ -243,7 +244,7 @@
			//å¤ææ¯å¦æ°å¢
			if (OperationType == 1) {
			//åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" }];
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
			table.render(option);
			}
			else {

			@@ -414,10 +414,10 @@
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			var HBillStatus = data[0].HBillStatus.toString();
			if (HBillStatus != "1") {
			layer.msg('åæ®ç¶æä¸ä¸ºæªå®¡æ ¸ç¶æ,ä¸åè®¸å é¤ï¼');
			return false;
			}
			//if (HBillStatus != "1") {
			// layer.msg('åæ®ç¶æä¸ä¸ºæªå®¡æ ¸ç¶æ,ä¸åè®¸å é¤ï¼');
			// return false;
			//}
			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax({

			@@ -102,9 +102,9 @@
			<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="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>ç¡®è®¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>-->

			</div>
			</script>
			@@ -123,6 +123,9 @@
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>

			<script>
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			@@ -187,14 +190,14 @@
			//if (flag) {
			// obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');
			// obj.tr.next().find('.layui-form-checkbox').removeClass('layui-form-checked');
			//}
			//}
			var datas = obj.data; //è·å¾å½åè¡æ°æ®
			var linterid = datas.hmainid;
			$.ajax({
			url: GetWEBURL() + 'Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
			type: "GET",
			data: { "HInterID": linterid },
			success: function (data1) {
			success: function (data1) {
			if (data1.count == 1) {
			option1.data = data1.list[0];
			table1.render(option1);
			@@ -264,7 +267,7 @@
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 200 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 200 }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 115, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 115, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 200 }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"}
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 200 }

			@@ -286,7 +286,7 @@
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "Sb_EqpRepairWorkBill/DeltetEqpRepairCheckBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID },
			data: { "HInterID": HInterID },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {