MES-WEB-LayUI.git

			@@ -18,6 +18,7 @@
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/layui-common-custom.js"></script>
			<style type="text/css">
			.layui-table-click {
			background: #ceedfa;
			@@ -94,6 +95,8 @@
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>

			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnzManual" id="btnResCnzManual" style="padding:0 5px">æå·¥åæ¥</button>
			</div>
			<div class="layui-inline">
			<div class="layui-row" style="margin-top:5px">
			@@ -210,7 +213,7 @@
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>è¯»åæ¹æ¡</button>
			</div>
			</script>
			<table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
			<table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
			<script type="text/html" id="toolbarDemoSub">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>è¡å³é</button>
			@@ -291,8 +294,8 @@
			case 'btn-Delete': set_DeleteBill();
			break;
			//æµè§
			case 'btn-view': get_ViewReport();
			break;
			//case 'btn-view': get_ViewReport();
			// break;
			//æå°
			case 'btn-print': get_PrintReport();
			break;
			@@ -383,6 +386,11 @@
			set_ClearQuery();
			});

			//æå·¥åæ¥æé®
			form.on('submit(btnResCnzManual)', function (data) {
			get_ResCnzManual(layer, HBillType, get_FastQuery)
			})

			table.on('tool(mainTable)' , function (obj) {
			var data = obj.data;
			if (obj.event == 'åæ®å·') {
			@@ -452,7 +460,7 @@
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			////ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option,1)

			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			@@ -463,108 +471,13 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-330'
			, height: 'full-300'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 150, }
			, { field: 'ç¶æ', title: 'ç¶æ', width: 100, sort: true }
			, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
			, { field: 'è¡ç¶æ', title: 'è¡ç¶æ', width: 125, sort: true }
			, { field: 'ä¾åºå', title: 'ä¾åºå', width: 150 }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
			//, { field: 'HBillType', title: 'HBillType', hide: true }
			//, { field: 'HSupID', title: 'HSupID', hide: true }
			//, { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100, hide: true }
			, { field: 'åéç¶æ', title: 'åéç¶æ', width: 100 }
			, { field: 'åå¸ç¶æ', title: 'åå¸ç¶æ', width: 100 }
			, { field: 'ä¾åºåååç¶æ', title: 'ä¾åºåååç¶æ', width: 135 }/ç©æä»£ç ï¼ç©æåç§°ï¼è§æ ¼åå·ï¼æ¹å·ï¼æ°éï¼åä½ï¼æºååå·/
			, { field: 'åé¦ç¶æ', title: 'ä¾åºååé¦ç¶æ', width: 135 }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 120 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 130 }
			, { field: 'æ§ç©æç¼ç ', title: 'æ§ç©æç¼ç ', width: 130 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 130 }
			, { field: 'æ°é', title: 'è®¢åæ°é', width: 100, totalRow: true }
			, { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120, totalRow: true }
			/* å®çæ°å¢åæ®µ begin */
			, { field: 'å¯æå°æ¡ç æ°é', title: 'å¯æå°æ¡ç æ°é', width: 120, totalRow: true}
			/* å®çæ°å¢åæ®µ end */
			, { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120, totalRow: true}
			, { field: 'æªå³èæ°é', title: 'å¯åè´§æ°é', width: 120, totalRow: true}
			/* å®çæ°å¢åæ®µ begin */
			, { field: 'éææ°é', title: 'éææ°é', width: 120, totalRow: true}
			, { field: 'å®æ¶æ°é', title: 'å®æ¶æ°é', width: 120, totalRow: true}
			, { field: 'å¥åºæ°é', title: 'å¥åºæ°é', width: 120, totalRow: true}
			, { field: 'å©ä½å¥åºæ°é', title: 'å©ä½å¥åºæ°é', width: 120, totalRow: true}
			, { field: 'å©ä½æ¶ææ°é', title: 'å©ä½æ¶ææ°é', width: 120, totalRow: true}
			/* å®çæ°å¢åæ®µ end */
			, { field: 'å®æç¶æ', title: 'å®æç¶æ', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			//, { field: 'HUnitID', title: 'HUnitID', hide: true } éå¤
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 120 , hide: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100 }
			, { field: 'æ¹å·', title: 'æ¹å·', width: 100 }
			, { field: 'æ°é', title: 'æ°é', width: 100, totalRow: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 100 }
			//, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120, hide: true}
			//, { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', width: 100, hide: true}
			//, { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
			, { field: 'ä¼åçº§', title: 'ä¼åçº§', width: 100 }
			, { field: 'äº¤è´§å°ç¹', title: 'äº¤è´§å°ç¹', width: 100}
			, { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
			, { field: 'éè´æ¹å¼ä»£ç ', title: 'éè´æ¹å¼ä»£ç ', width: 120, hide: true }
			, { field: 'éè´æ¹å¼', title: 'éè´æ¹å¼', width: 100}
			, { field: 'HSSID', title: 'HSSID', hide: true }
			, { field: 'ç»ç®æ¹å¼ä»£ç ', title: 'ç»ç®æ¹å¼ä»£ç ', width: 120}
			, { field: 'ç»ç®æ¹å¼', title: 'ç»ç®æ¹å¼', width: 100}
			, { field: 'ç»ç®æ¥æ', title: 'ç»ç®æ¥æ', width: 120, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.ç»ç®æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'HCurID', title: 'HCurID', hide: true }
			, { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ', width: 100, hide: true }
			, { field: 'å¸å«', title: 'å¸å«', width: 100}
			, { field: 'æ±ç', title: 'æ±ç', width: 100}
			, { field: 'HDeptID', title: 'HDeptID', hide: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 100, hide: true }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 100}
			, { field: 'HManagerID', title: 'HManagerID', hide: true }
			, { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ', width: 100, hide: true }
			, { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', width: 100}
			, { field: 'HEmpID', title: 'HEmpID', hide: true }
			, { field: 'æè¦', title: 'æè¦', width: 100 }
			, { field: 'HWHID', title: 'ä¸»è¡¨ä»åºID', width: 120, hide: true}
			, { field: 'ä»åº', title: 'ä¸»è¡¨ä»åº', width: 100, hide: true}
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 100}
			, { field: 'hsubid', title: 'hsubid', hide: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true }
			, { field: 'åä»·', title: 'åä»·', width: 100}
			, { field: 'éé¢', title: 'éé¢', width: 100, totalRow: true }
			, { field: 'ç¨ç', title: 'ç¨ç', width: 100}
			, { field: 'ç¨é¢', title: 'ç¨é¢', width: 100}
			, { field: 'ææ£ç', title: 'ææ£ç', width: 100}
			, { field: 'ä»·ç¨åè®¡', title: 'ä»·ç¨åè®¡', width: 100}
			, { field: 'äº¤è´§æ¥æ', title: 'äº¤è´§æ¥æ', width: 120, templet: "<div>{{d.äº¤è´§æ¥æ ==null ?'':layui.util.toDateString(d.äº¤è´§æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', width: 100}
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 100}
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 100}
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 100}
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 120, templet: "<div>{{d.å®¡æ ¸æ¥æ ==null ?'':layui.util.toDateString(d.å®¡æ ¸æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 100}
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 120, templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 100}
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 120, templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'è¡å³éäºº', title: 'è¡å³éäºº', width: 125, sort: true }
			, { field: 'è¡å³éæ¥æ', title: 'è¡å³éæ¥æ', width: 200, templet: "<div>{{d.è¡å³éäºº == ''?'':layui.util.toDateString(d.è¡å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 100}
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 120, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }

			]]
			, cols: [[]]

			, done: function (res, curr, count) {
			soulTable.render(this);
			@@ -574,8 +487,8 @@
			optionSub = {
			elem: '#mainTableSub'
			, toolbar: '#toolbarDemoSub'
			, height: 'full-500'
			, page: true
			//, height: 'full-500'
			, page: false
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			@@ -593,6 +506,7 @@
			$.ajax({
			url: GetWEBURL() + '/Cg_POOrderBill/QueryList',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere , "user": sessionStorage["HUserName"]},
			success: function (data1) {
			if (data1.count == 1) {
			@@ -611,7 +525,7 @@
			}
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'radio', fixed: 'left', totalRowText: 'åè®¡'});
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡'});
			for (var i = 0; i < data.length; i++) {
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			@@ -635,7 +549,7 @@
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name=="è¡å³éæ¥æ"?"è¡å³éäºº":data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{layui.util.toDateString(d." + (data[i].name != "æ¥æ" ? data[i].name + ", 'yyyy-MM-dd HH:mm:ss'" : data[i].name +", 'yyyy-MM-dd'")+")}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			@@ -800,7 +714,7 @@
			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {

			if (data[0].ç¶æ == "åå»º") {
			/if (data[0].ç¶æ == "åå»º") {/
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cg_POOrderBill/DeltetCg_POOrderBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			@@ -825,10 +739,10 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			} else {
			layer.msg('è¯¥æ¡æ°æ®ä¸æ¯åå»ºç¶æ,æ æ³å é¤ï¼');
			//} else {
			// layer.msg('è¯¥æ¡æ°æ®ä¸æ¯åå»ºç¶æ,æ æ³å é¤ï¼');

			}
			//}

			})
			}
			@@ -847,10 +761,7 @@
			}
			else {

			var hmainid = [];
			for (var i = 0; i < checkStatus.data.length; i++) {
			hmainid.push((data[i].hmainid * (10 ** 8)) + data[i].hsubid)
			}
			var hmainid = data[0].hmainid.toString();

			layer.open({
			type: 2
			@@ -859,7 +770,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid.toString() + '&MyMsg=' + hmainid.toString() + '&Type=HPOOrderBill', 'yes']
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + hmainid.toString() + '&MyMsg=' + hmainid.toString() + '&Type=HPOOrderBillByID', 'yes']
			, resize: false
			})
			}
			@@ -1279,15 +1190,10 @@
			var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ææ¥æ
			$('#HStatus').find("option[value='-1']").attr("selected", true);
			$("#HBillNo").val("");
			$("#HEmpName").val("");
			$("#HMaterNumber").val("");
			$("#HOldMaterNumber").val("");
			$("#HMaterShortNumber").val("");
			$("#HMaterName").val("");
			$("#HSupName").val("");
			$("#HOrgID").val(sessionStorage["OrganizationID"]);
			/$("#HOrgID").val(sessionStorage["OrganizationID"]);/
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			@@ -1332,7 +1238,6 @@
			}
			});
			}

			//#endregion
			//å·æ°
			function set_Refresh() {
			@@ -1416,6 +1321,10 @@
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = true;
			}

			}
			@@ -1534,7 +1443,10 @@
			if (dataCols[4] != null && dataCols[4] != "") {
			optionSub.cols[0][i + 1]["title"] = dataCols[4];
			}

			//ç»è®¡å
			if (dataCols[6] == 1) {
			optionSub.cols[0][i + 1]["totalRow"] = true;
			}
			}

			//åæ¶å»ç»å
			@@ -1576,15 +1488,26 @@

			//#region è¡ç¹å»äºä»¶
			table.on('row(mainTable)', function (obj) {

			//éä¸è¡æ¹åé¢è²
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			//æ¾ç¤ºåè¡¨
			get_DisplaySub(obj.data);
			//å¤ææ¯å¦å·²ç»è¢«éä¸
			if (obj.tr.find('.layui-form-radioed').length == 0) {
			//è§¦ååéæ¡éä¸äºä»¶
			obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
			}



			})
			//åè¡¨åé
			table.on('row(mainTableSub)', function (obj) {
			@@ -1596,6 +1519,22 @@
			})
			//#endregion

			//#region æåºåéæ©
			table.on('sort(mainTable)', function (obj) { //æ³¨ï¼sort æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			table.reload('mainTable', {
			initSort: obj //è®°å½åå§æåºï¼å¦æä¸è®¾çè¯ï¼å°æ æ³æ è®°è¡¨å¤´çæåºç¶æã layui 2.1.1 æ°å¢åæ°
			, where: { //è¯·æ±åæ°ï¼æ³¨æï¼è¿éé¢çåæ°å¯ä»»æå®ä¹ï¼å¹¶éä¸é¢åºå®çæ ¼å¼ï¼
			field: obj.field //æåºåæ®µ å¨æ¥å£ä½ä¸ºåæ°åæ®µ field order
			, order: obj.type //æåºæ¹å¼ å¨æ¥å£ä½ä¸ºåæ°åæ®µ field order
			}
			});
			option.data = layui.table.cache["mainTable"];
			table.render(option);
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			});
			//#endregion

			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			@@ -1691,7 +1630,7 @@
			//éèæ¾ç¤ºè¿æ»¤æ¹æ¡çæ ç¾ä¿¡æ¯
			document.getElementById("HFilterScheme_Now").style.display = "none";
			////æ§è¡æ¥è¯¢æ¹æ³
			//get_FastQuery()
			get_FastQuery()
			//form.render("select");
			}
			}, error: function () {
			@@ -1885,7 +1824,7 @@
			var addSWhere = "";

			if (openType == 2) {
			addSWhere = " and ç¶æ = 'å·²å®¡æ ¸' and è¡ç¶æ = '' and HOrgID = " + HOrgID;
			addSWhere = " and å®¡æ ¸äºº! = '' and å³éäºº = ''";
			}
			return addSWhere;
			}