1. 加上返回鍵
2. 修改報名記錄中的活動開始結束時間 3. 修正列印問題 4. 信眾資料及報名管理起始不會出現資料 5. 信眾不得重複報名相同活動 6. 信眾資料的 cache（含結果與搜尋條件） 7. 修復信眾、活動、品項刪除功能 8. 增加自訂是否自動編號 9. 優化信眾資料頁面（彈出查詢頁面、顯示剛新增資料） 10. 新增管理表單匯出 excel 功能 11. 無查詢資料時不可點選匯出／列印按鈕 12. 匯出／列印管理報表時，若無資料則顯示提示 13. 新增信眾資料時，加入日期預設為今日
This commit is contained in:
+30
-30
@@ -190,7 +190,7 @@
|
||||
text_prop: 'name_zh',
|
||||
value_prop: 'id',
|
||||
keys: [
|
||||
{ id: 'keyword', title: '關鍵字' },
|
||||
{ id: 'keyword', title: '關鍵字' },
|
||||
],
|
||||
api_url: HTTP_HOST + 'api/country/GetList',
|
||||
columns: [
|
||||
@@ -208,11 +208,11 @@
|
||||
title: '稱謂',
|
||||
text_prop: 'title',
|
||||
value_prop: 'num',
|
||||
keys: [
|
||||
keys: [
|
||||
],
|
||||
api_url: HTTP_HOST + 'api/appellation/GetList',
|
||||
columns: [
|
||||
{ id: 'title', title: '稱謂' },
|
||||
{ id: 'title', title: '稱謂' },
|
||||
],
|
||||
selected: {},
|
||||
select(item, index, t) {
|
||||
@@ -230,7 +230,7 @@
|
||||
{ id: 'f_number', title: '編號' },
|
||||
{ id: 'u_name', title: '姓名' },
|
||||
{ id: 'address', title: '地址' },
|
||||
{ id: 'onlyfamily', title: '只查親屬'},
|
||||
{ id: 'onlyfamily', title: '只查親屬' },
|
||||
],
|
||||
api_url: HTTP_HOST + 'api/follower/GetList',
|
||||
columns: [
|
||||
@@ -241,7 +241,7 @@
|
||||
selected: {},
|
||||
select(item, index, t) {
|
||||
console.log("select search5", t);
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
},
|
||||
@@ -314,10 +314,10 @@
|
||||
birthday: '',
|
||||
phoneDes: '',
|
||||
demo: '',
|
||||
appellation_id_selected :
|
||||
appellation_id_selected:
|
||||
{
|
||||
text : '',
|
||||
val : 0,
|
||||
text: '',
|
||||
val: 0,
|
||||
},
|
||||
|
||||
},
|
||||
@@ -372,33 +372,33 @@
|
||||
],
|
||||
tabletsDetail: { multiSort: false },
|
||||
tabletTable: {
|
||||
Loading:true,
|
||||
Loading: true,
|
||||
disableButton: true,
|
||||
searchDetail: '',
|
||||
headersDetail: [
|
||||
{ text: '超渡/陽上', value: 'type', sortable: false, width: "100px" },
|
||||
{ text: '* 牌位標題', value: 'title', sortable: true },
|
||||
{ text: '超渡/陽上', value: 'type', sortable: false, width: "100px" },
|
||||
{ text: '* 牌位標題', value: 'title', sortable: true },
|
||||
{ text: '', value: 'actions', sortable: false, width: "100px" },
|
||||
],
|
||||
],
|
||||
desserts: [],
|
||||
desserts_count: 0,
|
||||
editedIndex: -1,
|
||||
editedItem: {
|
||||
id: 0,
|
||||
num: 0,
|
||||
f_num: 0,
|
||||
title: '',
|
||||
num: 0,
|
||||
f_num: 0,
|
||||
title: '',
|
||||
},
|
||||
defaultItem: {
|
||||
id: 0,
|
||||
num: 0,
|
||||
f_num: 0,
|
||||
num: 0,
|
||||
f_num: 0,
|
||||
type: this.selectedTabletType,
|
||||
title:'',
|
||||
title: '',
|
||||
},
|
||||
},
|
||||
//新:家人
|
||||
family:{
|
||||
family: {
|
||||
dialog: false,
|
||||
isEditing: false,
|
||||
is_tw: true,
|
||||
@@ -420,8 +420,8 @@
|
||||
chinese_year: "",
|
||||
zodiac: "",
|
||||
birth_time: "",
|
||||
city:"",
|
||||
area:"",
|
||||
city: "",
|
||||
area: "",
|
||||
address: "",
|
||||
phone: "",
|
||||
mobile: "",
|
||||
@@ -440,8 +440,8 @@
|
||||
chinese_year: "",
|
||||
zodiac: "",
|
||||
birth_time: "",
|
||||
city:"",
|
||||
area:"",
|
||||
city: "",
|
||||
area: "",
|
||||
address: "",
|
||||
phone: "",
|
||||
mobile: "",
|
||||
@@ -458,11 +458,11 @@
|
||||
areaOptions: {}, // 區域選項
|
||||
//天干地支:甲子, 乙丑...
|
||||
chineseYears: [
|
||||
'甲子', '乙丑', '丙寅', '丁卯', '戊辰', '己巳', '庚午', '辛未', '壬申', '癸酉',
|
||||
'甲戌', '乙亥', '丙子', '丁丑', '戊寅', '己卯', '庚辰', '辛巳', '壬午', '癸未',
|
||||
'甲申', '乙酉', '丙戌', '丁亥', '戊子', '己丑', '庚寅', '辛卯', '壬辰', '癸巳',
|
||||
'甲午', '乙未', '丙申', '丁酉', '戊戌', '己亥', '庚子', '辛丑', '壬寅', '癸卯',
|
||||
'甲辰', '乙巳', '丙午', '丁未', '戊申', '己酉', '庚戌', '辛亥', '壬子', '癸丑',
|
||||
'甲子', '乙丑', '丙寅', '丁卯', '戊辰', '己巳', '庚午', '辛未', '壬申', '癸酉',
|
||||
'甲戌', '乙亥', '丙子', '丁丑', '戊寅', '己卯', '庚辰', '辛巳', '壬午', '癸未',
|
||||
'甲申', '乙酉', '丙戌', '丁亥', '戊子', '己丑', '庚寅', '辛卯', '壬辰', '癸巳',
|
||||
'甲午', '乙未', '丙申', '丁酉', '戊戌', '己亥', '庚子', '辛丑', '壬寅', '癸卯',
|
||||
'甲辰', '乙巳', '丙午', '丁未', '戊申', '己酉', '庚戌', '辛亥', '壬子', '癸丑',
|
||||
'甲寅', '乙卯', '丙辰', '丁巳', '戊午', '己未', '庚申', '辛酉', '壬戌', '癸亥'
|
||||
],
|
||||
//生肖
|
||||
@@ -585,7 +585,7 @@
|
||||
this.search_dialog.list = response.data.list
|
||||
this.search_dialog.count = response.data.count
|
||||
this.search_dialog.loading = false
|
||||
|
||||
console.log(this.search_dialog.list)
|
||||
})
|
||||
.catch(error => {
|
||||
console.log(error)
|
||||
@@ -1332,7 +1332,7 @@
|
||||
</label>
|
||||
</div>
|
||||
<asp:Button ID="add" runat="server" Text="送出" OnClick="add_Click" CssClass="btn btn-primary edit_Click noedit" />
|
||||
<asp:Button ID="edit" runat="server" Text="修改" Visible="false" OnClick="edit_Click" CssClass="btn btn-primary edit_Click noedit" />
|
||||
<asp:Button ID="edit" runat="server" Text="儲存" Visible="false" OnClick="edit_Click" CssClass="btn btn-primary edit_Click noedit" />
|
||||
<asp:Button ID="goback" runat="server" Text="回列表" Visible="false" CausesValidation="false" OnClick="goback_Click" CssClass="btn btn-outline-secondary" />
|
||||
</div>
|
||||
</asp:Content>
|
||||
|
||||
Reference in New Issue
Block a user