From c9ff0219e54b0a228af9c35cbc0100f3a70633aa Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 20 十月 2023 14:14:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 15a9494..303a7a3 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -289,6 +289,7 @@
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBillList_PDA.html" />
<Content Include="views\璐ㄩ噺绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Sc_ProcessErrStationReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_MateOutSumReport_QiaoYi.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_BrushingOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎缁勮杩芥函\Cj_AssemblyTraceability.html" />
@@ -476,6 +477,7 @@
<Content Include="views\grf\cs10.grf" />
<Content Include="views\grf\鎸囧紩鍗�1.grf" />
<Content Include="views\grf\鐢熶骇棰嗘枡鍗�.grf" />
+ <Content Include="views\grf\宸ュ簭鍦ㄥ埗鎶ヨ〃.grf" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1363,6 +1365,8 @@
<Content Include="views\閿�鍞鐞哱閿�鍞鍗昞Add_Edit_Xs_SeOrderBillList.html" />
<Content Include="views\椤圭洰绠＄悊\涓氱哗鎸囨爣\PM_YearEmployeeMoneyBillList.html" />
<Content Include="views\椤圭洰绠＄悊\涓氱哗鎸囨爣\PM_YearEmployeeMoneyBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBillList.html" />
+ <Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBillList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskReportBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBillList.html" />
--
Gitblit v1.9.1