MES-WEB-LayUI.git

			@@ -11,6 +11,7 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<style>
			.main-btn { /å¤´é¨ä¸»æé®/
			padding: 0 2px; /è°æ´æé®å·¦å³ç©ºéå¤§å°/
			@@ -57,6 +58,7 @@
			</div>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<h1 style="text-align:center;"><b>å·¥åºå§å¤æ´¾å·¥</b></h1>
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶ä»ä¿¡æ¯</li>
			@@ -92,7 +94,7 @@
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ´¾å·¥æ¥æ</label>
			<div class="layui-input-inline">
			@@ -100,7 +102,7 @@
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-row">
			<div class="layui-col-xs6 layui-inline">
			<label class="layui-form-label" style="width:12.5%">å¤æ³¨</label>
			<div class="layui-input-inline">
			@@ -231,6 +233,13 @@

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

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "3740";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
			$("h1").html('<b>' + HPageTitle + '</b>');
			//#endregion

			//åå§åçé¢
			set_ClearBill();

			@@ -352,7 +361,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -362,10 +371,10 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			HMaterName: checkStatus.data[0].HName
			HMaterName: checkStatus.data[0].ç©æåç§°
			, HMaterID: checkStatus.data[0].HItemID
			, HMaterNumber: checkStatus.data[0].HNumber
			, HMaterModel: checkStatus.data[0].HModel
			, HMaterNumber: checkStatus.data[0].ç©æä»£ç
			, HMaterModel: checkStatus.data[0].è§æ ¼åå·
			});

			layer.close(layer.index);
			@@ -414,7 +423,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			//, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -424,7 +433,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HDeptName").val(checkStatus.data[0].HName);
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -490,7 +499,7 @@
			//è¡¨å¤´
			columns = [ //è¡¨å¤´
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', totalRow: true }
			, { type: 'numbers', title: 'åºå·' }
			, { field: 'HMainID', title: 'å§å¤æ´¾å·¥åä¸»ID', hide: true }// ç¨äºæå°æ¶è·åæ°æ®
			, { field: 'HEntryID', title: 'å§å¤æ´¾å·¥ååID', hide: true }// ç¨äºæå°æ¶è·åæ°æ®
			, { field: 'HOrderBillNo', title: 'è®¢åå·' }
			@@ -499,12 +508,12 @@
			, { field: 'HMaterNumber', title: 'å å·¥äº§åä»£ç ' }
			, { field: 'HMaterName', title: 'å å·¥äº§ååç§°', width:220 }
			, { field: 'HMaterModel', title: 'å å·¥äº§åè§æ ¼' }
			, { field: 'HQty', title: 'å§å¤æ°é', edit: 'text', width:90 }
			, { field: 'HQty', title: 'å§å¤æ°é', totalRow: true, edit: 'text', width:90 }
			, { field: 'HEntrustType', title: 'å§å¤å å·¥ç±»å', edit: 'text' }
			, { field: 'HNextProcName', title: 'å§å¤ä¸éå·¥åº', edit: 'text' }
			, { field: 'HPrice', title: 'å å·¥åä»·', edit: 'text', width: 90 }
			, { field: 'HOutQty', title: 'è½¬åºæ°é', edit: 'text', width: 90 }
			, { field: 'HInQty', title: 'æ¥æ¶æ°é', edit: 'text', width: 90}
			, { field: 'HPrice', title: 'å å·¥åä»·', totalRow: true, edit: 'text', width: 90 }
			, { field: 'HOutQty', title: 'è½¬åºæ°é', totalRow: true, edit: 'text', width: 90 }
			, { field: 'HInQty', title: 'æ¥æ¶æ°é', totalRow: true, edit: 'text', width: 90}
			, { field: 'HInDate', title: 'ååæ¶é´', width: 120, templet: "<div>{{d.HInDate ==null ?'':layui.util.toDateString(d.HInDate, 'yyyy-MM-dd')}}</div>", event: 'HInDate' }
			, { field: 'HWorkProcFlow', title: 'äº§åå·¥èº', edit: 'text' }
			, { field: 'HMaterLenModel', title: 'æä»¶å°ºå¯¸', edit: 'text'}
			@@ -520,6 +529,7 @@
			, elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: false
			, totalRow: true
			, cellMinWidth: 120
			, height: 400
			, cols: [columns]