Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

杨乐

2021-12-27 2accba697d08fbdfa334ee19c39c905b490c1045

 WebTM/WebTM.csproj

@@ -125,13 +125,11 @@
    <Content Include="views\ReportHtml.html" />
    <Content Include="views\test\testRenderAutomationList.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockStepOutBill_Fast.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ClassTimePrjSub.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderLev.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ClassTimePrjSub.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Pay_PeriodInfoSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkType.html" />
@@ -144,8 +142,6 @@
    <Content Include="views\基础资料\公用基础资料\Gy_Employee_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipTypeEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ClassTimePrj.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ClassTimePrj.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Add_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MouldType.html" />
    <Content Include="views\基础资料\公用基础资料\grf\b.grf" />
@@ -169,6 +165,8 @@
    <Content Include="views\基础资料\公用基础资料\grf\器具改制入库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具改制出库单.grf" />
    <Content Include="views\基础资料\公用基础资料\grf\器具采购入库单.grf" />
    <Content Include="views\grf\设备档案.grf" />
    <Content Include="views\grf\器具档案.grf" />
    <None Include="Web.Debug.config">
      <DependentUpon>Web.config</DependentUpon>
    </None>
@@ -574,6 +572,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_EquipMent.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Currency.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipFileMainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_EquipTypeBill.aspx" />
@@ -581,6 +580,7 @@
    <Content Include="views\基础资料\公用基础资料\Gy_DepartmentList.html" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldFileMainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainPlanBill.aspx" />
    <Content Include="views\基础资料\公用基础资料\xmlLBM_MouldProdInStockBill.aspx" />
@@ -658,6 +658,12 @@
    <Content Include="views\工资管理\工资结算单%28其他%29\Pay_OtherBalBillList.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillEdit.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillList.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjSubBillEdit.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjBillEdit.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjBillList.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjSubBillList.html" />
    <Content Include="views\工资管理\班组职员清单\Gy_GroupEmpBillEdit.html" />
    <Content Include="views\工资管理\班组职员清单\Gy_GroupEmpBillList.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillEdit.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillList.html" />
    <Content Include="views\模治具管理\器具报表\ReportInventoryAccount.html" />
@@ -956,6 +962,13 @@
    <Compile Include="App_Data\MssqlReportData.cs" />
    <Compile Include="App_Data\ReportData.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipFileMainBill.aspx.cs">
      <DependentUpon>xmlLBM_EquipFileMainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipFileMainBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_EquipFileMainBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_EquipMaintainBill.aspx.cs">
      <DependentUpon>xmlLBM_EquipMaintainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
@@ -1005,6 +1018,13 @@
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldDotCheckPlanBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldDotCheckPlanBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldFileMainBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldFileMainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldFileMainBill.aspx.designer.cs">
      <DependentUpon>xmlLBM_MouldFileMainBill.aspx</DependentUpon>
    </Compile>
    <Compile Include="views\基础资料\公用基础资料\xmlLBM_MouldMaintainBill.aspx.cs">
      <DependentUpon>xmlLBM_MouldMaintainBill.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>