From f820d227c54e7686d7b582fcd3c1ffcf885b5d31 Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期五, 24 一月 2025 12:22:49 +0800 Subject: [PATCH] 审批拒绝的可以修改后再次提交 完成 报销单需要一个编号 EvaluationContent 报销单编号 完成 增加一个状态,保存状态 完成 --- CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 130 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 130 insertions(+), 0 deletions(-) diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj index 3794d34..f2e2648 100644 --- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj +++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj @@ -106,6 +106,7 @@ <Reference Include="System.Data" /> <Reference Include="System.Core" /> <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="System.Net.Http, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="System.Transactions" /> <Reference Include="System.Web.Extensions" /> <Reference Include="System.Xml.Linq" /> @@ -1883,6 +1884,11 @@ <Content Include="Pages\business\BackVisitNoteEdit.aspx" /> <Content Include="Pages\business\BargainPrice.aspx" /> <Content Include="Pages\business\BargainPriceByFirm.aspx" /> + <Content Include="Pages\business\Caigoufukuanshenqing.aspx" /> + <Content Include="Pages\business\Baozhengjinfukuan.aspx" /> + <Content Include="Pages\business\BaozhengjinCuishou.aspx" /> + <Content Include="Pages\business\OrderUpLoadLiuyang.aspx" /> + <Content Include="Pages\business\WaixieOrderPrint.aspx" /> <Content Include="Pages\business\Waixiefukuanweikaipiao.aspx" /> <Content Include="Pages\business\Waixiefukuanfukuan.aspx" /> <Content Include="Pages\business\InvoicingWeiquerenshouru.aspx" /> @@ -2042,7 +2048,11 @@ <Content Include="Pages\common\U_Login.ascx" /> <Content Include="Pages\financial\DepositsCustomershouruqueren.aspx" /> <Content Include="Pages\financial\DepositsCustomerFapiao.aspx" /> + <Content Include="Pages\financial\BaozhengjinIncome.aspx" /> + <Content Include="Pages\financial\BaoxiaoFukuanEdit.aspx" /> + <Content Include="Pages\financial\NewWaixieExpenses.aspx" /> <Content Include="Pages\financial\OutsourcePiliangPayMoney.aspx" /> + <Content Include="Pages\financial\CaigouPayEdit.aspx" /> <Content Include="Pages\financial\WaixieExpenses.aspx" /> <Content Include="Pages\financial\FirmAccountPrint.aspx" /> <Content Include="Pages\financial\FirmAccountPrintTable.aspx" /> @@ -2166,6 +2176,7 @@ <Content Include="Pages\personnel\OA_WagesRecordAdd.aspx" /> <Content Include="Pages\personnel\OA_WagesRecordDetail.aspx" /> <Content Include="Pages\personnel\OA_WagesRecordList.aspx" /> + <Content Include="Pages\personnel\StaffQuanxianshezhi.aspx" /> <Content Include="Pages\personnel\StaffPropertyRecordList.aspx" /> <Content Include="Pages\personnel\WorkReminderEdit.aspx" /> <Content Include="Pages\personnel\WorkReminderList.aspx" /> @@ -2759,10 +2770,15 @@ <Content Include="Pages\workcar\CarViolationList.aspx" /> <Content Include="Pages\workcar\MemberDictionaryEdit.aspx" /> <Content Include="Pages\workcar\MemberDictionaryList.aspx" /> + <Content Include="Pages\work\BaoxiaoFukuanList.aspx" /> + <Content Include="Pages\work\BaoxiaoReplyList.aspx" /> <Content Include="Pages\work\MyPlanAdd.aspx" /> <Content Include="Pages\work\MyPlanList.aspx" /> + <Content Include="Pages\work\MyBaoxiaoAdd.aspx" /> <Content Include="Pages\work\MyRequestAdd.aspx" /> + <Content Include="Pages\work\MyBaoxiaoDetail.aspx" /> <Content Include="Pages\work\MyRequestDetail.aspx" /> + <Content Include="Pages\work\MyBaoxiaoList.aspx" /> <Content Include="Pages\work\MyRequestList.aspx" /> <Content Include="Pages\work\OA_DocumentAdd.aspx" /> <Content Include="Pages\work\OA_DocumentDetail.aspx" /> @@ -2770,6 +2786,7 @@ <Content Include="Pages\work\OA_DocumentDicDetail.aspx" /> <Content Include="Pages\work\OA_DocumentDicList.aspx" /> <Content Include="Pages\work\OA_DocumentList.aspx" /> + <Content Include="Pages\work\BaoxiaoReplyAdd.aspx" /> <Content Include="Pages\work\RequestReplyAdd.aspx" /> <Content Include="Pages\work\RequestReplyList.aspx" /> <Content Include="Pages\work\WorkPlanAdd.aspx" /> @@ -2931,6 +2948,7 @@ <DependentUpon>Global.asax</DependentUpon> </Compile> <Compile Include="Helper\TimeTaskHelper.cs" /> + <Compile Include="Helper\upLoadLiuyangFile.cs" /> <Compile Include="Helper\upLoadContractFile.cs" /> <Compile Include="Index.aspx.cs"> <DependentUpon>Index.aspx</DependentUpon> @@ -3301,6 +3319,41 @@ </Compile> <Compile Include="Pages\business\BargainPriceByFirm.aspx.designer.cs"> <DependentUpon>BargainPriceByFirm.aspx</DependentUpon> + </Compile> + <Compile Include="Pages\business\Caigoufukuanshenqing.aspx.cs"> + <DependentUpon>Caigoufukuanshenqing.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\business\Caigoufukuanshenqing.aspx.designer.cs"> + <DependentUpon>Caigoufukuanshenqing.aspx</DependentUpon> + </Compile> + <Compile Include="Pages\business\Baozhengjinfukuan.aspx.cs"> + <DependentUpon>Baozhengjinfukuan.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\business\Baozhengjinfukuan.aspx.designer.cs"> + <DependentUpon>Baozhengjinfukuan.aspx</DependentUpon> + </Compile> + <Compile Include="Pages\business\BaozhengjinCuishou.aspx.cs"> + <DependentUpon>BaozhengjinCuishou.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\business\BaozhengjinCuishou.aspx.designer.cs"> + <DependentUpon>BaozhengjinCuishou.aspx</DependentUpon> + </Compile> + <Compile Include="Pages\business\OrderUpLoadLiuyang.aspx.cs"> + <DependentUpon>OrderUpLoadLiuyang.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\business\OrderUpLoadLiuyang.aspx.designer.cs"> + <DependentUpon>OrderUpLoadLiuyang.aspx</DependentUpon> + </Compile> + <Compile Include="Pages\business\WaixieOrderPrint.aspx.cs"> + <DependentUpon>WaixieOrderPrint.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\business\WaixieOrderPrint.aspx.designer.cs"> + <DependentUpon>WaixieOrderPrint.aspx</DependentUpon> </Compile> <Compile Include="Pages\business\Waixiefukuanweikaipiao.aspx.cs"> <DependentUpon>Waixiefukuanweikaipiao.aspx</DependentUpon> @@ -4415,12 +4468,40 @@ <Compile Include="Pages\financial\DepositsCustomerFapiao.aspx.designer.cs"> <DependentUpon>DepositsCustomerFapiao.aspx</DependentUpon> </Compile> + <Compile Include="Pages\financial\BaozhengjinIncome.aspx.cs"> + <DependentUpon>BaozhengjinIncome.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\financial\BaozhengjinIncome.aspx.designer.cs"> + <DependentUpon>BaozhengjinIncome.aspx</DependentUpon> + </Compile> + <Compile Include="Pages\financial\BaoxiaoFukuanEdit.aspx.cs"> + <DependentUpon>BaoxiaoFukuanEdit.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\financial\BaoxiaoFukuanEdit.aspx.designer.cs"> + <DependentUpon>BaoxiaoFukuanEdit.aspx</DependentUpon> + </Compile> + <Compile Include="Pages\financial\NewWaixieExpenses.aspx.cs"> + <DependentUpon>NewWaixieExpenses.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\financial\NewWaixieExpenses.aspx.designer.cs"> + <DependentUpon>NewWaixieExpenses.aspx</DependentUpon> + </Compile> <Compile Include="Pages\financial\OutsourcePiliangPayMoney.aspx.cs"> <DependentUpon>OutsourcePiliangPayMoney.aspx</DependentUpon> <SubType>ASPXCodeBehind</SubType> </Compile> <Compile Include="Pages\financial\OutsourcePiliangPayMoney.aspx.designer.cs"> <DependentUpon>OutsourcePiliangPayMoney.aspx</DependentUpon> + </Compile> + <Compile Include="Pages\financial\CaigouPayEdit.aspx.cs"> + <DependentUpon>CaigouPayEdit.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\financial\CaigouPayEdit.aspx.designer.cs"> + <DependentUpon>CaigouPayEdit.aspx</DependentUpon> </Compile> <Compile Include="Pages\financial\WaixieExpenses.aspx.cs"> <DependentUpon>WaixieExpenses.aspx</DependentUpon> @@ -5282,6 +5363,13 @@ </Compile> <Compile Include="Pages\personnel\OA_WagesRecordList.aspx.designer.cs"> <DependentUpon>OA_WagesRecordList.aspx</DependentUpon> + </Compile> + <Compile Include="Pages\personnel\StaffQuanxianshezhi.aspx.cs"> + <DependentUpon>StaffQuanxianshezhi.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\personnel\StaffQuanxianshezhi.aspx.designer.cs"> + <DependentUpon>StaffQuanxianshezhi.aspx</DependentUpon> </Compile> <Compile Include="Pages\personnel\StaffPropertyRecordList.aspx.cs"> <DependentUpon>StaffPropertyRecordList.aspx</DependentUpon> @@ -8842,6 +8930,20 @@ <Compile Include="Pages\workcar\MemberDictionaryList.aspx.designer.cs"> <DependentUpon>MemberDictionaryList.aspx</DependentUpon> </Compile> + <Compile Include="Pages\work\BaoxiaoFukuanList.aspx.cs"> + <DependentUpon>BaoxiaoFukuanList.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\work\BaoxiaoFukuanList.aspx.designer.cs"> + <DependentUpon>BaoxiaoFukuanList.aspx</DependentUpon> + </Compile> + <Compile Include="Pages\work\BaoxiaoReplyList.aspx.cs"> + <DependentUpon>BaoxiaoReplyList.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\work\BaoxiaoReplyList.aspx.designer.cs"> + <DependentUpon>BaoxiaoReplyList.aspx</DependentUpon> + </Compile> <Compile Include="Pages\work\MyPlanAdd.aspx.cs"> <DependentUpon>MyPlanAdd.aspx</DependentUpon> <SubType>ASPXCodeBehind</SubType> @@ -8856,6 +8958,13 @@ <Compile Include="Pages\work\MyPlanList.aspx.designer.cs"> <DependentUpon>MyPlanList.aspx</DependentUpon> </Compile> + <Compile Include="Pages\work\MyBaoxiaoAdd.aspx.cs"> + <DependentUpon>MyBaoxiaoAdd.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\work\MyBaoxiaoAdd.aspx.designer.cs"> + <DependentUpon>MyBaoxiaoAdd.aspx</DependentUpon> + </Compile> <Compile Include="Pages\work\MyRequestAdd.aspx.cs"> <DependentUpon>MyRequestAdd.aspx</DependentUpon> <SubType>ASPXCodeBehind</SubType> @@ -8863,12 +8972,26 @@ <Compile Include="Pages\work\MyRequestAdd.aspx.designer.cs"> <DependentUpon>MyRequestAdd.aspx</DependentUpon> </Compile> + <Compile Include="Pages\work\MyBaoxiaoDetail.aspx.cs"> + <DependentUpon>MyBaoxiaoDetail.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\work\MyBaoxiaoDetail.aspx.designer.cs"> + <DependentUpon>MyBaoxiaoDetail.aspx</DependentUpon> + </Compile> <Compile Include="Pages\work\MyRequestDetail.aspx.cs"> <DependentUpon>MyRequestDetail.aspx</DependentUpon> <SubType>ASPXCodeBehind</SubType> </Compile> <Compile Include="Pages\work\MyRequestDetail.aspx.designer.cs"> <DependentUpon>MyRequestDetail.aspx</DependentUpon> + </Compile> + <Compile Include="Pages\work\MyBaoxiaoList.aspx.cs"> + <DependentUpon>MyBaoxiaoList.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\work\MyBaoxiaoList.aspx.designer.cs"> + <DependentUpon>MyBaoxiaoList.aspx</DependentUpon> </Compile> <Compile Include="Pages\work\MyRequestList.aspx.cs"> <DependentUpon>MyRequestList.aspx</DependentUpon> @@ -8919,6 +9042,13 @@ <Compile Include="Pages\work\OA_DocumentList.aspx.designer.cs"> <DependentUpon>OA_DocumentList.aspx</DependentUpon> </Compile> + <Compile Include="Pages\work\BaoxiaoReplyAdd.aspx.cs"> + <DependentUpon>BaoxiaoReplyAdd.aspx</DependentUpon> + <SubType>ASPXCodeBehind</SubType> + </Compile> + <Compile Include="Pages\work\BaoxiaoReplyAdd.aspx.designer.cs"> + <DependentUpon>BaoxiaoReplyAdd.aspx</DependentUpon> + </Compile> <Compile Include="Pages\work\RequestReplyAdd.aspx.cs"> <DependentUpon>RequestReplyAdd.aspx</DependentUpon> <SubType>ASPXCodeBehind</SubType> -- Gitblit v1.9.1