MES-WEB-LayUI.git

			@@ -15,8 +15,7 @@
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<!--<script src="../../../layuiadmin/xlsx.full.min.js"></script>-->
			<script src="https://cdn.bootcdn.net/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
			<script src="../../../layuiadmin/xlsx.full.min.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -81,6 +80,13 @@
			<input type="text" class="layui-input" name="HMoneyTotalSum" id="HMoneyTotalSum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ééæ»åè®¡</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HWeightTotalSum" id="HWeightTotalSum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<span>å¨</span>
			</div>
			<div class="layui-row" style="position:relative; left:30px;">
			<div class="layui-inline" style="width:450px;">
			@@ -103,6 +109,13 @@
			<input type="text" class="layui-input" name="HMoneySum" id="HMoneySum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ¶¤çº¶ééåè®¡</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HWeightSum" id="HWeightSum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<span>å¨</span>
			</div>
			<div class="layui-row" style="position:relative; left:30px;">
			<div class="layui-inline" style="width:450px;">
			@@ -125,6 +138,13 @@
			<input type="text" class="layui-input" name="HMoneySum_YM" id="HMoneySum_YM" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç¾æ¯ééåè®¡</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HWeightSum_YM" id="HWeightSum_YM" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<span>å¨</span>
			</div>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:5px">
			@@ -154,6 +174,61 @@
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</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="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</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="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -164,9 +239,15 @@
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" 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" lay-event="get_export_normal" id="get_export_normal"><i class="layui-icon layui-icon-export"></i>å¯¼åº(å¸¸è§)</button>
			<button type="button" class="layui-btn layui-btn-sm" 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" lay-event="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			</div>
			</script>
			<script type="text/html" id="toolbarDemo1">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export_normal" id="get_export_normal"><i class="layui-icon layui-icon-export"></i>å¯¼åº(å¸¸è§)</button>
			</div>
			</script>
			</form>
			@@ -200,6 +281,11 @@
			//å¯¼åºåè½è·åæ°æ®
			var option_Bak = {};
			var option1_Bak = {};
			var sWhere_Bak = "";


			var ins1;
			var ins2;
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -223,6 +309,10 @@
			case 'get_export':
			get_Export();
			break;
			//å¯¼åºexcel
			case 'get_export_normal':
			get_Export_Normal();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			@@ -231,6 +321,17 @@
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "Kf_SellOutEntryReport";
			get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			};
			});
			//#endregion

			//#region å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable1)', function (obj) {
			switch (obj.event) {
			//å¯¼åºexcel
			case 'get_export_normal':
			get_Export1_Normal();
			break;
			};
			});
			@@ -313,10 +414,32 @@
			, totalRow: true
			//, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 50000]
			, limits: [50, 500, 5000, 20000]
			};

			option1 = {
			elem: '#mainTable1'
			, toolbar: '#toolbarDemo1'
			, height: 'full-50'
			, page: true
			, totalRow: true
			//, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			};

			option_Bak = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, totalRow: true
			//, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			};

			option1_Bak = {
			elem: '#mainTable1'
			//, toolbar: '#toolbarDemo'
			, height: 'full-50'
			@@ -324,7 +447,7 @@
			, totalRow: true
			//, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 50000]
			, limits: [50, 500, 5000, 20000]
			};
			}
			//#endregion
			@@ -339,7 +462,7 @@
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "userid": sessionStorage["Czybm"]},
			success: function (data1) {
			if (data1.count == 1) {
			var totalArray = ["ä»¶æ°", "ç±³æ°","éé¢"];
			var totalArray = ["ä»¶æ°", "ç±³æ°","éé¢","éé_å¨"];
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			@@ -376,22 +499,20 @@
			option1.cols = [col];
			option1.data = data1.data[1];

			//è·åå¯¼åºæ°æ®
			option_Bak = option;
			option1_Bak = option1;


			//è®¾ç½®è¡¨1ï¼åè¡¨åä¸ä¸ªåæ®åªæç¬¬ä¸æ¡æ°æ®æ¾ç¤ºä¸»è¡¨ä¿¡æ¯ï¼å¶å®è®°å½åªæ¾ç¤ºåè¡¨ä¿¡æ¯ï¼åè®¡æ°æ®
			//è®¾ç½®æ°æ®ï¼å£°æè®¡ç®åè®¡çåé
			var HPieceQtyTotalSum = 0;
			var HQtyTotalSum = 0;
			var HMoneyTotalSum = 0;
			var HWeightTotalSum = 0;
			var HPieceQtySum = 0;
			var HQtySum = 0;
			var HMoneySum = 0;
			var HWeightSum = 0;
			var HPieceQtySum_YM = 0;
			var HQtySum_YM= 0;
			var HMoneySum_YM = 0;
			var HWeightSum_YM = 0;
			//è·ååè¡¨åæ°æ®
			var colList = [];
			for (var i = 0; i < option.cols[0].length; i++) {
			@@ -405,6 +526,7 @@
			HPieceQtySum += result[i]["ä»¶æ°"] * 1;
			HQtySum += result[i]["ç±³æ°"] * 1;
			HMoneySum += result[i]["éé¢"] * 1;
			HWeightSum += result[i]["éé_å¨"] * 1;

			//è®¾ç½®åªæ¾ç¤ºåæ®çç¬¬ä¸è¡ä¸»è¡¨ä¿¡æ¯ï¼å¶ä»è¡åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			if (temp != result[i]["hmainid"]) {
			@@ -433,6 +555,7 @@
			HPieceQtySum_YM += result1[i]["ä»¶æ°"] * 1;
			HQtySum_YM += result1[i]["ç±³æ°"] * 1;
			HMoneySum_YM += result1[i]["éé¢"] * 1;
			HWeightSum_YM += result1[i]["éé_å¨"] * 1;

			//è®¾ç½®åªæ¾ç¤ºåæ®çç¬¬ä¸è¡ä¸»è¡¨ä¿¡æ¯ï¼å¶ä»è¡åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			if (temp1 != result1[i]["hmainid"]) {
			@@ -452,22 +575,29 @@
			option1.data = result1;

			//æ¸²æè¡¨1ãè¡¨2
			table.render(option);
			table.render(option1);
			ins1 = table.render(option);
			ins2 = table.render(option1);
			DisPlay_HideColumn();

			HPieceQtyTotalSum = HPieceQtySum + HPieceQtySum_YM;
			HQtyTotalSum = HQtySum + HQtySum_YM;
			HMoneyTotalSum = HMoneySum + HMoneySum_YM;
			HWeightTotalSum = (HWeightSum.toFixed(2) * 1) + (HWeightSum_YM.toFixed(2) * 1);

			$("#HPieceQtySum").val(fixed(HPieceQtySum*1));
			$("#HQtySum").val(fixed(HQtySum.toFixed(2)*1));
			$("#HMoneySum").val(fixed(HMoneySum.toFixed(2)*1));
			$("#HQtySum").val(fixed(HQtySum.toFixed(6)*1));
			$("#HMoneySum").val(fixed(HMoneySum.toFixed(6) * 1));
			$("#HWeightSum").val(fixed(HWeightSum.toFixed(2) * 1));
			$("#HPieceQtySum_YM").val(fixed(HPieceQtySum_YM*1));
			$("#HQtySum_YM").val(fixed(HQtySum_YM.toFixed(2)*1));
			$("#HMoneySum_YM").val(fixed(HMoneySum_YM.toFixed(2)*1));
			$("#HQtySum_YM").val(fixed(HQtySum_YM.toFixed(6)*1));
			$("#HMoneySum_YM").val(fixed(HMoneySum_YM.toFixed(6) * 1));
			$("#HWeightSum_YM").val(fixed(HWeightSum_YM.toFixed(2) * 1));
			$("#HPieceQtyTotalSum").val(fixed(HPieceQtyTotalSum*1));
			$("#HQtyTotalSum").val(fixed(HQtyTotalSum.toFixed(2)*1));
			$("#HMoneyTotalSum").val(fixed(HMoneyTotalSum.toFixed(2)*1));
			$("#HQtyTotalSum").val(fixed(HQtyTotalSum.toFixed(6)*1));
			$("#HMoneyTotalSum").val(fixed(HMoneyTotalSum.toFixed(6) * 1));
			$("#HWeightTotalSum").val(fixed(HWeightTotalSum.toFixed(2) * 1));



			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			@@ -519,6 +649,12 @@
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			var ColName1 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			@@ -541,6 +677,48 @@
			}
			sWhere += " and " + ColName + " " + com;
			}
			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			sWhere += " and " + ColName1 + " " + com1;
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 120) >= ''" + HDate + "''";
			}
			@@ -548,7 +726,7 @@
			sWhere += " and CONVERT(varchar(100),æ¥æ, 120) <= ''" + HDate1 + "''";
			}
			if (HCusName) {
			sWhere += " and å®¢æ· like ''%" + HCusName + "%''";
			sWhere += " and è´è´§åä½ like ''%" + HCusName + "%''";
			}
			if (HEmpName) {
			sWhere += " and ä¸å¡å like ''%" + HEmpName + "%''";
			@@ -560,6 +738,9 @@
			sWhere += getSWhereByHUser();

			get_Display(sWhere);

			sWhere_Bak = sWhere;

			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}
			//#endregion
			@@ -589,6 +770,12 @@
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');

			sWhere = "";
			@@ -613,6 +800,50 @@
			success: function (result) {
			if (result.count == 1) {
			exportAll();
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#region å¸¸è§å¯¼åºExecel
			function get_Export_Normal() {
			var ModRightNameCheck = "Kf_SellOutEntryReport_ExportExcel";

			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			table.exportFile(ins1.config.id, option.data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#region å¸¸è§å¯¼åºExecel
			function get_Export1_Normal() {
			var ModRightNameCheck = "Kf_SellOutEntryReport_ExportExcel";

			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			table.exportFile(ins2.config.id, option1.data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			@@ -755,6 +986,10 @@
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion
			@@ -788,7 +1023,7 @@

			//#region å¯¼åº
			function oneTable(option) {
			var exportCols = ["è´è´§åä½", "äº§ååç§°", "ä»¶æ°", "ç±³æ°", "åä»·", "éé¢", "ä¸å¡å"];
			var exportCols = ["è´è´§åä½", "äº§ååç§°", "ä»¶æ°", "ç±³æ°", "åä»·", "ç¨ç%", "éé¢", "ä¸å¡å"];

			//è·ååæ°æ®ï¼æ ¹æ®exportColsæ°ç»ä¸åçé¡ºåºå¯¼åº
			var colsList = [];
			@@ -804,16 +1039,24 @@

			//è·åè¡æ°æ®
			var listData = []; //è·åè¡æ°æ®
			var HPieceQtyTotalSum = 0;
			var HQtyTotalSum = 0;
			var HTaxMoneyTotalSum = 0;
			if (option.data.length > 0) {
			var HEmpID = option.data[0]["HEmpID"]; //ç¨äºåºåä¸åå®¢æ·
			var HEmpID = option.data[0]["HEmpID"]; //ç¨äºåºåä¸åä¸å¡å
			var HCusID = option.data[0]["HCusID"]; //ç¨äºåºåä¸åå®¢æ·
			var HPieceQtySum = 0; //ä»¶æ°åè®¡
			var HQtySum = 0; //æ°éåè®¡
			var HTaxMoneySum = 0; //éé¢åè®¡
			for (var i = 0; i < option.data.length; i++) {
			if (HEmpID != option.data[i]["HEmpID"]) {
			var sumTemp = { "è´è´§åä½": "åè®¡", "äº§ååç§°": "", "ä»¶æ°": HPieceQtySum, "ç±³æ°": HQtySum, "åä»·": "", "éé¢": HTaxMoneySum, "ä¸å¡å": "" };
			var emptyTemp = { "è´è´§åä½": "", "äº§ååç§°": "", "ä»¶æ°": "", "ç±³æ°": "", "åä»·": "", "éé¢": "", "ä¸å¡å": "" };
			var titleTemp = { "è´è´§åä½": "è´è´§åä½", "äº§ååç§°": "äº§ååç§°", "ä»¶æ°": "ä»¶æ°", "ç±³æ°": "ç±³æ°", "åä»·": "åä»·", "éé¢": "éé¢", "ä¸å¡å": "ä¸å¡å" };
			if (HEmpID != option.data[i]["HEmpID"] \|\| HCusID != option.data[i]["HCusID"]) {
			HPieceQtyTotalSum += HPieceQtySum;
			HQtyTotalSum += HQtySum;
			HTaxMoneyTotalSum += HTaxMoneySum;

			var sumTemp = { "è´è´§åä½": "åè®¡ï¼", "äº§ååç§°": "", "ä»¶æ°": fixed(HPieceQtySum * 1) + "ä»¶", "ç±³æ°": fixed(HQtySum.toFixed(6) * 1) + "ç±³", "åä»·": "", "ç¨ç%": "", "éé¢": fixed(HTaxMoneySum.toFixed(6) * 1), "ä¸å¡å": "" };
			var emptyTemp = { "è´è´§åä½": "", "äº§ååç§°": "", "ä»¶æ°": "", "ç±³æ°": "", "åä»·": "", "ç¨ç%": "", "éé¢": "", "ä¸å¡å": "" };
			var titleTemp = { "è´è´§åä½": "è´è´§åä½", "äº§ååç§°": "äº§ååç§°", "ä»¶æ°": "ä»¶æ°", "ç±³æ°": "ç±³æ°", "åä»·": "åä»·", "ç¨ç%": "ç¨ç%", "éé¢": "éé¢", "ä¸å¡å": "ä¸å¡å" };
			listData.push(sumTemp);
			listData.push(emptyTemp);
			listData.push(emptyTemp);
			@@ -821,6 +1064,7 @@

			//è®°å½æ°å®¢æ·çåç
			HEmpID = option.data[i]["HEmpID"];
			HCusID = option.data[i]["HCusID"];

			//åå§åä»¶æ°åè®¡ãæ°éåè®¡ãéé¢åè®¡
			HPieceQtySum = 0;
			@@ -834,19 +1078,31 @@
			HTaxMoneySum += option.data[i]["éé¢"] * 1;

			if (i == option.data.length - 1) {
			var sumTemp = { "è´è´§åä½": "åè®¡", "äº§ååç§°": "", "ä»¶æ°": HPieceQtySum, "ç±³æ°": HQtySum, "åä»·": "", "éé¢": HTaxMoneySum, "ä¸å¡å": "" };
			HPieceQtyTotalSum += HPieceQtySum;
			HQtyTotalSum += HQtySum;
			HTaxMoneyTotalSum += HTaxMoneySum;
			HPieceQtyTotalSum = fixed(HPieceQtyTotalSum * 1);
			HQtyTotalSum = fixed(HQtyTotalSum.toFixed(6) * 1);
			HTaxMoneyTotalSum = fixed(HTaxMoneyTotalSum.toFixed(6) * 1);

			var sumTemp = { "è´è´§åä½": "åè®¡:", "äº§ååç§°": "", "ä»¶æ°": fixed(HPieceQtySum * 1) + "ä»¶", "ç±³æ°": fixed(HQtySum.toFixed(6) * 1) + "ç±³", "åä»·": "", "ç¨ç%": "", "éé¢": fixed(HTaxMoneySum.toFixed(6) * 1), "ä¸å¡å": "" };
			var emptyTemp = { "è´è´§åä½": "", "äº§ååç§°": "", "ä»¶æ°": "", "ç±³æ°": "", "åä»·": "", "ç¨ç%": "", "éé¢": "", "ä¸å¡å": "" };
			var totalTemp = { "è´è´§åä½": "æ»åè®¡:", "äº§ååç§°": "", "ä»¶æ°": HPieceQtyTotalSum + "ä»¶", "ç±³æ°": HQtyTotalSum + "ç±³", "åä»·": "", "ç¨ç%": "", "éé¢": HTaxMoneyTotalSum, "ä¸å¡å": "" };
			listData.push(sumTemp);
			listData.push(emptyTemp);
			listData.push(emptyTemp);
			listData.push(totalTemp);
			}
			}
			}


			//è®¾ç½®sheetä¸çæ°æ®
			let news = [[]];
			for (var i = 0; i < colsList.length; i++) {
			news[0].push(colsList[i].title);
			}
			for (var i = 0; i < listData.length; i++) {
			news.push([listData[i][exportCols[0]], listData[i][exportCols[1]], listData[i][exportCols[2]], listData[i][exportCols[3]], listData[i][exportCols[4]], listData[i][exportCols[5]], listData[i][exportCols[6]] ]);
			news.push([listData[i][exportCols[0]], listData[i][exportCols[1]], listData[i][exportCols[2]], listData[i][exportCols[3]], listData[i][exportCols[4]], listData[i][exportCols[5]], listData[i][exportCols[6]], listData[i][exportCols[7]]]);
			}

			//åå»ºsheet
			@@ -854,7 +1110,7 @@
			return sheet;
			}
			function twoTable(option) {
			var exportCols = ["è´è´§åä½", "äº§ååç§°", "ä»¶æ°", "ç±³æ°", "åä»·", "éé¢", "ä¸å¡å"];
			var exportCols = ["è´è´§åä½", "äº§ååç§°", "ä»¶æ°", "ç±³æ°", "åä»·", "ç¨ç%", "éé¢", "ä¸å¡å"];

			//è·ååæ°æ®ï¼æ ¹æ®exportColsæ°ç»ä¸åçé¡ºåºå¯¼åº
			var colsList = [];
			@@ -870,16 +1126,24 @@

			//è·åè¡æ°æ®
			var listData = []; //è·åè¡æ°æ®
			var HPieceQtyTotalSum = 0;
			var HQtyTotalSum = 0;
			var HTaxMoneyTotalSum = 0;
			if (option.data.length > 0) {
			var HEmpID = option.data[0]["HEmpID"]; //ç¨äºåºåä¸åå®¢æ·
			var HEmpID = option.data[0]["HEmpID"]; //ç¨äºåºåä¸åä¸å¡å
			var HCusID = option.data[0]["HCusID"]; //ç¨äºåºåä¸åå®¢æ·
			var HPieceQtySum = 0; //ä»¶æ°åè®¡
			var HQtySum = 0; //æ°éåè®¡
			var HTaxMoneySum = 0; //éé¢åè®¡
			for (var i = 0; i < option.data.length; i++) {
			if (HEmpID != option.data[i]["HEmpID"]) {
			var sumTemp = { "è´è´§åä½": "åè®¡", "äº§ååç§°": "", "ä»¶æ°": HPieceQtySum, "ç±³æ°": HQtySum, "åä»·": "", "éé¢": HTaxMoneySum, "ä¸å¡å": "" };
			var emptyTemp = { "è´è´§åä½": "", "äº§ååç§°": "", "ä»¶æ°": "", "ç±³æ°": "", "åä»·": "", "éé¢": "", "ä¸å¡å": "" };
			var titleTemp = { "è´è´§åä½": "è´è´§åä½", "äº§ååç§°": "äº§ååç§°", "ä»¶æ°": "ä»¶æ°", "ç±³æ°": "ç±³æ°", "åä»·": "åä»·", "éé¢": "éé¢", "ä¸å¡å": "ä¸å¡å" };
			if (HEmpID != option.data[i]["HEmpID"] \|\| HCusID != option.data[i]["HCusID"]) {
			HPieceQtyTotalSum += HPieceQtySum;
			HQtyTotalSum += HQtySum;
			HTaxMoneyTotalSum += HTaxMoneySum;

			var sumTemp = { "è´è´§åä½": "åè®¡ï¼", "äº§ååç§°": "", "ä»¶æ°": fixed(HPieceQtySum * 1) + "ä»¶", "ç±³æ°": fixed(HQtySum.toFixed(6) * 1) + "ç±³", "åä»·": "", "ç¨ç%": "", "éé¢": fixed(HTaxMoneySum.toFixed(6) * 1), "ä¸å¡å": "" };
			var emptyTemp = { "è´è´§åä½": "", "äº§ååç§°": "", "ä»¶æ°": "", "ç±³æ°": "", "åä»·": "", "ç¨ç%": "", "éé¢": "", "ä¸å¡å": "" };
			var titleTemp = { "è´è´§åä½": "è´è´§åä½", "äº§ååç§°": "äº§ååç§°", "ä»¶æ°": "ä»¶æ°", "ç±³æ°": "ç±³æ°", "åä»·": "åä»·", "ç¨ç%": "ç¨ç%", "éé¢": "éé¢", "ä¸å¡å": "ä¸å¡å" };
			listData.push(sumTemp);
			listData.push(emptyTemp);
			listData.push(emptyTemp);
			@@ -887,6 +1151,7 @@

			//è®°å½æ°å®¢æ·çåç
			HEmpID = option.data[i]["HEmpID"];
			HCusID = option.data[i]["HCusID"];

			//åå§åä»¶æ°åè®¡ãæ°éåè®¡ãéé¢åè®¡
			HPieceQtySum = 0;
			@@ -900,8 +1165,20 @@
			HTaxMoneySum += option.data[i]["éé¢"] * 1;

			if (i == option.data.length - 1) {
			var sumTemp = { "è´è´§åä½": "åè®¡", "äº§ååç§°": "", "ä»¶æ°": HPieceQtySum, "ç±³æ°": HQtySum, "åä»·": "", "éé¢": HTaxMoneySum, "ä¸å¡å": "" };
			HPieceQtyTotalSum += HPieceQtySum;
			HQtyTotalSum += HQtySum;
			HTaxMoneyTotalSum += HTaxMoneySum;
			HPieceQtyTotalSum = fixed(HPieceQtyTotalSum * 1);
			HQtyTotalSum = fixed(HQtyTotalSum.toFixed(6) * 1);
			HTaxMoneyTotalSum = fixed(HTaxMoneyTotalSum.toFixed(6) * 1);

			var sumTemp = { "è´è´§åä½": "åè®¡:", "äº§ååç§°": "", "ä»¶æ°": fixed(HPieceQtySum * 1) + "ä»¶", "ç±³æ°": fixed(HQtySum.toFixed(6) * 1) + "ç±³", "åä»·": "", "ç¨ç%": "", "éé¢": fixed(HTaxMoneySum.toFixed(6) * 1), "ä¸å¡å": "" };
			var emptyTemp = { "è´è´§åä½": "", "äº§ååç§°": "", "ä»¶æ°": "", "ç±³æ°": "", "åä»·": "", "ç¨ç%": "", "éé¢": "", "ä¸å¡å": "" };
			var totalTemp = { "è´è´§åä½": "æ»åè®¡:", "äº§ååç§°": "", "ä»¶æ°": HPieceQtyTotalSum + "ä»¶", "ç±³æ°": HQtyTotalSum + "ç±³", "åä»·": "", "ç¨ç%": "", "éé¢": HTaxMoneyTotalSum, "ä¸å¡å": "" };
			listData.push(sumTemp);
			listData.push(emptyTemp);
			listData.push(emptyTemp);
			listData.push(totalTemp);
			}
			}
			}
			@@ -912,7 +1189,7 @@
			news[0].push(colsList[i].title);
			}
			for (var i = 0; i < listData.length; i++) {
			news.push([listData[i][exportCols[0]], listData[i][exportCols[1]], listData[i][exportCols[2]], listData[i][exportCols[3]], listData[i][exportCols[4]], listData[i][exportCols[5]], listData[i][exportCols[6]]]);
			news.push([listData[i][exportCols[0]], listData[i][exportCols[1]], listData[i][exportCols[2]], listData[i][exportCols[3]], listData[i][exportCols[4]], listData[i][exportCols[5]], listData[i][exportCols[6]], listData[i][exportCols[7]]]);
			}

			//åå»ºsheet
			@@ -920,22 +1197,69 @@
			return sheet;
			}
			function exportAll() {
			//è·åsheet
			let sheet1 = oneTable(option_Bak);
			let sheet2 = twoTable(option1_Bak);
			$.ajax({
			url: GetWEBURL() + '/Kf_SellOutEntryReport/list',
			type: "GET",
			data: { "sWhere": sWhere_Bak, "user": sessionStorage["HUserName"], "userid": sessionStorage["Czybm"] },
			success: function (data1) {
			if (data1.count == 1) {
			var totalArray = ["ä»¶æ°", "ç±³æ°", "éé¢"];
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			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' });
			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) {
			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, templet: "<div>{{d." + data[i].name + " ==null ?'':fixed(d." + data[i].name + ")}}</div>" });
			}
			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 + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
			}
			}
			}

			//åå»ºexcelææ¡£
			const wb = XLSX.utils.book_new();
			XLSX.utils.book_append_sheet(wb, sheet1, "æ¶¤çº¶");
			XLSX.utils.book_append_sheet(wb, sheet2, "ç¾æ¯");
			const workbookBlob = workbook2blob(wb);
			//è®¾ç½®è¡¨1å¯¼åºæ°æ®
			option_Bak.cols = [col];
			option_Bak.data = data1.data[0];

			// å¯¼åºæåçæ»è¡¨
			var ExcelName = "éå®åºåºæç»æ¥è¡¨" + Format(new Date(), "yyyy-MM-dd") + ".xlsx";
			openDownloadDialog(workbookBlob, ExcelName);
			//è·åè¡¨2å¯¼åºæ°æ®
			option1_Bak.cols = [col];
			option1_Bak.data = data1.data[1];

			//è·åsheet
			let sheet1 = oneTable(option_Bak);
			let sheet2 = twoTable(option1_Bak);

			// å°blobå¯¹è±¡ åå»ºbloburl,ç¶åç¨aæ ç¾å®ç°å¼¹åºä¸è½½æ¡
			//åå»ºexcelææ¡£
			const wb = XLSX.utils.book_new();
			XLSX.utils.book_append_sheet(wb, sheet1, "FDY");
			XLSX.utils.book_append_sheet(wb, sheet2, "ç¾æ¯");
			const workbookBlob = workbook2blob(wb);

			// å¯¼åºæåçæ»è¡¨
			var ExcelName = "éå®åºåºæç»æ¥è¡¨" + Format(new Date(), "yyyy-MM-dd") + ".xlsx";
			openDownloadDialog(workbookBlob, ExcelName);
			} else {
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#region è®¾ç½®å¯¼åºåæ°
			function workbook2blob(workbook) {