MES-WEB-LayUI.git

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

zzr99

2022-08-16 0d4c424ddf9101128e6e4cf606bf9004cf179a36

维护

6个文件已修改

	WebTM/layuiadmin/Scripts/webConfig.js	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/index.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具管理/Sc_Add_MouldMaintainBillList.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/设备管理/Sb_EquipDotCheckBillEdit.html	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/设备管理/Sb_EquipMaintainBillEdit.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -7,10 +7,10 @@
    //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://localhost:8082/LuBaoAPI/";    //æ¨ä¹æ¬å°éç½®
    //var WEBURL = "http://10.1.4.155/API/";   //æ±ä¸°å®¢æ·NEW
    var WEBURL = "http://47.96.97.237/API/";   //æºäºæå¡å¨
    //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/";   //ä¸¸äºåç»´å°æå¡å¨

 WebTM/views/index.html

@@ -573,7 +573,7 @@
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Gy_MouldFileList.html">å¨å·ä¸»æ¡£ç»´æ¤</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Sc_MouldMaintainRuleBillEdit.html">å¨å·ä¿å»è§ç¨å</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Sc_MouldMaintainRuleBillList.html">å¨å·ä¿å»è§ç¨åç»´æ¤</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Gy_MouldFileResume.html">å¨å·å±¥å</a></dd>
                                        <!--<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Gy_MouldFileResume.html">å¨å·å±¥å</a></dd>-->
                                    </dl>
                                </dd>
                                <dd>
@@ -646,7 +646,7 @@
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/å¨å·æ¥è¡¨/ReportMouldStock.html">å¨å·åºåæ¥è¯¢</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/å¨å·æ¥è¡¨/ReportMaterialReceipt.html">ç©ææ¶åæç»åæ±æ»</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/å¨å·æ¥è¡¨/ReportInventoryAccount.html">åºåå°è´¦</a></dd>
                                        <dd><a lay-href="">å¨å·å±¥åè¡¨n</a></dd>
                                        <dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Gy_MouldFileResume.html">å¨å·å±¥åè¡¨</a></dd>
                                        <dd><a lay-href="åºç¡èµæ/åºç¡èµæ/Gy_StockCheckItemList.html">çç¹æ¹æ¡åè¡¨</a></dd>
                                        <dd><a lay-href="åºç¡èµæ/åºç¡èµæ/Sc_MouldStockBillMain_Temp.html">çç¹è®°å½è¡¨</a></dd>
                                        <dd><a lay-href="åºç¡èµæ/åºç¡èµæ/InventoryAnalysis.html">çç¹åæåè¡¨</a></dd>
@@ -668,7 +668,7 @@
                                        <dd><a lay-href="è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleList.html">è®¾å¤ç¹æ£è§ç¨åç»´æ¤</a></dd>
                                        <dd><a lay-href="è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipMaintainRuleEdit.html">è®¾å¤ä¿å»è§ç¨å</a></dd>
                                        <dd><a lay-href="è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipMaintainRuleList.html">è®¾å¤ä¿å»è§ç¨åç»´æ¤</a></dd>
                                        <dd><a lay-href="è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileBillResume.html">è®¾å¤å±¥å</a></dd>
                                        <!--<dd><a lay-href="è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileBillResume.html">è®¾å¤å±¥å</a></dd>-->
                                    </dl>
                                </dd>
                                <dd>
@@ -700,7 +700,7 @@
                                <dd>
                                    <a>è®¾å¤æ¥è¡¨</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="">è®¾å¤å±¥åè¡¨n</a></dd>
                                        <dd><a lay-href="è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileBillResume.html">è®¾å¤å±¥åè¡¨</a></dd>
                                    </dl>
                                </dd>
                            </dl>

 WebTM/views/»ù´¡×ÊÁÏ/Òþ²ØÁÐÉèÖÃ/Gy_GridView_Hide.html

@@ -285,7 +285,7 @@
                    { field: 'ColumnName', title: 'åå', width: 100 }
                    , { file: 'IsHide', title: 'æ¯å¦éè', width: 100, templet: '#IsHide' }
                    , { field: 'Alignment', title: 'å¯¹é½æ¹å¼', width: 100, templet: '#Alignment' }
                    , { field: 'ColumnWidth', title: 'åå®½', width: 100, templet: '#ColumnWidth', edit: 'text' }
                    , { field: 'ColumnWidth', title: 'åå®½', width: 100,edit: 'text' }
                ]]
            };
        }

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

@@ -412,6 +412,9 @@
                                table.render(option);
                                table.render(option2);

                                $("#HMouldMaintainRuleInterID").val(BYData[0].HInterID);
                                $("#HMouldMaintainRuleInterNo").val(BYData[0].HBillNo);

                                if (BYData.length != 0)  //è¡¨ä½æ°æ®ä¸ºç©ºæ¶
                                {
                                    buttonArr = [];//æ¸ç©ºæ°ç»

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

@@ -270,10 +270,10 @@
                            if (result.count == 1) {
                                var BYData = result;//
                                var rowdate1 = layui.table.cache["mainTable"];
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
                                table.render(option);
                                $("#HEquipDotCheckRuleInterID").val(BYData.data[0].HInterID);
                                $("#HEquipDotCheckRuleInterNo").val(BYData.data[0].HBillNo)
                                $("#HEquipDotCheckRuleInterNo").val(BYData.data[0].HBillNo);
                                if (BYData.data.length != 0)  //è¡¨ä½æ°æ®ä¸ºç©ºæ¶
                                {
                                    buttonArr = [];//æ¸ç©ºæ°ç»
@@ -281,7 +281,7 @@
                                        var checkrow = {
                                            "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
                                            "HDotCheckPart": BYData.data[i].HDotCheckPart,  "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
                                            "HManagerName": BYData.data[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
                                            "HManagerName": BYData.data[i].HManagerName
                                        };
                                        buttonArr.push(checkrow);  //å°ä¹åçæ°æ®åå¨
                                    }
@@ -345,7 +345,7 @@
                            if (result.count == 1) {
                                var BYData = result;//
                                var rowdate1 = layui.table.cache["mainTable"];
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
                                table.render(option);

                                if (BYData.data.length != 0)  //è¡¨ä½æ°æ®ä¸ºç©ºæ¶
@@ -355,7 +355,7 @@
                                        var checkrow = {
                                            "HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
                                            "HDotCheckPart": BYData.data[i].HDotCheckPart, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
                                            "HManagerName": BYData.data[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
                                            "HManagerName": BYData.data[i].HManagerName
                                        };
                                        buttonArr.push(checkrow);  //å°ä¹åçæ°æ®åå¨
                                    }

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

@@ -272,6 +272,7 @@
                set_GridDelete1(obj);   //è¡åå é¤
                set_GridCellCheck1(obj); //è¡åå¿«æ·é®çé
            });

            //è¡¨å¤´ä¿¡æ¯è®¾å¤å¼¹çª
            form.on('submit(ProductModulList)', function () {
                //é¡µé¢å±-èªå®ä¹
@@ -323,7 +324,8 @@
                                option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
                                table.render(option);
                                table.render(option1);

                                $("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
                                $("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
                                if (BYData.length != 0)  //è¡¨ä½æ°æ®ä¸ºç©ºæ¶
                                {
                                    buttonArr = [];//æ¸ç©ºæ°ç»

			@@ -7,10 +7,10 @@
			//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://localhost:8082/LuBaoAPI/"; //æ¨ä¹æ¬å°éç½®
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW
			var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨
			//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/"; //ä¸¸äºåç»´å°æå¡å¨

			@@ -573,7 +573,7 @@
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Gy_MouldFileList.html">å¨å·ä¸»æ¡£ç»´æ¤</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Sc_MouldMaintainRuleBillEdit.html">å¨å·ä¿å»è§ç¨å</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Sc_MouldMaintainRuleBillList.html">å¨å·ä¿å»è§ç¨åç»´æ¤</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Gy_MouldFileResume.html">å¨å·å±¥å</a></dd>
			<!--<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Gy_MouldFileResume.html">å¨å·å±¥å</a></dd>-->
			</dl>
			</dd>
			<dd>
			@@ -646,7 +646,7 @@
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/å¨å·æ¥è¡¨/ReportMouldStock.html">å¨å·åºåæ¥è¯¢</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/å¨å·æ¥è¡¨/ReportMaterialReceipt.html">ç©ææ¶åæç»åæ±æ»</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/å¨å·æ¥è¡¨/ReportInventoryAccount.html">åºåå°è´¦</a></dd>
			<dd><a lay-href="">å¨å·å±¥åè¡¨n</a></dd>
			<dd><a lay-href="æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Gy_MouldFileResume.html">å¨å·å±¥åè¡¨</a></dd>
			<dd><a lay-href="åºç¡èµæ/åºç¡èµæ/Gy_StockCheckItemList.html">çç¹æ¹æ¡åè¡¨</a></dd>
			<dd><a lay-href="åºç¡èµæ/åºç¡èµæ/Sc_MouldStockBillMain_Temp.html">çç¹è®°å½è¡¨</a></dd>
			<dd><a lay-href="åºç¡èµæ/åºç¡èµæ/InventoryAnalysis.html">çç¹åæåè¡¨</a></dd>
			@@ -668,7 +668,7 @@
			<dd><a lay-href="è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleList.html">è®¾å¤ç¹æ£è§ç¨åç»´æ¤</a></dd>
			<dd><a lay-href="è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipMaintainRuleEdit.html">è®¾å¤ä¿å»è§ç¨å</a></dd>
			<dd><a lay-href="è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipMaintainRuleList.html">è®¾å¤ä¿å»è§ç¨åç»´æ¤</a></dd>
			<dd><a lay-href="è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileBillResume.html">è®¾å¤å±¥å</a></dd>
			<!--<dd><a lay-href="è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileBillResume.html">è®¾å¤å±¥å</a></dd>-->
			</dl>
			</dd>
			<dd>
			@@ -700,7 +700,7 @@
			<dd>
			<a>è®¾å¤æ¥è¡¨</a>
			<dl class="layui-nav-child">
			<dd><a lay-href="">è®¾å¤å±¥åè¡¨n</a></dd>
			<dd><a lay-href="è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileBillResume.html">è®¾å¤å±¥åè¡¨</a></dd>
			</dl>
			</dd>
			</dl>

			@@ -285,7 +285,7 @@
			{ field: 'ColumnName', title: 'åå', width: 100 }
			, { file: 'IsHide', title: 'æ¯å¦éè', width: 100, templet: '#IsHide' }
			, { field: 'Alignment', title: 'å¯¹é½æ¹å¼', width: 100, templet: '#Alignment' }
			, { field: 'ColumnWidth', title: 'åå®½', width: 100, templet: '#ColumnWidth', edit: 'text' }
			, { field: 'ColumnWidth', title: 'åå®½', width: 100,edit: 'text' }
			]]
			};
			}

			@@ -412,6 +412,9 @@
			table.render(option);
			table.render(option2);

			$("#HMouldMaintainRuleInterID").val(BYData[0].HInterID);
			$("#HMouldMaintainRuleInterNo").val(BYData[0].HBillNo);

			if (BYData.length != 0) //è¡¨ä½æ°æ®ä¸ºç©ºæ¶
			{
			buttonArr = [];//æ¸ç©ºæ°ç»

			@@ -270,10 +270,10 @@
			if (result.count == 1) {
			var BYData = result;//
			var rowdate1 = layui.table.cache["mainTable"];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
			table.render(option);
			$("#HEquipDotCheckRuleInterID").val(BYData.data[0].HInterID);
			$("#HEquipDotCheckRuleInterNo").val(BYData.data[0].HBillNo)
			$("#HEquipDotCheckRuleInterNo").val(BYData.data[0].HBillNo);
			if (BYData.data.length != 0) //è¡¨ä½æ°æ®ä¸ºç©ºæ¶
			{
			buttonArr = [];//æ¸ç©ºæ°ç»
			@@ -281,7 +281,7 @@
			var checkrow = {
			"HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
			"HDotCheckPart": BYData.data[i].HDotCheckPart, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
			"HManagerName": BYData.data[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
			"HManagerName": BYData.data[i].HManagerName
			};
			buttonArr.push(checkrow); //å°ä¹åçæ°æ®åå¨
			}
			@@ -345,7 +345,7 @@
			if (result.count == 1) {
			var BYData = result;//
			var rowdate1 = layui.table.cache["mainTable"];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": " ", "HDotCheckItem": " ", "HDotCheckPart": " ", "HClaim": " ", "HManagerID": 0, "HManagerCode": " ", "HManagerName": " ", "HRemark": " " }];
			table.render(option);

			if (BYData.data.length != 0) //è¡¨ä½æ°æ®ä¸ºç©ºæ¶
			@@ -355,7 +355,7 @@
			var checkrow = {
			"HDotCheckItemID": BYData.data[i].HDotCheckItemID, "HDotCheckCode": BYData.data[i].HDotCheckCode, "HDotCheckItem": BYData.data[i].HDotCheckItem,
			"HDotCheckPart": BYData.data[i].HDotCheckPart, "HManagerID": BYData.data[i].HManagerID, "HManagerCode": BYData.data[i].HManagerCode,
			"HManagerName": BYData.data[i].HManagerName, "HClaim": rowdate1[i].HClaim, "HRemark": rowdate1[i].HRemark
			"HManagerName": BYData.data[i].HManagerName
			};
			buttonArr.push(checkrow); //å°ä¹åçæ°æ®åå¨
			}

			@@ -272,6 +272,7 @@
			set_GridDelete1(obj); //è¡åå é¤
			set_GridCellCheck1(obj); //è¡åå¿«æ·é®çé
			});

			//è¡¨å¤´ä¿¡æ¯è®¾å¤å¼¹çª
			form.on('submit(ProductModulList)', function () {
			//é¡µé¢å±-èªå®ä¹
			@@ -323,7 +324,8 @@
			option1.data = [{ "HMaterID": 0, "HMaterNumber": "", "HMaterName": "", "HUnitID": 0, "HUnitNumber": "", "HUnitName": "", "HManagerID": "0 ", "HManagerNumber": " ", "HManagerName": " ", "HQty": "0", "HRemark": "" }];
			table.render(option);
			table.render(option1);

			$("#HEquipMaintainRuleInterID").val(BYData[0].HInterID);
			$("#HEquipMaintainRuleInterNo").val(BYData[0].HBillNo)
			if (BYData.length != 0) //è¡¨ä½æ°æ®ä¸ºç©ºæ¶
			{
			buttonArr = [];//æ¸ç©ºæ°ç»