MES-WEB-LayUI.git

			@@ -61,7 +61,7 @@
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç©æä»£ç </label>
			<div class="layui-input-block">
			<input type="hidden" class="layui-input " lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="text" class="layui-input ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;">
			<input type="text" class="layui-input ForFilteringSchemes" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 75%;display: inline-block;">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px;float: right;margin-right: 3px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			@@ -78,6 +78,12 @@
			<label class="layui-form-label" style="width: 85px;">è§æ ¼åå·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HModel" id="HModel">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">åºåå¼</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBenchmarkValue" id="HBenchmarkValue">
			</div>
			</div>
			</div>
			@@ -98,10 +104,10 @@
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" style="display:none;" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<button class="layui-btn layuiadmin-btn-order" style="" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">éç½®</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">éç½®</button>
			</div>
			<!--æ¾ç¤ºå½åè¿æ»¤æ¹æ¡-->
			<div class="layui-inline" style="margin-left:5px;">
			@@ -199,6 +205,7 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-delete"></i>Excelå¯¼å¥</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button>
			<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_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>æ°å¢åè·¯çº¿</button>
			@@ -216,6 +223,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_WithdrawCheck_Flow" id="WithdrawCheck_Flow"><i class="layui-icon layui-icon-form"></i>æ¤å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBillSetDate" id="set_CancelCloseBillSetDate"><i class="layui-icon layui-icon-form"></i>åå³é(è®¾ç½®æ¶é´)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="btn-Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-ProcPriceRequestBills" id="btn-ProcPriceRequestBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(å®é¢ç³è¯·å)</button>
			@@ -371,6 +379,9 @@
			//åå³é
			case 'set_CancelCloseBill': set_CloseBill(2);
			break;
			//åå³éè®¾ç½®æ¶é´
			case 'set_CancelCloseBillSetDate': set_CloseBillSetDate(2);
			break;
			//ä½åºæé® ï¼1:ä½åºã2:åä½åºï¼
			case 'btn-Drop':set_DropBill(1);
			break;
			@@ -383,6 +394,9 @@
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//å¯¼å¥
			case 'set_Excel': set_Excel();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
			@@ -439,6 +453,7 @@
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "get",
			async: false,
			url: GetWEBURL() + "/Web/GetOrganizations",
			success: function (result) {
			var Organization = "";
			@@ -496,13 +511,18 @@
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åè¡¨æ ¼
			set_InitGrid();

			Organ();
			//æ¥è¯¢
			//get_FastQuery(1);

			//è·åé¡¹ç®å·
			Get_HProject();

			//æ¥è¯¢
			get_FastQuery(1);

			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();
			$("#HBenchmarkValue").val(localStorage["HBenchmarkValue"])
			}
			//#endregion

			@@ -511,6 +531,7 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-150'
			, title: 'å·¥èºè·¯çº¿'
			, page: false
			, limit: 50
			, done: function (res, curr, count) {
			@@ -1006,12 +1027,12 @@
			if (HProID != 0 && HProID != "undefined" && HProID != null) {
			sWhere += " and HMainProcID = " + HProID;
			}
			if (number == 1) {
			HOrgID = sessionStorage["OrganizationID"];
			}
			else {
			HOrgID = $("#HOrgID").val();//ç»ç»
			}
			//if (number == 1) {
			// HOrgID = sessionStorage["OrganizationID"];
			//}
			//else {
			// HOrgID = $("#HOrgID").val();//ç»ç»
			//}

			if (HOrderProcNO) {
			sWhere += " and åæ®ç±»å like ''%" + HOrderProcNO + "%''";
			@@ -1029,9 +1050,9 @@
			if (WorkCenter) {
			sWhere += " and åæ®å· like ''%" + WorkCenter + "%''";
			}
			if (HOrgID) {
			sWhere += " and HOrgID = ''" + HOrgID + "''";
			}
			//if (HOrgID) {
			// sWhere += " and HOrgID = ''" + HOrgID + "''";
			//}
			if (number == 2) {
			if (HProject != '0') {
			sWhere += " and é¡¹ç®å· like ''%" + HProject + "%''";
			@@ -1039,6 +1060,9 @@
			}

			sWhere += " and å·¥åºä»£ç != ''9999'' and HBillSubType<>''SUB''"

			sWhere += getOrgIDByUser();//ç¨æ·å³èç»ç»æ¥è¯¢è¿æ»¤

			//å¤ææé
			if (PermissionJudge() == true) {
			get_DisplayPage(sWhere);
			@@ -1267,6 +1291,31 @@
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//#region æ ¹æ®ç¨æ·è·åç¨æ·å³èç»ç»çè¿æ»¤æ¡ä»¶
			function getOrgIDByUser() {
			var res = "";
			$.ajax({
			type: "GET",
			async: false,
			url: GetWEBURL() + "/Xt_User/getOrgIDListByUser", //æ¹æ³æå¨é¡µé¢åæ¹æ³å ä¼ å ç»ç»å¿é¡»æ¯åè¡¨å¤´é¨æ¥è¯¢çç»ç» ä¸è½ä½¿ç¨ç¨æ·é»è®¤
			data: { "UserID": sessionStorage["Czybm"], "UserName": sessionStorage["HUserName"], HOrgID: $("#HOrgID").val() },
			success: function (result) {
			if (result.count == 1) {
			if (result.data[0].sWhere == "1") {
			res = " and HOrgID = ''" + $("#HOrgID").val() + "''";
			} else {
			res = result.data[0].sWhere;
			}
			}
			}, error: function (err) {
			res = " and 1 = 0";
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			return res;
			}
			//#endregion

			@@ -1556,6 +1605,97 @@
			}
			}

			//å³é [1 å³éã2 åå³é]
			function set_CloseBillSetDate(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			var HInterID = data[0].hmainid;
			if (data.length == 1) {
			// å¼¹åºå±
			layer.open({
			type: 1,
			title: 'è®¾ç½®æ¶é´èå´',
			area: ['500px', '300px'],
			content: `
			<div class="layui-form" style="padding: 20px;">
			<div class="layui-form-item">
			<label class="layui-form-label">å¼å§æ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="startTime" placeholder="è¯·éæ©å¼å§æ¶é´">
			</div>
			</div>
			<div class="layui-form-item">
			<label class="layui-form-label">ç»ææ¶é´</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="endTime" placeholder="è¯·éæ©ç»ææ¶é´">
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-input-block" style="margin-left: 0; text-align: center;">
			<button class="layui-btn" id="confirmTime">ç¡®å®</button>
			<button class="layui-btn layui-btn-primary" id="cancelTime">åæ¶</button>
			</div>
			</div>
			</div> `,
			success: function (layero, index) {
			$("#startTime").val(Format(new Date(), "yyyy-MM-dd"));
			$("#endTime").val(Format(new Date(2100, 12, 31), "yyyy-MM-dd"));
			// ç¡®å®æé®ç¹å»äºä»¶
			$('#confirmTime').on('click', function () {
			var startTime = $('#startTime').val();
			var endTime = $('#endTime').val();

			if (!startTime) {
			layer.msg('è¯·éæ©å¼å§æ¶é´', { icon: 2 });
			return;
			}

			if (!endTime) {
			layer.msg('è¯·éæ©ç»ææ¶é´', { icon: 2 });
			return;
			}

			if (new Date(endTime) < new Date(startTime)) {
			layer.msg('ç»ææ¶é´ä¸è½æ©äºå¼å§æ¶é´', { icon: 2 });
			return;
			}
			$.ajax({
			url: GetWEBURL() + '/Gy_RoutingBill/CloseSetDate',
			type: "GET",
			data: { "HInterID": HInterID, "Type": num, "user": sessionStorage["HUserName"], "HBillSubType": "", "HBeginDate": startTime, "HEndDate": endTime},
			success: function (result) {
			if (result.count == 1) {
			// è¿éå¯ä»¥å¤çè·åå°çæ¶é´èå´
			layer.msg('æ¶é´èå´å·²è®¾ç½®ï¼' + startTime + ' è³ ' + endTime, { icon: 1 });
			// å³éå¼¹å±
			layer.close(index);
			$("#btnSearch").trigger('click');
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			// å³éå¼¹å±
			layer.close(index);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// å³éå¼¹å±
			layer.close(index);
			}
			});

			});

			// åæ¶æé®ç¹å»äºä»¶
			$('#cancelTime').on('click', function () {
			layer.close(index);
			});
			},
			})
			}
			else {
			layer.msg("è¯·éæ©ä¸æ¡æ°æ®!");
			}
			}

			//#region åä½åº/ä½åºæ°æ® [1 ä½åºã2 åä½åº]
			function set_DropBill(num) {
			var checkStatus = table.checkStatus('mainTable')
			@@ -1616,7 +1756,7 @@
			}
			});
			if (result.count == 1) {
			table.exportFile(ins.config.id, data, "xls");
			table.exportFile('mainTable', data, "xls");
			layer.close(wait);
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			@@ -1629,6 +1769,22 @@
			});
			}
			//#endregion

			//å¯¼å¥
			function set_Excel() {
			layer.open({
			type: 2
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['100%', '100%']
			, title: 'å·¥èºè·¯çº¿åè¡¨-å¯¼å¥'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../å·¥èºè·¯çº¿/Gy_RoutingBillimport.html'
			, end: function () {
			//å·æ°é¡µé¢,
			get_FastQuery();
			}
			})
			}

			//#region è·åå¯¼åºæ°æ®
			function getExportData() {
			@@ -2033,6 +2189,10 @@
			}
			//#endregion

			$("#HBenchmarkValue").on("input", function (e) {
			localStorage["HBenchmarkValue"] = e.delegateTarget.value;//åºåå¼ï¼ç¨äºæ·»åº·è®¡ç®çº¦å½ç³»æ°ï¼åºåå¼/å°æ¶äº§è½
			});

			//#endregion
			////éèåè®¾ç½®
			//function get_HideColumn() {
			@@ -2339,7 +2499,7 @@
			//éèæ¾ç¤ºè¿æ»¤æ¹æ¡çæ ç¾ä¿¡æ¯
			document.getElementById("HFilterScheme_Now").style.display = "none";
			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery()
			//get_FastQuery()
			form.render("select");
			}
			}, error: function () {