From a7b22f68527cfbd0e1400c06ef8a3e6b598f85c6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 22 一月 2024 16:55:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 159d01c..0d10128 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -93,6 +93,8 @@
<Content Include="layuiadmin\layui\images\erro.png" />
<Content Include="layuiadmin\layui\layui.js" />
<Content Include="layuiadmin\layui\layui1.js" />
+ <Content Include="layuiadmin\layui\lay\modules\table-鍓湰.js" />
+ <Content Include="layuiadmin\layui\lay\modules\table.js" />
<Content Include="layuiadmin\layui\zgqlayui.js" />
<Content Include="layuiadmin\lib\extend\echarts.min.js" />
<Content Include="layuiadmin\lineBreakTransformer.js" />
@@ -322,8 +324,10 @@
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderBill.aspx" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\xmlLBM_Xs_SeOrderChangeBillList.aspx" />
<Content Include="views\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckList_PDA.html" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjEdit.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPrice.html" />
<Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceList.html" />
+ <Content Include="views\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_Post.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_PostSkillList.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Add_Edit_Gy_BadResult.html" />
@@ -357,6 +361,8 @@
<Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesSumQueryBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\璇峰亣鐢宠\Pay_OutApplyBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\璇峰亣鐢宠\Pay_OutApplyBillList.html" />
+ <Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_ContactBalReport_ImportByExcel.html" />
+ <Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_ContactBalReport.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeEntryReport.html" />
<Content Include="views\搴旀敹绠＄悊\鎶ヨ〃鍒嗘瀽\YS_CusShouldIncomeReport.html" />
<Content Include="views\鏉＄爜鏄庣粏\Kf_BarCodeDetailQuery.html" />
@@ -389,12 +395,14 @@
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByWorkStationList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserCustomerList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserCustomerList_Edit.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserGroupList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserMaterList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserStockRelation.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserProcessList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserCustomer_ImportByExcel.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserEmployee_Excel.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserProcess_Excel.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserSupliesList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserSuplies_Excel.html" />
<Content Include="views\绯荤粺绠＄悊\鑿滃崟鑷畾涔塡Xt_DefineMenuDisplay.html" />
<Content Include="views\绯荤粺绠＄悊\杩囨护鏂规璁剧疆\Xt_FastICScheme.html" />
@@ -445,6 +453,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_Sc_ProcessExchangeBillMain_Note_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationInBillList_PDA_QiaoYi.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_StationOutBillList_PDA_QiaoYi.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Gy_ProcessBatchReport.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_LookDown.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗SingleRowWallList.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭杩涚珯鎺ユ敹鍗昞Cj_StationInBillList_QiaoYi.html" />
@@ -819,7 +828,6 @@
<Content Include="layuiadmin\layui\lay\modules\mobile\zepto.js" />
<Content Include="layuiadmin\layui\lay\modules\rate.js" />
<Content Include="layuiadmin\layui\lay\modules\slider.js" />
- <Content Include="layuiadmin\layui\lay\modules\table.js" />
<Content Include="layuiadmin\layui\lay\modules\tree.js" />
<Content Include="layuiadmin\layui\lay\modules\upload.js" />
<Content Include="layuiadmin\layui\lay\modules\util.js" />
@@ -1568,6 +1576,7 @@
<Content Include="views\椤圭洰绠＄悊\鎶ヨ〃鍒嗘瀽\PM_WorkTaskReportMonthSumReport.html" />
<Content Include="views\椤圭洰绠＄悊\鎶ヨ〃鍒嗘瀽\PM_ProjectWorkDaysSumReport.html" />
<Content Include="views\椤圭洰绠＄悊\鎶ヨ〃鍒嗘瀽\PM_ProjectWorkDaysEntryReport.html" />
+ <Content Include="views\椤圭洰绠＄悊\鎶ヨ〃鍒嗘瀽\PM_ProjectBillMainMy.html" />
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\Add_Edit_Gy_ProjectStage.html" />
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\Gy_ProjectStage.html" />
<Content Include="views\椤圭洰绠＄悊\椤圭洰闃舵\PM_ProjectReportBillList.html" />
--
Gitblit v1.9.1