From c8a8eff6d5c2ebf926ad15a61bbd48fb0c0fe483 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 29 十月 2024 13:43:12 +0800
Subject: [PATCH] 结算单页面完善
---
WebTM/WebTM.csproj.user | 28 +++++++++++++-
WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html | 25 +-----------
WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html | 25 +-----------
3 files changed, 30 insertions(+), 48 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 502622a..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -3,7 +3,7 @@
<PropertyGroup>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
@@ -12,5 +12,29 @@
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
- <ProjectExtensions />
+ <ProjectExtensions>
+ <VisualStudio>
+ <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+ <WebProjectProperties>
+ <StartPageUrl>
+ </StartPageUrl>
+ <StartAction>CurrentPage</StartAction>
+ <AspNetDebugging>True</AspNetDebugging>
+ <SilverlightDebugging>False</SilverlightDebugging>
+ <NativeDebugging>False</NativeDebugging>
+ <SQLDebugging>False</SQLDebugging>
+ <ExternalProgram>
+ </ExternalProgram>
+ <StartExternalURL>
+ </StartExternalURL>
+ <StartCmdLineArguments>
+ </StartCmdLineArguments>
+ <StartWorkingDirectory>
+ </StartWorkingDirectory>
+ <EnableENC>True</EnableENC>
+ <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
+ </WebProjectProperties>
+ </FlavorProperties>
+ </VisualStudio>
+ </ProjectExtensions>
</Project>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
index f0a8832..8628113 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\344\270\252\344\272\272\051/Pay_SingleBalBillList.html"
@@ -1135,29 +1135,8 @@
columns = col;
option.cols = [col];
- //option.data = data1.data;
- //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
- //鑾峰彇瀛愯〃鍒楁暟鎹�
- var colList = [];
- for (var i = 0; i < option.cols[0].length; i++) {
- colList.push(option.cols[0][i].field);
- }
- //璁剧疆鏁版嵁
- var result = data1.data;
- var temp = "";
- for (var i = 0; i < result.length; i++) {
- if (temp != result[i]["鍗曟嵁鍙�"]) {
- temp = result[i]["鍗曟嵁鍙�"];
- } else {
- var initIndex = $.inArray("鍗曟嵁鍙�", colList);
- var lastIndex = $.inArray("hsubid", colList);
- for (var j = initIndex; j < lastIndex; j++) {
- var fieldName = colList[j];
- result[i][fieldName] = "";
- }
- }
- }
- option.data = result;
+ option.data = data1.data;
+
option.totalRow = true;
laypage.render(optionPage);
//鍒锋柊琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
index bd8b0e9..7ac8c49 100644
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\345\267\245\350\265\204\347\273\223\347\256\227\345\215\225\050\351\233\206\344\275\223\051/Pay_GroupBalBillList.html"
@@ -1150,29 +1150,8 @@
columns = col;
option.cols = [col];
- //option.data = data1.data;
- //璁剧疆鍒楄〃鍚屼竴涓崟鎹彧鏈夌涓�鏉℃暟鎹樉绀轰富琛ㄤ俊鎭紝鍏跺畠璁板綍鍙樉绀哄瓙琛ㄤ俊鎭�
- //鑾峰彇瀛愯〃鍒楁暟鎹�
- var colList = [];
- for (var i = 0; i < option.cols[0].length; i++) {
- colList.push(option.cols[0][i].field);
- }
- //璁剧疆鏁版嵁
- var result = data1.data;
- var temp = "";
- for (var i = 0; i < result.length; i++) {
- if (temp != result[i]["鍗曟嵁鍙�"]) {
- temp = result[i]["鍗曟嵁鍙�"];
- } else {
- var initIndex = $.inArray("鍗曟嵁鍙�", colList);
- var lastIndex = $.inArray("hsubid", colList);
- for (var j = initIndex; j < lastIndex; j++) {
- var fieldName = colList[j];
- result[i][fieldName] = "";
- }
- }
- }
- option.data = result;
+ option.data = data1.data;
+
option.totalRow = true;
laypage.render(optionPage);
//鍒锋柊琛ㄦ牸鏁版嵁
--
Gitblit v1.9.1