MES-WEB-LayUI.git

			@@ -397,7 +397,7 @@
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" name="HNowWHName" id="HNowWHName" style="width: 60%;display: inline-block;" readonly>
			<input type="hidden" class="layui-input" name="HNowWHID" id="HNowWHID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowWHList" id="btnHNowWHList" style="padding: 0 10px;float: right;margin-right: 3px;">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowWHList" id="btnHNowWHList" style="padding: 0 10px;float: right;margin-right: 3px;" disabled>
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			@@ -407,7 +407,7 @@
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" name="HNowSPName" id="HNowSPName" style="width: 60%;display: inline-block;" readonly>
			<input type="hidden" class="layui-input" name="HNowSPID" id="HNowSPID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowSPList" id="btnHNowSPList" style="padding: 0 10px;float: right;margin-right: 3px;">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHNowSPList" id="btnHNowSPList" style="padding: 0 10px;float: right;margin-right: 3px;" disabled>
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			</div>
			@@ -415,7 +415,7 @@
			<div class="layui-inline" style="margin-left:10px;">
			<label class="layui-form-label">å¨å·å¯ç¨ç¶æ</label>
			<div class="layui-input-block">
			<select name="HMouldUseStatus" lay-filter="HMouldUseStatus" id="HMouldUseStatus">
			<select name="HMouldUseStatus" lay-filter="HMouldUseStatus" id="HMouldUseStatus" disabled>
			<option value="æ£å¸¸" selected="selected">æ£å¸¸</option>
			<option value="å¼å¸¸">å¼å¸¸</option>
			<option value="ä¿å»">ä¿å»</option>
			@@ -583,6 +583,8 @@
			</script>
			<script>
			var Stverf = "";

			var HDataEmp = {};
			//è·åé¡µé¢è·³è½¬åæ°
			var params = get_UrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			@@ -639,6 +641,7 @@
			//åå§ååè¡¨
			get_InitGrid();
			set_AddFNew();
			$("#HUSEORGID").attr("disabled", true);
			} else if (OperationType == 2) {//æ æºå
			Stverf = "Add";
			get_InitGrid();
			@@ -654,15 +657,20 @@
			$("#HCloseDate").val("");
			$("#HDeleteMan").val("");
			$("#HDeleteDate").val("");
			$("#HMouldNo").val("");
			$("#HBarCode").val("");
			$("#HUSEORGID").attr("disabled", true);
			}
			else if (OperationType == 3) {//ç¼è¾
			Stverf = "Update";
			//åå§ååè¡¨
			get_InitGrid();
			set_EditFromGrid();
			$("#HUSEORGID").attr("disabled", true);
			}
			else {
			layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
			$("#HUSEORGID").attr("disabled", true);
			}
			//#endregion

			@@ -692,6 +700,7 @@

			//å¯¹åºErpç©æ
			form.on('submit(btnHMaterList)', function () {
			var HOrgID = $("#HUSEORGID").val();
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -701,7 +710,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2&HOrgID=' + HOrgID , 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -730,6 +739,7 @@

			//æ¨¡å·åç±»
			form.on('submit(btnHMouleList)', function () {
			var HOrgID = $("#HUSEORGID").val();
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -739,7 +749,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_MouldType.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_MouldType.html?openType=2&HOrgID=' + HOrgID, 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -776,7 +786,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes'],
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -804,6 +814,8 @@

			//é¨é¨
			form.on('submit(btnHDeptList)', function () {
			var HOrgName = sessionStorage["Organization"];

			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -813,7 +825,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?openType=2&HOrgName=' + HOrgName, 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -841,6 +853,8 @@

			//ä¾åºå
			form.on('submit(btnHSupList)', function () {
			var HOrgName = sessionStorage["Organization"];

			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -850,7 +864,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html?Type=HSup', 'yes'],
			content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html?Type=HSup&HOrgName=' + HOrgName, 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -878,6 +892,7 @@

			//å¶é åå
			form.on('submit(btnHMadeSup)', function () {
			var HOrgName = sessionStorage["Organization"];
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -887,7 +902,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html?Type=HAccSup', 'yes'],
			content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html?Type=HAccSup&HOrgName=' + HOrgName, 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -924,7 +939,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html', 'yes'],
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -1109,7 +1124,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_StockPlace_List.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_StockPlace_List.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -1182,7 +1197,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['Sc_MouldMaintainRuleBillList.html', 'yes'],
			content: ['Sc_MouldMaintainRuleBillList.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -1393,7 +1408,7 @@
			//æ°å¢è¡è¡¨æ ¼æ°æ®

			var NewRow = {
			"HMouldFileID": "0", "HMouldFileName": "", "HUnionDate": Format(new Date, "yyyy- MM - dd"), "HRemark": "",
			"HMouldFileID": "0", "HMouldFileName": "", "HUnionDate": Format(new Date, "yyyy-MM-dd"), "HRemark": "",
			"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
			};
			switch (obj.event) {
			@@ -1615,7 +1630,7 @@
			{
			"HMouldFileID": "0"
			, "HMouldFileName": ""
			, "HUnionDate": Format(new Date, "yyyy- MM - dd")
			, "HUnionDate": Format(new Date, "yyyy-MM-dd")
			, "HRemark": ""
			, "HSourceInterID": "0"
			, "HSourceEntryID": "0"
			@@ -1713,6 +1728,7 @@
			$("#HInterID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			$.ajax({
			url: GetWEBURL() + "/Gy_Mould_Edit/xg",
			async:false,
			type: "GET",
			data: {
			"HInterID": linterid
			@@ -1995,7 +2011,7 @@
			data: { "oMain": oMain },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			if (data.code == 1) {
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
			if (linterid == undefined) {
			$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
			@@ -2043,34 +2059,42 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Gy_MouldFileList.html", "yes"]
			, content: ["../../æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Gy_MouldFileList.html?openType=2", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®
			var rowIndex = $(obj.tr).attr("data-index") * 1;

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (rowIndex + i >= option.data.length) {
			var NewRow = {
			"HMouldFileID": "0", "HMouldFileName": "", "HUnionDate": Format(new Date, "yyyy-MM-dd"), "HRemark": "",
			"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
			};
			btnAddLine(NewRow);
			}

			//è·åéä¸çåå¨å·ä¿¡æ¯
			var resultData = checkStatus.data[i];
			option.data[rowIndex + i].HMouldFileID = resultData.hmainid;
			option.data[rowIndex + i].HMouldFileName = resultData.æ¨¡å·åç§°;
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HMouldFileID": checkStatus.data[0].hmainid,
			"HMouldFileName": checkStatus.data[0].æ¨¡å·åç§°
			})

			table.render(option);

			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			, end: function () {
			if (typeof (OptionData.HItemID) != "undefined") {
			if (typeof (HDataEmp.hmainid) != "undefined") {
			obj.update({
			"HMouldFileID": OptionData.HItemID,
			"HMouldFileName": OptionData.æ¨¡å·åç§°
			"HMouldFileID": HDataEmp.hmainid,
			"HMouldFileName": HDataEmp.æ¨¡å·åç§°
			})
			OptionData = [];
			HDataEmp = {};
			}


			}
			})
			}
			@@ -2188,6 +2212,14 @@
			}
			//#endregion

			//#region å¨æ«å°¾å¢å ä¸è¡
			function btnAddLine(NewRow) {
			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];
			table.render(option);
			}
			//#endregion

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			//if (sessionStorage.login != "login") {
			// layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			@@ -2296,14 +2328,14 @@
			return Result;
			}

			function GetMaterValue(obj) { //ç©æ
			$("#HName").val(obj[0].ç©æåç§°);
			$("#HMaterNumber").val(obj[0].ç©æä»£ç );
			$("#HMaterID").val(obj[0].HItemID);
			function GetGyMaterial(obj) { //ç©æ
			$("#HName").val(obj.ç©æåç§°);
			$("#HMaterNumber").val(obj.ç©æä»£ç );
			$("#HMaterID").val(obj.HItemID);
			}

			function GetMouldTypeValue(obj) { //å¨å·åç±»
			$("#HMouleTypeName").val(obj[0].HName);
			$("#HMouleTypeName").val(obj[0].å¨å·åç±»åç§°);
			$("#HMouleTypeID").val(obj[0].HItemID);
			}

			@@ -2328,8 +2360,8 @@
			}

			function GetGyStockPlace(obj) { //ä»ä½
			$("#HSPName").val(obj[0].ä»ä½åç§°);
			$("#HSPID").val(obj[0].HMainID);
			$("#HSPName").val(obj.ä»ä½åç§°);
			$("#HSPID").val(obj.HMainID);
			}

			function GetMouldMaintainRuleValue(obj) { //ä¿å»è§ç¨
			@@ -2345,6 +2377,8 @@
			//åè¡¨å¨å·åå»è¿å
			function GetMouldFileValue(obj) {
			OptionData = obj[0];

			HDataEmp = obj[0];
			}
			function GetMouldDotCheckRuleValue(obj) {
			OptionData = obj[0];