Merge branch 'dev'
This commit is contained in:
@@ -194,6 +194,7 @@ async function loadWallets() {
|
|||||||
// 계좌 종류(콤보) → 해당 종류만 목록에
|
// 계좌 종류(콤보) → 해당 종류만 목록에
|
||||||
const WALLET_KINDS = [
|
const WALLET_KINDS = [
|
||||||
{ value: 'BANK', label: '계좌' },
|
{ value: 'BANK', label: '계좌' },
|
||||||
|
{ value: 'CASH', label: '현금' },
|
||||||
{ value: 'CARD', label: '카드' },
|
{ value: 'CARD', label: '카드' },
|
||||||
{ value: 'LOAN', label: '대출' },
|
{ value: 'LOAN', label: '대출' },
|
||||||
{ value: 'INVEST', label: '증권' },
|
{ value: 'INVEST', label: '증권' },
|
||||||
@@ -682,13 +683,10 @@ onMounted(async () => {
|
|||||||
<input type="radio" :value="k.value" v-model="form.walletKind" :disabled="submitting" @change="onWalletKindChange" />
|
<input type="radio" :value="k.value" v-model="form.walletKind" :disabled="submitting" @change="onWalletKindChange" />
|
||||||
{{ k.label }}
|
{{ k.label }}
|
||||||
</label>
|
</label>
|
||||||
<label v-if="form.type !== 'TRANSFER'" class="radio">
|
|
||||||
<input type="radio" value="CASH" v-model="form.walletKind" :disabled="submitting" @change="onWalletKindChange" /> 현금
|
|
||||||
</label>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<select v-if="form.walletKind && (form.walletKind !== 'CASH' || walletsOfKind.length)" v-model="form.walletId" :disabled="submitting">
|
<select v-if="form.walletKind" v-model="form.walletId" :disabled="submitting">
|
||||||
<option value="">{{ form.walletKind === 'CASH' ? '현금 (계좌 미지정)' : (form.type === 'INCOME' || form.type === 'EXPENSE' ? '계좌/카드 선택' : '출금 계좌 선택') }}</option>
|
<option value="">{{ form.walletKind === 'CASH' && (form.type === 'INCOME' || form.type === 'EXPENSE') ? '현금 (계좌 미지정)' : (form.type === 'INCOME' || form.type === 'EXPENSE' ? '계좌/카드 선택' : '출금 계좌 선택') }}</option>
|
||||||
<option v-for="w in walletsOfKind" :key="w.id" :value="w.id">
|
<option v-for="w in walletsOfKind" :key="w.id" :value="w.id">
|
||||||
{{ w.name }}{{ w.issuer ? ` (${w.issuer})` : '' }}
|
{{ w.name }}{{ w.issuer ? ` (${w.issuer})` : '' }}
|
||||||
</option>
|
</option>
|
||||||
|
|||||||
Reference in New Issue
Block a user