yiming/17168ERP
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

功能調整

Browse Source
This commit is contained in:
minom
2026-05-27 17:52:36 +08:00
parent 669b29d183
commit 2b9e266eb0
7 changed files with 193 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/admin/activity/reg.aspx
+2 -2
View File
@@ -986,7 +986,7 @@
</div>
</div>
<div class="row mb-1 label-sm-right">
<label class="col-sm-2 col-lg-1 col-form-label">開始日期（西元）</label>
<label class="col-sm-2 col-lg-1 col-form-label">開始日期（西元）*</label>
<div class="col-sm-4 col-lg-3">
<asp:TextBox ID="startDate_solar" TextMode="Date" runat="server" CssClass="form-control" onchange="chagenDate(this)"></asp:TextBox>
</div>
@@ -1003,7 +1003,7 @@
<div class="row mb-1 label-sm-right">
<label class="col-sm-2 col-lg-1 col-form-label">結束日期（西元）</label>
<label class="col-sm-2 col-lg-1 col-form-label">結束日期（西元）*</label>
<div class="col-sm-4 col-lg-3">
<asp:TextBox ID="endDate_solar" TextMode="Date" runat="server" CssClass="form-control" onchange="chagenDate(this)"></asp:TextBox>
</div>
web/admin/activity/reg.aspx.cs
+34 -20
View File
@@ -254,7 +254,7 @@ public partial class admin_activity_reg : MyWeb.config
{
if (textBox.TextMode == TextBoxMode.Date)
ObjValue.SetValue(activity, selectDate(textBox));
else
ObjValue.SetValue(activity, ((TextBox)obj).Text.Trim());
}
@@ -281,24 +281,31 @@ public partial class admin_activity_reg : MyWeb.config
// printInit 欄位
//var printInitValue = printInit.Text.Trim();
//activity.print_init = !string.IsNullOrEmpty(printInitValue) ? printInitValue : null;
activity.kind = Val(kind.Value);
activity.category_kind = Val(category_kind.Value);
activity.reg_time = DateTime.Now;
_db.activities.Add(activity);
_db.SaveChanges();
int _id = activity.num;
if (_id > 0)
if (activity.startDate_solar == null || activity.endDate_solar == null)
{
Model.admin_log admin_log = new Model.admin_log();
admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Activity, (int)Model.admin_log.Status.Insert, subject.Text);
Response.Redirect("index.aspx");
L_msg.Type = alert_type.danger;
L_msg.Text = "開始、結束日期必須填寫";
}
else
{
L_msg.Type = alert_type.danger;
L_msg.Text = "Error";
activity.kind = Val(kind.Value);
activity.category_kind = Val(category_kind.Value);
activity.reg_time = DateTime.Now;
_db.activities.Add(activity);
_db.SaveChanges();
int _id = activity.num;
if (_id > 0)
{
Model.admin_log admin_log = new Model.admin_log();
admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Activity, (int)Model.admin_log.Status.Insert, subject.Text);
Response.Redirect("index.aspx");
}
else
{
L_msg.Type = alert_type.danger;
L_msg.Text = "Error";
}
}
}
catch (Exception ex)
@@ -363,12 +370,19 @@ public partial class admin_activity_reg : MyWeb.config
// printInit 欄位
//var printInitValue = printInit.Text.Trim();
//activity.print_init = !string.IsNullOrEmpty(printInitValue) ? printInitValue : null;
if (activity.startDate_solar == null || activity.endDate_solar == null)
{
L_msg.Type = alert_type.danger;
L_msg.Text = "開始、結束日期必須填寫";
}
else
{
activity.category_kind = Val(category_kind.Value);
_db.SaveChanges();
activity.category_kind = Val(category_kind.Value);
_db.SaveChanges();
Model.admin_log admin_log = new Model.admin_log();
admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Activity, (int)Model.admin_log.Status.Update, subject.Text);
Model.admin_log admin_log = new Model.admin_log();
admin_log.writeLog(admin.info.u_id, (int)Model.admin_log.Systems.Activity, (int)Model.admin_log.Status.Update, subject.Text);
}
}
catch (Exception ex)
{