Browse Source

三期需求补充

zhangrenyuan/feature-20260128093451-日常优化1.0
ZhangYong 1 month ago
parent
commit
05161ca80b
  1. 2
      src/views/moneyManage/financialAccount/cashFlow.vue
  2. 14
      src/views/moneyManage/receiveDetail/receiveFinance.vue

2
src/views/moneyManage/financialAccount/cashFlow.vue

@ -93,7 +93,7 @@ const fetchData = async () => {
pageSize: queryParams.pageSize, pageSize: queryParams.pageSize,
fundsDTO: { fundsDTO: {
jwcode: queryParams.jwcode, jwcode: queryParams.jwcode,
markets: queryParams.markets,
localMarket:queryParams.markets,
startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '', startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '',
endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '', endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '',
payType: queryParams.payType, payType: queryParams.payType,

14
src/views/moneyManage/receiveDetail/receiveFinance.vue

@ -445,11 +445,11 @@
</div> </div>
</div> </div>
<el-form-item :label="t('common_add.payCurrency')"> <el-form-item :label="t('common_add.payCurrency')">
<CurrencySelect :disabled="!ifOnline" v-model="editFormData.paymentCurrency"
<CurrencySelect :disabled="ifOnline" v-model="editFormData.paymentCurrency"
:items="customOptions" :placeholder="t('common_add.payCurrency')" /> :items="customOptions" :placeholder="t('common_add.payCurrency')" />
</el-form-item> </el-form-item>
<el-form-item :label="t('common_add.payAmount')"> <el-form-item :label="t('common_add.payAmount')">
<el-input :disabled="!ifOnline" v-model="editFormData.paymentAmount"
<el-input :disabled="ifOnline" v-model="editFormData.paymentAmount"
:placeholder="t('common_add.payAmount')" /> :placeholder="t('common_add.payAmount')" />
</el-form-item> </el-form-item>
<el-form-item :label="t('common_add.payMethod')"> <el-form-item :label="t('common_add.payMethod')">
@ -1191,7 +1191,11 @@ watch(auditFormisible, (val) => {
const openEditForm = (row) => { const openEditForm = (row) => {
console.log('row.aaa', row.handlingCharge); console.log('row.aaa', row.handlingCharge);
editFormData.value = { ...row };
editFormData.value = {
...row,
paymentCurrencyOrig: row.paymentCurrency,
paymentAmountOrig: row.paymentAmount,
};
// //
if (row.goodsName === t('cash.coinRecharge')) isEditGold.value = true; if (row.goodsName === t('cash.coinRecharge')) isEditGold.value = true;
else isEditGold.value = false; else isEditGold.value = false;
@ -1235,7 +1239,9 @@ const submitEditForm = async () => {
receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency), receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
receivedAmount: editFormData.value.receivedAmount * 100 || null, // receivedAmount: editFormData.value.receivedAmount * 100 || null, //
receivedTime: editFormData.value.receivedTime, receivedTime: editFormData.value.receivedTime,
receivedRemark: editFormData.value.receivedRemark || ''
receivedRemark: editFormData.value.receivedRemark || '',
paymentCurrencyOrig: editFormData.value.paymentCurrencyOrig,
paymentAmountOrig: CurrencyForId(editFormData.value.paymentAmountOrig),
} }
}); });

Loading…
Cancel
Save