From ce625cdc3d0657f94e6f98b2cac777e05edb5afc Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 30 六月 2021 15:46:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/WebTM.csproj | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 4c25271..f0392c4 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -59,6 +59,7 @@
<Reference Include="System.EnterpriseServices" />
</ItemGroup>
<ItemGroup>
+ <Content Include="layuiadmin\layui\css\global.css" />
<Content Include="layuiadmin\layui\css\modules\layim\html\getmsg.json" />
<Content Include="layuiadmin\layui\css\zgqlayui.css" />
<Content Include="layuiadmin\layui\font\iconfont.eot" />
@@ -77,6 +78,9 @@
<Content Include="layuiadmin\myicon\杞﹂棿绠＄悊.svg" />
<Content Include="layuiadmin\treeTable.js" />
<Content Include="views\Baseset\HBarPlanPrint.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_RepairList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_ScrapReasonList.html" />
+ <Content Include="views\Baseset\鍩虹璧勬枡\Gy_CheckItemList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_ClassTimePrjGroupList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_DormList.html" />
<Content Include="views\Baseset\鍩虹璧勬枡\Gy_DutyList.html" />
@@ -411,17 +415,22 @@
<Content Include="views\iframe\layer\iframe.html" />
<Content Include="views\index_Mobile.html" />
<Content Include="views\index.html" />
+ <Content Include="views\IpadIndex.html" />
<Content Include="views\PublicPage\CheckItemType.html" />
<Content Include="views\PublicPage\CustomerInformation.html" />
<Content Include="views\PublicPage\DeptInformation.html" />
<Content Include="views\PublicPage\EqpInformation.html" />
<Content Include="views\PublicPage\FaultTypeInformation.html" />
<Content Include="views\PublicPage\GroupInformation.html" />
+ <Content Include="views\PublicPage\PropertyInformation.html" />
<Content Include="views\PublicPage\MouldInformation.html" />
+ <Content Include="views\PublicPage\PartInformation.html" />
<Content Include="views\PublicPage\RepairItemInformation.html" />
<Content Include="views\PublicPage\SourceInformation.html" />
<Content Include="views\PublicPage\SupplierInformation.html" />
+ <Content Include="views\PublicPage\UnitInformation.html" />
<Content Include="views\PublicPage\UserInformation.html" />
+ <Content Include="views\PublicPage\WareLocationInformation.html" />
<Content Include="views\PublicPage\WareHouseInformation.html" />
<Content Include="views\senior\echarts\bar.html" />
<Content Include="views\senior\echarts\line.html" />
@@ -511,6 +520,10 @@
<Content Include="views\鍩虹璧勬枡\杈呭姪鍩虹璧勬枡\Sb_Add_MaintenanceMode.html" />
<Content Include="views\鍩虹璧勬枡\閲囪喘鍩虹璧勬枡\Gy_Supplier.html" />
<Content Include="views\鍩虹璧勬枡\閿�鍞熀纭�璧勬枡\Gy_Customer.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿缁翠慨璁板綍鍗昞Sc_MouldRepairWorkBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍑哄簱鍗昞Sc_MouldOtherOutBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯″叿鍏朵粬鍏ュ簱鍗昞Sc_MouldOtherInBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapInBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldOtherOutBillEdit.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldOtherOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_Add_MouldLifeChangeBillList.html" />
@@ -523,6 +536,8 @@
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldProdOutBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapInBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏蜂粨搴撶鐞哱Sc_MouldScrapOutBillList.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldDotCheckBill_PDA.html" />
+ <Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风偣妫�淇濆吇\Sc_MouldMaintainBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_CheckToolsFileMainList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Gy_Mould.html" />
<Content Include="views\妯℃不鍏风鐞哱妯℃不鍏风鐞哱Sc_Add_MouldDotCheckBillList.html" />
@@ -543,9 +558,9 @@
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\濮斿宸ュ簭璁″垝杞嚭鍗昞WW_EntrustProcessSendOutBill_PDA.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞HBarPlanPrint.html" />
<Content Include="views\鐢熶骇宸ュ簭绠＄悊\宸ュ簭姹囨姤鍗昞xmlLBM_ProcessReport.aspx" />
- <Content Include="views\鐢熶骇绠＄悊\鍋滃伐鎸傝捣鍗昞Sc_MESStopUpWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍋滃伐鍗昞Sc_Add_MESStopWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍋滃伐鍗昞Sc_MESStopWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瀹屽伐鍗昞Sc_Add_MESEndWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瀹屽伐鍗昞Sc_MESEndWorkBillList.html" />
@@ -568,9 +583,12 @@
<Content Include="views\璁惧绠＄悊\Sb_Add_EqpRepairCheckBillList.html" />
<Content Include="views\璁惧绠＄悊\Sb_EqpConkBookBillList.html" />
<Content Include="views\璁惧绠＄悊\Sb_EqpMaintenanceBillList.html" />
+ <Content Include="views\璁惧绠＄悊\Sb_EqpMaintenanceBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\Sb_EqpRepairCheckBillList.html" />
+ <Content Include="views\璁惧绠＄悊\Sb_EquipDotCheckBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainBillEdit.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipDotCheckBillEdit.html" />
+ <Content Include="views\璁惧绠＄悊\Sb_EquipMaintainBillList_PDA.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainPlanBillEdit.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainBillList.html" />
<Content Include="views\璁惧绠＄悊\Sb_EquipMaintainPlanBillList.html" />
--
Gitblit v1.9.1