MES-WEB-LayUI.git

			@@ -122,13 +122,26 @@
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§èµæº</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float:left;width:150px;">
			<input type="hidden" class="layui-input" name="HSourceID" id="HSourceID" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">å¯¹åºERPç©æ<label style="color:red"> * </label></label>
			<label class="layui-form-label">
			å¯¹åºERPç©æ
			<!--<label style="color:red"> * </label>-->
			</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="float:left;width:150px;">
			<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" style="float:left;width:150px;">
			<input type="hidden" class="layui-input" name="HMaterID" id="HMaterID" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HMaterList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -264,6 +277,33 @@
			<option value="å³æº">å³æº</option>
			<option value="å¼å¸¸åæº">å¼å¸¸åæº</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">æ°éç©çå°å</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMacAddress" id="HMacAddress">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¯å¦ä¸»çäº§è®¾å¤</label>
			<div class="layui-input-block" style="margin-left: 125px;width:55%;">
			<select name="HMainSourceFlag" lay-filter="HMainSourceFlag" id="HMainSourceFlag">
			<option value="å¦" selected="selected">å¦</option>
			<option value="æ¯">æ¯</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æå±ä¸»çäº§è®¾å¤</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMainSourceName" id="HMainSourceName" style="float:left;width:150px;">
			<input type="hidden" class="layui-input" name="HMainSourceID" id="HMainSourceID" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSourceList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>
			@@ -490,7 +530,44 @@
			}
			});
			});
			//çäº§èµæº
			form.on('submit(HSourceList)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'çäº§èµæº',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.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('è¯·éæ©æ°æ®');
			}
			$("#HSourceID").val(checkStatus.data[0].HItemID);
			$("#HSourceName").val(checkStatus.data[0].çäº§èµæºåç§°);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {

			},
			success: function (layero, index) {

			}
			});
			});


			//å¯¹åºErpç©æ
			form.on('submit(HMaterList)', function () {
			//é¡µé¢å±-èªå®ä¹
			@@ -501,9 +578,9 @@
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/PartInformation.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			maxmin: true
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -511,8 +588,8 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HName").val(checkStatus.data[0].HName);
			$("#HMaterNumber").val(checkStatus.data[0].HNumber);
			$("#HName").val(checkStatus.data[0].ç©æåç§°);
			$("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -535,7 +612,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'å¨å·åç±»åè¡¨',
			title: 'è®¾å¤åç±»åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			@@ -576,9 +653,9 @@
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/UnitInformation.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			maxmin: true
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -586,7 +663,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HUnitName").val(checkStatus.data[0].HName);
			$("#HUnitName").val(checkStatus.data[0].è®¡éåä½åç§°);
			$("#HUnitID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -613,9 +690,9 @@
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/DeptInformation.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			maxmin: true
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -623,7 +700,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åé¨å¨æéå¢è®¡ç®ç
			}
			@@ -650,9 +727,9 @@
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/SupplierInformation.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			maxmin: true
			, content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -660,7 +737,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HSellSupName").val(checkStatus.data[0].HName);
			$("#HSellSupName").val(checkStatus.data[0].ä¾åºååç§°);
			$("#HSellSupID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -687,9 +764,9 @@
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/SupplierInformation.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			maxmin: true
			, content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -697,7 +774,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HMakeSupName").val(checkStatus.data[0].HName);
			$("#HMakeSupName").val(checkStatus.data[0].ä¾åºååç§°);
			$("#HMakeSupID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -720,13 +797,13 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ä¾åºååè¡¨',
			title: 'èååè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/UserInformation.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			maxmin: true
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -734,7 +811,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HUseEmpName").val(checkStatus.data[0].HName);
			$("#HUseEmpName").val(checkStatus.data[0].èååç§°);
			$("#HUseEmpID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -757,13 +834,13 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ä¾åºååè¡¨',
			title: 'èååè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/UserInformation.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			maxmin: true
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -771,8 +848,45 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HRepairEmpName").val(checkStatus.data[0].HName);
			$("#HRepairEmpName").val(checkStatus.data[0].èååç§°);
			$("#HRepairEmpID").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(HMainSourceList)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ä¸»çäº§è®¾å¤åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true
			, content: ['../../è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileMainList.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('è¯·éæ©æ°æ®');
			}
			$("#HMainSourceName").val(checkStatus.data[0].è®¾å¤åç§°);
			$("#HMainSourceID").val(checkStatus.data[0].hmainid);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -878,7 +992,13 @@
			$("#HProNum").val(d.data[0].å·¥ç¨ç¼ç );
			$("#HWorkArea").val(d.data[0].äº§å°);
			$("#HLogo").val(d.data[0].åç);

			$("#HSourceID").val(d.data[0].HSourceID);
			$("#HSourceName").val(d.data[0].HSourceName);
			$("#HMacAddress").val(d.data[0].æ°éç©çå°å);
			$("#HMainSourceFlag").val(d.data[0].æ¯å¦ä¸»çäº§è®¾å¤);
			$("#HMainSourcelD").val(d.data[0].HMainSourcelD);
			$("#HMainSourceName").val(d.data[0].æå±ä¸»çäº§è®¾å¤);
			form.render("select");
			}
			});
			}
			@@ -922,7 +1042,7 @@
			if (data.count == 1) {
			layer.msg(data.Message, { time: 1 * 10000, icon: 1 }, function () {
			if (linterid == undefined) {
			$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
			$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
			location.reload();
			}
			else {
			@@ -954,7 +1074,7 @@
			if (data.count == 1) {
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
			if (linterid == undefined) {
			$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
			$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
			location.reload();
			}
			else {
			@@ -994,10 +1114,11 @@
			layer.msg("è®¾å¤è§æ ¼ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HMaterID").val() == '' \|\| $("#HMaterID").val() == null) {
			layer.msg("è¯·éæ©å¯¹åºERPç©æï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			//å¯è´ä¸éè¦
			//if ($("#HMaterID").val() == '' \|\| $("#HMaterID").val() == null) {
			// layer.msg("è¯·éæ©å¯¹åºERPç©æï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return Result = false;
			//}
			if ($("#HEquipFileTypeID").val() == '' \|\| $("#HEquipFileTypeID").val() == null) {
			layer.msg("è¯·éæ©è®¾å¤åç±»ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;