MES-WEB-LayUI.git

parent: 00b1243f | 补丁 | 提交 | show whitespace

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

沈泽

2021-09-22 9036218de581fe0e930604d1587e98027224fd5d

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

4个文件已修改

1个文件已删除

	WebTM/WebTM.csproj	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/layuiadmin/Scripts/webConfig.js	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/index.html	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/公用基础资料/test.html	124 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/WebTM.csproj

@@ -527,7 +527,6 @@
    <Content Include="views\åºç¡èµæ\çäº§åºç¡èµæ\Add_Edit_Gy_Process.html" />
    <Content Include="views\åºç¡èµæ\éè´åºç¡èµæ\Gy_Supplier_Edit.html" />
    <Content Include="views\åºç¡èµæ\éå®åºç¡èµæ\Gy_Customer_Edit.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\test.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Xt_ORGANIZATIONSList.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_PropertyList.html" />
    <Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_Material.html" />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -2,15 +2,16 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //åå¬å®¤æå¡å¨
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //chæ¬å°
    var WEBURL = "http://localhost:8085/API/";   //zgqæ¬å°
    //var WEBURL = "http://localhost:8085/API/";   //zgqæ¬å°
    //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://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://localhost/API/";
    //var WEBURL = "http://183.129.128.86:9090/API/";   //å¯è´å¥ç¹å®¢æ·æå¡å¨å¤ç½
    //var WEBURL = "http://192.168.1.253:8080/API/";   //å¯è´å¥ç¹å®¢æ·æå¡å¨åç½
    var WEBURL = "http://localhost/API/";
    return WEBURL
}


 WebTM/views/index.html


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

File was deleted

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷×ª¿¨/Sc_ProcessExchangeBillList.html

@@ -85,15 +85,6 @@
                                <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>

                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></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-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>-->

                            </div>
                        </script>
                    </form>
@@ -122,6 +113,7 @@
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
            //var sWhere = " äº§åä»£ç  = 'BX0002'";
            var sWhere = "";
            var option = "";
@@ -148,7 +140,6 @@
                    //å é¤
                    case 'set_DeleteBill': set_DeleteBill();
                        break;

                    //å·æ°
                    case 'get_Refresh': get_Refresh();
                        break;
@@ -171,6 +162,7 @@
                get_FastQuery();
            });
            //#endregion

            //#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³
            function set_ClearBill() {
                //åå§åä¸»è¡¨åè¡¨
@@ -190,7 +182,7 @@
                $("#HDate1").val("");//ç»ææ¥æ
                $("#HOrderProcNO").val("");//è®¢åè·è¸ªå·
                $("#SHname").val("");//ç©æ|åä»¶åç§°|åä»¶è§æ ¼
                $("#btnSearch").click();
                //$("#btnSearch").click();
                sWhere = "";
            }
            //#endregion
@@ -307,6 +299,7 @@
            table.on('row(mainTable)', function (obj) { //æ³¨ï¼tool æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
                var datas = obj.data; //è·å¾å½åè¡æ°æ®
                var HMainID = datas.hmainid;
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
                    type: "GET",
@@ -315,10 +308,13 @@
                        if (data1.count == 1) {
                            option2.data = data1.data;
                            table.render(option2);
                            layer.close(wait);
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                            layer.close(wait);
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("æ¥å£å¤±æ!", { icon: 5 });
                    }
                });
@@ -333,14 +329,21 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , height: 256
                    , height: 300
                    , cellMinWidth: 90
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        //{ field: 'hmainid', title: 'hmainid', width: 90 }
                        , { field: 'æå°æ¬¡æ°', title: 'æå°æ¬¡æ°' }
                        , { field: 'ç±»å', title: 'ç±»å' }
                        , { field: 'æ¥æ', title: 'æ¥æ', width: 120, sort: true }
                        , {
                            field: 'æ¥æ', title: 'æ¥æ', width: 120, sort: true, templet: function (d) {
                                if (d.æ¥æ == null) {
                                    return "";
                                }
                                return util.toDateString(d.æ¥æ, "yyyy-MM-dd");
                            }
                        }
                        , { field: 'è®¢åè·è¸ªå·', title: 'è®¢åè·è¸ªå·', width: 120 }
                        , { field: 'åæ®å·', title: 'åæ®å·', width: 190 }
                        //, { field: 'hicmointerid', title: 'hicmointerid', width: 80 }
@@ -397,7 +400,7 @@
                    elem: '#mainTable2'
                    //, toolbar: '#toolbarDemo'
                    , page: true
                    , height: 226
                    , height: 300
                    , cellMinWidth: 90
                    , cols: [[

			@@ -527,7 +527,6 @@
			<Content Include="views\åºç¡èµæ\çäº§åºç¡èµæ\Add_Edit_Gy_Process.html" />
			<Content Include="views\åºç¡èµæ\éè´åºç¡èµæ\Gy_Supplier_Edit.html" />
			<Content Include="views\åºç¡èµæ\éå®åºç¡èµæ\Gy_Customer_Edit.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\test.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Xt_ORGANIZATIONSList.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_PropertyList.html" />
			<Content Include="views\åºç¡èµæ\å¬ç¨åºç¡èµæ\Gy_Material.html" />

			@@ -2,15 +2,16 @@
			function GetWEBURL() {
			//var WEBURL = "http://192.168.16.80:8011/"; //åå¬å®¤æå¡å¨
			//var WEBURL = "http://localhost:8081/SWEAPI/"; //chæ¬å°
			var WEBURL = "http://localhost:8085/API/"; //zgqæ¬å°
			//var WEBURL = "http://localhost:8085/API/"; //zgqæ¬å°
			//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://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://localhost/API/";
			//var WEBURL = "http://183.129.128.86:9090/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨å¤ç½
			//var WEBURL = "http://192.168.1.253:8080/API/"; //å¯è´å¥ç¹å®¢æ·æå¡å¨åç½
			var WEBURL = "http://localhost/API/";
			return WEBURL
			}

			@@ -85,15 +85,6 @@
			<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>

			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></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-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>-->

			</div>
			</script>
			</form>
			@@ -122,6 +113,7 @@
			, element = layui.element
			, laypage = layui.laypage
			, laydate = layui.laydate
			, util = layui.util
			//var sWhere = " äº§åä»£ç = 'BX0002'";
			var sWhere = "";
			var option = "";
			@@ -148,7 +140,6 @@
			//å é¤
			case 'set_DeleteBill': set_DeleteBill();
			break;

			//å·æ°
			case 'get_Refresh': get_Refresh();
			break;
			@@ -171,6 +162,7 @@
			get_FastQuery();
			});
			//#endregion

			//#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³
			function set_ClearBill() {
			//åå§åä¸»è¡¨åè¡¨
			@@ -190,7 +182,7 @@
			$("#HDate1").val("");//ç»ææ¥æ
			$("#HOrderProcNO").val("");//è®¢åè·è¸ªå·
			$("#SHname").val("");//ç©æ\|åä»¶åç§°\|åä»¶è§æ ¼
			$("#btnSearch").click();
			//$("#btnSearch").click();
			sWhere = "";
			}
			//#endregion
			@@ -307,6 +299,7 @@
			table.on('row(mainTable)', function (obj) { //æ³¨ï¼tool æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			var datas = obj.data; //è·å¾å½åè¡æ°æ®
			var HMainID = datas.hmainid;
			var wait = layer.load();
			$.ajax({
			url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
			type: "GET",
			@@ -315,10 +308,13 @@
			if (data1.count == 1) {
			option2.data = data1.data;
			table.render(option2);
			layer.close(wait);
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			layer.close(wait);
			}
			}, error: function () {
			layer.close(wait);
			layer.alert("æ¥å£å¤±æ!", { icon: 5 });
			}
			});
			@@ -333,14 +329,21 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, height: 256
			, height: 300
			, cellMinWidth: 90
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			//{ field: 'hmainid', title: 'hmainid', width: 90 }
			, { field: 'æå°æ¬¡æ°', title: 'æå°æ¬¡æ°' }
			, { field: 'ç±»å', title: 'ç±»å' }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 120, sort: true }
			, {
			field: 'æ¥æ', title: 'æ¥æ', width: 120, sort: true, templet: function (d) {
			if (d.æ¥æ == null) {
			return "";
			}
			return util.toDateString(d.æ¥æ, "yyyy-MM-dd");
			}
			}
			, { field: 'è®¢åè·è¸ªå·', title: 'è®¢åè·è¸ªå·', width: 120 }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 190 }
			//, { field: 'hicmointerid', title: 'hicmointerid', width: 80 }
			@@ -397,7 +400,7 @@
			elem: '#mainTable2'
			//, toolbar: '#toolbarDemo'
			, page: true
			, height: 226
			, height: 300
			, cellMinWidth: 90
			, cols: [[