MES-WEB-LayUI.git

			@@ -46,6 +46,14 @@
			<input type="text" class="layui-input ForFilteringSchemes" name="HName" id="HName">
			</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" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			@@ -131,6 +139,7 @@
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layuiiconlayuiicontips"></i>é¢è§</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="btn-Add"><i class="layui-iconlayuiiconfileb"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-NumAdd" id="btn-NumAdd"><i class="layu i-iconlayuiiconfileb"></i>æµæ°´å·æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit" id="btn-Edit"><i class="layuiiconlayuiiconform"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-copy" id="btn-copy"><i class="layuiiconlayuiiconform"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layuiiconlayuiicon-delete"></i>å é¤</button>
			@@ -151,7 +160,7 @@
			</form>
			<div class="layui-row" style="padding:10px 0">
			<div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
			<div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(50vh);"></div>
			<div id="TreeTable" class="demo-tree demo-tree-box" style="width:99.5%;height:calc(45vh);overflow-y:auto"></div>
			<div style="width:99.5%;height:calc(35vh);position: relative;">
			<!--//è½®æå¾-->
			<div class="layui-carousel" id="test1" style="position:absolute;">
			@@ -200,6 +209,7 @@
			var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag"];

			var ins; //ç¨äºå¯¼åºexcel
			var HMaterTypeID = 0; //ç©æåç±»èç¹id
			//#endregion

			//#region ãè¿æ»¤æ¹æ¡ã
			@@ -240,6 +250,12 @@
			//æ°å¢æé®
			case 'btn-Add':
			set_AddNew();
			break;
			//æ°å¢æµæ°´å·æé®
			case 'btn-NumAdd': set_NumAddNew();
			break;
			case 'btn-NumAdd':
			set_NumAddNew();
			break;
			case 'btn-Edit':
			set_ShowBill();
			@@ -413,8 +429,9 @@
			var html2 = '<h1 style="text-align:center;line-height:290px;color:red;font-weight:bolder;"></h1>';
			$("#file").append(html2);
			Carousel.reload({ autoplay: false })

			get_FastQuery();
			//è·åé¡¹ç®å·
			Get_HProject();
			get_FastQuery();
			//if (openType == 2) {
			// addSWhereByOpenType();
			// //get_Display(sWhere);
			@@ -479,6 +496,7 @@
			function set_ClearQuery() {
			$("#HNumber").val("");
			$("#HName").val("");
			$("#HProject").val("");
			$("#HModel").val("");
			$("#HOrgName").val("");
			$("#ColContent").val("");
			@@ -567,6 +585,7 @@
			sWhere = "";
			var HNumber = $("#HNumber").val();
			var HName = $("#HName").val();
			var HProject = $("#HProject").val();
			var HModel = $("#HModel").val();
			var HOrgName = $("#HOrgName").val();
			var ColName = $("#ColName").val();//å¤éæ¡
			@@ -604,6 +623,9 @@
			}
			if (HOrgName) {
			sWhere += " and ç»ç»åç§° like '%" + HOrgName + "%'";
			}
			if (HProject) {
			sWhere += " and é¡¹ç®å· like '%" + HProject + "%'";
			}
			if (GetDataCols != "") {
			sWhere += GetDataCols;
			@@ -805,6 +827,34 @@
			}
			//#endregion

			//#region æµæ°´å·æ°å¢
			function set_NumAddNew() {
			if (HMaterTypeID == 0 \|\| HMaterTypeID == null) {
			layer.msg('è¯·éæ©å·ä½ç©æåç±»ï¼');
			}
			else {
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ°å¢ç©æ',
			closeBtn: 1,
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: '../å¬ç¨åºç¡èµæ/Add_Edit_Gy_Material.html?hID=0&OperationType=4&HMaterTypeID=' + HMaterTypeID,
			end: function () {
			//å·æ°é¡µé¢,
			get_FastQuery(table, option);
			},
			success: function (layero, index) {

			}
			});
			}

			}
			//#endregion

			//#region ç¼è¾åæ®
			function set_ShowBill() {
			var checkStatus = table.checkStatus('mainTable')
			@@ -882,6 +932,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_Display_Tree() {
			@@ -937,10 +1012,13 @@
			var data = obj.data; //è·åå½åç¹å»çèç¹æ°æ®
			if (data.id == "100") {
			sql = " and HMaterTypeID=0 ";
			HMaterTypeID = 0;
			} else if (data.id == "0") {
			sql = "";
			HMaterTypeID = 0;
			} else {
			sql = " and HMaterTypeID='" + data.id + "' ";
			HMaterTypeID = data.id;
			}
			get_Display(sql);
			}