MES-WEB-LayUI.git

			@@ -59,19 +59,19 @@
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-inline">
			<div class="layui-inline" style="display:none;">
			<label class="layui-form-label">ç½å¯åå¸åè®¡å¬æ¤æ°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="SumHMaterOutQty" id="SumHMaterOutQty" disabled="disabled">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-inline" style="display:none;">
			<label class="layui-form-label">æååºç«åè®¡å¬æ¤æ°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="SumDyeColorOut" id="SumDyeColorOut" disabled="disabled">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-inline" style="display:none;">
			<label class="layui-form-label">å·®é¢</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="SumCompare" id="SumCompare" disabled="disabled">
			@@ -175,6 +175,8 @@
			var sWhere = "";
			var option = [];
			var HModName = "ProdProcessSumReport_DyeColor";

			var titleData = ["HCusID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//#endregion

			//#region è¿å¥é¡µé¢æ¢å è½½
			@@ -228,6 +230,42 @@
			});
			});

			//è¡çå¬äºä»¶-åå»
			table.on('rowDouble(mainTable)', function (obj) {
			//éä¸é«äº® åå»è¡
			obj.tr.find(':checkbox').prop('checked', true);
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = true;
			}
			});

			//ä¸æ¨
			var sBillNo = obj.data["çäº§è®¢åå·"];
			layer.open({
			type: 2
			, area: ['90%', '90%']
			, title: 'æåæç»æ¥è¡¨'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: 'Kf_ProdProcessEntryReport_DyeColor.html?sBillNo=' + sBillNo
			, resize: false
			, btn: ["ç¡®å®", "åæ¶"]
			, end: function () {
			//å·æ°é¡µé¢,
			//location.reload();
			}
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})

			});

			//#endregion

			@@ -283,6 +321,10 @@
			com = " and (" + ColName + " " + com + ")";
			}

			//æ ¹æ®ç¨æ·è¿æ»¤ç¨æ·å³èå®¢æ·çè®°å½
			var OtherSearch = getSWhereByHUser();


			sWhere = {
			HBeginDate: HBeginDate
			, HEndDate: HEndDate
			@@ -291,6 +333,7 @@
			, HProductName: HProductName
			, HProductModel: HProductModel
			, RandomSearch: com
			, OtherSearch: (OtherSearch == null \|\| OtherSearch == "undefine") ? " and 1=1 " : OtherSearch
			}
			sWhere = JSON.stringify(sWhere);

			@@ -299,7 +342,7 @@
			url: GetWEBURL() + "/ProdProcessSumReport/ProdProcessSumReport_DyeColor",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			//async: false,
			success: function (data1) {

			@@ -315,7 +358,7 @@
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, "") > -1) {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if (data[i].ColName == 'ç½å¯åå¸') {
			@@ -401,7 +444,7 @@
			$.ajax({
			url: GetWEBURL() + '/ProdProcessSumReport/ProdProcessSumReport_DyeColor',
			type: "GET",
			data: { "sWhere": sWhere },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			//è°æ´æ¥ææ ¼å¼ï¼æ¾ç¤º å¹´ææ¥ å æ¶
			@@ -496,14 +539,19 @@
			com = " and (" + ColName + " " + com + ")";
			}

			//æ ¹æ®ç¨æ·è¿æ»¤ç¨æ·å³èå®¢æ·çè®°å½
			var OtherSearch = getSWhereByHUser();


			sWhere = {
			HBeginDate: HBeginDate
			, HEndDate: HEndDate
			,HMaterNumber: HMaterNumber
			, HMaterNumber: HMaterNumber
			, HBillNo: HBillNo
			, HProductName: HProductName
			, HProductModel: HProductModel
			, RandomSearch:com
			, RandomSearch: com
			, OtherSearch: (OtherSearch == null \|\| OtherSearch == "undefine") ? " and 1=1 " : OtherSearch
			}
			//set_InitGrid(JSON.stringify(sWhere));
			get_Display(JSON.stringify(sWhere));
			@@ -566,11 +614,11 @@
			if (data1.data.length != 0) {

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			/var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±/

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			@@ -664,6 +712,31 @@
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
			}
			}


			//#region æ ¹æ®ç¨æ·è·åç¨æ·å³èå®¢æ·çè¿æ»¤æ¡ä»¶
			function getSWhereByHUser() {
			var res = "";
			$.ajax({
			type: "GET",
			async: false,
			url: GetWEBURL() + "/Xs_SeOrderBill/getCusIDListByUser", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "CurUserID": sessionStorage["Czybm"], "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			res = result.data;
			} else {
			res = result.data;
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function (err) {
			res = " and 1 = 0";
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			return res;
			}
			//#endregion
			//#endregion
			});
			</script>