From 7bcbbbd0459f00ebc3aa7d4f249cb9231a6b5d40 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 31 十月 2025 12:25:17 +0800
Subject: [PATCH] 这个销售绩效查询这个列表中的，你把这个到期类型和到期时间合并，现在到期类型就不要了， 到期时间里面，日期的就显示。时间，他是和金额执行完毕的，就在到期时间里头， 就填上金额执行完毕那个合同金额也是就有金额的显示。金额没得金额的，就先据实结算。好，合同类型这个就不要了。
---
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 96 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 96 insertions(+), 0 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 4362386..8203eb5 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1903,6 +1903,10 @@
<Content Include="Pages\business\DeliverPlanLishiPrint.aspx" />
<Content Include="Pages\business\DeliverPlanPaicheZhuyishixiang.aspx" />
<Content Include="Pages\business\DeliverPlanTimeEdit.aspx" />
+ <Content Include="Pages\business\DeliverWorkBookPandian.aspx" />
+ <Content Include="Pages\business\DeliverWorkBookFahuo.aspx" />
+ <Content Include="Pages\business\DeliverWorkBookfahuoqingkuang.aspx" />
+ <Content Include="Pages\business\Waixiefukuanweikaipiaoshuoming.aspx" />
<Content Include="Pages\business\ShejiOrderDeatil.aspx" />
<Content Include="Pages\business\ShejiOrderList.aspx" />
<Content Include="Pages\business\SHejiOrderEdit.aspx" />
@@ -2218,7 +2222,13 @@
<Content Include="Pages\procurement\OutOfStorageListHTML.aspx" />
<Content Include="Pages\procurement\OutOfStorageListPrint.aspx" />
<Content Include="Pages\Property\PrintCheckTable.aspx" />
+ <Content Include="Pages\Property\ShebeimanageEdit.aspx" />
+ <Content Include="Pages\Property\ShebeiWeixiuFukuanAdd.aspx" />
+ <Content Include="Pages\Property\ShebeiWeixiuList.aspx" />
+ <Content Include="Pages\Property\ShebeimanageList.aspx" />
+ <Content Include="Pages\Property\ShebeiCateEdit.aspx" />
<Content Include="Pages\Property\PropertyCateEdit.aspx" />
+ <Content Include="Pages\Property\ShebeiCateList.aspx" />
<Content Include="Pages\Property\PropertyCateList.aspx" />
<Content Include="Pages\Property\PropertyEdit.aspx" />
<Content Include="Pages\Property\PropertyList.aspx" />
@@ -2228,6 +2238,7 @@
<Content Include="Pages\Property\PropertyRecordDetail.aspx" />
<Content Include="Pages\Property\PropertyRecordEdit.aspx" />
<Content Include="Pages\Property\PropertyRecordList.aspx" />
+ <Content Include="Pages\Property\ShebeiWeixiuAdd.aspx" />
<Content Include="Pages\Soft\ClientAdd.aspx" />
<Content Include="Pages\Soft\ClientDetail.aspx" />
<Content Include="Pages\Soft\ClientList.aspx" />
@@ -2335,6 +2346,7 @@
<Content Include="Pages\Templet\pingxuan\Shared\sM.js" />
<Content Include="Pages\Templet\pingxuan\TemplateIndex.css" />
<Content Include="Pages\wage\OA_WageAwardPunishAdd.aspx" />
+ <Content Include="Pages\wage\FakuanShensuAdd.aspx" />
<Content Include="Pages\wage\StaffWageList.aspx" />
<Content Include="Pages\wage\WorkScoreList.aspx" />
<Content Include="Pages\webmanage\CashHandle.aspx" />
@@ -3491,8 +3503,36 @@
<Compile Include="Pages\business\DeliverPlanTimeEdit.aspx.designer.cs">
<DependentUpon>DeliverPlanTimeEdit.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\DeliverWorkBookPandian.aspx.cs">
+ <DependentUpon>DeliverWorkBookPandian.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookPandian.aspx.designer.cs">
+ <DependentUpon>DeliverWorkBookPandian.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookFahuo.aspx.cs">
+ <DependentUpon>DeliverWorkBookFahuo.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookFahuo.aspx.designer.cs">
+ <DependentUpon>DeliverWorkBookFahuo.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookfahuoqingkuang.aspx.cs">
+ <DependentUpon>DeliverWorkBookfahuoqingkuang.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\DeliverWorkBookfahuoqingkuang.aspx.designer.cs">
+ <DependentUpon>DeliverWorkBookfahuoqingkuang.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\FileUploadHandler.ashx.cs">
<DependentUpon>FileUploadHandler.ashx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\Waixiefukuanweikaipiaoshuoming.aspx.cs">
+ <DependentUpon>Waixiefukuanweikaipiaoshuoming.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\Waixiefukuanweikaipiaoshuoming.aspx.designer.cs">
+ <DependentUpon>Waixiefukuanweikaipiaoshuoming.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\business\ShejiOrderDeatil.aspx.cs">
<DependentUpon>ShejiOrderDeatil.aspx</DependentUpon>
@@ -5699,12 +5739,54 @@
<Compile Include="Pages\Property\PrintCheckTable.aspx.designer.cs">
<DependentUpon>PrintCheckTable.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\Property\ShebeimanageEdit.aspx.cs">
+ <DependentUpon>ShebeimanageEdit.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeimanageEdit.aspx.designer.cs">
+ <DependentUpon>ShebeimanageEdit.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuFukuanAdd.aspx.cs">
+ <DependentUpon>ShebeiWeixiuFukuanAdd.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuFukuanAdd.aspx.designer.cs">
+ <DependentUpon>ShebeiWeixiuFukuanAdd.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuList.aspx.cs">
+ <DependentUpon>ShebeiWeixiuList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuList.aspx.designer.cs">
+ <DependentUpon>ShebeiWeixiuList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeimanageList.aspx.cs">
+ <DependentUpon>ShebeimanageList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeimanageList.aspx.designer.cs">
+ <DependentUpon>ShebeimanageList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiCateEdit.aspx.cs">
+ <DependentUpon>ShebeiCateEdit.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiCateEdit.aspx.designer.cs">
+ <DependentUpon>ShebeiCateEdit.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\Property\PropertyCateEdit.aspx.cs">
<DependentUpon>PropertyCateEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Pages\Property\PropertyCateEdit.aspx.designer.cs">
<DependentUpon>PropertyCateEdit.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiCateList.aspx.cs">
+ <DependentUpon>ShebeiCateList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiCateList.aspx.designer.cs">
+ <DependentUpon>ShebeiCateList.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\Property\PropertyCateList.aspx.cs">
<DependentUpon>PropertyCateList.aspx</DependentUpon>
@@ -5768,6 +5850,13 @@
</Compile>
<Compile Include="Pages\Property\PropertyRecordList.aspx.designer.cs">
<DependentUpon>PropertyRecordList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuAdd.aspx.cs">
+ <DependentUpon>ShebeiWeixiuAdd.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuAdd.aspx.designer.cs">
+ <DependentUpon>ShebeiWeixiuAdd.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\Soft\ClientAdd.aspx.cs">
<DependentUpon>ClientAdd.aspx</DependentUpon>
@@ -6182,6 +6271,13 @@
<Compile Include="Pages\wage\OA_WageAwardPunishAdd.aspx.designer.cs">
<DependentUpon>OA_WageAwardPunishAdd.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\wage\FakuanShensuAdd.aspx.cs">
+ <DependentUpon>FakuanShensuAdd.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\wage\FakuanShensuAdd.aspx.designer.cs">
+ <DependentUpon>FakuanShensuAdd.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\wage\StaffWageList.aspx.cs">
<DependentUpon>StaffWageList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
--
Gitblit v1.9.1