MES-WEB-LayUI.git

			@@ -24,34 +24,34 @@
			<div class="layui-col-md12">
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group"
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div style="padding: 10px; ">
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_LookDown" lay-filter="btn_LookDown">å¼åº</button>
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">é¢è§</button>
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">æå°</button>
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_report" lay-filter="btn_report">æ±æ¥</button>
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">éåº</button>
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_LookDown" lay-filter="btn_LookDown">å¼åº</button>
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">é¢è§</button>
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_view" lay-filter="btn_view">æå°</button>
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="btn_report" lay-filter="btn_report">ä¸æ¨ä»»å¡æ±æ¥</button>
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" style="display:none;" id="get_Exit" lay-filter="get_Exit">éåº</button>
			</div>
			<div class="layui-tab layui-tab-card" style="margin-top:20px;" lay-filter="tab-TabTest">
			<ul class="layui-tab-title">
			<li lay-id="1" class="layui-this">æªå®æ</li>
			<li lay-id="2">æ£å¨è¿è¡</li>
			<li lay-id="3">å·²å®æ</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<!--æªå®æ-->
			<table class="layui-hide" id="mainTable_notcomplete" lay-filter="mainTable_notcomplete"></table>
			</div>
			<div class="layui-tab-item">
			<!--æ£å¨è¿è¡-->
			<table class="layui-hide" id="mainTable_proc" lay-filter="mainTable_proc"></table>
			</div>
			<div class="layui-tab-item">
			<!--å·²å®æ-->
			<table class="layui-hide" id="mainTable_finish" lay-filter="mainTable_finish"></table>
			</div>
			</div>
			<div class="layui-tab layui-tab-card" style="margin-top:20px;" >
			<ul class="layui-tab-title">
			<li class="layui-this">æªå®æ</li>
			<li>æ£å¨è¿è¡</li>
			<li>å·²å®æ</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<!--æªå®æ-->
			<table class="layui-hide" id="mainTable_notcomplete" lay-filter="mainTable_notcomplete"></table>
			</div>
			<div class="layui-tab-item">
			<!--æ£å¨è¿è¡-->
			<table class="layui-hide" id="mainTable_proc" lay-filter="mainTable_proc"></table>
			</div>
			<div class="layui-tab-item">
			<!--å·²å®æ-->
			<table class="layui-hide" id="mainTable_finish" lay-filter="mainTable_finish"></table>
			</div>
			</div>
			</div>
			<script type="text/html" id="toolbarDemo">

			@@ -83,8 +83,8 @@
			var option_finish = ""; //å·²å®æ
			var option_proc = ""; //æ£å¨è¿è¡
			var ins;
			var TableTab = "mainTable_notcomplete"; //åå§åé¡µé¢æ¶é»è®¤ä¸º âæªå®æâ é¡µç¾
			var cur_title = "æªå®æ"; //å½åéä¸é¡µç¾
			//var TableTab = "mainTable_notcomplete"; //åå§åé¡µé¢æ¶é»è®¤ä¸º âæªå®æâ é¡µç¾
			//var cur_title = "æªå®æ"; //å½åéä¸é¡µç¾
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -116,22 +116,6 @@
			form.on('submit(get_Exit)', function (data) {
			Pub_Close(2);
			});




			//çå¬å½åå¤äºåªä¸ä¸ªé¡µç¾ï¼ä¼ HModName å¼
			element.on('tab(tab-TabTest)', function (data) {
			HMaterInfo = table.cache['mainTable'];
			cur_title = data.elem.context.innerText;
			if (cur_title == "æªå®æ") {
			TableTab = "mainTable_notcomplete";
			} else if (cur_title == "å·²å®æ") {
			TableTab = "mainTable_finish";
			} else if (cur_title == "æ£å¨è¿è¡") {
			TableTab = "mainTable_proc";
			}
			})
			//#endregion

			//#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³
			@@ -159,6 +143,7 @@
			elem: '#mainTable_notcomplete'
			, toolbar: '#toolbarDemo'
			, page: true
			, totalRow: true
			, height: 300
			, cellMinWidth: 90
			, limit: 50
			@@ -174,6 +159,7 @@
			elem: '#mainTable_finish'
			, page: false
			, height: 500
			, totalRow: true
			, cellMinWidth: 90
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, cols: []
			@@ -186,6 +172,7 @@
			elem: '#mainTable_proc'
			, page: false
			, height: 500
			, totalRow: true
			, cellMinWidth: 90
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, cols: []
			@@ -204,6 +191,7 @@
			data: { "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			var totalArray = ["è¯ä¼°å·¥æ¶","å·²èç¨å·¥æ¶"]
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			@@ -216,6 +204,9 @@
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if ($.inArray(data[i].name, totalArray) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			}
			else {
			switch (data[i].Type) {
			@@ -237,6 +228,7 @@
			, data: data1.data.h_p_PM_WorkTaskBillMyList
			, height: 'full-80'
			, page: true
			, totalRow: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			@@ -251,6 +243,7 @@
			, data: data1.data.h_p_PM_WorkTaskBillMyList1
			, height: 'full-80'
			, page: true
			, totalRow: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			@@ -264,6 +257,7 @@
			, data: data1.data.h_p_PM_WorkTaskBillMyList2
			, height: 'full-80'
			, page: true
			, totalRow: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			@@ -275,7 +269,7 @@
			var HBillType = "æçä»»å¡";
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			//å·æ°è¡¨æ ¼æ°æ®
			//DisPlay_HideColumn();
			// DisPlay_HideColumn();

			layer.close(ajaxLoad);
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			@@ -298,47 +292,53 @@

			//#region å¯¼åºExecel
			function get_Export() {

			table.exportFile(ins.config.id, option_notcomplete.data, "xls");
			var data = option_notcomplete.data
			data.forEach((item) => {
			// å¦ææä¸ªåæ®µçå¼å¤ªé¿ï¼éè¦å»é¤æ¢è¡ç¬¦
			if (item.ä»»å¡æè¿°.length > 0) { // åè®¾åæ®µåä¸ºfield
			item.ä»»å¡æè¿° = item.ä»»å¡æè¿°.replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			});
			table.exportFile(ins.config.id, data, "xls");
			}
			//#endregion

			//#region æ±æ¥
			function get_report() {
			var checkStatus = table.checkStatus("mainTable_proc")
			, data = checkStatus.data;
			var activeTab = getActiveTab();

			if (activeTab == "æªå®æ") {
			var checkStatus = table.checkStatus('mainTable_notcomplete')
			, data = checkStatus.data;
			} else if (activeTab == "å·²å®æ") {
			var checkStatus = table.checkStatus('mainTable_finish')
			, data = checkStatus.data;
			} else if (activeTab == "æ£å¨è¿è¡") {
			var checkStatus = table.checkStatus('mainTable_proc')
			, data = checkStatus.data;
			}

			var HInterID = data[0].HInterID;
			var HEntryID = data[0].HEntryID;
			if (data.length == 1) {
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ°å¢äº§éæ±æ¥å',
			closeBtn: 1,
			shift: 2,
			area: ['100%', '100%'],
			maxmin: true,
			content: '../../çäº§ç®¡ç/äº§éæ±æ¥å/Sc_Add_ProductReportBillList.html?OperationType=2&linterid=&HSouceBillType=',
			end: function () {

			},
			success: function (dom, index) {
			var deliverData = [];
			deliverData.push({
			"HBillType": data[0].åæ®ç±»å,
			"HSourceInterID": data[0].HInterID,
			"HSourceEntryID": data[0].æºåååç ,
			"HSourceBillNo": data[0].æºååå·,
			"HSourceBillType": data[0].æºåç±»å
			});

			//éè¿ç´¢å¼è·åå°å½åiframeå¼¹åºå±
			var iframe = window['layui-layer-iframe' + index];
			//è°ç¨iframeå¼¹åºå±åçæ¹æ³
			iframe.edit(deliverData);
			},
			});
			} else {
			layer.msg('è¯·å¨ æ£å¨çäº§ é¡µç¾ä¸éæ©ä¸è¡æ°æ®å¼å·¥ï¼');
			}
			type: 2
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['100%', '100%']
			, title: 'å·¥ä½ä»»å¡-ä¸æ¨'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../é¡¹ç®ç®¡ç/å·¥ä½ä»»å¡/PM_WorkTaskReportBill.html?OperationType=2&linterid=' + HInterID + '&HSouceBillType='
			, btn: ['ç¡®å®'],
			// æé®1 çåè°
			btn1: function (index, layero, that) {
			//å·æ°é¡µé¢
			$("#btnSearch").trigger('click');
			}
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ä¸æ¨ï¼');
			}
			}
			//#endregion

			@@ -393,6 +393,20 @@
			}
			//#endregion

			// è·åæ ç¾
			function getActiveTab() {
			var tabs = document.getElementsByClassName("layui-tab-title")[0].getElementsByTagName("li");
			var activeTab;
			for (var i = 0; i < tabs.length; i++) {
			if (tabs[i].classList.contains("layui-this")) {
			activeTab = tabs[i].innerText;
			break;
			}
			}
			return activeTab;

			}

			//#region éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";