From a2869ec2b442dd0d3036cbad98c00fbf57722b5a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 25 四月 2024 11:06:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/WebTM.csproj | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f04f17e..3bbb58f 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\PlateBinding.js" />
<Content Include="layuiadmin\PageTitle.js" />
<Content Include="layuiadmin\HideButton.js" />
<Content Include="layuiadmin\layui\css\global.css" />
@@ -190,6 +191,7 @@
<Content Include="views\index_QiaoYi.html" />
<Content Include="views\index - 澶嶅埗.html" />
<Content Include="views\indexMenu.html" />
+ <Content Include="views\PlateBinding.html" />
<Content Include="views\IpadStepIndex.html" />
<Content Include="views\PublicPage\DeptInformation_PDA.html" />
<Content Include="views\PublicPage\MaterialInfo.html" />
@@ -283,6 +285,7 @@
<Content Include="views\浜轰簨绠＄悊\绂昏亴鐢宠\HR_EmpDimissionBillList.html" />
<Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBill.html" />
<Content Include="views\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillList.html" />
+ <Content Include="views\浠撳瓨绠＄悊\鐢熶骇鍏ュ簱鍗昞Kf_ProductInBillList.html" />
<Content Include="views\鍏叡椤甸潰\Kf_ChaoBaoEditDlg.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_BadClass.html" />
<Content Include="views\鍝佽川绠＄悊\瀹㈣瘔澶勭悊\QC_CustomerAppealReport_Material.html" />
@@ -410,8 +413,9 @@
<Content Include="views\宸ヨ祫绠＄悊\宀椾綅鎶�鑳芥竻鍗昞HR_PostSkillBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鍗昞Pay_PayMentBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫鍗昞Pay_PayMentBillList.html" />
- <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillEdit.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillEdit_old.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillList.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillEdit.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28闆嗕綋%29\Pay_GroupBalBillList.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫璁＄畻\Pay_SalaryCalculate.html" />
@@ -580,11 +584,13 @@
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\Cj_ProcessItemStationPlatform.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\RetrospectiveQueryReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\Sc_SourceLineRepairBillList.html" />
+ <Content Include="views\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill_CodingReport.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_ProcessExchangeBillList_PDA_QiaoYi.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆\MES_Sc_ICMOBillList_PDA_QiaoYi.html" />
<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\杞﹂棿绠＄悊\宸ュ簭鍑虹珯姹囨姤鍗昞Cj_StationOutBill_CurrentWork.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Gy_ProcessBatchReport.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_LookDown.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇璁″垝骞冲彴\Sc_WorkBillMonthPlan.html" />
--
Gitblit v1.9.1