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,20 +75,20 @@
			<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>
			</div>
			<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="HReportEmpName" name="HReportEmpName" id="HReportEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HReportEmpID" id="HReportEmpID" lay-verify="HReportEmpID" value="0">
			@@ -100,7 +100,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>
			@@ -108,7 +108,7 @@
			</div>
			<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; width: 501px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			@@ -237,8 +237,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>
			@@ -592,22 +592,23 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, limit: 500
			, limits: [50, 500, 5000, 50000]
			//, 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: 'HProNumber', title: 'é¡¹ç®ä»£ç '}
			, { field: 'HProjectStageID', title: 'é¡¹ç®é¶æ®µID', hide: true }
			, { field: 'HProjectStageName', title: 'é¡¹ç®é¶æ®µ' } //f7
			, { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }
			, { field: 'RowID', title: 'è¡å·', hide: true, style: 'background-color: #f9f9f9;' } //è¡æ è¯ï¼ç¨äºä¸ä¸è¡ãä¸ä¸è¡è¯å«æå¨è¡
			, { field: 'HProNumber', title: 'é¡¹ç®ä»£ç ', style: 'background-color: #f9f9f9;'}
			, { field: 'HProjectStageID', title: 'é¡¹ç®é¶æ®µID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HProjectStageName', title: 'é¡¹ç®é¶æ®µ', style: 'background-color: #f9f9f9;' } //f7
			, { field: 'HName', title: 'ä»»å¡åç§°', edit: 'text', event: "HName" }
			, { field: 'HTaskNote', title: 'ä»»å¡æè¿°' }
			, { field: 'HType', title: 'ä»»å¡ç±»å'}
			, { field: 'HRelTimes', title: 'èç¨å·¥æ¶', edit: 'text' }
			, { field: 'HTaskNote', title: 'ä»»å¡æè¿°', style: 'background-color: #f9f9f9;' }
			, { field: 'HType', title: 'ä»»å¡ç±»å', style: 'background-color: #f9f9f9;'}
			, { field: 'HRelTimes', title: 'èç¨å·¥æ¶', edit: 'text', totalRow: true }
			, { field: 'HReportNote', title: 'æ±æ¥åå®¹', edit: 'text' }
			, { field: 'HAdv', title: 'ä¼åå»ºè®®', edit: 'text' }
			, { field: 'HRemarkSub', title: 'å¤æ³¨', edit: 'text' }
			@@ -910,7 +911,12 @@
			return false;
			}

			if ($("#HReportEmpName").val() == "") {
			if ($("#HDate").val() == "") {
			layer.msg("æ¥æä¸è½ä¸ºç©º!");
			return false;
			}

			if ($("#HReportEmpID").val() == "0") {
			layer.msg("æ±æ¥äººæªéæ©!");
			return false;
			}
			@@ -920,16 +926,15 @@
			var num = [];
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i] != "") {
			////é¡¹ç®é¶æ®µéå¤æ£éª
			//if ($.inArray(option.data[i]["HProjectStageID"], num) == -1) {
			// num.push(option.data[i]["HProjectStageID"]);
			//} else {
			// layer.msg("ç¬¬" + (i + 1) + "è¡,é¡¹ç®é¶æ®µ:" + option.data[i]["HProjectStageName"] + "éå¤!");
			// return false;
			//}
			//é¡¹ç®é¶æ®µéç©ºæ£éª
			if (option.data[i]["HProjectStageName"] == "") {
			if (option.data[i]["HProjectStageID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:é¡¹ç®é¶æ®µä¸è½ä¸ºç©º!");
			return false;
			}

			//ä»»å¡åç§°éç©ºæ£éª
			if (option.data[i]["HName"] == "") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:ä»»å¡åç§°ä¸è½ä¸ºç©º!");
			return false;
			}

			@@ -946,6 +951,18 @@
			}
			}
			}
			}
			//#endregion

			//#region åè¡¨å³é®åæ®µéå¤æ£éª
			var num = [];
			for (var i = 0; i < option.data.length; i++) {
			temp = option.data[i]["HProNumber"] + "\|" + option.data[i]["HProjectStageID"] + "\|" + option.data[i]["HName"];
			if ($.inArray(temp, num) != -1) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼é¡¹ç®ä»£ç ãé¡¹ç®é¶æ®µãä»»å¡åç§°éå¤ï¼è¯·éæ°éæ©ï¼");
			return false;
			}
			num.push(temp);
			}
			//#endregion
			return true;
			@@ -1189,9 +1206,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) {

	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/项目管理/工作任务/PM_WorkTaskReportBill.html	79 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -4428,7 +4428,7 @@
			<publishTime>07/14/2023 15:45:18</publishTime>
			</File>
			<File Include="views/é¡¹ç®ç®¡ç/å·¥ä½ä»»å¡/PM_WorkTaskReportBill.html">
			<publishTime>07/25/2023 15:45:08</publishTime>
			<publishTime>08/16/2023 11:12:04</publishTime>
			</File>
			<File Include="views/é¡¹ç®ç®¡ç/å·¥ä½ä»»å¡/PM_WorkTaskReportBillList.html">
			<publishTime>07/14/2023 10:59:09</publishTime>