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.cs | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
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")
--
Gitblit v1.9.1