From 0cf6336668b925fa891b12e464ba4bdfc555a200 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 06 二月 2025 08:41:34 +0800
Subject: [PATCH] 总经理可以批量审批
---
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 16 +
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx | 11
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs | 11
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx.cs | 194 ++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx | 11
CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx.designer.cs | 80 +++++
CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx | 129 ++++++++
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoPiliangReply.aspx.cs | 259 +++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoPiliangReply.aspx | 68 ++++
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoPiliangReply.aspx.designer.cs | 80 +++++
12 files changed, 852 insertions(+), 15 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index f2e2648..87eae53 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -2046,6 +2046,7 @@
<Content Include="Pages\common\U_Info.ascx" />
<Content Include="Pages\common\U_Link.ascx" />
<Content Include="Pages\common\U_Login.ascx" />
+ <Content Include="Pages\financial\BaoxiaoFukuanPiliang.aspx" />
<Content Include="Pages\financial\DepositsCustomershouruqueren.aspx" />
<Content Include="Pages\financial\DepositsCustomerFapiao.aspx" />
<Content Include="Pages\financial\BaozhengjinIncome.aspx" />
@@ -2771,6 +2772,7 @@
<Content Include="Pages\workcar\MemberDictionaryEdit.aspx" />
<Content Include="Pages\workcar\MemberDictionaryList.aspx" />
<Content Include="Pages\work\BaoxiaoFukuanList.aspx" />
+ <Content Include="Pages\work\BaoxiaoPiliangReply.aspx" />
<Content Include="Pages\work\BaoxiaoReplyList.aspx" />
<Content Include="Pages\work\MyPlanAdd.aspx" />
<Content Include="Pages\work\MyPlanList.aspx" />
@@ -4453,6 +4455,13 @@
</Compile>
<Compile Include="Pages\common\U_Login.ascx.designer.cs">
<DependentUpon>U_Login.ascx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\financial\BaoxiaoFukuanPiliang.aspx.cs">
+ <DependentUpon>BaoxiaoFukuanPiliang.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\financial\BaoxiaoFukuanPiliang.aspx.designer.cs">
+ <DependentUpon>BaoxiaoFukuanPiliang.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\financial\DepositsCustomershouruqueren.aspx.cs">
<DependentUpon>DepositsCustomershouruqueren.aspx</DependentUpon>
@@ -8937,6 +8946,13 @@
<Compile Include="Pages\work\BaoxiaoFukuanList.aspx.designer.cs">
<DependentUpon>BaoxiaoFukuanList.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\work\BaoxiaoPiliangReply.aspx.cs">
+ <DependentUpon>BaoxiaoPiliangReply.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\work\BaoxiaoPiliangReply.aspx.designer.cs">
+ <DependentUpon>BaoxiaoPiliangReply.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\work\BaoxiaoReplyList.aspx.cs">
<DependentUpon>BaoxiaoReplyList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx
new file mode 100644
index 0000000..8cc627f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx
@@ -0,0 +1,129 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BaoxiaoFukuanPiliang.aspx.cs" Inherits="CY.WebForm.Pages.financial.BaoxiaoFukuanPiliang" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+ <title>娣诲姞鏀嚭璁板綍</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+</head>
+<body>
+ <form id="form1" runat="server" class="form2">
+ <div class="scrollCotent">
+ <table class="tableStyle">
+ <tr>
+ <td class="ali03 ">
+ 璐︽埛绫诲瀷锛�
+ </td>
+ <td>
+ <select class="Sreq" id="selAcoountType" runat="server" datatextfield="Name" datavaluefield="Name" onchange="ChangeThisType(this);" keepdefaultstyle="true" msg="璇烽�夋嫨璐︽埛绫诲瀷">
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 璐︽埛鍚嶇О锛�
+ </td>
+ <td>
+ <select class="Sreq" id="selAccountName" runat="server" datatextfield="AccountName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨璐︽埛鍚嶇О">
+ <option value="">璇烽�夋嫨</option>
+ </select>
+ </td>
+ </tr>
+ <%-- <tr>
+ <td class="ali03 ">
+ 绉戠洰鍚嶇О锛�
+ </td>
+ <td>
+ <input type="hidden" id="selSubject" runat="server" />
+ <input runat="server" id="selSubjectName" type="text" readonly ="readonly" />
+ </td>
+ </tr>--%>
+
+ <tr>
+ <td class="ali03 ">
+ 浠樻閲戦锛�
+ </td>
+ <td>
+ <input runat="server" id="txtMoney" type="text" class=" float req" maxlength="12" minNot="0" readonly="readonly" />(鍏�)
+ </td>
+ </tr>
+ <%-- <tr>
+ <td class="ali03 ">
+ 閮ㄩ棬锛�
+ </td>
+ <td>
+ <input runat="server" id="txtDepartment" maxlength="50" type="text" style="width: 259px" readonly="readonly" />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鏀舵浜�(鍗曚綅)锛�
+ </td>
+ <td>
+ <input runat="server" id="txtPaymentUnit" type="text" style="width: 259px" readonly="readonly" />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鎽樿锛�
+ </td>
+ <td>
+ <textarea runat="server" class="req" id="txtOperationalMatters" style="height: 40px" msg="璇峰～鍐欐憳瑕�" readonly="readonly" ></textarea>
+ </td>
+ </tr>--%>
+ <tr style="display: none">
+ <td class="ali03 ">
+ 澶囨敞锛�
+ </td>
+ <td>
+ <textarea runat="server" id="txtRemark" style="width: 400px;"></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ </td>
+ <td>
+ <asp:Button ID="btn_Submit" Text="鎻愪氦" runat="server" OnClick="btn_Submit_Click" />
+ </td>
+ </tr>
+ </table>
+ </div>
+ </form>
+ <script language="javascript" type="text/javascript">
+
+
+
+
+
+ function ChangeThisType(obj) {
+ $("#selAccountName").html("<option value=''>璇烽�夋嫨</option>");
+ $.ajax({
+ url: "/Pages/financial/BaoxiaoFukuanPiliang.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { TypeName: $(obj).val(), DataType: "change" },
+ global: false,
+ cache: false,
+ success: function (data) {
+ var myobj = eval('(' + data + ')');
+ if (myobj != null && myobj.length > 0) {
+ for (var i = 0; i < myobj.length; i++) {
+ var city_keyid = myobj[i].Keyid;
+ var city_name = myobj[i].AccountName + "-" + myobj[i].UserName;
+ var option = "";
+ option = "<option value = '" + city_keyid + "'>" + city_name + "</option>";
+ $(option).appendTo($("#selAccountName"));
+ }
+ }
+ }
+ });
+ }
+
+ </script>
+ <script type="text/javascript">
+ $(function () {
+ ChangeThisType("#selAcoountType");
+ });
+ </script>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx.cs
new file mode 100644
index 0000000..7483b37
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx.cs
@@ -0,0 +1,194 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.Model;
+using CY.Infrastructure.Common;
+using CY.BLL.OA;
+using CY.BLL.Sys;
+using CY.BLL;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.financial
+{
+ public partial class BaoxiaoFukuanPiliang : BasePage
+ {
+ Sys_DictionaryBLL _Sys_DictionaryBLL = null;
+ OA_SubjectSetBLL _OA_SubjectSetBLL = null;
+ OA_FirmAccountBLL _OA_FirmAccountBLL = null;
+ OA_FirmAccountRecordBLL _OA_FirmAccountRecordBLL = null;
+ OA_FirmAccountRecord firmAccountRecord = null;
+ OA_FirmAccount firmAccount = null;
+ OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
+ OA_StaffBLL staffBLL = null;
+ OA_WorkPlanBll bll_OA_WorkPlanBll = null;
+ OA_DepartmentBll oA_DepartmentBll = null;
+ public BaoxiaoFukuanPiliang()
+ {
+ firmAccount = new OA_FirmAccount();
+ _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ _OA_FirmAccountBLL = new OA_FirmAccountBLL();
+ _OA_FirmAccountRecordBLL = new OA_FirmAccountRecordBLL();
+ _OA_SubjectSetBLL = new OA_SubjectSetBLL();
+ firmAccountRecord = new OA_FirmAccountRecord();
+ oA_BaozhengjinBLL = new OA_BaozhengjinBLL();
+ staffBLL = new OA_StaffBLL();
+ bll_OA_WorkPlanBll = new OA_WorkPlanBll();
+ oA_DepartmentBll = new OA_DepartmentBll();
+ }
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["DataType"])
+ {
+ case "change":
+ Response.Write(reLoadAccountName(Request["TypeName"].ToString2()));
+ break;
+ default://涓�鑸儏鍐典笉澶勭悊
+ if (IsPostBack || IsCallback)
+ return;
+ else
+ {
+ InitialData();
+ }
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ Response.Write("-1");
+ }
+ Response.End();
+ }
+
+ protected void InitialData()
+ {
+ var keyids = Request["keyids"].Trim(',').Split(',');
+
+ ///璐︽埛绫诲瀷
+ selAcoountType.DataSource = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷");
+ selAcoountType.DataBind();
+
+
+
+ if (keyids.Length > 0)
+ {
+ decimal PlanMoney = 0;
+ foreach (var keyid in keyids)
+ {
+ var oA_WorkPlan = bll_OA_WorkPlanBll.GetModelByKeyid(keyid.ToInt32());
+ PlanMoney += oA_WorkPlan.PlanMoney.Value;
+ }
+
+
+ //this.selSubject.Value = oA_WorkPlan.RewardResult;
+ //this.selSubjectName.Value = oA_WorkPlan.RewardContent;
+ this.txtMoney.Value = PlanMoney.ToString("0.00");
+ //this.txtPaymentUnit.Value = oA_WorkPlan.PlanPeople;
+ //var oA_Department = oA_DepartmentBll.GetModelByKeyid(oA_WorkPlan.DepartId);
+ //if (oA_Department != null)
+ // this.txtDepartment.Value = oA_Department.Name;
+ //this.txtOperationalMatters.Value = oA_WorkPlan.PlanContent;
+ }
+
+ }
+
+ protected string reLoadAccountName(string selAcoountType)
+ {
+ return JsonHelper.GetJsonStringByObject(_OA_FirmAccountBLL.getAllSubject(CurrentUser.MemberId, selAcoountType));
+ }
+
+ protected void btn_Submit_Click(object sender, EventArgs e)
+ {
+ var keyids = Request["keyids"].Trim(',').Split(',');
+
+
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
+ {
+
+ try
+ {
+ firmAccount = _OA_FirmAccountBLL.getSingleSubject(Request["selAccountName"].ToInt32());
+ foreach (var keyid in keyids)
+ {
+ var oA_WorkPlan = bll_OA_WorkPlanBll.GetModelByKeyid(keyid.ToInt32());
+ if (oA_WorkPlan.EvaluationStatus == 1)
+ {
+ JavaScript.MessageBox(oA_WorkPlan.EvaluationContent + "璇ユ姤閿�宸茬粡浠樻锛屼笉鑳介噸澶嶄粯娆�", this);
+ return;
+ }
+ firmAccountRecord = new OA_FirmAccountRecord();
+
+ firmAccountRecord.AccountId = Request["selAccountName"].ToInt32();
+ firmAccountRecord.LastUpdateTime = DateTime.Now;
+ firmAccountRecord.Money = oA_WorkPlan.PlanMoney;//this.txtMoney.Value.ToDecimal2();
+ firmAccountRecord.OperationalMatters = oA_WorkPlan.PlanContent;// this.txtOperationalMatters.Value;
+ firmAccountRecord.Operator = CurrentUser.ShortName;
+ firmAccountRecord.PaymentUnit = oA_WorkPlan.PlanPeople; //this.txtPaymentUnit.Value;
+ firmAccountRecord.RecordTypeId = 2;//鏀嚭
+ firmAccountRecord.Remark = this.txtRemark.Value;
+ firmAccountRecord.SubjectId = oA_WorkPlan.RewardResult.ToInt32(); //this.selSubject.Value.ToInt32();
+ firmAccountRecord.ResidualAmount = firmAccount.Balance - this.txtMoney.Value.ToDecimal2();
+ var oA_Department = oA_DepartmentBll.GetModelByKeyid(oA_WorkPlan.DepartId);
+ if (oA_Department != null)
+ firmAccountRecord.Department = oA_Department.Name; //this.txtDepartment.Value;
+
+ firmAccount.AllExpenses = this.txtMoney.Value.ToDecimal2() + firmAccount.AllExpenses;
+ firmAccount.Balance = firmAccount.Balance - this.txtMoney.Value.ToDecimal2();
+
+ if (_OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount))
+ {
+ //淇敼OA_WorkPlan鐨勭姸鎬佹湭宸叉姤閿�
+
+ if (keyid.ToInt32() > 0)
+ {
+
+ oA_WorkPlan.EvaluationStatus = 1;
+ oA_WorkPlan.Operator = CurrentUser.ShortName;
+ oA_WorkPlan.LastUpdateTime = DateTime.Now;
+ var res = bll_OA_WorkPlanBll.UpdateModel(oA_WorkPlan);
+ }
+ }
+
+ }
+
+
+
+
+
+
+
+
+
+
+ scope.Complete();
+ JavaScript.MessageBox("娣诲姞鎴愬姛", this, true, true);
+
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("娣诲姞澶辫触", this);
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx.designer.cs
new file mode 100644
index 0000000..a9667d9
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanPiliang.aspx.designer.cs
@@ -0,0 +1,80 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+ public partial class BaoxiaoFukuanPiliang
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// selAcoountType 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selAcoountType;
+
+ /// <summary>
+ /// selAccountName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountName;
+
+ /// <summary>
+ /// txtMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtMoney;
+
+ /// <summary>
+ /// txtRemark 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 56098d6..bf625fc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -2512,7 +2512,7 @@
{
if (!string.IsNullOrEmpty(model.JTWZ))
{
- afterWorkStr = "瑁呰锛�" + model.JTWZ ;
+ afterWorkStr = /*"瑁呰锛�" +*/ model.JTWZ ;
if (model.JTWZ != "鑳跺ご" && model.JTWZ != "鑳跺乏" && model.JTWZ != "鍏朵粬")
{
afterWorkStr += "锛屽皝闈㈠嵃鍒疯姹傦細" + model.jtWZFM;
@@ -2534,7 +2534,7 @@
{
afterWorkStr += "锛�";
}
- afterWorkStr += "瑁呰锛�" + model.JTWZ;
+ afterWorkStr += /*"瑁呰锛�" +*/ model.JTWZ;
if (model.JTWZ != "鑳跺ご" && model.JTWZ != "鑳跺乏" && model.JTWZ != "鍏朵粬" && model.JTWZ != "鏁ｉ〉")
{
if (!string.IsNullOrEmpty(model.jtWZFM))
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx
index 53c90a3..11b98a7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx
@@ -246,10 +246,10 @@
</tr>--%>
<tr>
<td class="ali03">
- 鎵嬫満鍙风爜锛�
+ 宸ヤ綔鎵嬫満锛�
</td>
<td>
- <input type="text" id="txtMobieNum" runat="server" class="phone" maxlength="20" />
+ <input type="text" id="txtMobieNum" runat="server" class="" maxlength="20" />
</td>
<td class="ali03">
钖祫寰呴亣锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
index 4cb363d..fb6a1fd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
@@ -39,14 +39,15 @@
}
)
if (deleteKeyIds == "") {
- top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑璁板綍", function () {
+ top.Dialog.alert("璇烽�夋嫨瑕佷粯娆剧殑璁板綍", function () {
});
return;
}
else {
deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
- top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎褰曞悧锛�", function () {
- window.location = "/Pages/work/BaoxiaoFukuanList.aspx?deleteKeyIds=" + deleteKeyIds;
+ top.Dialog.confirm("纭畾瑕佷粯娆炬墍閫夎褰曞悧锛�", function () {
+ /* window.location = "/Pages/work/BaoxiaoFukuanList.aspx?deleteKeyIds=" + deleteKeyIds;*/
+ top.Dialog.open({ URL: "/Pages/financial/BaoxiaoFukuanPiliang.aspx?keyids=" + deleteKeyIds, Title: "鎵归噺鎶ラ攢浠樻", Width: 800, Height: 600 });
});
}
}
@@ -114,8 +115,8 @@
<div class="padding_top5 padding_left10">
<%-- <a href="javascript:;" onclick="addModel()" class="aaddModel" menu_member_case_id="case_addModel" menu_member_case_name="鏂板鎶ラ攢"><span class="icon_add">鏂板鎶ラ攢</span></a>
<div class="box_tool_line">
- </div>
- <a href="javascript:;" onclick="onAllDelete()" menu_member_case_id="case_onAllDeleteList" menu_member_case_name="鎵归噺鍒犻櫎"><span class="icon_delete">鎵归噺鍒犻櫎</span></a>--%>
+ </div>--%>
+ <a href="javascript:;" onclick="onAllDelete()" menu_member_case_id="case_onAllDeleteList" menu_member_case_name="鎵归噺浠樻"><span class="">鎵归噺浠樻</span></a>
<div class="clear">
</div>
</div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoPiliangReply.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoPiliangReply.aspx
new file mode 100644
index 0000000..67dd16b
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoPiliangReply.aspx
@@ -0,0 +1,68 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BaoxiaoPiliangReply.aspx.cs" Inherits="CY.WebForm.Pages.work.BaoxiaoPiliangReply" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>鎵瑰鎶ラ攢</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <style type="text/css">
+ .w70px{ width:70px;}
+ .wx100px{ width:100px;}
+ fieldset{ padding:3px; margin:5px auto;}
+ </style>
+</head>
+<body>
+ <form id="form1" class="form2" runat="server">
+ <div>
+ <fieldset>
+ <legend>鎶ラ攢淇℃伅</legend>
+ <table class="tableStyle" style="margin: 0px auto;" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="ali03" colspan="3" style="width:30%; ">
+ 鎶ラ攢鍗曞彿锛�
+ </td>
+ <td style="width:70%; ">
+ <span id="spanDepart" runat="server"></span>
+ </td>
+ </tr>
+
+
+ </table>
+ </fieldset>
+
+
+
+ <fieldset>
+ <legend>鎵瑰鎿嶄綔</legend>
+ <table class="tableStyle" style="margin: 0px auto;" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="ali03 w70px">
+ 瀹℃壒缁撴灉锛�
+ </td>
+ <td colspan="3">
+ <select keepDefaultStyle="true" runat="server" id="selApprovalStatus" class="wx100px Sreq" msg="璇烽�夋嫨瀹℃壒缁撴灉">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1" selected="selected" >鎵瑰噯</option>
+ <option value="2">涓嶆壒鍑�</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 瀹℃壒鍥炲锛�
+ </td>
+ <td colspan="3">
+ <textarea id="txtApprovalContent" runat="server" style="width: 460px; height: 40px;" ></textarea>
+ </td>
+ </tr>
+ <td colspan="4" style="text-align: center;">
+ <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" Text="鎻愪氦" />
+ </td>
+ </table>
+ </fieldset>
+
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoPiliangReply.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoPiliangReply.aspx.cs
new file mode 100644
index 0000000..ea59afa
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoPiliangReply.aspx.cs
@@ -0,0 +1,259 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Data;
+using System.Data.SqlClient;
+using CY.Model;
+using CY.BLL;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using CY.BLL.EC;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+using System.Transactions;
+using CY.BLL.OA;
+
+namespace CY.WebForm.Pages.work
+{
+ //鍚磋緣
+ //宸ヤ綔鑰冭瘎
+ public partial class BaoxiaoPiliangReply : BasePage
+ {
+ OA_WorkPlanBll oA_WorkReminderBll = null;
+ OA_KaipiaoshenqingBLL _oA_KaipiaoshenqingBLL = null;
+ EC_OrderBLL _eC_OrderBLL = null;
+ OA_FukuanshenqingBLL _oA_FukuanshenqingBLL = null;
+ EC_MemberBasicBLL _eC_MemberBasicBLL = null;
+ OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
+ OA_WorkPlan_shenpiBLL oA_WorkPlan_ShenpiBLL = null;
+ OA_StaffBLL oA_StaffBLL = null;
+ OA_DepartmentBll oA_DepartmentBll = null;
+ public string planDataType = "";
+ OA_SubjectSetBLL _OA_SubjectSetBLL = null;
+ public BaoxiaoPiliangReply()
+ {
+ oA_WorkReminderBll = new OA_WorkPlanBll();
+ _oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ _eC_OrderBLL = new EC_OrderBLL();
+ _oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
+ _eC_MemberBasicBLL = new EC_MemberBasicBLL();
+ oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
+ oA_WorkPlan_ShenpiBLL = new OA_WorkPlan_shenpiBLL();
+ oA_StaffBLL = new OA_StaffBLL();
+ oA_DepartmentBll = new OA_DepartmentBll();
+ _OA_SubjectSetBLL = new OA_SubjectSetBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ InitData();
+ }
+ }
+
+ //鏁版嵁鍔犺浇
+ public void InitData()
+ {
+ //绉戠洰鍚嶇О
+ var keyids = Request["keyids"].Trim(',').Split(',');
+ var sss = "";
+ foreach (var keyid in keyids)
+ {
+ OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(keyid.ToInt32());
+ if (m_OA_WorkPlan != null)
+ {
+ sss += m_OA_WorkPlan.EvaluationContent + ",";
+ }
+ }
+
+ this.spanDepart.InnerText = sss;
+
+
+ }
+
+ //琛ㄥ崟鎻愪氦
+ protected void btn_submit_form(object sender, EventArgs e)
+ {
+ var keyids = Request["keyids"].Trim(',').Split(',');
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
+ {
+ try
+ {
+
+
+ string Messagezhuguan = null;
+ string Messagejingli = null;
+ var res = false;
+ var oA_Staff = oA_StaffBLL.GetModelByMemberId(CurrentUser.TrueMemberId);
+ if (!oA_Staff.BF_IsBaoxiaozhuguan && !oA_Staff.BF_Isbaoxiaojingli)
+ {
+ JavaScript.MessageBox("浣犳病鏈夊鎵规潈闄�", this);
+ return;
+ }
+
+
+ foreach (var keyid in keyids)
+ {
+ OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(keyid.ToInt32());
+ if (m_OA_WorkPlan.ApprovalStatus == 1 || m_OA_WorkPlan.ApprovalStatus == 2)
+ {
+ JavaScript.MessageBox(m_OA_WorkPlan.EvaluationContent + "璇ユ姤閿�宸茬粡瀹℃壒瀹屾垚", this);
+ return;
+ }
+
+
+ var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(keyid.ToInt32().Value).ToList();
+
+
+ if (oA_Staff.BF_IsBaoxiaozhuguan)
+ {
+ var oA_WorkPlan_Shenpis1 = oA_WorkPlan_Shenpis.Where(x => x.Buzhou == 1).ToList();
+ if (oA_WorkPlan_Shenpis1.Count > 1)
+ {
+ Messagezhuguan = m_OA_WorkPlan.EvaluationContent + "璇ユ祦绋嬪凡缁忎笉鍦ㄤ富绠″鎵规楠わ紒";
+ }
+
+ var shenpicount = oA_WorkPlan_Shenpis1.Count(x => x.ApprovalStaffId == CurrentUser.TrueMemberId);
+ if (shenpicount > 0)
+ {
+ Messagezhuguan = m_OA_WorkPlan.EvaluationContent + "浣犲凡缁忓鎵硅繃璇ユ祦绋嬶紒";
+ }
+ }
+ if (oA_Staff.BF_IsBaoxiaozhuguan && !oA_Staff.BF_Isbaoxiaojingli)
+ {
+ if (!string.IsNullOrEmpty(Messagezhuguan))
+ {
+
+ JavaScript.MessageBox(Messagezhuguan, this);
+ return;
+ }
+ }
+
+ if (oA_Staff.BF_Isbaoxiaojingli)
+ {
+ if (oA_WorkPlan_Shenpis.Count > 2)
+ {
+ Messagejingli = "璇ユ祦绋嬪凡缁忓鎵瑰畬鎴愶紒";
+ }
+ if (oA_WorkPlan_Shenpis.Count < 2)
+ {
+ Messagejingli = "娌″埌缁忕悊瀹℃壒姝ラ锛�";
+ }
+ }
+ if (!oA_Staff.BF_IsBaoxiaozhuguan && oA_Staff.BF_Isbaoxiaojingli)
+ {
+ if (!string.IsNullOrEmpty(Messagejingli))
+ {
+
+ JavaScript.MessageBox(Messagejingli, this);
+ return;
+ }
+ }
+
+ if (oA_Staff.BF_IsBaoxiaozhuguan && oA_Staff.BF_Isbaoxiaojingli)
+ {
+ if (!string.IsNullOrEmpty(Messagezhuguan) && !string.IsNullOrEmpty(Messagejingli))
+ {
+
+ JavaScript.MessageBox(Messagezhuguan + Messagejingli, this);
+ return;
+ }
+ }
+
+ DateTime nowTime = DateTime.Now;
+
+ OA_WorkPlan_shenpi oA_WorkPlan_Shenpi = new OA_WorkPlan_shenpi();
+ oA_WorkPlan_Shenpi.OA_WorkPlanId = keyid.ToInt32();
+ oA_WorkPlan_Shenpi.ApprovalStaffId = CurrentUser.TrueMemberId;
+ oA_WorkPlan_Shenpi.ApprovalStatus = this.selApprovalStatus.Value.ToInt32();
+ oA_WorkPlan_Shenpi.ApprovalTime = nowTime;
+ oA_WorkPlan_Shenpi.ApprovalContent = this.txtApprovalContent.Value.Trim();
+ oA_WorkPlan_Shenpi.CreateTime = nowTime;
+ oA_WorkPlan_Shenpi.Operator = CurrentUser.TrueName;
+ if (oA_WorkPlan_Shenpis.Count == 2)
+ {
+ oA_WorkPlan_Shenpi.Buzhou = 2;
+ }
+ else
+ {
+ oA_WorkPlan_Shenpi.Buzhou = 1;
+ }
+ res = oA_WorkPlan_ShenpiBLL.InsertModel(oA_WorkPlan_Shenpi);
+
+
+ if (oA_WorkPlan_Shenpis.Count == 2 || this.selApprovalStatus.Value == "2")
+ {
+
+ m_OA_WorkPlan.ApprovalContent = this.txtApprovalContent.Value.Trim();
+ m_OA_WorkPlan.ApprovalStaffId = CurrentUser.TrueMemberId;
+ m_OA_WorkPlan.ApprovalStaffName = CurrentUser.TrueName;
+ m_OA_WorkPlan.ApprovalStatus = this.selApprovalStatus.Value.ToInt32();
+ m_OA_WorkPlan.ApprovalTime = nowTime;
+ m_OA_WorkPlan.PlanStatus = 2;
+ m_OA_WorkPlan.Operator = CurrentUser.ShortName;
+ m_OA_WorkPlan.LastUpdateTime = nowTime;
+ res = oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan);
+ }
+ else
+ {
+ res = oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan);
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ if (keyids.Length > 0)
+ {
+ if (res)
+ {
+ scope.Complete();
+ JavaScript.MessageBox("瀹℃壒鎴愬姛", this, true, true);
+ }
+
+ else
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ else
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoPiliangReply.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoPiliangReply.aspx.designer.cs
new file mode 100644
index 0000000..092a4fa
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoPiliangReply.aspx.designer.cs
@@ -0,0 +1,80 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class BaoxiaoPiliangReply
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// spanDepart 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanDepart;
+
+ /// <summary>
+ /// selApprovalStatus 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selApprovalStatus;
+
+ /// <summary>
+ /// txtApprovalContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtApprovalContent;
+
+ /// <summary>
+ /// btn_submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
index 801394e..74f191a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
@@ -39,14 +39,15 @@
}
)
if (deleteKeyIds == "") {
- top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑璁板綍", function () {
+ top.Dialog.alert("璇烽�夋嫨瑕佹壒澶嶇殑璁板綍", function () {
});
return;
}
else {
deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
- top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎褰曞悧锛�", function () {
- window.location = "/Pages/work/BaoxiaoReplyList.aspx?deleteKeyIds=" + deleteKeyIds;
+ top.Dialog.confirm("纭畾瑕佹壒澶嶆墍閫夎褰曞悧锛�", function () {
+ /* window.location = "/Pages/work/BaoxiaoReplyList.aspx?deleteKeyIds=" + deleteKeyIds;*/
+ top.Dialog.open({ URL: "/Pages/work/BaoxiaoPiliangReply.aspx?keyids=" + deleteKeyIds, Title: "鎵瑰鎶ラ攢", Width: 800, Height: 600 });
});
}
}
@@ -113,8 +114,8 @@
<div class="padding_top5 padding_left10">
<%-- <a href="javascript:;" onclick="addModel()" class="aaddModel" menu_member_case_id="case_addModel" menu_member_case_name="鏂板鎶ラ攢"><span class="icon_add">鏂板鎶ラ攢</span></a>
<div class="box_tool_line">
- </div>
- <a href="javascript:;" onclick="onAllDelete()" menu_member_case_id="case_onAllDeleteList" menu_member_case_name="鎵归噺鍒犻櫎"><span class="icon_delete">鎵归噺鍒犻櫎</span></a>--%>
+ </div>--%>
+ <a href="javascript:;" onclick="onAllDelete()" class="<%=(piliangpifu!="1"?"AlreadyReply":"")%>" ><span class="">鎵归噺鎵瑰</span></a>
<div class="clear">
</div>
</div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
index d266dcb..c8cc223 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
@@ -22,6 +22,7 @@
OA_DepartmentBll oA_DepartmentBll = null;
OA_StaffBLL oA_StaffBLL = null;
OA_WorkPlan_shenpiBLL oA_WorkPlan_ShenpiBLL = null;
+ public string piliangpifu = null;
//鍒濆鍖�
public BaoxiaoReplyList()
{
@@ -109,7 +110,15 @@
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
var oA_WorkPlans = bll_OA_WorkPlanBll.SelectModelPage(pa, CurrentUser.MemberId, Guid.Empty, Guid.Empty, 3, 17, "", null, null, string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value), string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : Convert.ToDateTime(this.txtRegTimeEnd.Value), this.txtPlanPeople.Value.Trim(), -1, this.selApprovalStatus.Value.ToInt32(), null, null,this.TxtRewardContent.Value.Trim(), this.txtPlanContent.Value.Trim(),"3");
var oA_Staff = oA_StaffBLL.GetModelByMemberId(CurrentUser.TrueMemberId);
-
+ if (oA_Staff.BF_Isbaoxiaojingli)
+ {
+ piliangpifu = "1";
+ }
+ else
+ {
+ piliangpifu = "0";
+ }
+
foreach (var oA_WorkPlan in oA_WorkPlans)
{
var sss = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value);
--
Gitblit v1.9.1