From f3f02a5a68c0e1d70a5447dc7bc8385a92c1807f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 23 六月 2025 10:52:55 +0800
Subject: [PATCH] 修改报销提交生成单号的异常
---
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.designer.cs | 27 ++++++---
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.cs | 62 ++++++++++----------
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx | 40 ++++++++++++-
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs | 2
4 files changed, 87 insertions(+), 44 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx
index d83179a..99dacc8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx
@@ -7,6 +7,34 @@
<title>鏂板璇风ず</title>
<uc:CMSHead ID="CMSHead1" runat="server" />
<script type="text/javascript">
+
+
+ function CheckStaff() {
+ var IsCanSubmit = true;
+ $.ajax({
+ url: "https://yocaisim.51zhengcai.com/api/CYOSSetting/GetShowID",
+ type: "GET",
+ dataType: "json",
+ data: { },
+ global: false,
+ cache: false,
+ async: false,
+ success: function (msg) {
+ $("#txtEvaluationContent").val(msg.data);
+
+ IsCanSubmit = true;
+
+ },
+ error: function (xhr, status, error) {
+ console.error('File upload failed:', status, error);
+ alertMsg('鐢熸垚鍗曞彿澶辫触');
+ IsCanSubmit = false;
+ }
+ });
+
+
+ return IsCanSubmit;
+ }
//鏌ョ湅
function checkSelFile(obj) {
@@ -123,6 +151,7 @@
</td>
<td>
<input id="txtDepart" type="text" runat="server" style=" width:180px;" readonly="readonly" />
+ <input type="hidden" runat ="server" id="txtEvaluationContent" />
</td>
</tr>
<tr>
@@ -270,10 +299,15 @@
<tr>
<td colspan="2" style="text-align: center;">
- <asp:Button ID="Button1" runat="server" OnClick="btn_baocun_form" Text="淇濆瓨" />
- <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" Text="鎻愪氦" />
- <asp:Button ID="Button2" runat="server" OnClick="btn_jixu_form" Text="缁х画鎶ラ攢" />
+ <asp:Button ID="Button3" runat="server" OnClick="btn_tijiao_form" Text="淇濆瓨" />
+
+ <asp:Button ID="Button1" runat="server" OnClientClick="if(CheckStaff())return true;else return false; " OnClick="btn_baocun_form" Text="鎻愪氦" />
+
+
+ <asp:Button ID="Button2" runat="server" OnClick="btn_jixu_form" Text="缁х画鎶ラ攢" />
+
+
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.cs
index 191f94b..64bd565 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.cs
@@ -86,15 +86,15 @@
selSubject.Disabled = true;
txtPlanContent.Disabled = true;
selHoubufapiaoStatus.Disabled = true;
- this.Button1.Enabled = false;
+ this.Button3.Enabled = false;
this.Button2.Enabled = false;
}
if (!string.IsNullOrEmpty(Request["zaici"]))
{
- this.Button1.Enabled = false;
+ this.Button3.Enabled = false;
this.Button2.Enabled = false;
- this.btn_submit.Text = "鍐嶆鎻愪氦";
+ this.Button1.Text = "鍐嶆鎻愪氦";
}
if (m_OA_WorkPlan != null)
@@ -120,14 +120,14 @@
}
//琛ㄥ崟鎻愪氦
- protected void btn_submit_form(object sender, EventArgs e)
+ protected void btn_baocun_form(object sender, EventArgs e)
{
var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
- if(HideKeyidFapiao.Length<=1 && this.selHoubufapiaoStatus.Value == "1")
- {
- JavaScript.MessageBox("閫夋嫨鏈夊彂绁ㄥ繀椤讳笂浼犲彂绁�", this);
- return;
- }
+ if (HideKeyidFapiao.Length <= 1 && this.selHoubufapiaoStatus.Value == "1")
+ {
+ JavaScript.MessageBox("閫夋嫨鏈夊彂绁ㄥ繀椤讳笂浼犲彂绁�", this);
+ return;
+ }
using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
new TransactionOptions
@@ -188,27 +188,27 @@
}
}
- if (string.IsNullOrEmpty(m_OA_WorkPlan.EvaluationContent))
- {
- using (var client = new HttpClient())
- {
- HttpResponseMessage response = client.GetAsync(url).Result;
- response.EnsureSuccessStatusCode();
- string responseBody = response.Content.ReadAsStringAsync().Result;
- JavaScriptSerializer serializer = new JavaScriptSerializer();
- var person = serializer.Deserialize<Responsebody>(responseBody);
- if (person != null && person.code == 1)
- {
- m_OA_WorkPlan.EvaluationContent = person.data;
- }
- else
- {
- JavaScript.MessageBox("鐢熸垚鎶ラ攢鍗曞彿澶辫触", this);
- return;
- }
- }
- }
- //m_OA_WorkPlan.EvaluationContent = "";
+ //if (string.IsNullOrEmpty(m_OA_WorkPlan.EvaluationContent))
+ //{
+ // using (var client = new HttpClient())
+ // {
+ // HttpResponseMessage response = client.GetAsync(url).Result;
+ // response.EnsureSuccessStatusCode();
+ // string responseBody = response.Content.ReadAsStringAsync().Result;
+ // JavaScriptSerializer serializer = new JavaScriptSerializer();
+ // var person = serializer.Deserialize<Responsebody>(responseBody);
+ // if (person != null && person.code == 1)
+ // {
+ // m_OA_WorkPlan.EvaluationContent = person.data;
+ // }
+ // else
+ // {
+ // JavaScript.MessageBox("鐢熸垚鎶ラ攢鍗曞彿澶辫触", this);
+ // return;
+ // }
+ // }
+ //}
+ m_OA_WorkPlan.EvaluationContent = this.txtEvaluationContent.Value;
m_OA_WorkPlan.RewardResult = this.selSubject.Value;
var a_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(this.selSubject.Value.ToInt32());
@@ -390,7 +390,7 @@
//琛ㄥ崟淇濆瓨
- protected void btn_baocun_form(object sender, EventArgs e)
+ protected void btn_tijiao_form(object sender, EventArgs e)
{
var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
//if (HideKeyidFapiao.Length <= 1 && this.selHoubufapiaoStatus.Value == "1")
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.designer.cs
index 5012f2e..b30b194 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.designer.cs
@@ -51,6 +51,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtDepart;
/// <summary>
+ /// txtEvaluationContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtEvaluationContent;
+
+ /// <summary>
/// txtStaff 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -132,6 +141,15 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selHoubufapiaoStatus;
/// <summary>
+ /// Button3 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button3;
+
+ /// <summary>
/// Button1 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -139,15 +157,6 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button Button1;
-
- /// <summary>
- /// btn_submit 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.WebControls.Button btn_submit;
/// <summary>
/// Button2 鎺т欢銆�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs
index ef3d05b..6549a32 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs
@@ -42,7 +42,7 @@
{
//var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["delete"].ToInt32().Value).ToList();
OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(Request["delete"].ToInt32());
- if (model.ApprovalStatus !=4 )
+ if (!string.IsNullOrEmpty(model.EvaluationContent) )
{
JavaScript.MessageBox("宸叉彁浜や俊鎭紝涓嶈兘鍒犻櫎", this);
return;
--
Gitblit v1.9.1