这个销售绩效查询这个列表中的，你把这个到期类型和到期时间合并，现在到期类型就不要了， 到期时间里面，日期的就显示。时间，他是和金额执行完毕的，就在到期...

username@email.com

2025-10-31 7bcbbbd0459f00ebc3aa7d4f249cb9231a6b5d40

这个销售绩效查询这个列表中的，你把这个到期类型和到期时间合并，现在到期类型就不要了，
到期时间里面，日期的就显示。时间，他是和金额执行完毕的，就在到期时间里头，
就填上金额执行完毕那个合同金额也是就有金额的显示。金额没得金额的，就先据实结算。好，合同类型这个就不要了。

把人事管理列表中的“状态”取消，这个位置改为“合同到期时间”

好人事管理，那现在是状态，状态在职离职，这个这个查询出来不需要显示，因为不会显示全部，别全部几百个职工那个表格拿来没用。
一般我们筛查都是选在职或离职，所以说这个列表中。再显示这个状态没得意义了，
好把这个状态这个位置把它改为合同到期时间，就是新增员工中有个合同到期时间噻哈就来源于这个到期时间年月日。

 CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs

@@ -614,6 +614,20 @@
                _sm_contractendtime = value;
            }
        }



        /// <summary>
        /// 合同到期时间
        /// </summary>		
        public string SM_ContractEndTimeName
        {
            get;
            
            set;
             
        }

        /// <summary>
        /// 离职审批/在职0,申请中1,同意离职2,拒绝申请3
        /// </summary>        

 CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx

@@ -179,15 +179,15 @@
                             <th style="text-align: center;">
                                建档时间
                            </th>
                             <th style="text-align: center;">
                           <%--  <th style="text-align: center;">
                               到期类型
                            </th>
                            </th>--%>
                             <th style="text-align: center;">
                                到期时间
                            </th>
                            <th style="text-align: center;">
                           <%-- <th style="text-align: center;">
                                合同类型
                            </th>
                            </th>--%>
                             <th style="text-align: center;">
                                合同金额
                            </th>
@@ -231,15 +231,15 @@
                        <td>
                            <%#Eval("ExpiretypeName")%>
                        </td>
                        <td>
                       <%-- <td>
                            <%#Eval("ExpireTime", "{0:yyyy-MM-dd}")%>
                        </td>
                        </td>--%>
                         <td>
                            <%#Eval("ContracttypeName")%>
                        </td>
                         <td>
                        <%-- <td>
                            <%#Eval("Contractmoney", "{0:F2}")%>
                        </td>
                        </td>--%>
                        
                         <td>
                            <%#Eval("SumPrice", "{0:F2}")%>
@@ -257,7 +257,7 @@
                </ItemTemplate>
                <FooterTemplate>
                     <tr class="StatisticsMoney">
                    <td colspan="8" class="ali03">
                    <td colspan="6" class="ali03">
                        当前页统计：
                    </td>
                    <td   class="ali01">
@@ -277,7 +277,7 @@
                    </td>
                </tr>
                <tr class="StatisticsMoney">
                    <td colspan="8" class="ali03">
                    <td colspan="6" class="ali03">
                        查询项统计：
                    </td>
                     <td   class="ali01">

 CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoList.aspx.cs

@@ -137,6 +137,20 @@
            weishoukuanjineheji = pa.heji5.Value.ToString("0.00"); ;


            foreach ( var  oA_DeliverPlan in oA_DeliverPlans)
            {
                if(oA_DeliverPlan.ExpiretypeName == "日期")
                {
                    oA_DeliverPlan.ExpiretypeName = oA_DeliverPlan.ExpireTime.HasValue ? oA_DeliverPlan.ExpireTime.Value.ToString("yyyy-MM-dd") : "";
                }

                if(oA_DeliverPlan.ContracttypeName == "金额")
                {
                    oA_DeliverPlan.ContracttypeName = oA_DeliverPlan.Contractmoney.HasValue ? oA_DeliverPlan.Contractmoney.Value.ToString("F2") : "0.00";
                }
            }


            this.RepClientList.DataSource = oA_DeliverPlans;
            this.RepClientList.DataBind();
            UCPager1.AspNetPager.RecordCount = pa.RecordCount;

 CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoPrint.aspx

@@ -67,15 +67,15 @@
                             <th style="text-align: center;">
                                建档时间
                            </th>
                             <th style="text-align: center;">
                            <%-- <th style="text-align: center;">
                               到期类型
                            </th>
                            </th>--%>
                             <th style="text-align: center;">
                                到期时间
                            </th>
                            <th style="text-align: center;">
                           <%-- <th style="text-align: center;">
                                合同类型
                            </th>
                            </th>--%>
                             <th style="text-align: center;">
                                合同金额
                            </th>
@@ -118,15 +118,15 @@
                        <td>
                            <%#Eval("ExpiretypeName")%>
                        </td>
                        <td>
                        <%--<td>
                            <%#Eval("ExpireTime", "{0:yyyy-MM-dd}")%>
                        </td>
                        </td>--%>
                         <td>
                            <%#Eval("ContracttypeName")%>
                        </td>
                         <td>
                        <%-- <td>
                            <%#Eval("Contractmoney", "{0:F2}")%>
                        </td>
                        </td>--%>
                        
                         <td>
                            <%#Eval("SumPrice", "{0:F2}")%>

 CY_ECommercePlatform/CY.WebForm/Pages/business/XiaoshoujixiaoPrint.aspx.cs

@@ -87,10 +87,7 @@
                PageSize = 1000,
                PageIndex = 1
            };
       


            this.rptOrder.DataSource = bll_EC_OrderBLL.GetxiaoshouchaxunList(pagination,
            var oA_DeliverPlans = bll_EC_OrderBLL.GetxiaoshouchaxunList(pagination,
               CurrentUser.MemberId,
                 selectProvince,
                selectCity,
@@ -107,6 +104,20 @@
               txtOrderMoney,
               txtLastOrderTime
              );

            foreach (var oA_DeliverPlan in oA_DeliverPlans)
            {
                if (oA_DeliverPlan.ExpiretypeName == "日期")
                {
                    oA_DeliverPlan.ExpiretypeName = oA_DeliverPlan.ExpireTime.HasValue ? oA_DeliverPlan.ExpireTime.Value.ToString("yyyy-MM-dd") : "";
                }

                if (oA_DeliverPlan.ContracttypeName == "金额")
                {
                    oA_DeliverPlan.ContracttypeName = oA_DeliverPlan.Contractmoney.HasValue ? oA_DeliverPlan.Contractmoney.Value.ToString("F2") : "0.00";
                }
            }
            this.rptOrder.DataSource = oA_DeliverPlans;
            this.rptOrder.DataBind();



 CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx

@@ -136,7 +136,7 @@
                                Email
                            </th>--%>
                            <th>
                                状态
                                合同到期时间
                            </th>
                             <th>
                                查询区域
@@ -205,8 +205,8 @@
                        <td>
                            <%#Eval("Email")%>
                        </td>--%>
                        <td>
                            <%#Eval("Status")%>
                        <td <%#Eval("SM_ContractEndTimeName") %> >
                            <%#Eval("SM_ContractEndTime","{0:yyyy-MM-dd}")%>
                        </td>
                          <td class="Operate">
                            <span menu_member_case_id="case_ManageAddress" menu_member_case_name="修改负责区域" onclick="ManageAddress('<%#Eval("Keyid")%>')">修改</span>

 CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx.cs

@@ -62,7 +62,25 @@
            Pagination pa = new Pagination();
            pa.PageSize = UCPager1.AspNetPager.PageSize;
            pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
            this.RepClientList.DataSource = bll_OA_StaffBLL.SelectModelPage(pa,this.selDepartmentId.Value.ToInt32(),  CurrentUser.MemberId, this.txtMemberName.Value.ToString2(), this.selStatus.Value.ToString2());
            var oA_Staffs = bll_OA_StaffBLL.SelectModelPage(pa, this.selDepartmentId.Value.ToInt32(), CurrentUser.MemberId, this.txtMemberName.Value.ToString2(), this.selStatus.Value.ToString2());
            foreach (var oA_Staff  in oA_Staffs)
            {
                oA_Staff.SM_ContractEndTimeName = "";
                if (oA_Staff.SM_ContractEndTime.HasValue)
                {
                    if(oA_Staff.SM_ContractEndTime.Value < DateTime.Now.AddMonths(3))
                    {
                        oA_Staff.SM_ContractEndTimeName = "style=\"color:red;\"";
                    }
                }

                if (!(oA_Staff.SM_IsContract.HasValue && oA_Staff.SM_IsContract.Value==1))
                {
                    oA_Staff.SM_ContractEndTime = null;
                }
            }
            
            this.RepClientList.DataSource = oA_Staffs;
            this.RepClientList.DataBind();
            UCPager1.AspNetPager.RecordCount = pa.RecordCount;
        }