diff --git a/web/admin/print/tablet_edit/editor.html b/web/admin/print/tablet_edit/editor.html index 813612f..1612060 100644 --- a/web/admin/print/tablet_edit/editor.html +++ b/web/admin/print/tablet_edit/editor.html @@ -214,29 +214,28 @@ - - - - 0 - {{ member.deceased ? '卍' : '' }} - {{ member.fam_name }} - - {{ member.fam_title }} - - - - - mdi-arrow-up - - - mdi-arrow-down - - - mdi-minus - - - - + + + + 0 + {{ member.deceased ? '卍' : '' }} + {{ member.fam_name }} + + {{ member.fam_title }} + + + + + mdi-arrow-up + + + mdi-arrow-down + + + mdi-minus + + + @@ -274,7 +273,7 @@ -
+
@@ -318,10 +317,14 @@ }, computed: { family_deceased_Y_unselected() { - return this.familyMembers.filter(member => member.deceased === true && !this.family_deceased_Y_selected.some(selected => selected.num === member.num)); + return this.familyMembers.filter(member => + member.deceased === true && + !this.family_deceased_Y_selected.some(selected => selected.num === member.num)); }, family_deceased_N_unselected() { - return this.familyMembers.filter(member => member.deceased === false && !this.family_deceased_N_selected.some(selected => selected.num === member.num)); + return this.familyMembers.filter(member => + member.deceased === false && + !this.family_deceased_N_selected.some(selected => selected.num === member.num)); }, item_type() { return this.tabletItem?.actitem_num_selected?.text?.includes('超') ? 'B' : 'A'; diff --git a/web/admin/transfer/verify2.aspx b/web/admin/transfer/verify2.aspx index 3abd2a0..af8a44a 100644 --- a/web/admin/transfer/verify2.aspx +++ b/web/admin/transfer/verify2.aspx @@ -156,9 +156,9 @@ new Vue({ headers: [ { text: '匯款人資訊', value: 'info' }, { text: '匯款備註/相片', value: 'note' }, - { text: '入帳銀行/帳戶 | 支付資訊/帳號後5碼', value: 'acc_num' }, - { text: '入帳日期', value: 'check_date' }, - { text: '入帳金額', value: 'check_amount' }, + { text: '*入帳銀行/帳戶 | 支付資訊/帳號後5碼', value: 'acc_num' }, + { text: '*入帳日期', value: 'check_date' }, + { text: '*入帳金額', value: 'check_amount' }, { text: '備註/狀態 | 核對記錄', value: 'check_memo' } ], items: [], @@ -215,6 +215,27 @@ new Vue({ this.loading = false; }, async submitData() { + // 檢查必填欄位 - 入帳銀行/帳戶 + const missingAccNum = this.items.filter(item => !item.acc_num); + if (missingAccNum.length > 0) { + alert('請選擇入帳銀行/帳戶!有 ' + missingAccNum.length + ' 筆資料未選擇。'); + return; + } + + // 檢查必填欄位 - 入帳日期 + const missingCheckDate = this.items.filter(item => !item.check_date); + if (missingCheckDate.length > 0) { + alert('請填寫入帳日期!有 ' + missingCheckDate.length + ' 筆資料未填寫。'); + return; + } + + // 檢查必填欄位 - 入帳金額 + const missingCheckAmount = this.items.filter(item => !item.check_amount || item.check_amount <= 0); + if (missingCheckAmount.length > 0) { + alert('請填寫入帳金額!有 ' + missingCheckAmount.length + ' 筆資料未填寫或金額無效。'); + return; + } + // 組出要更新的資料 const updateList = this.items.map(item => ({ id: item.id, diff --git a/web/web.config b/web/web.config index 87a0440..a6c713f 100644 --- a/web/web.config +++ b/web/web.config @@ -44,8 +44,8 @@ - - + +