MES-WEB-LayUI.git

			@@ -64,7 +64,11 @@
			<div class="layui-inline">
			<label class="layui-form-label">ä»åº</label>
			<div class="layui-input-inline">
			<input type="text" name="HWHID" id="HWHID" class="layui-input">
			<input type="text" name="HWHName" id="HWHName" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="WareHouse" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>
			@@ -72,8 +76,9 @@
			<div class="layui-inline">
			<label class="layui-form-label">éªæ¶å</label>
			<div class="layui-input-inline">
			<input type="text" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ProductModulList" style="width:40px;">
			<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HSecManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			@@ -81,8 +86,9 @@
			<div class="layui-inline">
			<label class="layui-form-label">ä¿ç®¡å</label>
			<div class="layui-input-inline">
			<input type="text" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ProductModulList" style="width:40px;">
			<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HKeeperList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			@@ -90,8 +96,9 @@
			<div class="layui-inline">
			<label class="layui-form-label">è´è´£äºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ProductModulList" style="width:40px;">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			@@ -99,8 +106,9 @@
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨</label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="ProductModulList" style="width:40px;">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="Department" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			@@ -2290,11 +2298,16 @@
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			, "HInnerBillNo": data.åé¨åæ®å·
			, "HWHID": data.HWHID //ä»åº
			, "HSecManagerID": data.HSecManagerID //éªæ¶å
			, "HKeeperID": data.HKeeperID //ä¿ç®¡å
			, "HManagerID": data.HManagerID //è´è´£äºº
			, "HDeptID": data.HDeptID //é¨é¨
			, "HWHID": data.HWHID //ä»åºID
			, "HWHName": data.ä»åºåç§° //ä»åºåç§°
			, "HSecManagerID": data.HSecManagerID //éªæ¶åID
			, "HSecManagerName": data.éªæ¶ååç§° //éªæ¶ååç§°
			, "HKeeperID": data.HKeeperID //ä¿ç®¡åID
			, "HKeeperName": data.ä¿ç®¡ååç§° //ä¿ç®¡ååç§°
			, "HManagerID": data.HManagerID //è´è´£äººID
			, "HManagerName": data.è´è´£äººåç§° //è´è´£äººåç§°
			, "HDeptID": data.HDeptID //é¨é¨ID
			, "HDeptName": data.é¨é¨åç§° //é¨é¨åç§°
			, "HSourceBillType":"" //æºåç±»å
			, "XDH": "" //éåå·
			, "HExplanation": data.æè¦ //æè¦
			@@ -2339,34 +2352,33 @@
			/* RoadBillSub(linterid);*/
			}

			//æåæ¨¡å·å¼¹çª
			form.on('submit(ProductModulList)', function () {
			//è¡¨å¤´ä¿¡æ¯ä»åºå¼¹çª
			form.on('submit(WareHouse)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ¨¡å·åè¡¨',
			title: 'ä»åºåè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['60%', '70%'],
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../Baseset/åºç¡èµæ/Gy_ModulList.html', 'yes'],
			content: ['../../PublicPage/WareHouseInformation.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			alert("aa");
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			console.log("aa"+checkStatus.data);//éä¸çå¼
			var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
			parent.layer.close(index); //åæ§è¡å³é Â Â
			$("#HWHName").val(checkStatus.data[0].HName);
			$("#HWHID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°

			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			@@ -2376,110 +2388,169 @@

			}
			});

			});

			//éæ©äº§åå¼¹çª
			form.on('submit(HMateria-BT)', function () {//äº§å

			//è¡¨å¤´ä¿¡æ¯éªæ¶åå¼¹çª
			form.on('submit(HSecManagerList)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2
			, area: ['80%', '80%']
			, title: 'ç©æ'
			, shade: 0.6 //é®ç½©éæåº¦
			//, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
			, resize: false
			, cancel: function (index, layero) {
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ä»åºåè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/UserInformation.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HSecManagerName").val(checkStatus.data[0].HName);
			$("#HSecManagerID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			})
			});
			//éæ©å·¥åº
			form.on('submit(HProc-BT)', function () {//éæ©å·¥åº
			layer.open({
			type: 2
			, area: ['80%', '80%']
			, title: 'å·¥åºåè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			//, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_ProcList.html', 'yes']
			, resize: false
			, cancel: function (index, layero) {
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			})
			});
			});

			//éæ©é¨é¨
			form.on('submit(HDepart-BT)', function () {//éæ©é¨é¨
			//è¡¨å¤´ä¿¡æ¯ä¿ç®¡åå¼¹çª
			form.on('submit(HKeeperList)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2
			, area: ['80%', '80%']
			, title: 'é¨é¨åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			//, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../Baseset/åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, resize: false
			, cancel: function (index, layero) {
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ä»åºåè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/UserInformation.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HKeeperName").val(checkStatus.data[0].HName);
			$("#HKeeperID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			})
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			});
			});
			//éæ©åä½
			form.on('submit(HUnitID-BT)', function () {//éæ©åä½

			//è¡¨å¤´ä¿¡æ¯è´è´£äººå¼¹çª
			form.on('submit(HManagerList)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2
			, area: ['666px', '666px']
			, title: 'åä½åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_UnitList.html', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'è´è´£äººåè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/UserInformation.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HManagerName").val(checkStatus.data[0].HName);
			$("#HManagerID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			})
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			});
			});


			//è¡¨å¤´ä¿¡æ¯é¨é¨å¼¹çª
			form.on('submit(Department)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'é¨é¨åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/DeptInformation.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HDeptName").val(checkStatus.data[0].HName);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			});
			});


			form.on('submit(Exit)', function (data) {//
			var index = parent.layer.getFrameIndex(window.name); //åå¾å°å½åiframeå±çç´¢å¼
			parent.layer.close(index); //åæ§è¡å³é
			});

			//éæ©è´£ä»»äºº
			form.on('submit(HEmployeeID-BT)', function () {//éæ©è´£ä»»äºº
			layer.open({
			type: 2
			, area: ['80%', '80%']
			, title: 'èååè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HKeeper', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			});

			//éæ©è´£ä»»å·¥åº
			form.on('submit(HZRProcID-BT)', function () {//éæ©è´£ä»»å·¥åº
			layer.open({
			type: 2
			, area: ['80%', '80%']
			, title: 'è´£ä»»å·¥åºåè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_ProcList.html?Type=HZR', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			});




			@@ -2507,7 +2578,7 @@
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			var sMainSub = sMainStr + ';' + sSubStr;
			console.log(sMainSub);


			$.ajax(
			{