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-09-11 17:56:59 +08:00
parent dfb6a8e6a4
commit be5352efed
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/App_Code/Model/ViewModel/activity.cs
+2 -1
View File
@@ -35,7 +35,8 @@ namespace Model.ViewModel
public string up_time1 { get; set; }
public string up_time2 { get; set; }
public string deadline { get; set; }
public string startDate_solar { get; set; }
public string endDate_solar { get; set; }
}
public class actItem
web/App_Code/api/activityController.cs
+15
View File
@@ -311,6 +311,21 @@ public class activityController : ApiController
qry = qry.Where(o => o.startDate_solar <=s&&o.endDate_solar>=s);
}
if (!string.IsNullOrEmpty(q.startDate_solar)&& !string.IsNullOrEmpty(q.endDate_solar))
{
var sDate = DateTime.Parse(q.startDate_solar);
var eDate = DateTime.Parse(q.endDate_solar);
qry = qry.Where(o => o.startDate_solar <= eDate && o.endDate_solar >= sDate);
}else if (!string.IsNullOrEmpty(q.startDate_solar))
{
var s = DateTime.Parse(q.startDate_solar);
qry = qry.Where(o => o.startDate_solar <= s && o.endDate_solar >= s);
}
else if (!string.IsNullOrEmpty(q.endDate_solar))
{
var s = DateTime.Parse(q.endDate_solar);
qry = qry.Where(o => o.startDate_solar <= s && o.endDate_solar >= s);
}
//if (!string.IsNullOrEmpty(q.up_time2))
//{
// var end = DateTime.Parse(q.up_time2);
web/admin/shuwen/shuwen.aspx
+10 -14
View File
@@ -3,7 +3,10 @@
<asp:Content ID="Content1" ContentPlaceHolderID="page_header" Runat="Server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="page_nav" Runat="Server">
<%--<div class="mb-2 mb-sm-0 d-flex align-items-center gap-2">--%>
<div class="mb-2 mb-sm-0 d-flex align-items-center gap-2">
<v-text-field v-model="query.start_date" label="活動起始日" type="date" dense outlined></v-text-field>
<v-text-field v-model="query.end_date" label="活動結束日" type="date" dense outlined></v-text-field>
<button class="btn btn-primary" @click="queryActivity">查詢</button>
<%--<span>查看疏文</span>
<select v-model="currentActivityNum" @change="onActivityChange" class="form-select" style="width: auto;">
<option value="">請選擇要查看的活動</option>
@@ -23,6 +26,7 @@
<a class="btn btn-outline-primary btn-print" @click="updateShuWen" v-if="currentActivityNum&&!latest">{{updateShuWenLoading ? '更新中': '更新疏文'}}</a>
<a :href="'<%=ResolveUrl("~/api/shuwen/download")%>?activitynum='+currentActivityNum" class="btn btn-outline-primary btn-print">下載疏文Word檔</a>
</div>--%>
</div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<!--要同時可以選多個活動，因為會拆成捐贈跟報名 ，還要能設定消災跟超薦的區分-->
@@ -37,17 +41,6 @@
<v-text-field v-model="query.sStart" label="超薦列印編號前置" type="text" dense outlined></v-text-field>
</v-col>
</v-row>
<v-row class="mb-0 mt-4">
<v-col cols="12" md="3">
<v-text-field v-model="query.start_date" label="活動起始日" type="date" dense outlined></v-text-field>
</v-col>
<v-col cols="12" md="3">
<v-text-field v-model="query.end_date" label="活動結束日" type="date" dense outlined></v-text-field>
</v-col>
<v-col cols="12" md="3">
<button class="btn btn-primary">查詢</button>
</v-col>
</v-row>
</v-container>
</template>
<%--<div v-if="currentActivityNum">
@@ -97,12 +90,15 @@
query: {
start_date: '',
end_date: '',
xStart: '',
sSatrt: ''
xStart: '',//消災
sSatrt: ''//超薦
},
}
},
methods: {
queryActivity() {//列出區間內的活動/法會
},
initActivity() {
axios.get(HTTP_HOST + 'api/activity')
.then(response => {