From c4867cf5e5f78cfb924a3048bd0c4232d4a1e986 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 19 十二月 2024 08:33:44 +0800
Subject: [PATCH] 新增审批 付款申请 再付款申请中操作其他付款付款 生产管理里边点采购的供应商修改
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs | 21 ++
CY_ECommercePlatform/CY.Infrastructure/Query/Pagination.cs | 8
CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs | 5
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx | 2
CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs | 9
CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.designer.cs | 54 +++++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs | 13 +
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx | 8
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs | 88 ++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs | 29 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx | 8
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs | 28 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx | 34 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx | 74 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs | 59 +++--
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx | 26 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs | 48 ++++
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs | 23 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx | 1
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx | 1
25 files changed, 507 insertions(+), 55 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs
index 7f4b51f..77ca71b 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs
@@ -154,7 +154,7 @@
Condition += " and ok.Creater like '%" + Creater + "%'";
if (!string.IsNullOrEmpty(SupplierName))
- Condition += " and oe.Name like '%" + SupplierName + "%'";
+ Condition += " and (ok.Huming like '%" + SupplierName + "%' or oe.Name like '%" + SupplierName + "%' ) ";
if (!string.IsNullOrEmpty(shifoufukuan))
Condition += " and ok.FukuanStatus = '" + shifoufukuan + "'";
@@ -190,7 +190,7 @@
Condition += " and ok.Creater like '%" + Creater + "%'";
if (!string.IsNullOrEmpty(SupplierName))
- Condition += " and oe.Name like '%" + SupplierName + "%'";
+ Condition += " and (ok.Huming like '%" + SupplierName + "%' or oe.Name like '%" + SupplierName + "%' ) ";
if (!string.IsNullOrEmpty(shifoufukuan))
Condition += " and ok.FukuanStatus = '" + shifoufukuan + "'";
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
index ad971c2..818249d 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_KaipiaoshenqingBLL.cs
@@ -161,11 +161,11 @@
{
if (HuikuanStates == "2")
{
- Condition += " and ok.Huikuanmoney >0 ";
+ Condition += " and ok.Huikuanmoney >= kpmoney ";
}
else if (HuikuanStates == "1")
{
- Condition += " and ( ok.Huikuanmoney is null or ok.Huikuanmoney <=0) ";
+ Condition += " and ( ok.Huikuanmoney is null or ok.Huikuanmoney < kpmoney ) ";
}
}
if (!string.IsNullOrEmpty(PayStates))
diff --git a/CY_ECommercePlatform/CY.Infrastructure/Query/Pagination.cs b/CY_ECommercePlatform/CY.Infrastructure/Query/Pagination.cs
index befd66d..c6b9569 100644
--- a/CY_ECommercePlatform/CY.Infrastructure/Query/Pagination.cs
+++ b/CY_ECommercePlatform/CY.Infrastructure/Query/Pagination.cs
@@ -26,6 +26,14 @@
/// 鎬昏褰曟暟
/// </summary>
public int RecordCount { get; set; }
+
+
+ public decimal? heji1 { get; set; }
+ public decimal? heji2 { get; set; }
+ public decimal? heji3 { get; set; }
+
+
+
/// <summary>
/// 鍒涘缓涓�涓柊鐨勫垎椤靛璞�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs
index 426c286..ecd4633 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs
@@ -25,7 +25,7 @@
/// </summary>
const string FROMSOUCEBEFORE = " ( select distinct ok.*, " +
" oe.Name as SupplierName " +
- " from [OA_Fukuanshenqing] ok inner join [OA_Suppliers] oe on oe.Keyid = ok.[SupplierId] " +
+ " from [OA_Fukuanshenqing] ok left join [OA_Suppliers] oe on oe.Keyid = ok.[SupplierId] " +
" where 0=0 ";
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
index 74f87f3..ffb57ce 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
@@ -274,6 +274,27 @@
resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
}
string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE, query.Criteria[0].Value, FROMSOUCEEND);//鎷艰鏉′欢
+
+
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ string fromss = " [OA_Kaipiaoshenqing] ok inner join [OA_CorporateClients] oe on oe.Keyid = ok.[BuyerId] " +
+
+
+
+
+
+ " where 0=0 "+ query.Criteria[0].Value;
+ var ssss = _dataBase.SelectModel<Model.OA_Kaipiaoshenqing>(" sum(ok.kpmoney) as kpmoney,sum(ok.Huikuanmoney) as Huikuanmoney,sum(ok.Zengjianmoney) as Zengjianmoney ", fromss);
+ if (ssss.Count>0)
+ {
+ var aaaaa = ssss.First();
+ pagination.heji1 = aaaaa.kpmoney;
+ pagination.heji2 = aaaaa.Zengjianmoney;
+ pagination.heji3 = aaaaa.Huikuanmoney;
+ }
+
return _dataBase.SelectModelPage<Model.OA_Kaipiaoshenqing>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
index e24d161..e4d3e5a 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
@@ -36,10 +36,21 @@
{
return false;
}
+ SqlParameter SuppliersId = null;
+ if (trueModel.SuppliersId.HasValue)
+ {
+ SuppliersId = new SqlParameter("@SuppliersId", trueModel.SuppliersId);
+ }
+ else
+ {
+ SuppliersId = new SqlParameter("@SuppliersId", DBNull.Value);
+ }
+
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
new SqlParameter("@FirmId",trueModel.FirmId),
- new SqlParameter("@SuppliersId",trueModel.SuppliersId),
+ SuppliersId,
new SqlParameter("@GoodsId",trueModel.GoodsId),
new SqlParameter("@ClearingStatusId",trueModel.ClearingStatusId),
new SqlParameter("@Price",trueModel.Price),
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
index f7d1ec9..b983c1f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
@@ -158,7 +158,29 @@
});
}
-
+
+
+ $(function () {
+ var value_NowPageAllMoney = 0;
+ $(".OrderAllMoney").each(function (ii, vv) {
+ value_NowPageAllMoney += parseFloat($(vv).text());
+ });
+ $("#NowPageAllMoney").html(value_NowPageAllMoney.toFixed(2));
+
+
+ var value_NowPageZengMoney = 0;
+ $(".OrderZengMoney").each(function (ii, vv) {
+ value_NowPageZengMoney += parseFloat($(vv).text());
+ });
+ $("#NowPageZengMoney").html(value_NowPageZengMoney.toFixed(2));
+
+
+ var value_NowPageHuiMoney = 0;
+ $(".OrderHuiMoney").each(function (ii, vv) {
+ value_NowPageHuiMoney += parseFloat($(vv).text());
+ });
+ $("#NowPageHuiMoney").html(value_NowPageHuiMoney.toFixed(2));
+ });
</script>
<style type="text/css">
.tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
@@ -185,6 +207,8 @@
cursor: pointer;
width: 26px;
}
+ .StatisticsMoney td { color: #FF5500; }
+ .StatisticsMoney span { color: #FF5500; font-weight: bold; }
</style>
</head>
<body>
@@ -312,16 +336,16 @@
<th width="36">
璁㈠崟鏁伴噺
</th>
- <th width="60">
+ <th width="60" >
閲戦
</th>
- <th width="60">
+ <th width="60" >
澧炲噺閲戦
</th>
<th width="60">
绛惧崟鍥炴墽
</th>
- <th width="60">
+ <th width="60" >
鍥炴閲戦
</th>
<th width="60">
@@ -381,10 +405,10 @@
</td>
- <td>
+ <td class="OrderAllMoney">
<%#Eval("kpmoney", "{0:F}")%>
</td>
- <td>
+ <td class="OrderZengMoney">
<%#Eval("Zengjianmoney", "{0:F}")%>
</td>
<td>
@@ -394,7 +418,7 @@
</td>
- <td>
+ <td class="OrderHuiMoney">
<%#Eval("Huikuanmoney", "{0:F}")%>
</td>
<td>
@@ -423,6 +447,42 @@
</tr>
</itemtemplate>
</asp:repeater>
+ <tr class="StatisticsMoney">
+ <td colspan="7" class="ali03">
+ 褰撳墠椤电粺璁★細
+ </td>
+ <td class="ali01">
+ <span id="NowPageAllMoney" runat="server"></span>
+ </td>
+ <td class="ali01">
+ <span id="NowPageZengMoney" runat="server"></span>
+ </td>
+ <td class="ali01">
+ </td>
+ <td class="ali01">
+ <span id="NowPageHuiMoney" runat="server"></span>
+ </td>
+ <td class="ali01" colspan="3">
+ </td>
+ </tr>
+ <tr class="StatisticsMoney">
+ <td colspan="7" class="ali03">
+ 鏌ヨ椤圭粺璁★細
+ </td>
+ <td class="ali01">
+ <span id="AllMoney" runat="server"></span>
+ </td>
+ <td class="ali01">
+ <span id="ZengMoney" runat="server"></span>
+ </td>
+ <td class="ali01">
+ </td>
+ <td class="ali01">
+ <span id="HuiMoney" runat="server"></span>
+ </td>
+ <td class="ali01" colspan="3">
+ </td>
+ </tr>
</tbody>
</table>
<uc:ucpager id="UCPager1" runat="server" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
index 6b36501..11a0de3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
@@ -579,7 +579,7 @@
//this.selKaipiaoshenqing.Value = "1";
//this.selPayStates.Value = "1";
- //this.selHuikuanStates.Value = "1";
+ this.selHuikuanStates.Value = "1";
@@ -690,6 +690,33 @@
rptData.DataSource = result;
rptData.DataBind();
+ if (pagination.heji1.HasValue)
+ {
+ this.AllMoney.InnerText = pagination.heji1.Value.ToString("0.00");
+ }
+ else
+ {
+ this.AllMoney.InnerText = 0.ToString("0.00");
+ }
+
+ if (pagination.heji2.HasValue)
+ {
+ this.ZengMoney.InnerText = pagination.heji2.Value.ToString("0.00");
+ }
+ else
+ {
+ this.ZengMoney.InnerText = 0.ToString("0.00");
+ }
+
+ if (pagination.heji3.HasValue)
+ {
+ this.HuiMoney.InnerText = pagination.heji3.Value.ToString("0.00");
+ }
+ else
+ {
+ this.HuiMoney.InnerText = 0.ToString("0.00");
+ }
+
UCPager1.AspNetPager.RecordCount = pagination.RecordCount;
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.designer.cs
index 36bea9f..d1358a9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.designer.cs
@@ -132,6 +132,60 @@
protected global::System.Web.UI.WebControls.Repeater rptData;
/// <summary>
+ /// NowPageAllMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageAllMoney;
+
+ /// <summary>
+ /// NowPageZengMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageZengMoney;
+
+ /// <summary>
+ /// NowPageHuiMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageHuiMoney;
+
+ /// <summary>
+ /// AllMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl AllMoney;
+
+ /// <summary>
+ /// ZengMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl ZengMoney;
+
+ /// <summary>
+ /// HuiMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl HuiMoney;
+
+ /// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
index cdadbbb..708958f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
@@ -328,7 +328,7 @@
<td>
- <a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'> 鏌ョ湅璁㈠崟 </a>
+ <%#Eval("Fukuanyongtu").ToString().Equals("鍏朵粬浠樻")?"":"<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\")'> 鏌ョ湅璁㈠崟 </a>" %> <%--<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'> 鏌ョ湅璁㈠崟 </a>--%>
</td>
@@ -348,7 +348,7 @@
</asp:repeater>
</tbody>
<tr>
- <td colspan="5">
+ <td colspan="8">
鍚堣
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
index 62f201b..37e6590 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
@@ -228,6 +228,15 @@
鏀舵鍗曚綅
</th>
<th style="text-align: center;" width="70">
+ 鎴峰悕
+ </th>
+ <th style="text-align: center;" width="70">
+ 寮�鎴疯
+ </th>
+ <th style="text-align: center;" width="70">
+ 璐﹀彿
+ </th>
+ <th style="text-align: center;" width="70">
浠樻鐢ㄩ��
</th>
<th width="60">
@@ -272,6 +281,21 @@
<a href='javascript:void(0)' title='鐐瑰嚮鏌ョ湅 <%#Eval("SupplierName").ToString()%> 璧勬枡' class='a_under' onclick='onView("<%#Eval("SupplierId")%>")'><%#Eval("SupplierName") %></a>
</td>
+ <td style="text-align: center;">
+ <%#Eval("Huming")%>
+
+
+ </td>
+ <td style="text-align: center;">
+ <%#Eval("Bank")%>
+
+
+ </td>
+ <td style="text-align: center;">
+ <%#Eval("AccountID")%>
+
+
+ </td>
<td style="text-align: center;">
<%#Eval("Fukuanyongtu")%>
@@ -291,7 +315,7 @@
<td>
- <a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'> 鏌ョ湅璁㈠崟 </a>
+ <%#Eval("Fukuanyongtu").ToString().Equals("鍏朵粬浠樻")?"":"<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\")'> 鏌ョ湅璁㈠崟 </a>" %>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
index 1ebb739..f826db9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
@@ -81,11 +81,28 @@
var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id.ToInt32().Value);
if (fukuanshenqing != null)
{
- var oA_Suppliers = oA_SuppliersBLL.getSingleSupplier(fukuanshenqing.SupplierId.ToString());
- this.txtPaymentUnit.Value = oA_Suppliers.Name;
+ if (!string.IsNullOrWhiteSpace(fukuanshenqing.Huming))
+ {
+ this.txtPaymentUnit.Value = fukuanshenqing.Huming;
+ }
+ else
+ {
+ if (fukuanshenqing.SupplierId > 0)
+ {
+ var oA_Suppliers = oA_SuppliersBLL.getSingleSupplier(fukuanshenqing.SupplierId.ToString());
+ if (oA_Suppliers != null)
+ {
+ this.txtPaymentUnit.Value = oA_Suppliers.Name;
+ this.txtSupplierId.Value = oA_Suppliers.Keyid.ToString();
+ }
+ }
+
+
+ }
+
this.Keyid.Value = id;
- this.txtSupplierId.Value = oA_Suppliers.Keyid.ToString();
+
this.txtYouwufapiao.Value = fukuanshenqing.YouwufapiaoName;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx
index 4631f1b..11eb01e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx
@@ -14,7 +14,7 @@
渚涘簲鍟嗭細
</td>
<td>
- <select id="selSuppliers" runat="server" class="Sreq w120px" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" msg="璇烽�夋嫨渚涘簲鍟�">
+ <select id="selSuppliers" runat="server" class=" w120px" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" msg="璇烽�夋嫨渚涘簲鍟�">
</select>
</td>
<td class="ali03 w100px">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
index e35325b..a4e73d2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
@@ -67,22 +67,90 @@
/// </summary>
protected void InitialData()
{
+ var dataTable = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
+ var sss = dataTable.Select(" SuppliersTypeId ='182' ");
+
+
+ DataTable dtNew2 = dataTable.Clone(); //澶嶅埗缁撴瀯
+ for (int i = 0; i < sss.Length; i++)
+ {
+ dtNew2.ImportRow(sss[i]); //ImportRow 鏄鍒�
+ }
+
///渚涘簲鍟�
- selSuppliers.DataSource = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
-
+ selSuppliers.DataSource = dtNew2;//.Select(" SuppliersTypeId='200' ")
+
selSuppliers.DataBind();
- //selSuppliers.Items.Insert(0, new ListItem("璇烽�夋嫨", "0"));
+ selSuppliers.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
///浜у搧绫诲埆
///
dwCommity.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
- DataTable ds = _OA_CommodityBLL.SelectModelPage(CurrentUser.MemberId, "", "true");
- GetDataByLevel(dwCommity, ds, 0, 0);
+ DataTable dss = _OA_CommodityBLL.SelectModelPage(CurrentUser.MemberId, "", "true");
+ GetDataByLevel(dwCommity, dss, 0, 0);
+
+
+
if (Request["Keyid"].ToInt32() > 0)
{
Keyid = Request["Keyid"].ToString();
ShowProcurementData();
+ }
+ else
+ {
+ dwCommity.SelectedValue = "4";
+ DataTable ds = _OA_GoodsInfoBLL.SlectModleByCommity(dwCommity.SelectedValue, CurrentUser.MemberId);
+ if (ds.Rows.Count > 0)
+ {
+ dwGoodsList.DataSource = ds;
+ dwGoodsList.DataTextField = "GoodsName";
+ dwGoodsList.DataValueField = "Keyid";
+ dwGoodsList.DataBind();
+ dwGoodsList.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwBrand.Items.Clear();
+ dwBrand.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwSpecification.Items.Clear();
+ dwSpecification.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwPaperWeight.Items.Clear();
+ dwPaperWeight.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ if (dwCommity.SelectedItem.Text == "绾稿紶")
+ {
+ this.dwPaperWeight.Visible = true;
+ this.trWeight.Visible = true;
+ this.tanDiv.Visible = true;
+ this.tanDiv1.Visible = false;
+ this.div_td.Visible = true;
+ this.div_td1.Visible = false;
+ }
+ else
+ {
+ this.dwPaperWeight.Visible = false;
+ this.trWeight.Visible = false;
+ this.tanDiv.Visible = false;
+ this.tanDiv1.Visible = true;
+ this.div_td.Visible = false;
+ this.div_td1.Visible = true;
+ }
+ }
+ else
+ {
+ dwGoodsList.Items.Clear();
+ dwGoodsList.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwBrand.Items.Clear();
+ dwBrand.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwSpecification.Items.Clear();
+ dwSpecification.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ dwPaperWeight.Items.Clear();
+ dwPaperWeight.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ }
}
@@ -301,7 +369,15 @@
procurement.Price = this.txtPrice.Value.ToDecimal2();
procurement.LastUpdateTime = DateTime.Now;
procurement.Operator = CurrentUser.ShortName;
- procurement.SuppliersId = this.selSuppliers.Value.ToInt32();
+ if (string.IsNullOrEmpty(this.selSuppliers.Value))
+ {
+ procurement.SuppliersId = null;
+ }
+ else
+ {
+ procurement.SuppliersId = this.selSuppliers.Value.ToInt32();
+ }
+
procurement.FirmId = CurrentUser.MemberId;
procurement.GoodsId = this.dwGoodsList.SelectedValue.ToInt32();
procurement.Remark = "";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
index 4a4d5de..bf942b5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
@@ -16,7 +16,31 @@
$("#trCarNo").css("display", "table-row");
$("#trCarYes").css("display", "none");
}
+ if ($(this).val() == "15") {
+
+ $("#trShoukuandanwei").css("display", "table-row");
+ } else {
+
+ $("#trShoukuandanwei").css("display", "none");
+ }
+
+
});
+
+ if ($("#selPlanDataType").val() == "7") {
+ $("#trCarNo").css("display", "none");
+ $("#trCarYes").css("display", "table-row");
+ } else {
+ $("#trCarNo").css("display", "table-row");
+ $("#trCarYes").css("display", "none");
+ }
+ if ($("#selPlanDataType").val() == "15") {
+
+ $("#trShoukuandanwei").css("display", "table-row");
+ } else {
+
+ $("#trShoukuandanwei").css("display", "none");
+ }
});
</script>
</head>
@@ -37,7 +61,7 @@
<option value="7">鐢ㄨ溅</option>
<option value="10">涓氬姟缁忚垂</option>
<option value="11">瀹㈡埛鑱旇皧</option>
-<%-- <option value="13">寮�绁ㄧ敵璇�</option>--%>
+ <option value="15">浠樻鐢宠</option>
<option value="12">鍏朵粬</option>
</select>
</td>
@@ -64,6 +88,14 @@
<select id="selPlanTitle" runat="server" keepdefaultstyle="true" style=" width:100px;"></select>
</td>
</tr>
+ <tr id="trShoukuandanwei" style=" display:none;">
+ <td class="ali03">
+ 鏀舵鍗曚綅锛�
+ </td>
+ <td colspan="3">
+ <input id="txtShoukuandanwei" type="text" style=" width:400px;" class="" runat="server" msg="璇疯緭鍏ユ敹娆惧崟浣�" maxlength="50" />
+ </td>
+ </tr>
<tr>
<td class="ali03">
璇风ず鍐呭锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
index 735677a..61b09ef 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
@@ -72,6 +72,14 @@
{
this.txtPlanTitle.Value = m_OA_WorkPlan.PlanTitle.ToString();
}
+ if (m_OA_WorkPlan.PlanDataType == 15)
+ {
+ this.txtShoukuandanwei.Value = m_OA_WorkPlan.PlanComplany;
+ }
+ else
+ {
+ this.txtShoukuandanwei.Value = "";
+ }
this.txtPlanContent.Value = m_OA_WorkPlan.PlanContent.ToString();
}
}
@@ -121,7 +129,25 @@
}
m_OA_WorkPlan.Operator = CurrentUser.ShortName;
- m_OA_WorkPlan.PlanComplany = "";
+ if (this.selPlanDataType.Value == "15")
+ {
+ if (!this.txtPlanMoney.Value.Trim().ToDecimal2().HasValue || this.txtPlanMoney.Value.Trim().ToDecimal2().Value <= 0)
+ {
+ JavaScript.MessageBox("浠樻鐢宠璇峰～鍐欑敵璇疯垂鐢紒", this);
+ return;
+ }
+ if (string.IsNullOrWhiteSpace(this.txtShoukuandanwei.Value))
+ {
+ JavaScript.MessageBox("浠樻鐢宠璇峰～鍐欐敹娆惧崟浣嶏紒", this);
+ return;
+ }
+ m_OA_WorkPlan.PlanComplany = this.txtShoukuandanwei.Value;
+ }
+ else
+ {
+ m_OA_WorkPlan.PlanComplany = "";
+ }
+
m_OA_WorkPlan.PlanContent = this.txtPlanContent.Value.Trim();
m_OA_WorkPlan.PlanDataType = this.selPlanDataType.Value.ToInt32();
m_OA_WorkPlan.PlanMoney = this.txtPlanMoney.Value.Trim().ToDecimal2()??0;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
index 54e0b41..914dd83 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
@@ -78,6 +78,15 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selPlanTitle;
/// <summary>
+ /// txtShoukuandanwei 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtShoukuandanwei;
+
+ /// <summary>
/// txtPlanContent 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
index fee15c8..dae8edd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
@@ -52,6 +52,14 @@
<span id="spanPlanTitle" runat="server"></span>
</td>
</tr>
+ <tr style='<%=planDataType=="15"?"":"display:none;" %>'>
+ <td class="ali03">
+ 鏀舵鍗曚綅锛�
+ </td>
+ <td colspan="3">
+ <span id="spanShoukuandanwei" runat="server"></span>
+ </td>
+ </tr>
<tr>
<td class="ali03">
璇︾粏鍐呭锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
index c4ec8bb..efb6bbd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
@@ -21,7 +21,7 @@
public partial class MyRequestDetail : BasePage
{
OA_WorkPlanBll oA_WorkReminderBll = null;
-
+ public string planDataType = "";
public MyRequestDetail()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
@@ -42,6 +42,7 @@
OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
if (m_OA_WorkPlan != null)
{
+ planDataType = m_OA_WorkPlan.PlanDataType.Value.ToString();
this.spanPlanDataType.InnerText = m_OA_WorkPlan.PlanDataTypeName.ToString();
this.spanPlanMoney.InnerText = m_OA_WorkPlan.PlanMoney.Value.ToString("0.00");
this.spanPlanPeople.InnerText = m_OA_WorkPlan.PlanPeople.ToString();
@@ -49,7 +50,7 @@
this.spanPlanRemark.InnerText = m_OA_WorkPlan.PlanRemark.ToString();
this.spanPlanTitle.InnerText = m_OA_WorkPlan.PlanTitle.ToString();
this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
-
+ this.spanShoukuandanwei.InnerText = m_OA_WorkPlan.PlanComplany;
if (m_OA_WorkPlan.PlanStatus == 1)
{
this.panelApprovalNo.Visible = true;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs
index c2c6a40..aea15c9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.work {
-
-
- public partial class MyRequestDetail {
-
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class MyRequestDetail
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// spanPlanDataType 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanDataType;
-
+
/// <summary>
/// spanPlanMoney 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanMoney;
-
+
/// <summary>
/// spanPlanPeople 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanPeople;
-
+
/// <summary>
/// spanPlanStartTime 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanStartTime;
-
+
/// <summary>
/// spanPlanTitle 鎺т欢銆�
/// </summary>
@@ -83,7 +85,16 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanTitle;
-
+
+ /// <summary>
+ /// spanShoukuandanwei 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanShoukuandanwei;
+
/// <summary>
/// spanPlanContent 鎺т欢銆�
/// </summary>
@@ -92,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanContent;
-
+
/// <summary>
/// spanPlanRemark 鎺т欢銆�
/// </summary>
@@ -101,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanRemark;
-
+
/// <summary>
/// panelApprovalNo 鎺т欢銆�
/// </summary>
@@ -110,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl panelApprovalNo;
-
+
/// <summary>
/// spanPlanStatus 鎺т欢銆�
/// </summary>
@@ -119,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanStatus;
-
+
/// <summary>
/// panelApprovalYes 鎺т欢銆�
/// </summary>
@@ -128,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl panelApprovalYes;
-
+
/// <summary>
/// spanApprovalStaffName 鎺т欢銆�
/// </summary>
@@ -137,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanApprovalStaffName;
-
+
/// <summary>
/// spanApprovalTime 鎺т欢銆�
/// </summary>
@@ -146,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanApprovalTime;
-
+
/// <summary>
/// spanPlanStatus1 鎺т欢銆�
/// </summary>
@@ -155,7 +166,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanStatus1;
-
+
/// <summary>
/// spanApprovalStatus 鎺т欢銆�
/// </summary>
@@ -164,7 +175,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanApprovalStatus;
-
+
/// <summary>
/// spanApprovalContent 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
index 5c40e38..bc57ce2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
@@ -85,6 +85,7 @@
<option value="11">瀹㈡埛鑱旇皧</option>
<option value="13">寮�绁ㄧ敵璇�</option>
<option value="14">澶栧崗浠樻鐢宠</option>
+ <option value="15">浠樻鐢宠</option>
<option value="12">鍏朵粬</option>
</select>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
index 44183d4..3f0048d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
@@ -54,6 +54,14 @@
<span id="spanPlanTitle" runat="server"></span>
</td>
</tr>
+ <tr style='<%=planDataType=="15"?"":"display:none;" %>'>
+ <td class="ali03">
+ 鏀舵鍗曚綅锛�
+ </td>
+ <td colspan="3">
+ <span id="spanShoukuandanwei" runat="server"></span>
+ </td>
+ </tr>
<tr>
<td class="ali03">
璇︾粏鍐呭锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
index d4c73fb..7a6f07f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -24,12 +24,15 @@
OA_KaipiaoshenqingBLL _oA_KaipiaoshenqingBLL = null;
EC_OrderBLL _eC_OrderBLL = null;
OA_FukuanshenqingBLL _oA_FukuanshenqingBLL = null;
+ EC_MemberBasicBLL _eC_MemberBasicBLL = null;
+ public string planDataType = "";
public RequestReplyAdd()
{
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();
}
//椤甸潰鍔犺浇
@@ -52,6 +55,7 @@
}
if (m_OA_WorkPlan != null)
{
+ planDataType = m_OA_WorkPlan.PlanDataType.Value.ToString();
this.spanPlanDataType.InnerText = m_OA_WorkPlan.PlanDataTypeName.ToString();
this.spanPlanMoney.InnerText = m_OA_WorkPlan.PlanMoney.Value.ToString("0.00");
this.spanPlanPeople.InnerText = m_OA_WorkPlan.PlanPeople.ToString();
@@ -59,6 +63,7 @@
this.spanPlanRemark.InnerText = m_OA_WorkPlan.PlanRemark.ToString();
this.spanPlanTitle.InnerText = m_OA_WorkPlan.PlanTitle.ToString();
this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
+ this.spanShoukuandanwei.InnerText = m_OA_WorkPlan.PlanComplany;
}
}
@@ -105,6 +110,49 @@
_oA_FukuanshenqingBLL.UpdateModel(fukuanshenqing);
}
+
+ if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 15)
+ {//鎵瑰噯鏂板浠樻鐢宠
+ OA_Fukuanshenqing oA_Fukuanshenqing = new OA_Fukuanshenqing();
+
+
+
+ oA_Fukuanshenqing.FirmId = CurrentUser.MemberId;
+ oA_Fukuanshenqing.SupplierId = 0;
+ oA_Fukuanshenqing.Fukuanshenqingstatus = 0;
+ oA_Fukuanshenqing.ApprovalStatus = 1;
+ oA_Fukuanshenqing.Fukuanmoney = m_OA_WorkPlan.PlanMoney;
+
+ oA_Fukuanshenqing.Bank = "";
+ oA_Fukuanshenqing.Huming = m_OA_WorkPlan.PlanComplany;
+ oA_Fukuanshenqing.AccountID = "";
+ oA_Fukuanshenqing.Yishoumoney = 0;
+ oA_Fukuanshenqing.Youwufapiao = 0;
+ oA_Fukuanshenqing.Fukuanyongtu = "鍏朵粬浠樻";
+ oA_Fukuanshenqing.FukuanStatus = 1;
+ oA_Fukuanshenqing.remark = "";
+ oA_Fukuanshenqing.DindanId = "";
+
+ var eC_MemberBasic = _eC_MemberBasicBLL.GetMemberByMemberId(m_OA_WorkPlan.SentStaffId);
+ if (eC_MemberBasic != null)
+ {
+ oA_Fukuanshenqing.Creater = CurrentUser.ShortName;
+ oA_Fukuanshenqing.Updater = CurrentUser.ShortName;
+ }
+ else
+ {
+ oA_Fukuanshenqing.Creater = "";
+ oA_Fukuanshenqing.Updater = "";
+ }
+
+
+ oA_Fukuanshenqing.CreateTime = DateTime.Now;
+
+ oA_Fukuanshenqing.LastUpdateTime = DateTime.Now;
+
+ var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);
+ }
+
if (Request["keyid"].ToInt32() > 0)
{
if (oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan))
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
index d47d4c0..b1514a6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
@@ -87,6 +87,15 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanTitle;
/// <summary>
+ /// spanShoukuandanwei 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanShoukuandanwei;
+
+ /// <summary>
/// spanPlanContent 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
index 47a4e5f..c35477f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
@@ -59,6 +59,7 @@
<option value="11">瀹㈡埛鑱旇皧</option>
<option value="13">寮�绁ㄧ敵璇�</option>
<option value="14">澶栧崗浠樻鐢宠</option>
+ <option value="15">浠樻鐢宠</option>
<option value="12">鍏朵粬</option>
</select>
</td>
--
Gitblit v1.9.1