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-28 17:52:06 +08:00
parent 2b9e266eb0
commit a3a9968e62
5 changed files with 63 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/App_Data/PublishProfiles/FolderProfile.pubxml
+3 -2
View File
@@ -8,13 +8,14 @@
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<PublishProvider>FileSystem</PublishProvider>
<PublishUrl>C:\17168web</PublishUrl>
<PublishUrl>D:\17168web</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<_TargetId>Folder</_TargetId>
<SiteUrlToLaunchAfterPublish />
<PrecompileBeforePublish>true</PrecompileBeforePublish>
<EnableUpdateable>true</EnableUpdateable>
<DebugSymbols>false</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
<WDPMergeOption>CreateSeparateAssembly</WDPMergeOption>
<UseFixedNames>true</UseFixedNames>
</PropertyGroup>
</Project>
web/admin/activity/reg.aspx
+2 -2
View File
@@ -942,7 +942,7 @@
<asp:RequiredFieldValidator ID="RequiredFieldValidator1" ControlToValidate="subject" runat="server" ErrorMessage="必填！" Display="Dynamic" SetFocusOnError="true"></asp:RequiredFieldValidator>
</div>
<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-10 col-lg-3" >
<div class="input-group mb-3" data-search-control="search4" @click="search_show(search_dialog.controls.search4)" >
<input class="form-control search-text" type="text" readonly
@@ -953,7 +953,7 @@
</button>
</div>
<asp:RequiredFieldValidator ID="RequiredFieldValidator3" ControlToValidate="category_kind_txt" runat="server" ErrorMessage="必填！" Display="Dynamic" SetFocusOnError="true"></asp:RequiredFieldValidator>
</div>
</div>--%>
<label class="col-sm-2 col-lg-1 col-form-label">活動詳細分類 *</label>
<div class="col-sm-10 col-lg-3">
web/admin/activity/reg.aspx.cs
+4 -4
View File
@@ -78,8 +78,8 @@ public partial class admin_activity_reg : MyWeb.config
if (prod.category_kind.HasValue)
{
_category_kindTxt = prod.activity_category_kind.kind;
category_kind_txt.Value = prod.activity_category_kind.kind;
category_kind.Value = prod.category_kind.Value.ToString();
//category_kind_txt.Value = prod.activity_category_kind.kind;
//category_kind.Value = prod.category_kind.Value.ToString();
}
if (prod.startDate_solar.HasValue)
{
@@ -289,7 +289,7 @@ public partial class admin_activity_reg : MyWeb.config
else
{
activity.kind = Val(kind.Value);
activity.category_kind = Val(category_kind.Value);
//activity.category_kind = Val(category_kind.Value);
activity.reg_time = DateTime.Now;
_db.activities.Add(activity);
_db.SaveChanges();
@@ -377,7 +377,7 @@ public partial class admin_activity_reg : MyWeb.config
}
else
{
activity.category_kind = Val(category_kind.Value);
//activity.category_kind = Val(category_kind.Value);
_db.SaveChanges();
Model.admin_log admin_log = new Model.admin_log();
web/admin/order/fastSignUp3.vue
+51 -17
View File
@@ -4,7 +4,7 @@
<v-card-title class="bg-primary white--text text-center">
<h5 class="mb-0">快速報名</h5>
<div class="ms-auto">
<v-btn @click.prevent="saveOrder()" v-if="follower.f_number!=undefined&&follower.f_number!=''">儲存</v-btn>
<v-btn @click.prevent="saveOrder()" v-if="follower.f_number!=undefined&&follower.f_number!=''">儲存</v-btn>
<v-btn @click.prevent="back01()">返回</v-btn>
</div>
</v-card-title>
@@ -63,9 +63,9 @@
</v-col>
</v-row>
<hr class="hr-text" data-content="前次法會功德" v-if="follower.f_number!=undefined&&follower.f_number!=''">
<hr class="hr-text" data-content="前次法會功德" v-if="follower.f_number!=undefined&&follower.f_number!=''">
<v-row v-show="tablet_show">
<v-select :items="orders"
<v-select :items="orders"
label="選擇法會"
item-text="subject" @change="changeOrderDetail()"
item-value="order_no" v-model="order_no">
@@ -93,14 +93,14 @@
<v-col cols="3" md="3">
<v-btn class="ms-auto" @click.prevent="copytablet(item)">複製為</v-btn>
</v-col>
<v-col cols="9" md="9">
<v-select :items="act_items"
label="選擇功德項目"
item-text="act_item_selected.text"
item-value="act_item_selected.val" v-model="item.changeActitem">
</v-select>
</v-col>
<v-col cols="9" md="9">
<v-select :items="act_items"
label="選擇功德項目"
item-text="act_item_selected.text"
item-value="act_item_selected.val" v-model="item.changeActitem">
</v-select>
</v-col>
</v-row>
</v-card-title>
<v-card-text>
@@ -111,7 +111,7 @@
</v-row>
</template>
<template v-slot:no-data>
<v-alert :value="true" color="error" icon="warning">
<v-alert :value="value" color="error" icon="warning">
無資料可顯示，可能此信眾未曾參加過任何法會。
</v-alert>
</template>
@@ -135,6 +135,19 @@
</template>
</v-dialog>
<v-dialog v-model="none_dialog.show" class="dialog_width">
<template>
<v-card>
<v-card-title>
{{ none_dialog.message }}
</v-card-title>
<v-card-text>
<v-btn @click.prevent="none_dialog.show=false">關閉</v-btn>
<v-btn @click.prevent="gotoOldSign()">前往傳統報名</v-btn>
</v-card-text>
</v-card>
</template>
</v-dialog>
<v-dialog v-model="transfer_dialog.show" class="dialog_width">
<template>
@@ -164,7 +177,8 @@
data() {
return {
transfer_dialog: { show: false, message: "" },
message_dialog: { show: false,show_confirm:false, message: "" },
message_dialog: { show: false, show_confirm: false, message: "" },
none_dialog: { show: false, message: "" },
idNo: "",
phoneNum: "",
name: "",
@@ -173,6 +187,7 @@
tablet_list: [],
act_items: [],
search: {},
value:false,
query: {
id_code: { type: String }, cellphone: { type: String }
},
@@ -184,10 +199,22 @@
}
},
activated() {
this.tablet_show = false
this.value=true
//this.getFollower()
//先清資料
this.follower = {}
this.orders = []
this.tablet_list = []
this.idNo = ""
this.phoneNum = ""
this.name=""
this.getActItem()
},
methods: {
gotoOldSign() {
this.$emit('custom-event', { action: 'oldSign', item: this.num });
},
back01() {
this.$emit('custom-event', { action: 'signup1', item: this.num });
},
@@ -278,22 +305,29 @@
.then(response => {
if (response.data.list && response.data.list.length > 0) {
this.orders = response.data.list
//先確定是否有報名過
let o = this.orders.find(x => x.activity_num === this.num)
if (o != null && o != undefined) {
this.message_dialog.show = true
this.message_dialog.message="此人已有報名資料，請勿重複報名"
return
this.message_dialog.message = "此人已有報名資料，請勿重複報名"
return
}
this.orders = this.orders.filter(x => x.activity_num !== this.num)
//console.log("orders",this.orders)
if (this.orders && this.orders.length > 0) {
this.getOrderDetail()
}
}
else
else {
this.none_dialog.show = true
this.none_dialog.message = "尚未參加任何法會活動"
console.log("getOrder 查無資料");
}
})
.catch(error => console.log(error))
},
web/admin/order/index4.aspx
+3 -1
View File
@@ -111,7 +111,7 @@
this.twoData = item.item.num
this.currentView = "fastSignUp2-component"
} else if (item.action === "add") {
this.twoData=item.item.num
this.twoData = item.item.num
this.currentView = "fastSignUp3-component"
} else if (item.action === "signup4") {
this.twoData = item.item
@@ -119,6 +119,8 @@
} else if (item.action === "signup1") {
this.twoData = item.item
this.currentView = "fastSignUp-component"
} else if (item.action === "oldSign") {
location.href="~/admin/order/index.aspx"
}
//console.log("item.action:",this.twoData)
},