MES-WEB-LayUI.git

			@@ -53,6 +53,7 @@
			<li class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li>è¡¥åä¿¡æ¯</li>
			<li>å¶ä»ä¿¡æ¯</li>
			<li>å¶åä¿¡æ¯</li>
			<li>éä»¶ä¿¡æ¯</li>
			</ul>
			<h1 style="text-align:center;"><b>ç©æè®¾ç½®</b></h1>
			@@ -213,6 +214,7 @@
			<option value="å¶ä»" selected>å¶ä»</option>
			<option value="ææ">ææ</option>
			<option value="å©å">å©å</option>
			<option value="å©åï¼æå¸ç®ï¼">å©åï¼æå¸ç®ï¼</option>
			</select>
			</div>
			</div>
			@@ -243,7 +245,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">ç¦ç¨æ å¿ï¼</label>
			<div class="layui-input-inline">
			<input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="æ¯å¦ç¦ç¨">
			<input type="checkbox" name="HStopflag" id="HStopflag" lay-skin="primary" lay-filter="checkbox" value="true" title="æ¯å¦ç¦ç¨" disabled>
			<input type="hidden" name="UnitType" id="UnitType">
			</div>
			</div>
			@@ -692,6 +694,54 @@
			</div>
			</div>
			</div>
			<!--å¶åä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¶åäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMakeEmp" id="HMakeEmp" style="background-color:#efefef4d;" readonly>
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å®¡æ ¸äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HCheckEmp" id="HCheckEmp" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç¦ç¨äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HStopEmp" id="HStopEmp" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¶åæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å®¡æ ¸æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç¦ç¨æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HStopDate" id="HStopDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>

			</div>
			</div>
			</div>
			<!--éä»¶ä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding-top: 10px;">
			@@ -746,6 +796,7 @@
			var hID = params[params[0]];//ç¼è¾æ¥ç
			var OperationType = params[params[1]];//1 æ°å¢ 2å¤å¶ 3ç¼è¾ 4æµæ°´å·æ°å¢
			var HMaterTypeID = params[params[2]];//ç±»åid
			var OptionData = [];
			//åå§å å å¬ç¨åé
			var date = new Date();
			var day = date.getDate();
			@@ -804,12 +855,20 @@
			PicUpload();
			}
			});

			$("#HMakeEmp").val(sessionStorage["HUserName"]);
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
			}
			else if (OperationType == 2) {
			//ä¿®æ¹æ¶ä¸»è¡¨ID
			RoadBillMain(hID);
			$("#HItemID").val(0);
			//åå§åå¶åäººåå¶åæ¶é´
			$("#HMakeEmp").val(sessionStorage["HUserName"]);
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HCheckEmp").val('');
			$("#HCheckDate").val('');
			$("#HStopEmp").val('');
			$("#HStopDate").val('');
			//æä»¶éæ©åå§å
			PicUpload();
			}
			@@ -1011,7 +1070,7 @@
			//alert(hID);
			//æ¥è¯¢èåè®¾ç½®æ¯å¦åå¨
			$.ajax({
			url: GetWEBURL() + "Gy_Material/GetGy_MaterialDetail",
			url: GetWEBURL() + "/Gy_Material/GetGy_MaterialDetail",
			type: "GET",
			async: false,
			data: {
			@@ -1113,6 +1172,12 @@
			, "HSizing_M": data.å®åæµæ
			, "HLotcardQty": data.åä¸ªæµè½¬å¡æ°é
			, "HCubicleQty": data.å·¥ä½æ°é
			, "HMakeEmp": data["åå»ºäºº"]
			, "HMakeDate": data["åå»ºæ¥æ"] == null ? "" : Format(new Date(data["åå»ºæ¥æ"]), "yyyy-MM-dd")
			, "HCheckEmp": data["å®¡æ ¸äºº"]
			, "HCheckDate": data["å®¡æ ¸æ¥æ"] == null ? "" : Format(new Date(data["å®¡æ ¸æ¥æ"]), "yyyy-MM-dd")
			, "HStopEmp": data["ç¦ç¨äºº"]
			, "HStopDate": data["ç¦ç¨æ¥æ"] == null ? "" : Format(new Date(data["ç¦ç¨æ¥æ"]), "yyyy-MM-dd")
			});

			colorpicker.render({
			@@ -1194,6 +1259,18 @@
			layer.msg("è¯·éæ©ä¸»è®¡éåä½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}

			if (defaintOperationByCompanyName()) {
			var temp = $("#HPOUnitID").val();
			var temp1 = $("#HMaterClsID").val();
			if (temp1 == "1" \|\| temp1 == "3") {
			if (typeof (temp) == "undefined" \|\| temp == "" \|\| temp == "0") {
			layer.msg("å½åç©æå±æ§ä¸º[å¤è´]æ[å§å¤],è¯·éæ©éè´è®¡éåä½ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			}
			}

			var HWeight = $('#HWeight').val();
			if (HWeight.substring(HWeight.length - 1, HWeight.length) == ".") {
			layer.msg("åéçç»å°¾ä¸è½æ¯.ï¼");
			@@ -1499,7 +1576,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'æ£éªæ¹æ¡åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../è´¨éç®¡ç/æ£éªæ¹æ¡å/QC_CheckProjectList.html', 'yes']
			, content: ['../../è´¨éç®¡ç/æ£éªæ¹æ¡å/QC_CheckProjectList.html?Type=2', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1512,6 +1589,13 @@
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function (index, layero) {
			if (OptionData.length > 0) {
			$("#HQCSchemeName_Fst").val(OptionData[0].æ£éªæ¹æ¡åç§°);
			$("#HQCSchemeID_Fst").val(OptionData[0].hmainid);
			}
			OptionData = [];
			}
			})
			}
			//#endregion
			@@ -1524,7 +1608,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'æ£éªæ¹æ¡åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../è´¨éç®¡ç/æ£éªæ¹æ¡å/QC_CheckProjectList.html', 'yes']
			, content: ['../../è´¨éç®¡ç/æ£éªæ¹æ¡å/QC_CheckProjectList.html?Type=2', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1537,6 +1621,13 @@
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function (index, layero) {
			if (OptionData.length > 0) {
			$("#HQCSchemeName_Proc").val(OptionData[0].æ£éªæ¹æ¡åç§°);
			$("#HQCSchemeID_Proc").val(OptionData[0].hmainid);
			}
			OptionData = [];
			}
			})
			}
			//#endregion
			@@ -1549,7 +1640,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'æ£éªæ¹æ¡åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../è´¨éç®¡ç/æ£éªæ¹æ¡å/QC_CheckProjectList.html', 'yes']
			, content: ['../../è´¨éç®¡ç/æ£éªæ¹æ¡å/QC_CheckProjectList.html?Type=2', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1562,6 +1653,13 @@
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function (index, layero) {
			if (OptionData.length > 0) {
			$("#HQCSchemeName_Patrol").val(OptionData[0].æ£éªæ¹æ¡åç§°);
			$("#HQCSchemeID_Patrol").val(OptionData[0].hmainid);
			}
			OptionData = [];
			}
			})
			}
			//#endregion
			@@ -1576,7 +1674,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html?Type=2', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -1593,6 +1691,13 @@
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function (index, layero) {
			if (OptionData.length > 0) {
			$("#HUnitName").val(OptionData[0].è®¡éåä½åç§°);
			$("#HUnitID").val(OptionData[0].HItemID);
			}
			OptionData = [];
			}
			})
			});

			@@ -1605,7 +1710,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_MaterType.html', 'yes']
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_MaterType.html?HType=2', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -1635,7 +1740,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html?Type=2', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -1652,6 +1757,13 @@
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function (index, layero) {
			if (OptionData.length > 0) {
			$("#HSecUnitName").val(OptionData[0].è®¡éåä½åç§°);
			$("#HSecUnitID").val(OptionData[0].HItemID);
			}
			OptionData = [];
			}
			})
			});

			@@ -1722,7 +1834,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html', 'yes']
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?HType=2', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -1750,7 +1862,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html?Type=2', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -1767,6 +1879,13 @@
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function (index, layero) {
			if (OptionData.length > 0) {
			$("#HSALEUNITName").val(OptionData[0].è®¡éåä½åç§°);
			$("#HSALEUNITID").val(OptionData[0].HItemID);
			}
			OptionData = [];
			}
			})
			});
			//éæ©éå®è®¡ä»·è®¡éåä½
			@@ -1778,7 +1897,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html?Type=2', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -1795,6 +1914,13 @@
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function (index, layero) {
			if (OptionData.length > 0) {
			$("#HSALEPRICEUNITName").val(OptionData[0].è®¡éåä½åç§°);
			$("#HSALEPRICEUNITID").val(OptionData[0].HItemID);
			}
			OptionData = [];
			}
			})
			});
			//éæ©åºæ¬è®¡éåä½
			@@ -1806,7 +1932,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html?Type=2', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -1823,6 +1949,13 @@
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function (index, layero) {
			if (OptionData.length > 0) {
			$("#HBASEUNITName").val(OptionData[0].è®¡éåä½åç§°);
			$("#HBASEUNITID").val(OptionData[0].HItemID);
			}
			OptionData = [];
			}
			})
			});
			//éæ©åºåè®¡éåä½
			@@ -1834,7 +1967,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html?Type=2', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -1851,6 +1984,13 @@
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function (index, layero) {
			if (OptionData.length > 0) {
			$("#HSTOREUNITName").val(OptionData[0].è®¡éåä½åç§°);
			$("#HSTOREUNITID").val(OptionData[0].HItemID);
			}
			OptionData = [];
			}
			})
			});
			//éæ©éè´è®¡éåä½
			@@ -1862,7 +2002,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html?Type=2', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			@@ -1879,6 +2019,13 @@
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function (index, layero) {
			if (OptionData.length > 0) {
			$("#HPOUnitName").val(OptionData[0].è®¡éåä½åç§°);
			$("#HPOUnitID").val(OptionData[0].HItemID);
			}
			OptionData = [];
			}
			})
			});
			//æ¸ç©ºçé¢
			@@ -1952,6 +2099,27 @@
			tds.eq(3).find('.demo-reload').removeClass('layui-hide'); //æ¾ç¤ºä¸ä¼
			}
			});
			}
			//#endregion

			//#region è·åå¬å¸åï¼æ ¹æ®å¬å¸è¿è¡å®å¶åå¼å
			function defaintOperationByCompanyName() {
			var result = false;
			$.ajax({
			url: GetWEBURL() + '/Xt_getInfo/getCompanyName',
			async: false,
			type: "GET",
			data: {},
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.data == "ä¹ä¸") {
			result = true;
			}
			}
			}, error: function (e) {
			}
			});
			return result;
			}
			//#endregion

			@@ -2046,7 +2214,7 @@

			//è¿åä»åº
			function GetHWHValue(obj) {
			$("#HWhName").val(obj[0].HName);
			$("#HWhName").val(obj[0].ä»åºåç§°);
			$("#HWhID").val(obj[0].HItemID);
			}
			//è¿åè®¡éåä½ç»
			@@ -2060,19 +2228,19 @@
			$("#HProjectName").val(obj[0].é¡¹ç®ç»);
			$("#HProjectBillMainID").val(obj[0].HInterID);
			}

			//è¿åè®¡éåä½
			function GetHUnitNameValue(obj) {
			if ($("#UnitType").val() == 1) {
			$("#HUnitName").val(obj[0].HName);
			$("#HUnitID").val(obj[0].HItemID);
			}
			else if ($("#UnitType").val() == 2) {
			$("#HSecUnitName").val(obj[0].HName);
			$("#HSecUnitID").val(obj[0].HItemID);
			}
			//è¿åç©æåç±»
			function GetMaterTypeValue(obj) {
			$("#HMaterClsName").val(obj[0].åç§°);
			$("#HMaterTypeID").val(obj[0].HItemID);
			}

			//è¿åè®¡éåä½
			function GetUnitValue(obj) {
			OptionData = obj;
			}
			//æ¹æ¡è¿å
			function GetCheckProjectValue(obj) {
			OptionData = obj;
			}
			function previewImg(obj) {
			var img = new Image();
			img.src = obj.src;