MES-WEB-LayUI.git

			@@ -186,16 +186,6 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">å®¡æ¹æµ</label>
			<div class="layui-input-block">
			<select name="HCheckFlowList" id="HCheckFlowList" class="ForFilteringSchemes" lay-filter="HCheckFlowList" style="width:190px;">
			</select>
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -220,6 +210,7 @@
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>æ¥çå®¡æ¹è¿åº¦</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>å¤çº§å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>å¤çº§åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>å³é</button>
			@@ -283,7 +274,7 @@
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
			//#endregion

			var titleData = ["hmainid", "HBillType", "HCusID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//#region ãè¿æ»¤æ¹æ¡ã

			//è¿æ»¤æ¡ä»¶çclassç±»
			@@ -299,10 +290,6 @@
			//#endregion

			//#region å è½½é¡µé¢
			//#region å è½½å®¡æ¹æµ
			HCheckFlowList_Filter();
			//#endregion

			//#region åå§åçé¢
			set_ClearBill();
			//#endregion
			@@ -396,6 +383,9 @@
			break;
			//å¤çº§åå®¡æ ¸
			case 'set_AbandonCheck_Flow': set_CheckBill_Flow(1);
			break;
			//é©³å
			case 'set_RejectCheck_Flow': set_RejectCheck_Flow();
			break;
			//å®¡æ ¸
			case 'set_CheckBill': set_CheckBill(0);
			@@ -729,7 +719,35 @@
			};
			}
			//#endregion
			//#endregion çå¬ç½æ ¼è¡¨ä½äºä»¶
			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;

			//åæ®å·è¶é¾æ¥
			if (obj.event == 'åæ®å·') { //æ£æ¥ obj.event æ¯å¦çäºåç¬¦ä¸² 'åæ®å·'ãå¦æçäºï¼åæ§è¡ifå¾ªç¯
			var linterid = data.hmainid.toString(); //å£°æåélinterid ä¸º data.hmainid
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({ //ä½¿ç¨ layerçopenæå¼å¼¹åº å±
			type: 2 //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe
			, area: ['100%', '100%']
			, title: 'ç¼è¾' + HPageTitle //è®¾ç½®å¼¹åºå±çååååé
			, closeBtn: 1//æ¾ç¤ºå³éæé®
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../éå®ç®¡ç/éå®è®¢å/Add_Edit_Xs_SeOrderBillList.html?OperationType=3&linterid='+linterid+'& HSouceBillType=0&closeType=1' //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼

			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°
			end: function () { //å½å³éæ¶è°ç¨
			get_FastQuery(table, option);
			}
			, cancel: function () { //ç¹å»åæ¶æ¶ä½¿ç¨åè°
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			}
			});
			//#endregion
			//#region è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			@@ -740,13 +758,60 @@
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {



			var data = [];//ååæ®µæ°æ®
			var col = [];
			var totalArray = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {//å¾ªåºéåæ°ç»
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//ä»æ¯ä¸ªå¯¹è±¡ä¸æåæ°æ®
			}
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' });
			//è®¾ç½®åè¡¨åä¸ä¸ªåæ®åªæç¬¬ä¸æ¡æ°æ®æ¾ç¤ºä¸»è¡¨ä¿¡æ¯ï¼å¶å®è®°å½åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			//è·ååè¡¨åæ°æ®
			var colList = [];
			for (var i = 0; i < option.cols[0].length; i++) {
			colList.push(option.cols[0][i].field);
			}
			for (var i = 0; i < data.length; i++) {//éådataæ°ç»éçæ°æ®
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {//æ£æ¥dataãiã.nameæ¯å¦å¨æ°ç»ä¸ //è®¡ç®å
			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 if (data[i].name == 'åæ®å·') {
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·'
			, event: 'åæ®å·', templet: function (d) {
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;' });
			} else {
			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 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}
			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 800
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			}
			//è®¾ç½®æ°æ®
			var result = data1.data;
			@@ -768,7 +833,7 @@
			option.data = result;
			ins = table.render(option);
			layer.close(ajaxLoad);

			DisPlay_HideColumn();
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			@@ -1071,32 +1136,37 @@
			var InterID = data[0].hmainid.toString();
			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Xs_SeOrderBill/DropXs_SeOrderBill",
			data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			////ä¿®æ¹ä¸ºååå·æ°çé¢
			//if (get_needClose_Bar == 0) {
			// $("#btnSearch").trigger('click');
			//} else if (get_needClose_Bar == 1) {
			// $("#get_needClose").trigger('click');
			//}
			});
			if (data[0].ç¶æ == "åå»º") {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Xs_SeOrderBill/DropXs_SeOrderBill",
			data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			////ä¿®æ¹ä¸ºååå·æ°çé¢
			//if (get_needClose_Bar == 0) {
			// $("#btnSearch").trigger('click');
			//} else if (get_needClose_Bar == 1) {
			// $("#get_needClose").trigger('click');
			//}
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			});
			} else {
			layer.msg('è¯¥æ¡æ°æ®ä¸æ¯åå»ºç¶æ,æ æ³å é¤ï¼');

			}
			})
			}
			else {
			@@ -1540,12 +1610,11 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			var HCheckFlowID = $("#HCheckFlowList").val();
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Xs_SeOrderBill/StartCheckFlow_SeOrderBIll", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "HCheckFlowID_select": HCheckFlowID, "CurUserName": sessionStorage["HUserName"] },
			data: { "HInterID": InterID,"CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			@@ -1554,9 +1623,6 @@
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);



			//ä¿®æ¹ä¸ºååå·æ°çé¢
			if (get_needClose_Bar == 0) {
			$("#btnSearch").trigger('click');
			@@ -1579,6 +1645,41 @@
			}
			//#endregion

			//#region é©³å
			function set_RejectCheck_Flow() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Xs_SeOrderBill/RejectCheckFlow_POOrderBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "CurUserID": sessionStorage["Czybm"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			});
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å®¡æ ¸ï¼');
			}
			}
			//#endregion

			//#region æ¥çå®¡æ¹è¿åº¦
			function get_CheckFlowInfo() {
			var checkStatus = table.checkStatus('mainTable')
			@@ -1587,7 +1688,7 @@
			var hID = data[0].hmainid.toString();
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, area: ['70%', '70%']
			, title: 'åæ®å®¡æ¹è¿åº¦'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			@@ -1783,7 +1884,7 @@
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Xs_SeOrderBill/DeleteXs_SeOrderBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/Xs_SeOrderBill/CancellXs_SeOrderBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			@@ -2079,8 +2180,6 @@
			//$('#HEndDate').prop('disabled', false);
			}



			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery()
			form.render("select");
			@@ -2314,34 +2413,6 @@
			}
			})
			}

			//#region å®¡æ¹æµæ¾ç¤ºä¸ææ¡
			function HCheckFlowList_Filter() {
			sWhere_CheckFlowList = " and a.HBillTypeID='" + HBillType + "' and c.HUserID = '" + sessionStorage["Czybm"] + "' ";
			$.ajax({
			url: GetWEBURL() + '/Xt_CheckFlowProgressBill/getList_CheckFlowList',
			async: false,
			type: "GET",
			data: { "sWhere": sWhere_CheckFlowList, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			var data = data1.data;
			if (data1.count == 1) {
			var Organization = '<option value="' + data[0]["HInterID"] + '" selected="selected" >' + data[0]["å®¡æ¹æµ"] + '</option>';
			for (var i = 1; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i]["HInterID"] + '">' + data[i]["å®¡æ¹æµ"] + '</option>';
			}
			$("#HCheckFlowList").empty();
			$("#HCheckFlowList").append(Organization);
			form.render('select');
			} else {

			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#region åææ¾ç¤ºä¸ææ¡
			function ColFilter() {