From e01b56dff67628c7bfaca6f488c89970989e824c Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 31 七月 2023 15:24:37 +0800
Subject: [PATCH] 工资结算单(个人)：部分问题修改
---
WebTM/WebTM.csproj | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 741c944..e2a9130 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -160,8 +160,12 @@
<Content Include="views\grf\a.grf" />
<Content Include="views\grf\b1.grf" />
<Content Include="views\grf\b.grf" />
+ <Content Include="views\home\console_KaiBeiNaiTe.html" />
+ <Content Include="views\home\console_Mobile_KaiBeiNaiTe.html" />
<Content Include="views\home\console_QiaoYi.html" />
<Content Include="views\home\console_Mobile_QiaoYi.html" />
+ <Content Include="views\index_KaiBeiNaiTe.html" />
+ <Content Include="views\index_Mobile_KaiBeiNaiTe.html" />
<Content Include="views\index_Mobile_QiaoYi.html" />
<Content Include="views\index_QiaoYi.html" />
<Content Include="views\index - 澶嶅埗.html" />
@@ -198,6 +202,12 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇绠＄悊\鐢熶骇缁勬墭鍗昞Sc_PackUnionBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\璋冩嫧鎹㈡墭\Kf_MoveStockBill_HuanTuo_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\璋冩嫧鎹㈡墭\Kf_MoveStockBillList_HuanTuo_PDA.html" />
+ <Content Include="views\浜轰簨绠＄悊\鍏ヨ亴鐢宠\HR_EmpEngageRequestBill.html" />
+ <Content Include="views\浜轰簨绠＄悊\鍏ヨ亴鐢宠\HR_EmpEngageRequestBillList.html" />
+ <Content Include="views\浜轰簨绠＄悊\绂昏亴鐢宠\HR_EmpDimissionBill.html" />
+ <Content Include="views\浜轰簨绠＄悊\绂昏亴鐢宠\HR_EmpDimissionBillList.html" />
+ <Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBill.html" />
+ <Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_MaterTypeEdit.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\HBarPlanPrint_GXPG.html" />
@@ -207,15 +217,38 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Gy_SourceList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchSendWorkBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Sc_ProcExchRecordBackBillList.aspx" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPrice.html" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBill.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBillList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillEdit.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillEdit.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫璁＄畻\Pay_SalaryCalculate.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\寮傚父宸ユ椂鐢宠鍗昞Pay_ErrWorkTimesRequestBill.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\寮傚父宸ユ椂鐢宠鍗昞Pay_ErrWorkTimesRequestBillList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\鎵ｈˉ椤圭洰璐圭敤鍗昞Pay_DuSubsidyItemBill.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\鎵ｈˉ椤圭洰璐圭敤鍗昞Pay_DuSubsidyItemBillList.html" />
<Content Include="views\鏉＄爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
<Content Include="views\鐢熶骇绠＄悊\鏃ヨ鍒掑熀纭�璧勬枡\Cg_PODemandPlanConfigBill_Excel.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_ShopCalendar.html" />
+ <Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu.html" />
+ <Content Include="views\绯荤粺绠＄悊\蹇嵎鏂瑰紡鑷畾涔塡Xt_UserFastMenu_IconSet.html" />
<Content Include="views\绯荤粺绠＄悊\鎸夐挳璁剧疆\Xt_ModuleButtonSet.html" />
+ <Content Include="views\绯荤粺绠＄悊\鑿滃崟鑷畾涔塡Xt_DefineMenuDisplay.html" />
<Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillListQuery.html" />
+ <Content Include="views\璁″垝绠＄悊\宸ヨ壓璺嚎\Gy_RoutingBillList_His.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillQuery_Mobile.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Change.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_Copy_PL.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessEntryReport_DyeColor.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_ProdProcessSumReport_DyeColor_third.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\SC_DayRkReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ICOMProBarCodeReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\sc_ICOMReport.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\sc_ICOMRKReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopProcessWIPSumReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_WorkShopProcessWIPReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_EmployeePieceWorkReport.html" />
@@ -888,12 +921,8 @@
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\Pay_WorkTimesPayMentSumReport.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\ReportList2.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鎶ヨ〃\ReportList.html" />
- <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillEdit.html" />
- <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBillList.html" />
- <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillEdit.html" />
- <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫杩愮畻\Pay_SingleBalBillOperation.html" />
<Content Include="views\宸ヨ祫绠＄悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjGroupBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\鏍哥畻鏂瑰紡\Gy_ClassTimePrjSubBillEdit.html" />
@@ -1244,6 +1273,20 @@
<Content Include="views\閿�鍞鐞哱閿�鍞��璐у崟\Add_Edit_Kf_ICStockBillMainList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞��璐у崟\Kf_ICStockBillMainList.html" />
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Add_Edit_Xs_SeOrderBillList.html" />
+ <Content Include="views\椤圭洰绠＄悊\涓氱哗鎸囨爣\PM_YearEmployeeMoneyBillList.html" />
+ <Content Include="views\椤圭洰绠＄悊\涓氱哗鎸囨爣\PM_YearEmployeeMoneyBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBillList.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBillList.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBillList.html" />
+ <Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\Add_Edit_Gy_ProjectStage.html" />
+ <Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\Gy_ProjectStage.html" />
+ <Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\PM_ProjectReportBillList.html" />
+ <Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\PM_ProjectReportBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\PM_ProjectStageBillList.html" />
+ <Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\PM_ProjectStageBill.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBill_Check.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍒嗘寮忚皟鍑哄崟\Fb_StepFoldOutBillList.html" />
<Content Include="views\棰嗘枡鍙戣揣\濮斿鍑哄簱\Kf_EntrustOutBillList.html" />
@@ -1701,7 +1744,6 @@
<Folder Include="Files\" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
- <Folder Include="views\绯荤粺绠＄悊\鑿滃崟鑷畾涔塡" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
--
Gitblit v1.9.1