MES-WEB-LayUI.git

			@@ -30,28 +30,26 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æå°ç¶æ</label>
			<div class="layui-input-block" style="width:100px">
			<select name="city" lay-verify="required" id="SHPrintQty">
			<option value="å¨é¨">å¨é¨</option>
			<option value="æªæå°">æªæå°</option>
			<option value="å·²æå°">å·²æå°</option>
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§è½¦é´</label>
			<div class="layui-input-block">
			<select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
			<!--å¨ææ¸²æè½¦é´-->
			</select>
			</div>
			</div>
			<input type="checkbox" id="wybj" name="wybj" title="åªæ¾ç¤ºå§å¤" lay-filter="wybj" lay-skin="primary">
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<label class="layui-form-label">è§æ ¼åå·</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HDate">
			<input type="text" class="layui-input" name="HModel" id="HModel">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HDate1">
			</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>
			@@ -76,12 +74,27 @@
			<input type="text" class="layui-input" name="HWorkBillNo" id="HWorkBillNo">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<label class="layui-form-label">æå°ç¶æ</label>
			<div class="layui-input-block" style="width:100px">
			<select name="city" lay-verify="required" id="SHPrintQty">
			<option value="å¨é¨">å¨é¨</option>
			<option value="æªæå°">æªæå°</option>
			<option value="å·²æå°">å·²æå°</option>
			</select>
			</div>
			</div>
			<input type="checkbox" id="wybj" name="wybj" title="åªæ¾ç¤ºå§å¤" lay-filter="wybj" lay-skin="primary">
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			<input type="date" class="layui-input" id="HDate">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HDate1">
			</div>
			</div>
			</div>
			@@ -96,6 +109,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SendWork"><i class="layui-icon layui-icon-file-b"></i>å·¥åºæ´¾å·¥</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_PlanDate"><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-file-b"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></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="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>å·¥åºåºç«æ±æ¥å</button>-->
			@@ -137,6 +151,7 @@
			var option2 = "";
			var HBillNo = "";
			var wybj = false;
			var HDeptID = 0;
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -144,8 +159,8 @@
			//
			var HModName = "Sc_ProcessExchangeIssueBillList";
			//åå§åçé¢
			set_ClearBill();

			set_ClearBill();

			//#endregion

			//#region å¤´å·¥å·æ äºä»¶
			@@ -223,8 +238,30 @@
			set_InitGrid();
			//æ¥è¯¢
			get_FastQuery();
			//è½¦é´åè¡¨
			getDept();
			}

			//è·åè½¦é´åè¡¨
			function getDept() {
			var HDeptName = '<option value="0" style="color:red;" selected>å¨é¨è½¦é´</option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
			}
			$("#HDeptName").append(HDeptName);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}

			//#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			@@ -236,9 +273,12 @@
			$("#HOrderProcNO").val("");//è®¢åè·è¸ªå·
			$("#SHname").val("");//ç©æ\|åä»¶åç§°\|åä»¶è§æ ¼
			$("#HBillNo").val("");//åæ®å·
			$("#HModel").val("");//è§æ ¼åå·
			$("#HDeptName").val("0");//è½¦é´
			form.render('select');
			//$("#btnSearch").click();
			sWhere = "";
			get_FastQuery() ;
			sWhere = "";
			}
			//#endregion

			@@ -251,6 +291,8 @@
			var HWorkBillNo = $("#HWorkBillNo").val();
			var SHname = $("#SHname").val();//ç©æ\|åä»¶åç§°\|åä»¶è§æ ¼
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HModel = $("#HModel").val();//è§æ ¼åå·
			var HDeptName = $("#HDeptName").val();//è½¦é´
			if (SHPrintQty) {//å¤ææå°ç¶æ
			if (SHPrintQty == "å¨é¨") {
			sWhere = " and æå°æ¬¡æ° >= 0 ";
			@@ -283,6 +325,12 @@
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'"
			}
			if (HDeptName && HDeptName != "0") {
			sWhere += " and HWorkShopID = '" + HDeptName + "'";
			}
			if (HModel) {
			sWhere += " and åä»¶è§æ ¼ like '%" + HModel + "%'";
			}
			get_Display(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			@@ -311,6 +359,29 @@
			, { field: 'hmainid', title: 'hmainid', width: 90, hide: true }
			, { field: 'HEntryID', title: 'HEntryID', width: 90, hide: true }
			, { field: 'ä¸è¾¾ç¶æ', title: 'ä¸è¾¾ç¶æ' }
			, { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true }
			, { field: 'çäº§è½¦é´', title: 'çäº§è½¦é´' }
			, { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true }
			, { field: 'åä»¶åç§°', title: 'äº§ååç§°' }
			, { field: 'åä»¶è§æ ¼', title: 'è§æ ¼åå·' }
			, { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
			, { field: 'åä½', title: 'åä½' }
			, { field: 'æµæ°´å·', title: 'æµæ°´å·' }
			, { field: 'HProcID', title: 'HProcID', hide: true }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ' }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°' }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width: 100 }
			, {
			field: 'è®¡åå¼å·¥æ¥æ', title: 'è®¡åå¼å·¥æ¥æ', width: 120, sort: true, templet: "<div>{{d.è®¡åå¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>"
			}
			, {
			field: 'è®¡åå®å·¥æ¥æ', title: 'è®¡åå®å·¥æ¥æ', width: 120, sort: true, templet: "<div>{{d.è®¡åå®å·¥æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>"
			}
			, { field: 'çäº§è½¦é´ä»£ç ', title: 'çäº§è½¦é´ä»£ç ', width: 115 }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
			, { field: 'åä½ä»£ç ', title: 'åä½ä»£ç ' }


			, { field: 'æå°æ¬¡æ°', title: 'æå°æ¬¡æ°' }
			, {
			field: 'æ¥æ', title: 'æ¥æ', width: 120, sort: true, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>"
			@@ -320,38 +391,16 @@
			, { field: 'hicmointerid', title: 'hicmointerid', width: 80, hide: true }
			, { field: 'ä»»å¡åå·', title: 'ä»»å¡åå·', width: 140 }
			, { field: 'HWorkShopID', title: 'HWorkShopID', width: 80, hide: true }
			, { field: 'HDeptID', title: 'HDeptID', width: 80, hide: true }
			, { field: 'çäº§è½¦é´ä»£ç ', title: 'çäº§è½¦é´ä»£ç ', width: 115 }
			, { field: 'çäº§è½¦é´', title: 'çäº§è½¦é´' }
			, { field: 'æµæ°´å·', title: 'æµæ°´å·' }
			, { field: 'HProcID', title: 'HProcID', hide: true }
			, { field: 'å·¥åºä»£ç ', title: 'å·¥åºä»£ç ' }
			, { field: 'å·¥åºåç§°', title: 'å·¥åºåç§°' }
			, {
			field: 'è®¡åå¼å·¥æ¥æ', title: 'è®¡åå¼å·¥æ¥æ', width: 120, sort: true, templet: "<div>{{d.è®¡åå¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>"
			}
			, {
			field: 'è®¡åå®å·¥æ¥æ', title: 'è®¡åå®å·¥æ¥æ', width: 120, sort: true, templet: "<div>{{d.è®¡åå®å·¥æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>"
			}
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width: 100 }
			, { field: 'å§å¤æ è®°', title: 'å§å¤æ è®°' }
			, { field: 'HMaterID', title: 'HMaterID', width: 80, hide: true }
			, { field: 'åä»¶ä»£ç ', title: 'åä»¶ä»£ç ' }
			, { field: 'åä»¶åç§°', title: 'åä»¶åç§°' }
			, { field: 'åä»¶è§æ ¼', title: 'åä»¶è§æ ¼' }
			, { field: 'äº§ååç§°', title: 'åä»¶åç§°' }
			, { field: 'è§æ ¼åå·', title: 'åä»¶è§æ ¼' }
			, { field: 'æ¹å·', title: 'æ¹å·' }
			, { field: 'åææ¹æ¬¡å·', title: 'åææ¹æ¬¡å·' }
			, { field: 'HMaterID2', title: 'HMaterID2', width: 80, hide: true }
			, { field: 'äº§åä»£ç ', title: 'äº§åä»£ç ' }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°' }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
			, { field: 'HUnitID', title: 'HUnitID', width: 80, hide: true }
			, { field: 'åä½ä»£ç ', title: 'åä½ä»£ç ' }
			, { field: 'åä½', title: 'åä½' }
			, { field: 'è®¾å¤æ¨¡å·ä»£ç ', title: 'è®¾å¤æ¨¡å·ä»£ç ' }
			, { field: 'è®¾å¤æ¨¡å·', title: 'è®¾å¤æ¨¡å·' }
			, { field: 'çäº§æ°é', title: 'çäº§æ°é' }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é' }

			, { field: 'æè¦', title: 'æè¦' }
			, { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·' }
			@@ -378,7 +427,7 @@
			}
			//#region æ¥è¯¢
			function get_Display(sWhere) {
			sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
			sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and å·¥åºåç§° != 'è½¬å·¥åº'";
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeIssueBillList_Json',
			@@ -744,7 +793,7 @@
			} else {
			layer.msg('è¯·éæ©æ°æ®ç¼è¾ï¼');
			}
			}
			}

			//#region ææ´¾æ¥æ
			function set_PlanDate() {
			@@ -840,7 +889,16 @@
			function get_print() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			if (checkStatus.data.length >= 1) {
			var rows = [];
			var arr = [];
			var ieid = [];
			for (var i = 0; i < data.length; i++) {
			rows.push(data[i].hmainid.toString());
			arr.push(data[i].HEntryID.toString());
			ieid.push(data[i].hmainid.toString() + data[i].HEntryID.toString())
			}

			layer.open({
			type: 2
			, area: ['50%', '50%']
			@@ -848,7 +906,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=HProcessExchange', 'yes']
			, content: ['../../BaseSet/SRM_OpenTmpList_GXPG.html?linterid=' + rows.toString() + '&MyMsg=' + rows.toString() + '&Type=HProcSendWork' + '&ieid=' + ieid.toString(), 'yes']
			, resize: false
			})
			}