feat(clgl): 增加入库申请编辑与明细导入
支持入库申请信息维护、入库明细批量导入及模板下载, 完善材料入库业务流程,减少人工录入和明细维护成本。 增加焊口流转区段信息,并统一相关单位工程列表排序
This commit is contained in:
@@ -344,17 +344,14 @@
|
||||
<Content Include="BaseInfo\WorkPost.aspx" />
|
||||
<Content Include="BaseInfo\WorkPostCleanupMerge.aspx" />
|
||||
<Content Include="BaseInfo\WorkStage.aspx" />
|
||||
<Content Include="bin\FastReport.dll" />
|
||||
<Content Include="bin\FastReport.Editor.dll" />
|
||||
<Content Include="bin\FastReport.Web.dll" />
|
||||
<Content Include="bin\FineUIPro.Web.dll" />
|
||||
<Content Include="bin\FineUIPro.Web.pdb" />
|
||||
<Content Include="CLGL\ArrivalStatistics.aspx" />
|
||||
<Content Include="CLGL\OutPlanMaster.aspx" />
|
||||
<Content Include="CLGL\OutPlanMasterDetailImport.aspx" />
|
||||
<Content Include="CLGL\OutPlanMasterHistoryImport.aspx" />
|
||||
<Content Include="CLGL\OutPlanMasterEdit.aspx" />
|
||||
<Content Include="CLGL\OutPlanMasterOut.aspx" />
|
||||
<Content Include="CLGL\InPlanMasterApplyEdit.aspx" />
|
||||
<Content Include="CLGL\InPlanMasterDetailImport.aspx" />
|
||||
<Content Include="CLGL\InPlanMaster.aspx" />
|
||||
<Content Include="CLGL\InPlanMasterDataIn.aspx" />
|
||||
<Content Include="CLGL\InPlanMasterEdit.aspx" />
|
||||
@@ -645,10 +642,6 @@
|
||||
<Content Include="DigData\ProjectWBSAnalysis.aspx" />
|
||||
<Content Include="DigData\WBSAnalysis.aspx" />
|
||||
<Content Include="DigData\WBSDW.aspx" />
|
||||
<Content Include="FakesAssemblies\Apache.NMS.Fakes.dll" />
|
||||
<Content Include="FakesAssemblies\Apache.NMS.Fakes.xml" />
|
||||
<Content Include="FakesAssemblies\ThoughtWorks.QRCode.Fakes.dll" />
|
||||
<Content Include="FakesAssemblies\ThoughtWorks.QRCode.Fakes.xml" />
|
||||
<Content Include="File\Image\label.png" />
|
||||
<Content Include="File\Image\loc.png" />
|
||||
<Content Include="File\Image\SEDIN_Code.jpg" />
|
||||
@@ -3038,14 +3031,6 @@
|
||||
<Content Include="Notice\NoticeEdit.aspx" />
|
||||
<Content Include="Notice\NoticeView.aspx" />
|
||||
<Content Include="Notice\NoticeView2.aspx" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.csproj.FileListAbsolute.txt" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.dll" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.pdb" />
|
||||
<Content Include="obj\Debug\Interop.WIA.dll" />
|
||||
<Content Include="obj\Debug\TempPE\Service References.HSSEService.Reference.cs.dll" />
|
||||
<Content Include="obj\Debug\Web.csproj.FileListAbsolute.txt" />
|
||||
<Content Include="obj\Debug\Web.dll" />
|
||||
<Content Include="obj\Debug\Web.pdb" />
|
||||
<Content Include="OfficeCheck\Check\CheckContentEdit.aspx" />
|
||||
<Content Include="OfficeCheck\Check\CheckInfo.aspx" />
|
||||
<Content Include="OfficeCheck\Check\CheckNotice.aspx" />
|
||||
@@ -3592,7 +3577,6 @@
|
||||
<Content Include="ZHGL\RealName\OnPost.aspx" />
|
||||
<Content Include="ZHGL\RealName\SynchroRecord.aspx" />
|
||||
<Content Include="ZHGL\RealName\SynchroSet.aspx" />
|
||||
<Content Include="AttachFile\officecontrol\2222.docx" />
|
||||
<Content Include="ZHGL\Supervise\ShowFileUpload.aspx" />
|
||||
<Content Include="ZHGL\Supervise\ShowRectifyItem.aspx" />
|
||||
<Content Include="ZHGL\Supervise\SubUnitCheckRectifyEdit.aspx" />
|
||||
@@ -3641,8 +3625,6 @@
|
||||
<Content Include="HSSE\Doc\用户权限怎么设置.doc" />
|
||||
<Content Include="HSSE\Doc\隐患整改单操作说明.doc" />
|
||||
<Content Include="HJGL\WeldingManage\GetWdldingDailyItem.ashx" />
|
||||
<Content Include="File\Word\Person\~%24经理工作任务书.doc" />
|
||||
<Content Include="File\Word\Person\~WRL0001.tmp" />
|
||||
<Content Include="File\Word\Person\安全专业工程师工作任务书.doc" />
|
||||
<Content Include="File\Word\Person\安全经理工作任务书.doc" />
|
||||
<Content Include="File\Word\Person\施工专业工程师工作任务书.doc" />
|
||||
@@ -3669,11 +3651,8 @@
|
||||
<Content Include="File\Word\HSSE\专项检查.doc" />
|
||||
<Content Include="File\Excel\DataIn\WBS定制导入模板.xls" />
|
||||
<Content Include="File\Word\HSSE\安全日志.doc" />
|
||||
<Fakes Include="Fakes\Apache.NMS.fakes" />
|
||||
<Fakes Include="Fakes\ThoughtWorks.QRCode.fakes" />
|
||||
<Content Include="File\Word\PHTGL\合同评审、审批表.docx" />
|
||||
<Content Include="File\Word\PHTGL\招标文件审批表.docx" />
|
||||
<Content Include="File\Word\PHTGL\施工分包合同\~%249 施工分包商组织机构人员配置表及关键人员名单.docx" />
|
||||
<Content Include="File\Word\PHTGL\施工分包合同\施工合同标准文本.docx" />
|
||||
<Content Include="File\Word\PHTGL\施工分包合同\第三部分 专用合同条款.docx" />
|
||||
<Content Include="File\Word\PHTGL\施工分包合同\第二部分 通用合同条款.docx" />
|
||||
@@ -3701,19 +3680,6 @@
|
||||
<Content Include="File\Word\PHTGL\施工招标评标小组名单审批表.docx" />
|
||||
<Content Include="File\Word\PHTGL\确定分包商审批表(用于经评审的最低投标报价法).docx" />
|
||||
<Content Include="File\Word\PHTGL\确定分包商审批表(用于综合评估法).docx" />
|
||||
<Content Include="FakesAssemblies\Apache.NMS.Fakes.fakesconfig" />
|
||||
<Content Include="FakesAssemblies\Apache.NMS.Fakes.messages" />
|
||||
<Content Include="FakesAssemblies\ThoughtWorks.QRCode.Fakes.fakesconfig" />
|
||||
<Content Include="FakesAssemblies\ThoughtWorks.QRCode.Fakes.messages" />
|
||||
<Content Include="obj\Debug\DesignTimeResolveAssemblyReferences.cache" />
|
||||
<Content Include="obj\Debug\DesignTimeResolveAssemblyReferencesInput.cache" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.csproj.CopyComplete" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.csproj.CoreCompileInputs.cache" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.csprojAssemblyReference.cache" />
|
||||
<Content Include="obj\Debug\FineUIPro.Web.csprojFakesResolveAssemblyReference.cache" />
|
||||
<Content Include="obj\Debug\ResolveAssemblyReference.cache" />
|
||||
<Content Include="obj\Debug\TempPE\vssver.scc" />
|
||||
<Content Include="obj\Debug\Web.csprojResolveAssemblyReference.cache" />
|
||||
<Content Include="File\Word\Person\员工总结模板.doc" />
|
||||
<Fakes Include="Fakes\FastReport.fakes" />
|
||||
<Content Include="libman.json" />
|
||||
@@ -3735,7 +3701,6 @@
|
||||
<Content Include="ReportPrint\ReportTabFile\项目现场职工伤亡事故原因分析报.tab" />
|
||||
<Content Include="ReportPrint\ReportTabFile\职业健康安全危险源辨识与评价.tab" />
|
||||
<Content Include="ReportPrint\ReportTabFile\职业健康安全危险源辨识与评价(重大危险源).tab" />
|
||||
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
|
||||
<Content Include="Personal\RunLog.aspx" />
|
||||
<Content Include="Personal\PersonalSet.aspx" />
|
||||
<Content Include="Personal\PersonalInfo.aspx" />
|
||||
@@ -8252,6 +8217,20 @@
|
||||
<Compile Include="CLGL\OutPlanMasterOut.aspx.designer.cs">
|
||||
<DependentUpon>OutPlanMasterOut.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CLGL\InPlanMasterApplyEdit.aspx.cs">
|
||||
<DependentUpon>InPlanMasterApplyEdit.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="CLGL\InPlanMasterApplyEdit.aspx.designer.cs">
|
||||
<DependentUpon>InPlanMasterApplyEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CLGL\InPlanMasterDetailImport.aspx.cs">
|
||||
<DependentUpon>InPlanMasterDetailImport.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="CLGL\InPlanMasterDetailImport.aspx.designer.cs">
|
||||
<DependentUpon>InPlanMasterDetailImport.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="CLGL\InPlanMaster.aspx.cs">
|
||||
<DependentUpon>InPlanMaster.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
@@ -17190,20 +17169,15 @@
|
||||
<DependentUpon>UnitHazardRegisterRecordEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="App_Themes\Web.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="App_Themes\Default\Images\" />
|
||||
<Folder Include="FakesAssemblies\" />
|
||||
<Folder Include="FileUpload\" />
|
||||
<Folder Include="Images\charts_0\" />
|
||||
<Folder Include="Images\charts_1\" />
|
||||
<Folder Include="Images\charts_2\" />
|
||||
<Folder Include="Images\charts_3\" />
|
||||
<Folder Include="obj\Debug\Fakes\anms\b\zh-Hans\" />
|
||||
<Folder Include="obj\Debug\Fakes\anms\o\" />
|
||||
<Folder Include="obj\Debug\Fakes\twqrc\b\zh-Hans\" />
|
||||
<Folder Include="obj\Debug\Fakes\twqrc\o\" />
|
||||
<Folder Include="Properties\PublishProfiles\" />
|
||||
<Folder Include="res\indexv1\assets\image\sub_index\quality\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
@@ -17298,4 +17272,4 @@
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
</Project>
|
||||
Reference in New Issue
Block a user