MES-WEB-LayUI.git

			@@ -59,38 +59,22 @@
			<div class="layui-tab-item layui-show">
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®ç¼å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HInterID" id="HInterID" value="0">
			<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">è¾å©åæ®µ</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" readonly>
			</div>
			</div>


			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">äº¤è´§å°ç¹</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">é¨é¨</label>
			<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="float:left;width:150px;">
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
			@@ -99,20 +83,8 @@
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">å®¢æ·</label>
			<div class="layui-input-inline">
			<input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" 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-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸å¡å</label>
			<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="float:left;width:150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
			@@ -121,8 +93,10 @@
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">å¸å«</label>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">éå®å¸å«</label>
			<div class="layui-input-inline">
			<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
			@@ -131,35 +105,25 @@
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">æ±ç</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" readonly>
			</div>
			</div>
			<div class="layui-inline" style="width:900px;">
			<label class="layui-form-label">å®¢æ·</label>
			<div class="layui-input-inline" style="width:700px;">
			<input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="float:left;width:465px;">
			<input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" 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-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸»ç®¡</label>
			<div class="layui-input-inline">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HManagerID" id="HManagerID" 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-col-xs4 layui-inline">
			<label class="layui-form-label">éå®æ¹å¼</label>
			<div class="layui-input-inline">
			<input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSellSID" id="HSellSID" 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>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">ç»ç®æ¹å¼</label>
			<div class="layui-input-inline">
			<input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float:left;width:150px;">
			@@ -169,29 +133,58 @@
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ç»ç®æ¥æ</label>
			<div class="layui-inline">
			<label class="layui-form-label">éå®æ¹å¼</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" lay-verify="HSSDate" name="HSSDate" id="HSSDate" style="padding-left: 80px;">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ç»ç®æ¹</label>
			<div class="layui-input-inline">
			<input type="text" name="HPayCusName" id="HPayCusName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HPayCusID" id="HPayCusID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HPayCusList" style="width:40px;">
			<input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSellSID" id="HSellSID" 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>
			</div>
			</div>

			<div class="layui-col-xs7 layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off" style="width: 501px;">
			</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="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HManagerID" id="HManagerID" 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>
			<div class="layui-input-inline">
			<input class="layui-input" name="HLinkMan" id="HLinkMan" autocomplete="off" value="" >
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">èç³»çµè¯</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off" value="">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åé¨è®¢åå·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width: 501px;">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width: 1135px;">
			</div>
			</div>
			</div>
			@@ -202,6 +195,44 @@
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å®¢æ·ä½é¢</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="" id="" autocomplete="off" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å®¢æ·ä¿¡ç¨é¢åº¦</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="" id="" autocomplete="off" readonly>
			</div>
			</div>
			</div>

			<!--éèåæ®µï¼ææ¶æ²¡æç¨å¤-->
			<div class="layui-row" style="display:none;">
			<div class="layui-inline">
			<label class="layui-form-label">ç»ç®æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" lay-verify="HSSDate" name="HSSDate" id="HSSDate" style="padding-left: 80px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ç®æ¹</label>
			<div class="layui-input-inline">
			<input type="text" name="HPayCusName" id="HPayCusName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HPayCusID" id="HPayCusID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HPayCusList" 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 class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
			</div>
			</div>
			</div>
			@@ -666,19 +697,21 @@
			, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100 }//f7
			, { field: 'HQty', title: 'æ°é', width: 100, edit: 'text' }
			, { field: 'HPrice', title: 'ä¸å«ç¨åä»·', width: 100, edit: 'text' }
			, { field: 'HPrice', title: 'åä»·', width: 100, edit: 'text' }
			, { field: 'HTaxRate', title: 'ç¨ç', width: 100, edit: 'text' }
			, { field: 'HTaxPrice', title: 'å«ç¨åä»·', width: 100, edit: 'text' }
			, { field: 'HMoney', title: 'éé¢', width: 100, edit: 'text' }
			, { field: 'HDiscountRate', title: 'ææ£ç', width: 100, edit: 'text' }
			, { field: 'HRelTaxPrice', title: 'å®éå«ç¨åä»·', width: 110, }
			, { field: 'HTaxRate', title: 'ç¨ç', width: 100, edit: 'text' }
			, { field: 'HTaxMoney', title: 'ç¨é¢', width: 100, }
			, { field: 'HlineTotal', title: 'ä»·ç¨åè®¡', width: 100, }
			, { field: 'HlineTotalBB', title: 'æ¬ä½å¸ä»·ç¨åè®¡', width: 120, }
			, { field: 'HDate', title: 'äº¤è´§æ¥æ', event: "HDate", width: 120 }
			, { field: 'HOutStockQty', title: 'åºåºæ°é', width: 100, edit: 'text' }
			, { field: 'HInvoiceQty', title: 'å¼ç¥¨æ°é', width: 100, edit: 'text' }
			, { field: 'HRemark', title: 'å¤æ³¨', width: 100, edit: 'text' }


			, { field: 'HDiscountRate', title: 'ææ£ç', width: 100, edit: 'text', hide: true }
			, { field: 'HRelTaxPrice', title: 'å®éå«ç¨åä»·', width: 110, hide: true }
			, { field: 'HTaxMoney', title: 'ç¨é¢', width: 100, hide: true }
			, { field: 'HlineTotalBB', title: 'æ¬ä½å¸ä»·ç¨åè®¡', width: 120, hide: true }
			, { field: 'HOutStockQty', title: 'åºåºæ°é', width: 100, edit: 'text', hide: true }
			, { field: 'HInvoiceQty', title: 'å¼ç¥¨æ°é', width: 100, edit: 'text', hide: true }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			}
			@@ -769,6 +802,9 @@
			, "HSSDate": formatDate(data.ç»ç®æ¥æ)
			, "HPayCusID": data.HPayCusID
			, "HPayCusName": data.ç»ç®æ¹
			, "HLinkMan": data.èç³»äºº
			, "HExplanation": data.æè¦
			, "HLinkPhone": data.èç³»çµè¯
			, "HRemark": data.è¡¨å¤´å¤æ³¨
			, "HMaker": data.å¶åäºº
			, "HMakeDate": data.å¶åäºº == "" ? "" :formatDate(data.å¶åæ¥æ)
			@@ -1096,7 +1132,7 @@

			//#region è¡¨å¤´æ°æ®æ£éª
			if ($("#HBillNo").val() == "") {
			layer.msg("åæ®å·ä¸è½ä¸ºç©º!");
			layer.msg("åæ®ç¼å·ä¸è½ä¸ºç©º!");
			return false;
			}

			@@ -1106,7 +1142,7 @@
			}

			if ($("#HDeptID").val() == "0") {
			layer.msg("é¨é¨æªéæ©!");
			layer.msg("éå®é¨é¨æªéæ©!");
			return false;
			}

			@@ -1116,17 +1152,17 @@
			}

			if ($("#HEmpID").val() == "0") {
			layer.msg("ä¸å¡åæªéæ©!");
			layer.msg("éå®åæªéæ©!");
			return false;
			}

			if ($("#HCurID").val() == "0") {
			layer.msg("å¸å«æªéæ©!");
			layer.msg("éå®å¸å«æªéæ©!");
			return false;
			}

			if ($("#HMangerID").val() == "0") {
			layer.msg("ä¸»ç®¡æªéæ©!");
			layer.msg("éå®ä¸»ç®¡æªéæ©!");
			return false;
			}

			@@ -1135,24 +1171,19 @@
			return false;
			}

			if ($("#HPayCusID").val() == "0") {
			layer.msg("ç»ç®æ¹æªéæ©!");
			return false;
			}
			//if ($("#HPayCusID").val() == "0") {
			// layer.msg("ç»ç®æ¹æªéæ©!");
			// return false;
			//}

			if ($("#HDate").val() == "") {
			layer.msg("æ¥ææªè®¾ç½®!");
			return false;
			}

			if ($("#HSSDate").val() == "") {
			layer.msg("ç»ç®æ¥ææªè®¾ç½®!");
			return false;
			}
			//if ($("#HSSDate").val() == "") {
			// layer.msg("ç»ç®æ¥ææªè®¾ç½®!");
			// return false;
			//}

			temp = $("HExRate").val() + "";
			if (temp == 0) {
			layer.msg("æ±çä¸è½ä¸º0!");
			if (temp == 0 \|\| temp == "") {
			layer.msg("æ±çä¸è½ä¸º0æç©º!");
			return false;
			} else if (!ref.test(temp)){
			layer.msg("æ±çè¯·è¾å¥å¤§äº0çæ°å!");
			@@ -1187,13 +1218,13 @@
			return false;
			}

			//ä¸å«ç¨åä»·æ ¼å¼æ ¡éª
			//åä»·æ ¼å¼æ ¡éª
			temp = option.data[i]["HPrice"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + i + "è¡ï¼ä¸å«ç¨åä»·ä¸è½ä¸º0ï¼");
			layer.msg("ç¬¬" + i + "è¡ï¼åä»·ä¸è½ä¸º0ï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + i + "è¡ï¼ä¸å«ç¨åä»·è¯·è¾å¥å¤§äº0çæ°åï¼");
			layer.msg("ç¬¬" + i + "è¡ï¼åä»·è¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}

			@@ -1217,25 +1248,25 @@
			return false;
			}

			//ææ£çæ ¼å¼æ ¡éª
			temp = option.data[i]["HDiscountRate"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + i + "è¡ï¼ææ£çä¸è½ä¸º0ï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + i + "è¡ï¼ææ£çè¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}
			////ææ£çæ ¼å¼æ ¡éª
			//temp = option.data[i]["HDiscountRate"] + "";
			//if (temp == "0") {
			// layer.msg("ç¬¬" + i + "è¡ï¼ææ£çä¸è½ä¸º0ï¼");
			// return false;
			//} else if (!ref.test(temp)) {
			// layer.msg("ç¬¬" + i + "è¡ï¼ææ£çè¯·è¾å¥å¤§äº0çæ°åï¼");
			// return false;
			//}

			//å®éå«ç¨åä»·æ ¼å¼æ ¡éª
			temp = option.data[i]["HRelTaxPrice"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + i + "è¡ï¼å®éå«ç¨åä»·ä¸è½ä¸º0ï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + i + "è¡ï¼å®éå«ç¨åä»·è¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}
			////å®éå«ç¨åä»·æ ¼å¼æ ¡éª
			//temp = option.data[i]["HRelTaxPrice"] + "";
			//if (temp == "0") {
			// layer.msg("ç¬¬" + i + "è¡ï¼å®éå«ç¨åä»·ä¸è½ä¸º0ï¼");
			// return false;
			//} else if (!ref.test(temp)) {
			// layer.msg("ç¬¬" + i + "è¡ï¼å®éå«ç¨åä»·è¯·è¾å¥å¤§äº0çæ°åï¼");
			// return false;
			//}

			//ç¨çæ ¼å¼æ ¡éª
			temp = option.data[i]["HTaxRate"] + "";
			@@ -1267,29 +1298,29 @@
			return false;
			}

			//æ¬ä½å¸ä»·ç¨åè®¡æ ¼å¼æ ¡éª
			temp = option.data[i]["HlineTotalBB"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + i + "è¡ï¼æ¬ä½å¸ä»·ç¨åè®¡ä¸è½ä¸º0ï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + i + "è¡ï¼æ¬ä½å¸ä»·ç¨åè®¡è¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}
			////æ¬ä½å¸ä»·ç¨åè®¡æ ¼å¼æ ¡éª
			//temp = option.data[i]["HlineTotalBB"] + "";
			//if (temp == "0") {
			// layer.msg("ç¬¬" + i + "è¡ï¼æ¬ä½å¸ä»·ç¨åè®¡ä¸è½ä¸º0ï¼");
			// return false;
			//} else if (!ref.test(temp)) {
			// layer.msg("ç¬¬" + i + "è¡ï¼æ¬ä½å¸ä»·ç¨åè®¡è¯·è¾å¥å¤§äº0çæ°åï¼");
			// return false;
			//}

			//åºåºæ°éæ ¼å¼æ ¡éª
			temp = option.data[i]["HOutStockQty"] + "";
			if (!ref.test(temp)) {
			layer.msg("ç¬¬" + i + "è¡ï¼åºåºæ°éè¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}
			////åºåºæ°éæ ¼å¼æ ¡éª
			//temp = option.data[i]["HOutStockQty"] + "";
			//if (!ref.test(temp)) {
			// layer.msg("ç¬¬" + i + "è¡ï¼åºåºæ°éè¯·è¾å¥å¤§äº0çæ°åï¼");
			// return false;
			//}

			//å¼ç¥¨æ°éæ ¼å¼æ ¡éª
			temp = option.data[i]["HInvoiceQty"] + "";
			if (!ref.test(temp)) {
			layer.msg("ç¬¬" + i + "è¡ï¼å¼ç¥¨æ°éè¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}
			////å¼ç¥¨æ°éæ ¼å¼æ ¡éª
			//temp = option.data[i]["HInvoiceQty"] + "";
			//if (!ref.test(temp)) {
			// layer.msg("ç¬¬" + i + "è¡ï¼å¼ç¥¨æ°éè¯·è¾å¥å¤§äº0çæ°åï¼");
			// return false;
			//}
			}
			//#endregion

			@@ -1564,7 +1595,7 @@
			success: function (data1) {
			if (data1.data.length != 0) {
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["HMaterID", "HUnitID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HMaterID", "HUnitID", "ææ£ç", "å®éå«ç¨åä»·", "ç¨é¢","æ¬ä½å¸ä»·ç¨åè®¡","åºåºæ°é","å¼ç¥¨æ°é"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//titleData = [];

			dataCol = data1.data[0].HGridString.split(',');