疏文

web/admin/shuwen/shuwen.aspx

@@ -3,26 +3,54 @@
 <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">
-        <span>查看疏文</span>
+    <%--<div class="mb-2 mb-sm-0 d-flex align-items-center gap-2">--%>
+        <%--<span>查看疏文</span>
         <select v-model="currentActivityNum" @change="onActivityChange" class="form-select" style="width: auto;">
             <option value="">請選擇要查看的活動</option>
             <option v-for="activity in activityList" :value="activity.num" :key="activity.num">
                 {{activity.subject}}
             </option>
-        </select>
+        </select>--%>
+
         <h4>
-        <span v-if="currentActivityNum">{{latest ? '當前疏文是最新版本': '當前疏文不是最新版本'}}</span>        
+        <%--<span v-if="currentActivityNum">{{latest ? '當前疏文是最新版本': '當前疏文不是最新版本'}}</span>--%>        
         </h4>
-    </div>
+     
     
-    <div class="">
+ <%--   </div>--%>
+    
+ <%--   <div class="">
         <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">
-    <div v-if="currentActivityNum">
+    <!--要同時可以選多個活動，因為會拆成捐贈跟報名 ，還要能設定消災跟超薦的區分-->
+
+    <template>
+        <v-container>
+             <v-row class="mb-0 mt-4">
+                 <v-col cols="12" md="3">
+                     <v-text-field v-model="query.xStart" label="消災列印編號前置" type="text" dense outlined></v-text-field>
+                 </v-col>
+                 <v-col cols="12" md="3">
+                     <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">
         <div><h2 style="text-align:center">消災疏文</h2></div>
         <div v-for="(item, index) in ShuWenJson?.xiaozai" :key="Object.keys(item)[0] + 'xz' + index">
                 <h4>報名信眾：{{ item[Object.keys(item)[0]].user.name }}</h4>
@@ -48,7 +76,7 @@
                 </ul>
                 <hr/>
             </div>
-    </div>
+    </div>--%>
 
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="offCanvasRight" Runat="Server">
@@ -65,7 +93,13 @@
                     ShuWenJson: {},
                     ShuWenItem: '',
                     updateShuWenLoading: false,
-                    latest: false
+                    latest: false,
+                    query: {
+                        start_date: '',
+                        end_date: '',
+                        xStart: '',
+                        sSatrt: ''
+                    },
                 }
             },
             methods: {
@@ -100,7 +134,7 @@
                 },
                 getShuWen() {
                     if (this.currentActivityNum) {
-                        axios.get(HTTP_HOST + 'api/shuwen/getshuwen', {
+                        axios.post(HTTP_HOST + 'api/shuwen/RenderShuWenByGong', {
                             params: {
                                 activitynum: this.currentActivityNum
                             }