MES-WEB-LayUI.git

			@@ -14,7 +14,7 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<style>
			<!--<style>
			.main-btn { /å¤´é¨ä¸»æé®/
			padding: 0 2px; /è°æ´æé®å·¦å³ç©ºéå¤§å°/
			height: 30px;
			@@ -44,7 +44,7 @@
			.layui-form-label {
			width: 25%;
			}
			</style>
			</style>-->

			</head>
			<body>
			@@ -75,14 +75,14 @@
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">åæ®å·</label>
			<label class="layui-form-label" style="width: 85px;">åæ®å·<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ¥æ</label>
			<label class="layui-form-label" style="width: 85px;">æ¥æ<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px; width:180px;">
			<input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
			</div>
			@@ -96,7 +96,7 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç³è¯·é¨é¨</label>
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç³è¯·é¨é¨<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
			@@ -224,8 +224,8 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>å¤å¶ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>-->
			</div>
			</script>
			</form>
			@@ -335,9 +335,9 @@
			//#region æä½æé®è§¦åäºä»¶
			//#region ä¿åæäº¤
			form.on('submit(btnSave)', function (data) {//æäº¤
			//if (AllowLoadData(data)) {
			if (AllowLoadData(data)) {
			set_AddNew(data);
			//}
			}
			});
			//#endregion

			@@ -573,41 +573,39 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, limit: 500
			, limits: [50, 500, 5000, 50000]
			, totalRow: true
			, cellMinWidth: 120
			, height: 400
			, cols: [[
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', totalRow: true }
			, { field: 'RowID', title: 'è¡å·', hide: true } //è¡æ è¯ï¼ç¨äºä¸ä¸è¡ãä¸ä¸è¡è¯å«æå¨è¡
			, { field: 'HMaterID', title: 'ç©æID', hide: true }
			, { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }
			, { field: 'RowID', title: 'è¡å·', hide: true, style: 'background-color: #f9f9f9;' } //è¡æ è¯ï¼ç¨äºä¸ä¸è¡ãä¸ä¸è¡è¯å«æå¨è¡
			, { field: 'HMaterID', title: 'ç©æID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', edit: 'text', event: "HMaterNumber" } //f7
			, { field: 'HMaterName', title: 'ç©æåç§°' }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·' }
			, { field: 'HProcID', title: 'å·¥åºID', hide: true }
			, { field: 'HMaterName', title: 'ç©æåç§°', style: 'background-color: #f9f9f9;' }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', style: 'background-color: #f9f9f9;' }
			, { field: 'HProcID', title: 'å·¥åºID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HProcNumber', title: 'å·¥åºä»£ç ', edit: 'text', event: "HProcNumber" } //f7
			, { field: 'HProcName', title: 'å·¥åºåç§°' }
			, { field: 'HSourceID', title: 'èµæºID', hide: true }
			, { field: 'HProcName', title: 'å·¥åºåç§°', style: 'background-color: #f9f9f9;' }
			, { field: 'HSourceID', title: 'èµæºID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HSourceNumber', title: 'èµæºä»£ç ', edit: 'text', event: "HSourceNumber" } //f7
			, { field: 'HSourceName', title: 'èµæºåç§°' }
			, { field: 'HOldPrice', title: 'ååä»·'}
			, { field: 'HSourceName', title: 'èµæºåç§°', style: 'background-color: #f9f9f9;' }
			, { field: 'HOldPrice', title: 'ååä»·', style: 'background-color: #f9f9f9;'}
			, { field: 'HPrice', title: 'åä»·', edit: 'text' }
			, { field: 'HOldFixPrice', title: 'åå°æ¶å®é¢' }
			, { field: 'HOldFixPrice', title: 'åå°æ¶å®é¢', style: 'background-color: #f9f9f9;' }
			, { field: 'HFixPrice', title: 'å°æ¶å®é¢', edit: 'text' }
			, { field: 'HBeginDate', title: 'å¼å§æ¥æ', event: "HBeginDate" }
			, { field: 'HEndDate', title: 'ç»ææ¥æ', event: "HEndDate" }
			, { field: 'HCostFlag', title: 'ææ¬é»è®¤æ è®°', templet: "#HCostFlag" }
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ' }
			, { field: 'HSourceEntryID', title: 'æºåååç ' }
			, { field: 'HSourceBillNo', title: 'æºååå·' }
			, { field: 'HSourceBillType', title: 'æºåç±»å' }
			, { field: 'HRelationQty', title: 'å³èæ°é' }
			, { field: 'HRelationMoney', title: 'å³èéé¢' }
			, { field: 'HCloseMan', title: 'è¡å³éäºº' }
			, { field: 'HEntryCloseDate', title: 'è¡å³éæ¶é´' }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HSourceEntryID', title: 'æºåååç ', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HSourceBillNo', title: 'æºååå·', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HSourceBillType', title: 'æºåç±»å', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HRelationQty', title: 'å³èæ°é', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HRelationMoney', title: 'å³èéé¢', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HCloseMan', title: 'è¡å³éäºº', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HEntryCloseDate', title: 'è¡å³éæ¶é´', hide: true, style: 'background-color: #f9f9f9;' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			}
			@@ -895,24 +893,12 @@
			layer.msg("åæ®å·ä¸è½ä¸ºç©º!");
			return false;
			}
			if ($("#HInnerBillNo").val() == "") {
			layer.msg("åé¨åæ®å·ä¸è½ä¸ºç©º!");
			if ($("#HDate").val() == "") {
			layer.msg("æ¥æä¸è½ä¸ºç©º!");
			return false;
			}
			if ($("#HGroupName").val() == "") {
			layer.msg("çç»æªéæ©!");
			return false;
			}
			if ($("#HDeptName").val() == "") {
			if ($("#HDeptID").val() == "0") {
			layer.msg("é¨é¨æªéæ©!");
			return false;
			}
			if ($("#HEmpName").val() == "") {
			layer.msg("ä¸»ç®¡æªéæ©!");
			return false;
			}
			if ($("#HPayTypeName").val() == "") {
			layer.msg("å·¥èµç±»åæªéæ©!");
			return false;
			}
			//#endregion
			@@ -921,18 +907,18 @@
			var temp; //è®°å½éè¦æ£éªçå±æ§çå¼ï¼ç¨äºæ£éª
			var ref = /^\d+(\.\d+)?$/; //å¤ææ¯å¦æ¯éè´æµ®ç¹æ°
			var ref1 = /^\d+$/; //å¤ææ¯å¦æ¯éè´æ´æ°
			var value1 = ["HTimes", "HQty", "HPrice", "HPriceRate", "HSubsidyQty", "HSubsidyMoney", "HSubsidyTotal", "HDeuctTotal", "HPackQty", "HPackPrice", "HPackMoney", "HMoney"]; //åè¡¨éè¦è¿è¡æµ®ç¹æ°éªè¯çå±æ§æ¸å
			var value1_ = ["å·¥æ¶", "æ°é", "å·¥ä»·", "å®é¢æµ®å¨æ¯ç", "è¡¥è´´æ°é", "è¡¥è´´éé¢", "è¡¥è´´åè®¡", "æ£æ¬¾å°è®¡", "åè£æ°é", "åè£åä»·", "åè£éé¢", "éé¢"]; ////åè¡¨éè¦è¿è¡æµ®ç¹æ°éªè¯çå±æ§æ¸åå¯¹åºçååæ¸å
			var value2 = ["HICMOInterID", "HProcReportInterID", "HProcReportEntryID", "HProcPlanInterID", "HProcPlanEntryID"]; //åè¡¨éè¦æ´æ°æ£éªçå±æ§æ¸å
			var value2_ = ["çäº§ä»»å¡åID", "å·¥åºæ±æ¥åID", "å·¥åºæ±æ¥ååID", "å·¥åºè®¡ååID", "å·¥åºè®¡åååID"]; //åè¡¨éè¦æ´æ°æ£éªçå±æ§æ¸åå¯¹åºçååæ¸å
			var value3 = ["HMaterNumber", "HProcNumber", "HEmpNumber", "HPackMaterName"]; //åè¡¨éè¦è¿è¡éç©ºæ£éªçå±æ§æ¸å
			var value3_ = ["ç©æ", "å·¥åº", "èå", "åè£æ¹å¼"]; //åè¡¨éè¦è¿è¡éç©ºæ£éªçå±æ§æ¸åå¯¹åºçååæ¸å
			var value1 = ["HOldPrice", "HPrice", "HOldFixPrice", "HFixPrice"]; //åè¡¨éè¦è¿è¡æµ®ç¹æ°éªè¯çå±æ§æ¸å
			var value1_ = ["ååä»·", "åä»·", "åå°æ¶å®é¢", "å°æ¶å®é¢"]; ////åè¡¨éè¦è¿è¡æµ®ç¹æ°éªè¯çå±æ§æ¸åå¯¹åºçååæ¸å
			var value2 = []; //åè¡¨éè¦æ´æ°æ£éªçå±æ§æ¸å
			var value2_ = []; //åè¡¨éè¦æ´æ°æ£éªçå±æ§æ¸åå¯¹åºçååæ¸å
			var value3 = ["HMaterID", "HProcID", "HSourceID"]; //åè¡¨éè¦è¿è¡éç©ºæ£éªçå±æ§æ¸å
			var value3_ = ["ç©æ", "å·¥åº", "èµæº"]; //åè¡¨éè¦è¿è¡éç©ºæ£éªçå±æ§æ¸åå¯¹åºçååæ¸å
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i] != "") {
			//éç©ºæ£éª
			for (var j = 0; j < value3.length; j++) {
			temp = option.data[i][value3[j]] + "";
			if (temp == "") {
			if (temp == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:" + value3_[j] + "æªéæ©!");
			return false;
			}
			@@ -960,6 +946,18 @@
			}
			}
			}
			}
			//#endregion

			//#region åè¡¨å³é®åæ®µéå¤æ£éª
			var num = [];
			for (var i = 0; i < option.data.length; i++) {
			temp = option.data[i]["HMaterID"] + "\|" + option.data[i]["HProcID"] + "\|" + option.data[i]["HSourceID"];
			if ($.inArray(temp, num) != -1) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ç©æãå·¥åºãèµæºéå¤ï¼è¯·éæ°éæ©ï¼");
			return false;
			}
			num.push(temp);
			}
			//#endregion
			return true;
			@@ -1060,13 +1058,29 @@
			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HMaterID": checkStatus.data[0].HItemID
			, "HMaterNumber": checkStatus.data[0].HNumber
			, "HMaterName": checkStatus.data[0].HName
			, "HMaterModel": checkStatus.data[0].HModel
			})
			//è·åå·¥ä»·
			var HMaterID = checkStatus.data[0].HItemID;
			var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
			var HSourceID = obj.data.hasOwnProperty("HSourceID") ? obj.data.HSourceID + "" : "0";
			var HOldPrice = subTable_GetHPrice(HMaterID, HProcID, HSourceID);

			if (HOldPrice != -1) {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HMaterID": checkStatus.data[0].HItemID
			, "HMaterNumber": checkStatus.data[0].HNumber
			, "HMaterName": checkStatus.data[0].HName
			, "HMaterModel": checkStatus.data[0].HModel
			, "HOldPrice": HOldPrice
			})
			} else {
			obj.update({
			"HMaterID": checkStatus.data[0].HItemID
			, "HMaterNumber": checkStatus.data[0].HNumber
			, "HMaterName": checkStatus.data[0].HName
			, "HMaterModel": checkStatus.data[0].HModel
			})
			}
			layer.close(index);//å³éå¼¹çª
			}
			})
			@@ -1092,12 +1106,27 @@
			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//è·åå·¥ä»·
			var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
			var HProcID = checkStatus.data[0].HItemID;
			var HSourceID = obj.data.hasOwnProperty("HSourceID") ? obj.data.HSourceID + "" : "0";
			var HOldPrice = subTable_GetHPrice(HMaterID, HProcID, HSourceID);

			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HProcID": checkStatus.data[0].HItemID
			, "HProcNumber": checkStatus.data[0].å·¥åºä»£ç
			, "HProcName": checkStatus.data[0].å·¥åº
			})
			if (HOldPrice != -1) {
			obj.update({
			"HProcID": checkStatus.data[0].HItemID
			, "HProcNumber": checkStatus.data[0].å·¥åºä»£ç
			, "HProcName": checkStatus.data[0].å·¥åº
			, "HOldPrice": HOldPrice
			})
			} else {
			obj.update({
			"HProcID": checkStatus.data[0].HItemID
			, "HProcNumber": checkStatus.data[0].å·¥åºä»£ç
			, "HProcName": checkStatus.data[0].å·¥åº
			})
			}
			layer.close(index);//å³éå¼¹çª
			}
			})
			@@ -1123,12 +1152,27 @@
			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//è·åå·¥ä»·
			var HMaterID = obj.data.hasOwnProperty("HMaterID") ? obj.data.HMaterID + "" : "0";
			var HProcID = obj.data.hasOwnProperty("HProcID") ? obj.data.HProcID + "" : "0";
			var HSourceID = checkStatus.data[0].HItemID;
			var HOldPrice = subTable_GetHPrice(HMaterID, HProcID, HSourceID);

			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HSourceID": checkStatus.data[0].HItemID
			, "HSourceNumber": checkStatus.data[0].çäº§èµæºä»£ç
			, "HSourceName": checkStatus.data[0].çäº§èµæºåç§°
			})
			if (HOldPrice != -1) {
			obj.update({
			"HSourceID": checkStatus.data[0].HItemID
			, "HSourceNumber": checkStatus.data[0].çäº§èµæºä»£ç
			, "HSourceName": checkStatus.data[0].çäº§èµæºåç§°
			, "HOldPrice": HOldPrice
			})
			} else {
			obj.update({
			"HSourceID": checkStatus.data[0].HItemID
			, "HSourceNumber": checkStatus.data[0].çäº§èµæºä»£ç
			, "HSourceName": checkStatus.data[0].çäº§èµæºåç§°
			})
			}
			layer.close(index);//å³éå¼¹çª
			}
			})
			@@ -1138,83 +1182,6 @@
			}

			})
			//#endregion

			//#region å¤±ç¦è§¦åäºä»¶
			//$(document).off('change', ".layui-table-edit").on('change', '.layui-table-edit', function (e) {
			// var fieldList = ["HQty", "HPrice", "HPriceRate", "HSubsidyQty", "HSubsidyTotal", "HDeuctTotal", "HPackQty", "HPackPrice"]; //ç»å®è¯¥äºä»¶çåç´ çeventå±æ§å¼æ¸å
			// if ($.inArray(obj.event, fieldList) >= 0) {
			// //è·åchangeåçæ°å¼
			// var HQty = obj.data.HQty; //æ°é
			// var HPrice = obj.data.HPrice; //å·¥ä»·
			// var HPriceRate = obj.data.HPriceRate; //å®é¢æµ®å¨æ¯ç
			// var HSubsidyQty = obj.data.HSubsidyQty; //è¡¥è´´æ°é
			// var HSubsidyTotal = obj.data.HSubsidyTotal; //è¡¥è´´åè®¡
			// var HDeuctTotal = obj.data.HDeuctTotal; //æ£æ¬¾å°è®¡
			// var HPackQty = obj.data.HPackQty; //åè£æ°é
			// var HPackPrice = obj.data.HPackPrice; //åè£åä»·
			// var valueList = [];
			// valueList.push(HQty);
			// valueList.push(HPrice);
			// valueList.push(HPriceRate);
			// valueList.push(HSubsidyQty);
			// valueList.push(HSubsidyTotal);
			// valueList.push(HDeuctTotal);
			// valueList.push(HPackQty);
			// valueList.push(HPackPrice);
			// //æ£éªæ°æ®æ ¼å¼
			// var temp; //åå¨éè¦æ ¡éªçæ°æ®
			// var ref = /^\d+(\.\d+)?$/; //æ£åè¡¨è¾¾å¼-æ ¡éªæ¯å¦ä¸ºéè´æ°å
			// for (var i = 0; i < valueList.length; i++) {
			// temp = valueList[i] + "";
			// if (temp == "") {
			// //valueList[i] = 0;
			// layer.msg("æ°æ®ä¸å¯ä»¥ä¸ºç©º!");
			// //è¥æ ¡éªåå¨é®é¢ï¼åå°å¼åæ´ä¸ºchangeåçå¼
			// //HQty = valueList[0];
			// //HPrice = valueList[1];
			// //HPriceRate = valueList[2];
			// //HSubsidyQty = valueList[3];
			// //HSubsidyTotal = valueList[4];
			// //HDeuctTotal = valueList[5];
			// //HPackQty = valueList[6];
			// //HPackPrice = valueList[7];
			// return;
			// } else if (!ref.test(temp)) {
			// //valueList[i] = 0;
			// layer.msg("è¯·è¾å¥éè´æ°åï¼")
			// //è¥æ ¡éªåå¨é®é¢ï¼åå°å¼åæ´ä¸ºchangeåçå¼
			// //HQty = valueList[0];
			// //HPrice = valueList[1];
			// //HPriceRate = valueList[2];
			// //HSubsidyQty = valueList[3];
			// //HSubsidyTotal = valueList[4];
			// //HDeuctTotal = valueList[5];
			// //HPackQty = valueList[6];
			// //HPackPrice = valueList[7];
			// return;
			// }
			// }
			// var baseSum = HQty * HPrice * HPriceRate;
			// var HSubsidyMoney = HSubsidyQty * HPrice; //è¡¥è´´éé¢
			// var HPackMoney = HPackQty * HPackPrice; //åè£éé¢
			// var HMoney = baseSum + HSubsidyMoney + HSubsidyTotal + HSubsidyTotal + HPackMoney - HDeuctTotal; //éé¢ = æ°éå·¥ä»·é¢å®æµ®å¨æ¯ç + è¡¥è´´æ°éå·¥ä»· + è¡¥è´´åè®¡ + åè£æ°éåè£åä»· - æ£æ¬¾å°è®¡
			// //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			// //obj.update({
			// // "HQty": HQty
			// // , "HPrice": HPrice
			// // , "HPriceRate": HPriceRate
			// // , "HSubsidyQty": HSubsidyQty
			// // , "HSubsidyMoney": HSubsidyMoney
			// // , "HSubsidyTotal": HSubsidyTotal
			// // , "HDeuctTotal": HDeuctTotal
			// // , "HPackQty": HPackQty
			// // , "HPackPrice": HPackPrice
			// // , "HPackMoney": HPackMoney
			// // , "HMoney": HMoney
			// //})
			// }
			//});
			//#endregion
			}
			//#endregion
			@@ -1264,7 +1231,7 @@
			success: function (data1) {
			if (data1.data.length != 0) {
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["è¡å·", "ç©æID", "å·¥åºID", "èåID", "åè£ç±»åID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["è¡å·", "ç©æID", "å·¥åºID", "èåID", "èµæºID", "æºåä¸»åç ", "æºåååç ", "æºååå·", "æºåç±»å", "å³èæ°é", "å³èéé¢", "è¡å³éäºº", "è¡å³éæ¶é´"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

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

			@@ -1280,9 +1247,9 @@
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			option.cols[0][i + 1]["style"] += "font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {
			@@ -1351,11 +1318,38 @@
			form.render('checkbox');
			}
			//#endregion

			//#region åè¡¨ç©æãå·¥åºå¸¦åºå·¥ä»·
			function subTable_GetHPrice(HMaterID, HProcID, HSourceID) {
			var HPrice;
			if (HMaterID != "0" && HProcID != "0") {
			$.ajax({
			type: "Get",
			url: GetWEBURL() + "/Pay_SingleBalBill/get_HPrice_BaseMaterHProcHSource",
			async: false,
			data: { "HMaterID": HMaterID, "HProcID": HProcID, "HSourceID": HSourceID },
			success: function (res) {
			if (res.count == 1) {
			HPrice = res.data;
			}
			else {
			layer.msg(res.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			HPrice = 0;
			}
			},
			error: function (err) {
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			HPrice = 0;
			}
			});
			return HPrice;
			} else {
			HPrice = -1;
			return HPrice;
			}
			}
			//#endregion




			//#endregion
			});

	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/定额申请/Pay_ProcPriceRequestBill.html	302 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -2670,7 +2670,7 @@
			<publishTime>04/11/2023 16:34:43</publishTime>
			</File>
			<File Include="views/å·¥èµç®¡ç/å®é¢ç³è¯·/Pay_ProcPriceRequestBill.html">
			<publishTime>07/25/2023 15:25:28</publishTime>
			<publishTime>08/10/2023 15:51:10</publishTime>
			</File>
			<File Include="views/å·¥èµç®¡ç/å®é¢ç³è¯·/Pay_ProcPriceRequestBillList.html">
			<publishTime>07/24/2023 14:56:05</publishTime>