MES-WEB-LayUI.git

			@@ -15,6 +15,7 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -54,30 +55,17 @@
			<input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç©æä»£ç </label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<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" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 50%;display: inline-block;" readonly>
			<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>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">çäº§è®¢åç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" style="display:none;" 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>
			<div class="layui-row" style="margin-top:10px;margin-left:5%;">
			<!--å¶ä»æ¡ä»¶-->
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">ç©æä»£ç </label>
			<div class="layui-input-block" style="margin-left: 77px;">
			<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" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 50%;display: inline-block;" readonly>
			<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>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 76px;">ç©æåç§°</label>
			<div class="layui-input-block" style="margin-left: 107px;">
			@@ -90,6 +78,28 @@
			<input type="text" class="layui-input" name="HModel" id="HModel">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">çäº§è®¢åç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">é¡¹ç®å·</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HProject" id="HProject" class=" ForFilteringSchemes" lay-verify="HProject">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" style="display:none;" 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>
			</div>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">

			@@ -207,7 +217,7 @@
			</script>
			<script type="text/html" id="toolbarDemo2">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_HideColumn2" id="get_HideColumn2"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_HideColumn2" id="get_HideColumn2"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			</form>
			@@ -241,16 +251,36 @@
			var titleData = ["hmainid", "åæ®ç±»å", "HMaterID", "hunitid", "HOrgID", "HMainCenterID", "å·¥ä½", "HMainProcID", "å·¥åºåç§°", "ä¸»è¿è¡æ¶é´", "è¿è¡æ¶é´åä½", "ä¸»å å·¥æ°é", "æè´¨", "å¾å·çæ¬", "HMainGroupID", "çç»", "å·¥ä»·", "æ åèµæºæ°", "å èµæºå¢é", "åèµæºåé", "HItemID", "HPRDORGID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData2 = ["hmainid", "hsubid", "ç¨åºå·", "æ¬å·¥åºç¡®è®¤è®°å½", "èªå¨ç§»è½¬", "æ¢ååå¤æ¶é´", "æ¬éåå¤æ¶é´", "ä¸éå¾ªç¯å¨æ", "ä¸éåºå®å¤©æ°", "å¼å·¥ä½éï¼åºæ°ï¼", "å¼å·¥ä½éï¼å¤©æ°ï¼", "æ åå®é¢", "æ¥åºåä»·", "ä¸åæ ¼åä»·", "å·¥åºå·¥ä»·", "çäº§å®é¢", "å¯æä½è®¾å¤æ°", "æ åäººæ°", "æµè½¬å·¥åº", "ä¸éæµè½¬å·¥åº", "åºå®çäº§å¤©æ°", "çäº§å¨æ", "ææ¾åº", "å¨è½¬ç®±", "å¨è½¬ç®±æ å", "æ¢æ¨¡æ¶é´", "è½¬ç§»æ¶é´", "æéæ¶é´", "åå¤æ¶é´", "äº§çº¿äººæ°", "äº§çº¿äº§è½", "äº§çº¿ä¸å¿", "è¯ç", "å å·¥æ°é", "è¿è¡æ¶é´", "æ¶é´åä½", "å¾çº¸ç¼å·", "æ¨¡å·ç¼å·", "è¯åä»", "æ¥åºåä»", "ä¸è¯åä»", "å·¥åºç±»å", "hprocid", "HSupID", "HCenterID", "HCenterID_S", "å·¥æ®µ", "å¼å·¥ä½éå¤©æ°", "å¼å·¥ä½éåºæ°", "ç´¯è®¡è¯ç", "è¶é¢æ¯ä¾", "HDayWorkQty", "HGroupID", "HWorkerID", "HSourceID", "å å·¥åä»·", "HNextProcFlag", "HBadWHID", "HBadWHName", "HWasterWHID", "HWasterWHName", "HWHID", "HWHName"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			//è·ååæ°
			function getUrlVars() {
			var vars = [], hash;
			var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
			for (var i = 0; i < hashes.length; i++) {
			hash = hashes[i].split('=');
			vars.push(hash[0]);
			vars[hash[0]] = hash[1];
			}
			return vars;
			}

			var HMaterID = "";
			var HProID = 0;
			var params = getUrlVars();
			if (params[params[0]] != "undefined") {
			HMaterID = params[params[0]]; //ä»åæ°ä¸è·å
			HProID = params[params[1]]; //ä»åæ°ä¸è·å
			}

			var ins; //ç¨äºå¯¼åºexcel
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½



			//åå§åçé¢
			set_ClearBill();
			//åå§åè¡¨æ ¼
			DisPlay_HideColumn();
			//DisPlay_HideColumn();

			//#endregion

			@@ -389,8 +419,11 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			Organ();
			//æ¥è¯¢é¡¹ç®å·
			Get_HProject();
			//æ¥è¯¢
			get_FastQuery(1);

			}
			//#endregion

			@@ -421,6 +454,7 @@
			$("#HMaterNumber").val("");//ç©æ
			$("#HModel").val("");//ç©æ
			$("#HOrderProcNO").val("");//åæ®ç±»å
			$("#HProject").val("");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			@@ -456,6 +490,31 @@
			}
			//#endregion

			//#region è·åé¡¹ç®å·
			function Get_HProject() {
			//è·åé¡¹ç®å·
			var HProjectList = '<option value="0" style="color:red;" selected></option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Gy_Material/Get_HProject",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HProjectList += '<option style="color:blue;" value="' + data[i].HName + '" >' + data[i].HName + '</option>';
			}
			$("#HProject").append(HProjectList);
			form.render('select');

			}
			layer.closeAll("loading");
			}
			})
			}
			//#endregion

			//ç©æ
			function get_btnHMaterID() {
			layer.open({
			@@ -488,12 +547,12 @@

			//åæ®å·è¶é¾æ¥
			if (obj.event == 'åæ®å·') { //æ£æ¥ obj.event æ¯å¦çäºåç¬¦ä¸² 'åæ®å·'ãå¦æçäºï¼åæ§è¡ifå¾ªç¯
			var linterid = data.hmainid.toString(); //å£°æåélinterid ä¸º data.hmainid
			var linterid = data.hmainid.toString(); //å£°æåélinterid ä¸º data.hmainid
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({ //ä½¿ç¨ layerçopenæå¼å¼¹åº å±
			layer.open({ //ä½¿ç¨ layerçopenæå¼å¼¹åº å±
			type: 2 //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe
			, area: ['100%', '100%']
			, title: 'ç¼è¾' + HPageTitle //è®¾ç½®å¼¹åºå±çååååé
			, title: 'ç¼è¾' //è®¾ç½®å¼¹åºå±çååååé
			, closeBtn: 1//æ¾ç¤ºå³éæé®
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			@@ -536,7 +595,7 @@
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			} else if ($.inArray(data[i].name, totalArray) > -1) { //è®¡ç®å
			} 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 if (data[i].name == 'åæ®å·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·' });
			@@ -709,6 +768,7 @@
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HOrgID = "";
			var HProject = $("#HProject").val();
			var HOrderProcNO = $("#HOrderProcNO").val();//åæ®ç±»å
			//var HMaterID = $("#HMaterID").val();
			var HMaterName = $("#HMaterName").val();
			@@ -790,12 +850,19 @@
			sWhere += " and " + ColName2 + " " + com2;
			}

			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";

			if (HMaterID != "" && HMaterID != "undefined" && HMaterID != null) {
			//ä»å«çé¡µé¢æå¼ä¼ å¥Hmateridå¼ï¼è®¾ç½®ç©æè¿æ»¤,æªå³é
			sWhere += " and HMaterID = " + HMaterID + " and isnull(å®¡æ ¸äºº,'''')<>'''' ";
			} else {
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			}
			}
			if (HDate1) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) <= '" + HDate1 + "'";
			}

			if (number == 1) {
			HOrgID = sessionStorage["OrganizationID"];
			}
			@@ -821,6 +888,12 @@
			if (HOrgID) {
			sWhere += " and HOrgID = '" + HOrgID + "'";
			}
			if (number==2) {
			if (HProject) {
			sWhere += " and é¡¹ç®å· like '%" + HProject + "%'";
			}
			}

			sWhere += " and HBillSubType<>'SUB' ";
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			@@ -999,7 +1072,7 @@
			})
			}

			//#region æç» éèåè®¾ç½®
			//#region æç» éèåè®¾ç½®
			function get_HideColumn2() {
			var colName = "";
			var contentUrl = "";