yiming/17168ERP
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

merge N++ 0.1

Browse Source
This commit is contained in:
minom
2026-06-08 09:39:58 +08:00
parent a14fef3841 b866a3c454
commit 121c5e1637
17 changed files with 1674 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/admin/print/tablet_edit/editor.html
+25
View File
@@ -147,6 +147,14 @@
</v-col>
<v-col cols="auto" class="ml-4">
<span class="subtitle-2 grey--text text--darken-1">超渡-已選</span>
<v-chip v-if="tabletItem.has_chao_limit"
x-small
class="ml-2 px-2"
:color="family_deceased_Y_selected.length > tabletItem.chao_limit_count ? 'error' : 'grey lighten-1'"
:dark="family_deceased_Y_selected.length > tabletItem.chao_limit_count"
label>
{{ family_deceased_Y_selected.length }} / {{ tabletItem.chao_limit_count }}
</v-chip>
</v-col>
<v-spacer></v-spacer>
<v-col cols="auto">
@@ -237,6 +245,14 @@
</v-col>
<v-col cols="auto" :class="{'ml-4': item_type==='A'}">
<span class="subtitle-2 grey--text text--darken-1">陽上/祈福-已選</span>
<v-chip v-if="tabletItem.has_yang_limit"
x-small
class="ml-2 px-2"
:color="family_deceased_N_selected.length > tabletItem.yang_limit_count ? 'error' : 'grey lighten-1'"
:dark="family_deceased_N_selected.length > tabletItem.yang_limit_count"
label>
{{ family_deceased_N_selected.length }} / {{ tabletItem.yang_limit_count }}
</v-chip>
</v-col>
<v-spacer></v-spacer>
<v-col cols="auto">
@@ -700,6 +716,15 @@
saveData() {
// 其它資料欄位, 不應在這裡修改
// 應該在進來的時候, 就已經修改(insert)好了
if (this.tabletItem.has_chao_limit && this.family_deceased_Y_selected.length > this.tabletItem.chao_limit_count) {
alert(`超渡人數超過限制！(上限 ${this.tabletItem.chao_limit_count} 人)`);
return; // 阻斷存檔
}
if (this.tabletItem.has_yang_limit && this.family_deceased_N_selected.length > this.tabletItem.yang_limit_count) {
alert(`陽上人數超過限制！(上限 ${this.tabletItem.yang_limit_count} 人)`);
return; // 阻斷存檔
}
let tablet_data = {};
if (this.item_type === 'B') {// B:超渡, 超薦.....
tablet_data = {