MES-WEB-LayUI.git

parent: 187db2c9 | 补丁 | 提交 | ignore whitespace

wtt

2024-10-29 c8a8eff6d5c2ebf926ad15a61bbd48fb0c0fe483

结算单页面完善

3个文件已修改

	WebTM/WebTM.csproj.user	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/工资结算单(个人)/Pay_SingleBalBillList.html	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/工资管理/工资结算单(集体)/Pay_GroupBalBillList.html	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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>

 WebTM/views/¹¤×Ê¹ÜÀí/¹¤×Ê½áËãµ¥(¸öÈË)/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);
                            //å·æ°è¡¨æ ¼æ°æ®

 WebTM/views/¹¤×Ê¹ÜÀí/¹¤×Ê½áËãµ¥(¼¯Ìå)/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);
                            //å·æ°è¡¨æ ¼æ°æ®

			@@ -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>

			@@ -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);
			//å·æ°è¡¨æ ¼æ°æ®

			@@ -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);
			//å·æ°è¡¨æ ¼æ°æ®