From 48da2eef68996fad4d40350ad705d6a04a428a19 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 05 十一月 2024 09:15:36 +0800
Subject: [PATCH] 首巡末根据检测值判断合格不合格 产线包装单增加墨西哥页面 增加墨西哥条码白标报表
---
WebTM/views/应收管理/报表分析/Kf_SellOutEntryReport.html | 276 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 244 insertions(+), 32 deletions(-)
diff --git "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_SellOutEntryReport.html" "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_SellOutEntryReport.html"
index 8743b9d..87dd097 100644
--- "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_SellOutEntryReport.html"
+++ "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_SellOutEntryReport.html"
@@ -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>
@@ -201,6 +282,10 @@
var option_Bak = {};
var option1_Bak = {};
var sWhere_Bak = "";
+
+
+ var ins1;
+ var ins2;
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -224,6 +309,10 @@
case 'get_export':
get_Export();
break;
+ //瀵煎嚭excel
+ case 'get_export_normal':
+ get_Export_Normal();
+ break;
//鍒楄缃�
case 'set_HideColumn': get_HideColumn();
break;
@@ -232,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;
};
});
@@ -314,18 +414,18 @@
, totalRow: true
//, cellMinWidth: 90
, limit: 50
- , limits: [50, 500, 5000, 50000]
+ , limits: [50, 500, 5000, 20000]
};
option1 = {
elem: '#mainTable1'
- //, toolbar: '#toolbarDemo'
+ , toolbar: '#toolbarDemo1'
, height: 'full-50'
, page: true
, totalRow: true
//, cellMinWidth: 90
, limit: 50
- , limits: [50, 500, 5000, 50000]
+ , limits: [50, 500, 5000, 20000]
};
option_Bak = {
@@ -336,7 +436,7 @@
, totalRow: true
//, cellMinWidth: 90
, limit: 50
- , limits: [50, 500, 5000, 50000]
+ , limits: [50, 500, 5000, 20000]
};
option1_Bak = {
@@ -347,7 +447,7 @@
, totalRow: true
//, cellMinWidth: 90
, limit: 50
- , limits: [50, 500, 5000, 50000]
+ , limits: [50, 500, 5000, 20000]
};
}
//#endregion
@@ -362,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 = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -404,12 +504,15 @@
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++) {
@@ -423,6 +526,7 @@
HPieceQtySum += result[i]["浠舵暟"] * 1;
HQtySum += result[i]["绫虫暟"] * 1;
HMoneySum += result[i]["閲戦"] * 1;
+ HWeightSum += result[i]["閲嶉噺_鍚�"] * 1;
//璁剧疆鍙樉绀哄崟鎹殑绗竴琛屼富琛ㄤ俊鎭紝鍏朵粬琛屽彧鏄剧ず瀛愯〃淇℃伅
if (temp != result[i]["hmainid"]) {
@@ -451,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"]) {
@@ -470,22 +575,27 @@
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(6)*1));
- $("#HMoneySum").val(fixed(HMoneySum.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(6)*1));
- $("#HMoneySum_YM").val(fixed(HMoneySum_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(6)*1));
- $("#HMoneyTotalSum").val(fixed(HMoneyTotalSum.toFixed(6)*1));
+ $("#HMoneyTotalSum").val(fixed(HMoneyTotalSum.toFixed(6) * 1));
+ $("#HWeightTotalSum").val(fixed(HWeightTotalSum.toFixed(2) * 1));
@@ -539,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 = "";
@@ -561,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 + "''";
}
@@ -568,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 + "%''";
@@ -612,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 = "";
@@ -636,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 });
}
@@ -778,6 +986,10 @@
}
$("#ColName").empty();
$("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
form.render('select');
}
//#endregion
@@ -811,7 +1023,7 @@
//#region 瀵煎嚭
function oneTable(option) {
- var exportCols = ["璐揣鍗曚綅", "浜у搧鍚嶇О", "浠舵暟", "绫虫暟", "鍗曚环", "閲戦", "涓氬姟鍛�"];
+ var exportCols = ["璐揣鍗曚綅", "浜у搧鍚嶇О", "浠舵暟", "绫虫暟", "鍗曚环", "绋庣巼%", "閲戦", "涓氬姟鍛�"];
//鑾峰彇鍒楁暟鎹紝鏍规嵁exportCols鏁扮粍涓垪鐨勯『搴忓鍑�
var colsList = [];
@@ -842,9 +1054,9 @@
HQtyTotalSum += HQtySum;
HTaxMoneyTotalSum += HTaxMoneySum;
- var sumTemp = { "璐揣鍗曚綅": "鍚堣", "浜у搧鍚嶇О": "", "浠舵暟": fixed(HPieceQtySum * 1) + "浠�", "绫虫暟": fixed(HQtySum.toFixed(6) * 1) + "绫�", "鍗曚环": "", "閲戦": fixed(HTaxMoneySum.toFixed(6) * 1), "涓氬姟鍛�": "" };
- var emptyTemp = { "璐揣鍗曚綅": "", "浜у搧鍚嶇О": "", "浠舵暟": "", "绫虫暟": "", "鍗曚环": "", "閲戦": "", "涓氬姟鍛�": "" };
- var titleTemp = { "璐揣鍗曚綅": "璐揣鍗曚綅", "浜у搧鍚嶇О": "浜у搧鍚嶇О", "浠舵暟": "浠舵暟", "绫虫暟": "绫虫暟", "鍗曚环": "鍗曚环", "閲戦": "閲戦", "涓氬姟鍛�": "涓氬姟鍛�" };
+ 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);
@@ -873,9 +1085,9 @@
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, "涓氬姟鍛�": "" };
+ 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);
@@ -883,14 +1095,14 @@
}
}
}
-
+
//璁剧疆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
@@ -898,7 +1110,7 @@
return sheet;
}
function twoTable(option) {
- var exportCols = ["璐揣鍗曚綅", "浜у搧鍚嶇О", "浠舵暟", "绫虫暟", "鍗曚环", "閲戦", "涓氬姟鍛�"];
+ var exportCols = ["璐揣鍗曚綅", "浜у搧鍚嶇О", "浠舵暟", "绫虫暟", "鍗曚环", "绋庣巼%", "閲戦", "涓氬姟鍛�"];
//鑾峰彇鍒楁暟鎹紝鏍规嵁exportCols鏁扮粍涓垪鐨勯『搴忓鍑�
var colsList = [];
@@ -929,9 +1141,9 @@
HQtyTotalSum += HQtySum;
HTaxMoneyTotalSum += HTaxMoneySum;
- var sumTemp = { "璐揣鍗曚綅": "鍚堣", "浜у搧鍚嶇О": "", "浠舵暟": fixed(HPieceQtySum * 1) + "浠�", "绫虫暟": fixed(HQtySum.toFixed(6) * 1) + "绫�", "鍗曚环": "", "閲戦": fixed(HTaxMoneySum.toFixed(6) * 1), "涓氬姟鍛�": "" };
- var emptyTemp = { "璐揣鍗曚綅": "", "浜у搧鍚嶇О": "", "浠舵暟": "", "绫虫暟": "", "鍗曚环": "", "閲戦": "", "涓氬姟鍛�": "" };
- var titleTemp = { "璐揣鍗曚綅": "璐揣鍗曚綅", "浜у搧鍚嶇О": "浜у搧鍚嶇О", "浠舵暟": "浠舵暟", "绫虫暟": "绫虫暟", "鍗曚环": "鍗曚环", "閲戦": "閲戦", "涓氬姟鍛�": "涓氬姟鍛�" };
+ 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);
@@ -960,9 +1172,9 @@
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, "涓氬姟鍛�": "" };
+ 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);
@@ -977,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
--
Gitblit v1.9.1