Browse Source

Merge branch 'zhangyong/feature-20260402144402-现金4期' into milestone-20260402-现金4期

zhangyong/feature-20260402144402-现金4期
ZhangYong 4 days ago
parent
commit
c71c077581
  1. 3
      src/utils/menuUtils.js
  2. 6
      src/views/moneyManage/receiveDetail/receiveService.vue

3
src/utils/menuUtils.js

@ -7,7 +7,8 @@ export function filterMenu(menuList) {
...menu, ...menu,
children: menu.children ? filterMenu(menu.children) : [] children: menu.children ? filterMenu(menu.children) : []
})) }))
.sort((a, b) => a.id - b.id); // 按 id 升序
// 按 id 升序
// .sort((a, b) => a.id - b.id);
} }
// 过滤 只获得第三级的菜单 // 过滤 只获得第三级的菜单

6
src/views/moneyManage/receiveDetail/receiveService.vue

@ -270,7 +270,7 @@
@change="handleMarketChange($event)"> @change="handleMarketChange($event)">
</CurrencySelect> </CurrencySelect>
</el-form-item> </el-form-item>
<el-form-item :label="t('common_add.receiveWallet')" required prop="receivedWallet" v-if="isGold">
<el-form-item :label="t('common_add.receiveWallet')" required prop="receivedWallet" >
<CurrencySelect v-model="addFormData.receivedWallet" :items="MoneyWalletOptions" <CurrencySelect v-model="addFormData.receivedWallet" :items="MoneyWalletOptions"
:placeholder="t('common_add.receiveWalletPlaceholder')" :disabled="!selectWallet || isGroup" :placeholder="t('common_add.receiveWalletPlaceholder')" :disabled="!selectWallet || isGroup"
@update:modelValue="handleFieldInput('receivedWallet')" @update:modelValue="handleFieldInput('receivedWallet')"
@ -991,9 +991,9 @@ const handleAddForm = async () => {
paymentAmount: (addFormData.value.paymentAmount) * 100, paymentAmount: (addFormData.value.paymentAmount) * 100,
submitterMarket: normalizeSubmitterMarket(adminData.value.markets), submitterMarket: normalizeSubmitterMarket(adminData.value.markets),
isPerformance: 1, isPerformance: 1,
...(isGold.value ? {
...( {
walletId: WalletForId(addFormData.value.receivedWallet) walletId: WalletForId(addFormData.value.receivedWallet)
} : {})
} )
} }
}) })
if (result.code == 200) { if (result.code == 200) {

Loading…
Cancel
Save