From a137c837d4ae36ffd67a3cee253bd7b5507f32a9 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期五, 01 三月 2024 13:56:20 +0800
Subject: [PATCH] 1、工资管理模块下的全部单据和单据列表模块:单据有网格的增加合计行,单据列表增加合计行;模块标题名称根据单据类型从数据库单据类型表里动态获取;2、扣补项目费用单、请假申请单、加班申请单、工资单列表模块修改完善
---
WebTM/WebTM.csproj | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index de988e1..fe8c1f4 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -75,6 +75,7 @@
<Content Include="layuiadmin\ckou.js" />
<Content Include="layuiadmin\echarts.min.js" />
<Content Include="layuiadmin\grwebapp.js" />
+ <Content Include="layuiadmin\PageTitle.js" />
<Content Include="layuiadmin\HideButton.js" />
<Content Include="layuiadmin\layui\css\global.css" />
<Content Include="layuiadmin\layui\css\layui - 澶嶅埗.css" />
@@ -242,9 +243,12 @@
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇鍏ュ簱\Kf_ProductInBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇姹囨姤\Sc_ICMOReportBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇姹囨姤\Sc_ICMOReportBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBill_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepOutBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepInBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockStepOutBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBillList_PDA.html" />
+ <Content Include="views\WMS鎵爜妯″潡\鐢熶骇璋冩嫧\Kf_MoveStockBill_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBackBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBillList_PDA.html" />
<Content Include="views\WMS鎵爜妯″潡\鐢熶骇棰嗘枡\Kf_MateOutBill_PDA.html" />
@@ -288,6 +292,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_PoStockStyle.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_CusType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_StockCheckItem.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_ProjectMoney.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_SupType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_SellStyle.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_AreaSet.html" />
@@ -303,6 +308,7 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_AreaSet.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_CusType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_StockCheckItem.html" />
+ <Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_ProjectMoney.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_SupType.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_SellStyle.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Gy_PoStockStyle.html" />
@@ -361,6 +367,7 @@
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_DisposeWayList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ScrapReasonList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_Souce_Excel.html" />
+ <Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_QueryCondition.html" />
<Content Include="views\宸ヨ祫绠$悊\鍔犵彮鐢宠\Pay_OverApplyBill.html" />
<Content Include="views\宸ヨ祫绠$悊\鍔犵彮鐢宠\Pay_OverApplyBillList.html" />
<Content Include="views\宸ヨ祫绠$悊\瀹氶鐢宠\Pay_ProcPriceRequestBill.html" />
@@ -454,6 +461,7 @@
<Content Include="views\璁惧绠$悊\璁惧鎶ヨ〃\Sb_EquipDotCheckBillReport.html" />
<Content Include="views\璁惧绠$悊\璁惧鎶ヨ〃\Sb_EquipMaintainBillReport.html" />
<Content Include="views\璁惧绠$悊\璁惧瑙勭▼鍗昞Sb_EquipDotCheckRuleList_PDA.html" />
+ <Content Include="views\璁惧绠$悊\璁惧瑙勭▼鍗昞Sb_EquipMaintainRuleList_PDA.html" />
<Content Include="views\璐ㄩ噺绠$悊\鍩虹寤烘ā\Add_Edit_Gy_ErrType.html" />
<Content Include="views\璐ㄩ噺绠$悊\鍩虹寤烘ā\Gy_ErrType.html" />
<Content Include="views\璐ㄩ噺绠$悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBillList_PDA.html" />
@@ -1605,6 +1613,12 @@
<Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBillList.html" />
<Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBill.html" />
<Content Include="views\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBillMainMy.html" />
+ <Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectBeginBillMain.html" />
+ <Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectBeginBillMainList.html" />
+ <Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectEndBillMain.html" />
+ <Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectEndBillMainList.html" />
+ <Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectMoneyBillMainList.html" />
+ <Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectMoneyBillMain.html" />
<Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectBill.html" />
<Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectBillList.html" />
<Content Include="views\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_WorkPlanMonthBillMain.html" />
@@ -1622,6 +1636,7 @@
<Content Include="views\椤圭洰绠$悊\椤圭洰闃舵\PM_ProjectStageBillList.html" />
<Content Include="views\椤圭洰绠$悊\椤圭洰闃舵\PM_ProjectStageBill.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍏朵粬鍑哄簱\Kf_OtherOutBill_Check.html" />
+ <Content Include="views\棰嗘枡鍙戣揣\鍒嗘寮忚皟鍑哄崟\Fb_StepFoldOutBillEdit.html" />
<Content Include="views\棰嗘枡鍙戣揣\鍒嗘寮忚皟鍑哄崟\Fb_StepFoldOutBillList.html" />
<Content Include="views\棰嗘枡鍙戣揣\濮斿鍑哄簱\Kf_EntrustOutBillList.html" />
<Content Include="views\棰嗘枡鍙戣揣\濮斿鍑哄簱\Kf_EntrustOutBill_Check_New.html" />
--
Gitblit v1.9.1