From 82662b0e9ab839c72ec3734f18b691d5f037c0a3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 12 二月 2025 08:43:36 +0800
Subject: [PATCH] 外协订单不要松活信息 新增采购信息改为新增采购订单 角色查询增加查询条件，有效无效
---
CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx.cs | 21 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx | 8 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx | 8 +-
CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx.designer.cs | 46 +++++++++++----
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx.designer.cs | 74 ++++++++++++------------
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx | 8 ++
8 files changed, 109 insertions(+), 62 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx
index 0685a7c..5b0bf96 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx
@@ -27,7 +27,7 @@
if ('0' == document.getElementById('txtKeyid').value) {
document.getElementById('txtDeliveryTime').value = new Date().ToFuture({ day: 15 }).ToString('yyyy-MM-dd');
document.getElementById('div_InquiryEdit').style.display = '';
- ReceiptT('member', '<%=targetid %>', 4, 100); return;
+ <%--ReceiptT('member', '<%=targetid %>', 4, 100); --%>return;
} else; //淇敼鏃朵笉鏄剧ず鍗板埛鍙傛暟鎺т欢
document.getElementById('selPrintTypes').style.display = 'none';
document.getElementById('spnPrintType').innerHTML = document.getElementById('txtPrintTypes').value;
@@ -265,13 +265,13 @@
<textarea style="width: 600px; height: 30px;" id="txtRemark" runat="server"></textarea>
</td>
</tr>
- <tr id='ReceiptT_Html'>
+ <%-- <tr id='ReceiptT_Html'>
<td class="ali03">
</td>
<td colspan="3">
</td>
- </tr>
+ </tr>--%>
<tr id= "trFile" runat = "server">
<td></td>
<td align="left" class="style1"><asp:CheckBox ID="cbkIsAllRecovery" Text="鏄惁鑷姩涓婁紶鏂囦欢" runat="server" Checked="true" Visible = "false"/></td>
@@ -289,7 +289,7 @@
</table>
</form>
<script type="text/javascript">
- ReceiptT('member', '<%=targetid %>', 4, 100);
+ <%-- ReceiptT('member', '<%=targetid %>', 4, 100);--%>
</script>
</body>
</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx
index 98a18c9..0fcaea7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx
@@ -13,7 +13,7 @@
<script type="text/javascript">
$(function () {
try {
- ReceiptT('order', '<%=targetid %>', 4, 100);
+ <%-- ReceiptT('order', '<%=targetid %>', 4, 100); --%>
} catch (e) {
}
});
@@ -214,13 +214,13 @@
<textarea style="width: 600px; height: 30px;" id="txtRemark" runat="server"></textarea>
</td>
</tr>
- <tr id='ReceiptT_Html'>
+ <%-- <tr id='ReceiptT_Html'>
<td class="ali03">
</td>
<td colspan="3">
</td>
- </tr>
+ </tr>--%>
<tr>
<td class="contentLeft" colspan="4" style="text-align: center;">
<input type="hidden" id='txtKeyid' runat="server" value='0' /><input type="hidden" value='0' id='txtBillMode' runat="server" />
@@ -232,7 +232,7 @@
</table>
</form>
<script type="text/javascript">
- ReceiptT('member', '<%=targetid %>', 4, 100);
+ <%-- ReceiptT('member', '<%=targetid %>', 4, 100);--%>
</script>
</body>
</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx.cs
index 297c16b..7ad11ac 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx.cs
@@ -235,7 +235,7 @@
EC_AcceptWayByOrder m_EC_AcceptWayByOrder = new EC_AcceptWayByOrderBLL().GetModelByTargetId(m_EC_OrderBasicNew.Keyid);
m_EC_OrderBasicNew.AcceptWayByOrder.Keyid = (m_EC_AcceptWayByOrder == null ? new EC_AcceptWayByOrder() : m_EC_AcceptWayByOrder).Keyid;
m_EC_OrderBasicNew.AcceptWayByOrder.TargetId = m_EC_OrderBasicNew.Keyid;
- m_EC_OrderBasicNew.AcceptWayByOrder.AcceptTypeId = Request["AcceptTypeId"].ToInt32();
+ m_EC_OrderBasicNew.AcceptWayByOrder.AcceptTypeId = 104;//Request["AcceptTypeId"].ToInt32();
m_EC_OrderBasicNew.AcceptWayByOrder.InvoiceDemand = Request["InvoiceId"].ToString2();
m_EC_OrderBasicNew.AcceptWayByOrder.Remark = Request["Remark"].ToString2();
m_EC_OrderBasicNew.AcceptWayByOrder.LastUpdateTime = DateTime.Now;
@@ -254,7 +254,7 @@
m_EC_OrderBasicNew.AcceptWayByOrder.AppointCourierCompany = "";
m_EC_OrderBasicNew.AcceptWayByOrder.TheAwb = "";
- string ReceiptType = bll_Sys_DictionaryBLL.GetModelByKeyid(Request["AcceptTypeId"].ToInt32());
+ string ReceiptType = bll_Sys_DictionaryBLL.GetModelByKeyid(104);//Request["AcceptTypeId"].ToInt32()
switch (ReceiptType)
{
case "鑷彁":
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx.designer.cs
index de6889a..8bb1f86 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllUpdate.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.business {
-
-
- public partial class AgOutsourcSingleAllUpdate {
-
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class AgOutsourcSingleAllUpdate
+ {
+
/// <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>
/// selOutFirm 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selOutFirm;
-
+
/// <summary>
/// spanSpecialOprator 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialOprator;
-
+
/// <summary>
/// spanSpecialTime 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSpecialTime;
-
+
/// <summary>
/// txtAllMoney 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtAllMoney;
-
+
/// <summary>
/// selExigencyDegree 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selExigencyDegree;
-
+
/// <summary>
/// txtDeliveryTime 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtDeliveryTime;
-
+
/// <summary>
/// spanOrderNum 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderNum;
-
+
/// <summary>
/// spanOrderType 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderType;
-
+
/// <summary>
/// spanOrderDeliveryTime 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderDeliveryTime;
-
+
/// <summary>
/// spanOrderTitle 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderTitle;
-
+
/// <summary>
/// spanVerifyWay 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanVerifyWay;
-
+
/// <summary>
/// spanExigencyDegree 鎺т欢銆�
/// </summary>
@@ -146,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanExigencyDegree;
-
+
/// <summary>
/// spanOrderCustormName 鎺т欢銆�
/// </summary>
@@ -155,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormName;
-
+
/// <summary>
/// spanOrderBusinessManage 鎺т欢銆�
/// </summary>
@@ -164,7 +166,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderBusinessManage;
-
+
/// <summary>
/// spanOrderCustormManage 鎺т欢銆�
/// </summary>
@@ -173,7 +175,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormManage;
-
+
/// <summary>
/// spanOrderCustormLevel 鎺т欢銆�
/// </summary>
@@ -182,7 +184,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormLevel;
-
+
/// <summary>
/// spanOrderCustormPeople 鎺т欢銆�
/// </summary>
@@ -191,7 +193,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormPeople;
-
+
/// <summary>
/// spanOrderCustormPhone 鎺т欢銆�
/// </summary>
@@ -200,7 +202,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderCustormPhone;
-
+
/// <summary>
/// spanUnitPrice 鎺т欢銆�
/// </summary>
@@ -209,7 +211,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanUnitPrice;
-
+
/// <summary>
/// spanSumPrice 鎺т欢銆�
/// </summary>
@@ -218,7 +220,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSumPrice;
-
+
/// <summary>
/// spanSurplusPrintNum 鎺т欢銆�
/// </summary>
@@ -227,7 +229,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSurplusPrintNum;
-
+
/// <summary>
/// txtPrintDemand 鎺т欢銆�
/// </summary>
@@ -236,7 +238,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPrintDemand;
-
+
/// <summary>
/// txtAfterWorksDemand 鎺т欢銆�
/// </summary>
@@ -245,7 +247,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtAfterWorksDemand;
-
+
/// <summary>
/// txtRemark 鎺т欢銆�
/// </summary>
@@ -254,7 +256,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
-
+
/// <summary>
/// txtKeyid 鎺т欢銆�
/// </summary>
@@ -263,7 +265,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtKeyid;
-
+
/// <summary>
/// txtBillMode 鎺т欢銆�
/// </summary>
@@ -272,7 +274,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtBillMode;
-
+
/// <summary>
/// btnSave 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx
index 90869c6..a06b81a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx
@@ -130,7 +130,13 @@
</div>
<div style="float: left; border: 1px solid #CCCCCC; margin-left: 20px; height: 100%; padding: 10px; width: 360px;">
<div style="margin-bottom: 10px; float: left; width: 360px;">
- <input id="btnAddRole" type="button" value="娣诲姞瑙掕壊" onclick="addModel();" />
+ <input id="btnAddRole" type="button" value="娣诲姞瑙掕壊" onclick="addModel();" />
+ 鏄惁浣跨敤锛�<select id="selSPS_Department" runat="server" keepDefaultStyle="true">
+ <option value="0">鍏ㄩ儴</option>
+ <option value="1" selected="selected" >鏄�</option>
+ <option value="2">鍚�</option>
+ </select>
+ <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" />
</div>
<div style="float: left; width: 360px;">
<asp:Repeater ID="RepClientList" runat="server">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx.cs
index 164321c..acad232 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx.cs
@@ -55,10 +55,23 @@
//鑾峰彇閬嶅巻缁撴灉
public void InitialData()
{
+ var youxiao = this.selSPS_Department.Value.ToInt32();
+ var oA_FirmRoles = bll_OA_FirmRoleBLL.SelectList(CurrentUser.MemberId);
+ if (youxiao>0)
+ {
+ if (youxiao == 1)
+ {
+ oA_FirmRoles = oA_FirmRoles.Where(x => x.IsUsed == true);
+ }
+ else if (youxiao == 2)
+ {
+ oA_FirmRoles = oA_FirmRoles.Where(x => x.IsUsed == false);
+ }
+ }
treeHtml = "{GetMenuRoleId:'0', id: 99999, parentId: 900009, name: '鏈�楂樻潈闄�', open: true },";
- this.RepClientList.DataSource = bll_OA_FirmRoleBLL.SelectList(CurrentUser.MemberId);
+ this.RepClientList.DataSource = oA_FirmRoles;// bll_OA_FirmRoleBLL.SelectList(CurrentUser.MemberId);
this.RepClientList.DataBind();
Sys_Permissions_UserRoleRelation m_Sys_Permissions_UserRoleRelation = bll_Sys_Permissions_RoleBLL.SelectSys_Permissions_UserRoleRelation(CurrentUser.MemberId);
@@ -100,6 +113,12 @@
treeHtml = treeHtml.Trim(',');
}
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object src, EventArgs e)
+ {
+ InitialData();
+ }
+
//淇濆瓨瑙掕壊鏉冮檺
protected void btn_SaveRole_Click(object sender, EventArgs e)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx.designer.cs
index 9ab21d4..9e8425c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/FirmRoleList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.personnel {
-
-
- public partial class FirmRoleList {
-
+namespace CY.WebForm.Pages.personnel
+{
+
+
+ public partial class FirmRoleList
+ {
+
/// <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>
/// hideKeyid 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideKeyid;
-
+
/// <summary>
/// hideRoles 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideRoles;
-
+
/// <summary>
/// btn_SaveRole 鎺т欢銆�
/// </summary>
@@ -65,7 +67,25 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_SaveRole;
-
+
+ /// <summary>
+ /// selSPS_Department 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selSPS_Department;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
index 7c44821..d4d37c9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
@@ -184,7 +184,7 @@
<div class="left">
<div class="right">
<div class="padding_top5 padding_left10">
- <a href="javascript:;" onclick="addModel()" menu_member_case_id="case_addModel" menu_member_case_name="鏂板閲囪喘淇℃伅"><span class="icon_add">鏂板閲囪喘淇℃伅</span></a>
+ <a href="javascript:;" onclick="addModel()" menu_member_case_id="case_addModel" menu_member_case_name="鏂板閲囪喘璁㈠崟"><span class="icon_add">鏂板閲囪喘璁㈠崟</span></a>
<a href="javascript:;" onclick="PrintModel()" menu_member_case_id="case_PrintModel" menu_member_case_name="鎵撳嵃閲囪喘淇℃伅"><span class="icon_add">鎵撳嵃閲囪喘淇℃伅</span></a>
<a href="javascript:;" menu_member_case_id="case_caigoufukuan" menu_member_case_name="閲囪喘浠樻鐢宠" onclick="ToWaixieFukuan()"><span class="icon_edit">閲囪喘浠樻鐢宠</span></a>
<div class="box_tool_line">
--
Gitblit v1.9.1