MES-WEB-LayUI.git

			@@ -159,7 +159,7 @@
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;display:none;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			@@ -215,6 +215,7 @@
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print_StockIn" lay-event="btn-print_StockIn"><i class="layui-icon layui-icon-form"></i>æå°(å¥åºç å)</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			@@ -396,6 +397,9 @@
			//æå°
			case 'btn-print': get_PrintReport();
			break;
			//æå°ï¼å¥åºç åï¼
			case 'btn-print_StockIn': btn_print_StockIn();
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			@@ -448,7 +452,7 @@
			table.render(option);
			layer.close(ajaxLoad);

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
			ColFilter();
			}
			} else {
			@@ -526,8 +530,8 @@
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);
			//$('#HBeginDate').prop('disabled', true);
			//$('#HEndDate').prop('disabled', true);

			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			@@ -539,8 +543,8 @@
			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			//$('#HBeginDate').prop('disabled', false);
			//$('#HEndDate').prop('disabled', false);
			}
			});
			//#endregion
			@@ -556,11 +560,11 @@
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);
			//$('#HBeginDate').prop('disabled', true);
			//$('#HEndDate').prop('disabled', true);
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			//$('#HBeginDate').prop('disabled', false);
			//$('#HEndDate').prop('disabled', false);
			}

			//æ ¹æ®æ¥æé´éè®¾ç½®å¼å§æ¶é´ä¸ç»ææ¶é´
			@@ -569,12 +573,12 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_FastQuery();
			//get_FastQuery();
			//get_Display(sWhere);
			DisPlay_HideColumn();

			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();
			DisPlay_HideColumn();
			}
			//#endregion

			@@ -598,6 +602,7 @@
			, { field: 'ç¶æ', title: 'ç¶æ', width: 125, sort: true }
			, { field: 'è¡ç¶æ', title: 'è¡ç¶æ', width: 125, sort: true }
			, { field: 'æ¯å¦ä¸æ¨çäº§è®¢å', title: 'æ¯å¦ä¸æ¨çäº§è®¢å', width: 125, sort: true }
			, { field: 'å®éæ¯ä¾', title: 'å®éæ¯ä¾%', sort: true }
			, { field: 'æ¯å¦ååºå', title: 'æ¯å¦ååºå', width: 125, sort: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', sort: true }
			@@ -622,6 +627,7 @@
			, { field: 'å«ç¨åä»·', title: 'å«ç¨åä»·', sort: true }
			, { field: 'éé¢', title: 'éé¢', sort: true, totalRow: true }
			, { field: 'ä»·ç¨åè®¡', title: 'ä»·ç¨åè®¡', sort: true, totalRow: true }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', sort: true }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', sort: true }
			, { field: 'ææ', title: 'ææ', sort: true }
			, { field: 'æ·±å å·¥', title: 'æ·±å å·¥', sort: true }
			@@ -642,6 +648,7 @@
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 200, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'HWhID', title: 'HWhID', hide: true, sort: true }
			, { field: 'åä»åº', title: 'åä»åº', hide: true, sort: true }
			, { field: 'ç©æåç±»', title: 'ç©æåç±»', sort: true }

			//, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
			//, { field: 'äº¤è´§å°å', title: 'äº¤è´§å°å', width: 125, sort: true }
			@@ -667,7 +674,7 @@
			//, { field: 'ç¨é¢', title: 'ç¨é¢', sort: true }
			//, { field: 'æºååå·', title: 'æºååå·', sort: true }
			//, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', sort: true }
			//, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', sort: true }

			]]
			, done: function (res, curr, count) {
			soulTable.render(this);
			@@ -737,7 +744,7 @@
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);


			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
			ColFilter();
			}
			} else {
			@@ -1435,7 +1442,7 @@
			get_needClose_Bar = 1;

			//ä¸ºè¿æ»¤æ¡ä»¶å¢å æåº
			sWhere_Bak += " and å©ä½è®¢é>0 and å©ä½è®¢é<=1000 and å³éäºº='' and è¡å³éäºº='' and ç¶æ = 'å·²å®¡æ ¸' order by åæ®å· desc";
			sWhere_Bak += " and å©ä½è®¢é>0 and å©ä½è®¢é<=1000 and å³éäºº='' and è¡å³éäºº='' and ç¶æ = 'å·²å®¡æ ¸' and HCusID <> 166351 order by åæ®å· desc";

			//è·åæåºåçæ°æ®å¹¶éæ°æ¸²æ
			var ajaxLoad = layer.load();
			@@ -1474,7 +1481,7 @@
			table.render(option);
			layer.close(ajaxLoad);

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
			ColFilter();
			}
			} else {
			@@ -1686,6 +1693,34 @@
			}
			//#endregion

			//#region æå°ï¼å¥åºç åï¼
			function btn_print_StockIn() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {

			if (data[0].ç¶æ != "å·²å®¡æ ¸") {
			layer.alert("æå°å¤±è´¥!åå ï¼åæ®ç¶æä¸ä¸º'å·²å®¡æ ¸'ç¶æ!!", { icon: 5 });
			return;
			}

			layer.open({
			type: 2
			, area: ['50%', '50%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Xs_SeOrderBill_StockInCodeNote', 'yes']
			, resize: false
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®æå°ï¼');
			}
			}
			//#endregion

			//#region å¯¼åºExecel
			function get_Export() {
			var ModRightNameCheck = "Xs_SeOrderBillList_ExportExcel";
			@@ -1848,6 +1883,11 @@
			data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
			success: function (data1) {
			if (data1.count == 1) {
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
			ColFilter();
			}


			//å½åç¨æ·è®¾ç½®æé»è®¤çè¿æ»¤æ¹æ¡
			var data = data1.data;
			//å½åéæ©çè¿æ»¤æ¹æ¡
			@@ -1873,8 +1913,8 @@
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			//è¥æ¥æé´éä¸ä¸º ä»»æé´éï¼åç¦ç¨å¼å§æ¥æä¸ç»ææ¥æçéæ©
			if (HInitTimeCycle != -1) {
			$('#HBeginDate').prop('disabled', true);
			$('#HEndDate').prop('disabled', true);
			//$('#HBeginDate').prop('disabled', true);
			//$('#HEndDate').prop('disabled', true);

			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			@@ -1886,8 +1926,8 @@
			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			//$('#HBeginDate').prop('disabled', false);
			//$('#HEndDate').prop('disabled', false);
			}