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>
			@@ -90,7 +90,7 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¤æ³¨<label style="color:red"> * </label></label>
			<label class="layui-form-label" style="width: 85px;">å¤æ³¨</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
			</div>
			@@ -207,8 +207,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>
			</div>
			@@ -463,6 +463,32 @@
			})
			//#endregion

			//#region åè¡¨ï¼ååæ ¼ç¼è¾çå¬
			table.on('edit(mainTable)', function (obj) {
			// ååæ ¼ç¼è¾ä¹åçå¼
			var oldText = $(this).prev().text();
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			, data = obj.data //å¾å°æå¨è¡ææé®å¼
			, field = obj.field; //å¾å°åæ®µ
			//æ£åè¡¨è¾¾å¼-æ ¡éªéè´æµ®ç¹æ°
			var ref = /^\d+(\.\d+)?$/;

			switch (field) {
			case "HRate": //æ°é
			if (!ref.test(value)) { //è¥è¾å¥å¼æ ¼å¼ä¸æ£ç¡®ï¼ååååæ¥çå¼
			obj.update({
			HRate: oldText
			});
			layer.msg("ä¸ç»©å æ¯ï¼æ°æ®éè¯¯ï¼è¯·è¾å¥éè´å°æ°")
			} else {
			table.render(option);
			CheckedSet_tableSub();
			}
			break;
			default:
			}
			});
			//#endregion


			//
			@@ -551,22 +577,20 @@
			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: 'HProjectStageID', title: 'é¡¹ç®é¶æ®µID', hide: true }
			, { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }
			, { field: 'RowID', title: 'è¡å·', hide: true, style: 'background-color: #f9f9f9;' } //è¡æ è¯ï¼ç¨äºä¸ä¸è¡ãä¸ä¸è¡è¯å«æå¨è¡
			, { field: 'HProjectStageID', title: 'é¡¹ç®é¶æ®µID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HProjectStageName', title: 'é¡¹ç®é¶æ®µ', edit: 'text', event: "HProjectStageName" } //f7
			, { field: 'HStageNote', title: 'é¡¹ç®é¶æ®µè¯¦ç»åå®¹' }
			, { field: 'HPMGoodsID', title: 'ç¸å³äº¤ä»ç©ID', hide: true }
			, { field: 'HStageNote', title: 'é¡¹ç®é¶æ®µè¯¦ç»åå®¹', style: 'background-color: #f9f9f9;' }
			, { field: 'HPMGoodsID', title: 'ç¸å³äº¤ä»ç©ID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HPMGoodsName', title: 'ç¸å³äº¤ä»ç©', edit: 'text', event: "HPMGoodsName" } //f7
			, { field: 'HIsKey', title: 'éç¨ç¢', templet: "#HIsKey" }
			, { field: 'HRate', title: 'ä¸ç»©å æ¯', edit: 'text' }
			, { field: 'HRate', title: 'ä¸ç»©å æ¯', edit: 'text', totalRow: true }
			//, { field: 'HEmpID', title: 'é¶æ®µè´è´£äººID', hide: true }
			//, { field: 'HEmpName', title: 'é¶æ®µè´è´£äºº', edit: 'text', event: "HEmpName" } //f7
			//, { field: 'HCheckEmpID', title: 'é¶æ®µå®¡æ ¸äººID', hide: true }
			@@ -827,7 +851,7 @@
			return false;
			}
			//é¡¹ç®é¶æ®µéç©ºæ£éª
			if (option.data[i]["HProjectStageName"] == "") {
			if (option.data[i]["HProjectStageID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:é¡¹ç®é¶æ®µä¸è½ä¸ºç©º!");
			return false;
			}
			@@ -836,12 +860,12 @@
			var HRate = option.data[i]["HRate"] + "";
			if (HRate.substring(HRate.length - 1, HRate.length) == ".") {
			layer.msg("ä¸ç»©å æ¯æ«å°¾ä¸è½ä¸º.ï¼");
			return;
			return false;
			} else {
			var ref = /^[0-9]+\.?[0-9]*$/;
			if (!ref.test(HRate)) {
			layer.msg("ä¸ç»©å æ¯è¯·è¾æ£ç¡®å¥æ°åï¼");
			return;
			return false;
			}
			}
			////éç¨ç¢åå®¹æ£éª
			@@ -849,6 +873,15 @@
			// layer.msg("éç¨ç¢è¯·è¾å¥0æ1ï¼");
			//}
			}
			}

			var total = 0;
			for (var i = 0; i < option.data.length; i++) {
			total += option.data[i]["HRate"] * 1;
			}
			if (total > 100) {
			layer.msg("ä¸ç»©å æ¯åè®¡ä¸è½å¤§äº100ï¼");
			return false;
			}
			//#endregion
			return true;
			@@ -1040,9 +1073,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) {