MES-WEB-LayUI.git

parent: 153d0e18 | 补丁 | 提交 | ignore whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

仲国强

2021-09-02 2a66617a818aef903bd69f19db38e57a4a5b1f4c

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

4个文件已修改

	WebTM/layuiadmin/Scripts/webConfig.js	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/设备管理/Sb_EquipDotCheckBillList.html	55 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -5,12 +5,11 @@
    //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://localhost/API/";//zgqæ¬å°
    //var WEBURL = "http://183.129.128.86:9090/API/";   //å¯è´å¥ç¹å®¢æ·æå¡å¨
    //var WEBURL = "http://localhost/API/";
    return WEBURL
}


 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -75,7 +75,7 @@
    <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-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ä¸æ¨</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>

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

@@ -270,15 +270,13 @@
                                    });
                                }
                                else {

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

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

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

@@ -1,8 +1,8 @@
ï»¿<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>è®¾å¤ç¹æ£è®°å½ååè¡¨</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <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, maximum-scale=1">
@@ -37,7 +37,7 @@
                                            <option value="ZHSJ">ä¸æ¶å½è¿å</option>
                                        </select>
                                    </div>
                                </div>
                                </div>-->
                                <div class="layui-inline">
                                    <label class="layui-form-label">åæ®å·</label>
                                    <div class="layui-input-block">
@@ -49,30 +49,30 @@
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
                                    </div>
                                </div>-->
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">å¼å§æ¶é´</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ç»ææ¶é´</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>-->
                                <!--<div class="layui-colla-content">
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                        <div class="layui-inline">
                                            <span>å¶ä»æ¡ä»¶></span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">å¼å§æ¶é´</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç»ææ¶é´</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
                                        </div>
                                    </div>
                                </div>-->
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -331,35 +331,36 @@
            }
            //å¿«éè¿æ»¤
            function get_FastQuery() {
                var HBillType = $("#HBillType").val();//åæ®ç±»å
                //var HBillType = $("#HBillType").val();//åæ®ç±»å
                var HBillNo = $("#HBillNo").val();//åæ®å·
                var HCreateBy = $("#HCreateBy").val();//å¶åäºº
                var BenginHCreateDate = $("#BenginHCreateDate").val();//å¼å§å¶åæ¶é´
                var EndHCreateDate = $("#EndHCreateDate").val();//ç»æå¶åæ¶é´
                if (HBillNo) {
                    sWhere += " and HBillNo like '%" + HBillNo + "%'";
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
                if (HCreateBy) {
                    sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
                    sWhere += " and å¶åäºº like '%" + HCreateBy + "%'";
                }
                if (BenginHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + BenginHCreateDate + "'";
                }
                if (EndHCreateDate) {
                    sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + EndHCreateDate + "'";
                }
                get_Display(sWhere);
                sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
            }
            //éç½®è¿æ»¤æ¡ä»¶æ¹æ³
            function set_ClearQuery() {
                $("#HBillType").val("");//åæ®ç±»å
                //$("#HBillType").val("");//åæ®ç±»å
                $("#HBillNo").val("");//åæ®å·
                $("#HSourceBillNo").val("");//æºåå·
                $("#HCreateBy").val("");//å¶åäºº
                $("#BenginHCreateDate").val("");//å¼å§å¶åæ¶é´
                $("#EndHCreateDate").val("");//ç»æå¶åæ¶é´
                sWhere = "";
                $("#btnSearch").click();
            }
            //å·æ°
            function get_Refresh() {
@@ -369,8 +370,8 @@
            //#endregion

            //#endregion
            
          


            //ä»¥ä¸æ¯layuiæ¨¡å
        });

			@@ -5,12 +5,11 @@
			//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://localhost/API/";//zgqæ¬å°
			//var WEBURL = "http://183.129.128.86:9090/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨
			//var WEBURL = "http://localhost/API/";
			return WEBURL
			}

			@@ -75,7 +75,7 @@
			<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-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ä¸æ¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>

			@@ -270,15 +270,13 @@
			});
			}
			else {

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

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

			@@ -1,8 +1,8 @@
			ï»¿<!DOCTYPE html>
			<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
			<title>è®¾å¤ç¹æ£è®°å½ååè¡¨</title>
			<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
			<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, maximum-scale=1">
			@@ -37,7 +37,7 @@
			<option value="ZHSJ">ä¸æ¶å½è¿å</option>
			</select>
			</div>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			@@ -49,30 +49,30 @@
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
			</div>
			</div>-->
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>-->
			<!--<div class="layui-colla-content">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-colla-content">
			<div class="layui-inline">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
			</div>
			</div>
			</div>-->
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			@@ -331,35 +331,36 @@
			}
			//å¿«éè¿æ»¤
			function get_FastQuery() {
			var HBillType = $("#HBillType").val();//åæ®ç±»å
			//var HBillType = $("#HBillType").val();//åæ®ç±»å
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HCreateBy = $("#HCreateBy").val();//å¶åäºº
			var BenginHCreateDate = $("#BenginHCreateDate").val();//å¼å§å¶åæ¶é´
			var EndHCreateDate = $("#EndHCreateDate").val();//ç»æå¶åæ¶é´
			if (HBillNo) {
			sWhere += " and HBillNo like '%" + HBillNo + "%'";
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HCreateBy) {
			sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
			sWhere += " and å¶åäºº like '%" + HCreateBy + "%'";
			}
			if (BenginHCreateDate) {
			sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + BenginHCreateDate + "'";
			}
			if (EndHCreateDate) {
			sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + EndHCreateDate + "'";
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			//éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			$("#HBillType").val("");//åæ®ç±»å
			//$("#HBillType").val("");//åæ®ç±»å
			$("#HBillNo").val("");//åæ®å·
			$("#HSourceBillNo").val("");//æºåå·
			$("#HCreateBy").val("");//å¶åäºº
			$("#BenginHCreateDate").val("");//å¼å§å¶åæ¶é´
			$("#EndHCreateDate").val("");//ç»æå¶åæ¶é´
			sWhere = "";
			$("#btnSearch").click();
			}
			//å·æ°
			function get_Refresh() {
			@@ -369,8 +370,8 @@
			//#endregion

			//#endregion




			//ä»¥ä¸æ¯layuiæ¨¡å
			});