合并

ch

2022-07-27 36257012be1cca005b6d228d5115d7ef47250e07

 WebTM/WebTM.csproj

@@ -160,6 +160,7 @@
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Pay_PeriodInfoSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenterDyCol.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Pay_PeriodInfoSet.html" />
@@ -726,7 +727,9 @@
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjSubBillList.html" />
    <Content Include="views\工资管理\班组职员清单\Gy_GroupEmpBillEdit.html" />
    <Content Include="views\工资管理\班组职员清单\Gy_GroupEmpBillList.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillEdit_yqn.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillEdit.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillList_yqn.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillList.html" />
    <Content Include="views\模治具管理\器具报表\ReportInventoryAccount.html" />
    <Content Include="views\模治具管理\器具报表\ReportMaterialReceipt.html" />
@@ -979,6 +982,7 @@
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturnList.html" />
    <Content Include="views\采购管理\采购退料单\Cg_PurchaseReturn_Add_Up.html" />
    <Content Include="views\销售管理\发货通知单\Add_Edit_Xs_SeOutStockBillList.html" />
    <Content Include="views\销售管理\销售订单\Xs_SeOrderBillDyColList.html" />
    <Content Include="views\销售管理\销售退货单\Add_Edit_Kf_ICStockBillMainList.html" />
    <Content Include="views\销售管理\销售退货单\Kf_ICStockBillMainList.html" />
    <Content Include="views\销售管理\销售订单\Add_Edit_Xs_SeOrderBillList.html" />