MES-WEB-LayUI.git

			@@ -702,14 +702,14 @@
			, loading: false
			, cols: [[ //åè¡¨
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', width: 100 }
			, { type: 'numbers', field: 'åºå·', title: 'åºå·', width: 100 }
			, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 150, style: 'background-color:#efefef4d;'}
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, style: 'background-color:#efefef4d;' }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100, style: 'background-color:#efefef4d;' }
			, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100, style: 'background-color:#efefef4d;'}
			, { field: 'HQty', title: 'æ°é', width: 100, totalRow: true }
			, { field: 'HQty', title: 'æ°é', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HPrice', title: 'åä»·', width: 100, style: 'background-color:#efefef4d;' }
			, { field: 'HMoney', title: 'ç»ç®éé¢', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HReceiveBillInterID', title: 'æ¥æ¶æºååç ', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			@@ -747,11 +747,13 @@
			//, { field: 'HSeContractInterID', title: 'éå®åååç ', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			//, { field: 'HSeContractEntryID', title: 'éå®ååååç ', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			//, { field: 'HSeContractBillNo', title: 'éå®ååå·', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			, { field: 'æä½' ,fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			}
			option.data = [];
			table.render(option);

			DisPlay_HideColumn();
			}
			//#endregion

			@@ -817,13 +819,14 @@
			//#region å¼¹çªé¡µé¢æ¹æ³
			//#region éæ©é¨é¨
			function get_checkDept() {
			var HOrgName = $('select[name="HOrgID"] option:selected').text();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'é¨é¨åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?Type=HWH&HOrgName=' + HOrgName, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -841,13 +844,14 @@
			//#endregion

			function get_checkEmp() {
			var HOrgID = $("#HOrgID").val();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä¸å¡ååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmp', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmp&HOrgID=' + HOrgID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -871,7 +875,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'å¸å«åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Currency.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Currency.html?Type=2', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -892,13 +896,14 @@

			//#region ä¸å¡åä½éæ©é¡µé¢
			function get_checkSup() {
			var HOrgName = $('select[name="HOrgID"] option:selected').text();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä¸å¡åä½åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html?Type=HSup', 'yes']
			, content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html?Type=HSup&HOrgName=' + HOrgName, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -986,7 +991,7 @@
			//#endregion


			//#region éæ©æºå-ä»æ¬¾å
			//#region éæ©æºå-åºä»å
			function setPayableBill(checkStatus) {
			var dataArray = [];

			@@ -997,10 +1002,10 @@
			layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + temp.åæ®å· + "ãåæ®ç¶æä¸ä¸ºå·²å®¡æ ¸ç¶æ!");
			return;
			}
			//if (temp.è¡ç¶æ == "å·²å³é") {
			// layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + temp.åæ®å· + "ãä¸éä¸çè®°å½ä¸åå¨å·²å³éç¶æçè®°å½!");
			// return;
			//}
			if (temp.è¡ç¶æ == "å·²å³é") {
			layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + temp.åæ®å· + "ãä¸éä¸çè®°å½ä¸åå¨å·²å³éç¶æçè®°å½!");
			return;
			}
			dataArray.push(temp);
			} else {
			return;
			@@ -1057,7 +1062,7 @@
			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].åæ®ç±»å
			, "HSourceBillType": '1114'
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

			@@ -1084,7 +1089,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'ç»ç®æ¹å¼åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/åºç¡èµæ/Gy_SettleStyle.html', 'yes']
			, content: ['../../åºç¡èµæ/åºç¡èµæ/Gy_SettleStyle.html?Type=2', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1118,13 +1123,14 @@

			//#region ç»ç®åä½éæ©é¡µé¢
			function get_checkAccSup() {
			var HOrgName = $('select[name="HOrgID"] option:selected').text();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ç»ç®åä½åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html?Type=HAccSup', 'yes']
			, content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html?Type=HAccSup&HOrgName=' + HOrgName, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1230,8 +1236,14 @@
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
			$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
			layer.msg("æäº¤æå");
			$('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
			if (data.Verify == "Y") //èªå¨å®¡æ ¸
			{
			$("#HInterID").val(data.HInterID);//è·åæäº¤æåè¿åçåæ®ä¸»ID
			set_CheckBill(0); //å®¡æ ¸
			}
			});

			}
			else {
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			@@ -1244,6 +1256,34 @@
			});
			}
			//#endregion

			//#region åå®¡æ ¸/å®¡æ ¸æ°æ®
			function set_CheckBill(num) {
			var InterID = $("#HInterID").val();
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/YF_PayMentBill/AuditYF_PayMentBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "IsAudit": num, "CurUserName": 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);
			});

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


			//#region ç¼è¾é¡µé¢åå§å
			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			@@ -1338,7 +1378,7 @@
			, "HSourceInterID": result.data[i].æºåä¸»åç
			, "HSourceEntryID": result.data[i].æºåååç
			, "HSourceBillNo": result.data[i].æºååå·
			, "HSourceBillType": 1114
			, "HSourceBillType": result.data[i].æºåç±»å
			, "HRelationQty": result.data[i].å³èæ°é
			, "HRelationMoney": result.data[i].å³èéé¢

			@@ -1530,13 +1570,17 @@
			}
			//#endregion

			//#region éèåè®¾ç½®
			//#region åè®¾ç½®
			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["title"] + ",";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}

			var colTitleName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colTitleName += option.cols[0][i]["title"] + ",";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			@@ -1546,7 +1590,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			@@ -1556,98 +1600,80 @@
			}
			})
			}
			//#endregion

			//#region æ¾ç¤ºåæ°æ®
			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async: false,
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "HBillType", "HSupID", "ä¸å¡ç¶æ", "HUnitID", "ä¾åºåä»£ç ", "ä¸å¡åä»£ç ", "HPriority", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');
			//åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
			if (dataCol.length == option.cols[0].length - 1) {
			//éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
			for (var j = 0; j < option.cols[0].length - 1; j++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[j].split('\|');
			//éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
			if (option.cols[0][i + 1]["field"] == dataCols[4]) {
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			newCols[0].push(option.cols[0][i + 1]);
			}
			}

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			if (dataCol.length == newCols[0].length - 1) {
			option.cols = newCols;
			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			}
			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			table.render(option);
			var HBillType = "1102";
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			} else {
			table.render(option);
			var HBillType = "1102";
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			@@ -1745,6 +1771,10 @@
			//#endregion

			});
			//åå»è¿åè´§å¸
			function GetGyCur(data) {
			OptionData = data
			}
			//#region è·ååæ°_ä¼ éçJSONæ ¼å¼åæ°
			function getUrlVars_JSON() {
			var datajson;