MES-WEB-LayUI.git

			@@ -100,56 +100,46 @@
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">éè´é¨é¨</label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="hdeptlist" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¸å¡å</label>
			<div class="layui-input-inline">
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¸»ç®¡</label>
			<div class="layui-input-inline">
			<input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="0" style="float:left;width:150px;">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-inline"style="width:625px">
			<label class="layui-form-label">ä¾åºå<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color: #efefef4d; width: 505px" readonly>
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 505px;">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">éè´é¨é¨<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px; " readonly>
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¸å¡å<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">å¸å«</label>
			<label class="layui-form-label">å¸å«<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
			<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
			<input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			@@ -159,27 +149,37 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">éè´æ¹å¼</label>
			<label class="layui-form-label">éè´æ¹å¼<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HPSStyleName" id="HPSStyleName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
			<input type="text" name="HPSStyleName" id="HPSStyleName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
			<input type="hidden" name="HPSStyleID" id="HPSStyleID" class="layui-input" value="0" style="float:left;width:150px;">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="hsellslist" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HPSStyleList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ç®æ¹å¼<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
			<input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
			<input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">ä¸»ç®¡</label>
			<div class="layui-input-inline">
			<input type="text" name="HMangerName" id="HMangerName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
			<input type="hidden" name="HMangerID" id="HMangerID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»æ¬¾æ¥æ<label style="color:red"> * </label></label>
			<div class="layui-input-block">
			@@ -498,9 +498,9 @@
			}
			//#endregion

			//if (AllowLoadData(data)) {
			if (AllowLoadData(data)) {
			set_SaveBill(data);
			//}
			}
			});
			//#endregion
			//#endregion
			@@ -759,7 +759,7 @@
			}
			});
			}
			////#endregion
			//#endregion

			//#region å¼¹çªéæ©æ¹æ³
			//#region éæ©éè´é¨é¨
			@@ -770,7 +770,19 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'éè´é¨é¨åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}
			//#endregion
			@@ -783,7 +795,19 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'éè´ä¸»ç®¡åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HManager', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HManager', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HMangerName").val(checkStatus.data[0].èååç§°);
			$("#HMangerID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}
			//#endregion
			@@ -796,7 +820,19 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä¸å¡ååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HEmp', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmp', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpName").val(checkStatus.data[0].èååç§°);
			$("#HEmpID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}
			//#endregion
			@@ -822,7 +858,20 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'éè´æ¹å¼åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_PoStockStyle.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_PoStockStyle.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}

			$("#HPSStyleName").val(checkStatus.data[0].éè´æ¹å¼åç§°);
			$("#HPSStyleID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}
			//#endregion
			@@ -835,7 +884,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'ç»ç®æ¹å¼åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_SettleStyle.html', 'yes']
			, content: ['../../åºç¡èµæ/åºç¡èµæ/Gy_SettleStyle.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -843,7 +892,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HSSName").val(checkStatus.data[0].HName);
			$("#HSSName").val(checkStatus.data[0].ç»ç®æ¹å¼åç§°);
			$("#HSSID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -1404,7 +1453,7 @@
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': dataArray[i].ææ£ç //
			, 'HRelTaxPrice': dataArray[i].å®éå«ç¨åä»·
			, 'HRelTaxPrice': dataArray[i].å®éå«ç¨åä»·
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dataArray[i].ç¨é¢ //
			, "HMoney": dealDoubleToFixed(dataArray[i].éé¢, 2)
			@@ -1481,7 +1530,7 @@
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].å®æ¶æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dataArray[i].å«ç¨åä»·
			, "HTaxPrice": dataArray[i].å«ç¨åä»·
			, 'HDiscountRate': dataArray[i].ææ£ç //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			@@ -1594,14 +1643,33 @@
			layer.msg("æ¥æä¸è½ä¸ºç©º!");
			return false;
			}
			if ($("#HSupID").val() == "0") {
			layer.msg("ä¾åºåæªéæ©!");
			return false;
			if ($("#HCurID").val() == 0) {
			layer.msg("è¯·éæ©å¸å«ï¼");
			return;
			}

			if ($("#HCurID").val() == "0") {
			layer.msg("å¸å«æªéæ©!");
			return false;
			if ($("#HExRate").val() == 0) {
			layer.msg("è¯·è¾å¥æ±çï¼");
			return;
			}
			if ($("#HEmpID").val() == 0) {
			layer.msg("è¯·éæ©ä¸å¡ååï¼");
			return;
			}
			if ($("#HDeptID").val() == 0) {
			layer.msg("è¯·éæ©éè´é¨é¨ï¼");
			return;
			}
			if ($("#HSupID").val() == 0) {
			layer.msg("è¯·éæ©ä¾åºåï¼");
			return;
			}
			if ($("#HPSStyleID").val() == 0) {
			layer.msg("è¯·éæ©éè´æ¹å¼ï¼");
			return;
			}
			if ($("#HSSID").val() == 0) {
			layer.msg("è¯·éæ©ç»ç®æ¹å¼ï¼");
			return;
			}

			temp = $("#HExRate").val() + "";
			@@ -1616,6 +1684,9 @@

			//#region åè¡¨ æ°æ®æ£éª
			for (var i = 0; i < option.data.length; i++) {
			if (typeof option.data[i] !== 'object' \|\| option.data[i] === null \|\| Array.isArray(option.data[i])) {
			continue; // è·³è¿éå¯¹è±¡é¡¹ï¼å¦ç©ºæ°ç»ï¼
			}
			if (option.data[i]["HMaterID"] == "0") {
			layer.msg("ç¬¬" + (i+1) + "è¡ï¼ç©ææªéæ©ï¼");
			return false;
			@@ -1682,12 +1753,6 @@
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ä»·ç¨åè®¡è¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}

			//åè´§ä»åºéç©ºéªè¯
			if (option.data[i]["HWHID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼åè´§ä»åºæªéæ©ï¼");
			return false;
			}
			}
			//#endregion
			return true;
			@@ -1733,7 +1798,7 @@
			}
			, end: function () {
			obj.update({
			"HMaterID" :OptionData.HMaterID
			"HMaterID": OptionData.HItemID
			,"ç©æä»£ç " : OptionData.ç©æä»£ç
			, "ç©æåç§°" :OptionData.ç©æåç§°
			,"è§æ ¼åå·" : OptionData.è§æ ¼åå·
			@@ -2193,6 +2258,7 @@
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].å®æ¶æ°é-dataArray[i].å³èæ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			@@ -2303,6 +2369,9 @@
			return res;
			}
			//#endregion



			//#endregion


			@@ -2311,7 +2380,7 @@
			// åºç¡èµæè¿åæ°æ®
			function GetHEmpValue(obj) //è¿åä¸å¡å
			{
			$("#HEmpName").val(obj[0].HName);
			$("#HEmpName").val(obj[0].èååç§°);
			$("#HEmpID").val(obj[0].HItemID);
			}

			@@ -2323,25 +2392,25 @@

			function GetHManagerValue(obj) //è¿åä¸»ç®¡
			{
			$("#HMangerName").val(obj[0].HName);
			$("#HMangerName").val(obj[0].èååç§°);
			$("#HMangerID").val(obj[0].HItemID);
			}

			function GetHDeptNameValue(obj) //è¿åé¨é¨
			{
			$("#HDeptName").val(obj[0].HName);
			$("#HDeptName").val(obj[0].é¨é¨åç§°);
			$("#HDeptID").val(obj[0].HItemID);
			}

			function GetHPSStyleValue(obj) //è¿åéè´æ¹å¼
			function GetHPSStyleNameValue(obj) //è¿åéè´æ¹å¼
			{
			$("#HSellSName").val(obj[0].HName);
			$("#HSellSID").val(obj[0].HItemID);
			$("#HPSStyleName").val(obj[0].éè´æ¹å¼åç§°);
			$("#HPSStyleID").val(obj[0].HItemID);
			}

			function GetSettleStyleValue(obj) //è¿åç»ç®æ¹å¼
			{
			$("#HSSName").val(obj[0].HName);
			$("#HSSName").val(obj[0].ç»ç®æ¹å¼åç§°);
			$("#HSSID").val(obj[0].HItemID);
			}