From 00ea07f0fcdb261bf088e8aed9443161064cce1e Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 16 十月 2024 09:27:24 +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 3911b23..a404706 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -93,6 +93,7 @@
<Content Include="layuiadmin\ax\images\login-left.jpg" />
<Content Include="layuiadmin\ax\images\yanzhengma.jpg" />
<Content Include="layuiadmin\ax\main.css" />
+ <Content Include="layuiadmin\BillMainAutoLoad.js" />
<Content Include="layuiadmin\ckou.js" />
<Content Include="layuiadmin\echarts.min.js" />
<Content Include="layuiadmin\grwebapp.js" />
@@ -403,6 +404,7 @@
<Content Include="views\鍩虹璧勬枡\閫氱敤鍩虹璧勬枡\Gy_CommonBaseData.html" />
<Content Include="views\鍩虹璧勬枡\闅愯棌鍒楄缃甛Gy_GridView_Hide_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\瀹氶鐢宠\Pay_ProcPriceRequestBillCheckQuery.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫杩愮畻\Pay_SalaryCalculate_New.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\鎶�鑳借�冩牳\HR_EmployeeSkillExamBillList.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />
@@ -548,6 +550,7 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_ProcessReportList_Last.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_StationInBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\test.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍏抽敭浠剁粦瀹歕Sc_KeyElementBinding.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBillList.html" />
@@ -2038,6 +2041,7 @@
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkReportWeekBillMainList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBillList.html" />
<Content Include="views\椤圭洰绠＄悊\鍛ㄨ鍒抃PM_WorkTaskWeekBill.html" />
+ <Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskBill_AutoLoadBillMain.html" />
<Content Include="views\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_CustomerProInfoBillMainList.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBOMBill.html" />
<Content Include="views\椤圭洰绠＄悊\宸ヤ綔浠诲姟\PM_WorkTaskMoneyBOMBillList.html" />
--
Gitblit v1.9.1