MES-WEB-LayUI.git

			@@ -16,10 +16,12 @@
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/HideButton_New.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/common.js"></script>


			</head>
			@@ -173,24 +175,25 @@
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<div id="page" style="position: relative; bottom: 0;"></div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_view"><i class="layui-icon layui-icon-form"></i>æµè§</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BatchAudit"><i class="layui-icon layui-icon-radio"></i>æ¹éå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BatchDeAudit"><i class="layui-icon layui-icon-radio"></i>æ¹éåå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-radio"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BatchAudit" id="BatchAudit"><i class="layui-icon layui-icon-radio"></i>æ¹éå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BatchDeAudit" id="BatchDeAudit"><i class="layui-icon layui-icon-radio"></i>æ¹éåå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></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-DeStop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>ä¿åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>è¯»åæ¹æ¡</button>
			</div>
			@@ -227,6 +230,8 @@
			var option = [];
			var sWhere = "";
			var HModName = "PM_WorkTaskReportBillList";
			var set_HideButton_ID = "toolbarDemo_ButtonSet"; //éè¦è®¾ç½®çæé®çç¶çº§èç¹çid
			var HBillType = "4754";
			var optionPage = [];
			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "4754";
			@@ -326,6 +331,10 @@
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			//ä¿åæ¹æ¡
			case 'set_SaveScheme': set_SaveScheme();
			break;
			@@ -335,6 +344,26 @@
			};
			});
			//#endregion

			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;
			if (obj.event == 'åæ®å·') {
			var linterid = data.HInterID.toString();
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ç¼è¾' + HPageTitle
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../é¡¹ç®ç®¡ç/å·¥ä½ä»»å¡/PM_WorkTaskReportBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
			, btn: ['ç¡®å®'],
			// æé®1 çåè°
			end: function (index, layero, that) {
			//å·æ°é¡µé¢
			$("#btnSearch").trigger('click');
			}
			})
			}
			});

			//#region ç¹å»è¡éä¸é«äº®
			table.on('row(mainTable)', function (obj) {
			@@ -382,11 +411,6 @@
			//åå§åç»ç»
			Organ();
			//æ¥è¯¢
			if (addSWhereByOpenType()) { //addSWhereByOpenType()æ¹æ³å¤ææ¯å¦å¶å®é¡µé¢æå¼æ¬é¡µé¢ï¼è¥æ¯åå¤çè¿æ»¤æ¡ä»¶ï¼å¹¶è¿åtrue
			get_FastQuery(2);
			} else {
			get_FastQuery(1);
			}
			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();
			}
			@@ -545,6 +569,13 @@
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if (data[i].name == 'åæ®å·') {//æ·»å è¶é¾æ¥
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·', templet: function (d) {
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;'
			});
			}
			else if ($.inArray(data[i].name, totalArray) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			} else {
			@@ -567,6 +598,7 @@
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -584,10 +616,14 @@
			//#region å¿«éè¿æ»¤
			function get_FastQuery(number) {
			////è·åç»å½è´¦æ·å¯¹åºèååç§°

			let openType = addSWhereByOpenType()
			var HUserName = getHEmpByHUserName();
			if (HUserName != "" && HUserName != null) {
			sWhere = " and æ±æ¥äºº = '" + HUserName + "' ";
			sWhere += " and æ±æ¥äºº = N'" + HUserName + "' OR æ¥æ¶äºº = N'" + HUserName + "' OR æéäºº like N'%"
			+ HUserName + "%'";
			}


			var HOrgID = "";
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			@@ -670,7 +706,7 @@
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (number == 1) {
			if (openType == false) {
			HOrgID = sessionStorage["OrganizationID"];
			}
			else {
			@@ -1208,6 +1244,18 @@
			var params = getUrlVars();
			var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å¶å®é¡µé¢éè¿éæ©æé®æå¼
			var HOrgID = params[params[1]];
			var Employee = params[params[2]]; // èå
			var DateInfo = params[params[3]]; // æ¥æä¿¡æ¯
			if (isEmpty(Employee) === false && isEmpty(DateInfo) === false) {
			let EmployeeDecode = decodeURIComponent(Employee)
			debugger
			$('#HReportEmp').val(EmployeeDecode)
			if (DateInfo.length == 7) { //å¹´æ
			sWhere += " and æ¥æ >= CAST(N'" + DateInfo + "' + '-01' AS DATE) and æ¥æ < DATEADD(MONTH, 1, CAST(N'" + DateInfo + "' + '-01' AS DATE))"
			} else if (DateInfo.length == 10) { //å¹´ææ¥
			sWhere += " and æ¥æ >= CAST(N'" + DateInfo + "' AS DATE) and æ¥æ < DATEADD(DAY, 1, CAST(N'" + DateInfo + "' AS DATE))"
			}
			}
			if (openType == 2) {
			sWhere += " and ISNULL(å³éäºº,'') = '' and ISNULL(ä½åºäºº,'') = '' ";
			$("#HOrgID").val(HOrgID);