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

yangle

2024-01-22 a7b22f68527cfbd0e1400c06ef8a3e6b598f85c6

 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" />