huangqizhen
/
gold-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'jiangcheng/feature-20260326164657-金币日常优化3.0' into milestone-20260328-金币日常优化3.0

jiangcheng/feature-20260326164657-金币日常优化3.0
jiangcheng 3 weeks ago
parent
2885a353c7 a92962be6f
commit
6b1f8b358c
3 changed files with 53 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/views/moneyManage/receiveDetail/receiveFinance.vue
  2. 5
      src/views/moneyManage/receiveDetail/receiveManage.vue
  3. 56
      src/views/moneyManage/receiveDetail/receiveService.vue

5
src/views/moneyManage/receiveDetail/receiveFinance.vue
View File

@ -350,11 +350,12 @@
</el-form-item>
<el-form-item :label="t('common_add.transferVoucher')">
<div class="pic">
<el-upload disabled="true" ref="uploadRef" class="uploader" :show-file-list="false"
<el-upload ref="uploadRef" class="uploader" :show-file-list="false"
list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload"
:on-error="handelImgErr" :on-change="handleImageChange" :http-request="customUpload">
<img v-if="auditFormData.voucher" :src="auditFormData.voucher" class="avatar"
style="height: 100%; width: 100%; object-fit: cover;" />
style="height: 100%; width: 100%; object-fit: cover; cursor: pointer;"
@click.stop="previewImage(auditFormData.voucher)"/>
<el-icon v-else class="avatar-uploader-icon">
<Plus />
</el-icon>

5
src/views/moneyManage/receiveDetail/receiveManage.vue
View File

@ -350,11 +350,12 @@
</el-form-item>
<el-form-item :label="t('common_add.transferVoucher')">
<div class="pic">
<el-upload disabled="true" ref="uploadRef" class="uploader" :show-file-list="false"
<el-upload ref="uploadRef" class="uploader" :show-file-list="false"
list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload"
:on-error="handelImgErr" :on-change="handleImageChange" :http-request="customUpload">
<img v-if="auditFormData.voucher" :src="auditFormData.voucher" class="avatar"
style="height: 100%; width: 100%; object-fit: cover;" />
style="height: 100%; width: 100%; object-fit: cover; cursor: pointer;"
@click.stop="previewImage(auditFormData.voucher)" />
<el-icon v-else class="avatar-uploader-icon">
<Plus />
</el-icon>

56
src/views/moneyManage/receiveDetail/receiveService.vue
View File

@ -201,7 +201,8 @@
label-position="left">
<el-form-item :label="t('common_add.jwcode')" required prop="jwcode">
<el-input v-model="addFormData.jwcode" :placeholder="t('common_add.jwcodePlaceholder')"
@focus="handleJwcodeFocus" @blur="handleJwcodeBlur" @keyup.enter="handleJwcodeEnter" />
@focus="handleJwcodeFocus" @blur="handleJwcodeBlur" @keyup.enter="handleJwcodeEnter"
@input="handleFieldInput('jwcode')"/>
</el-form-item>
<el-form-item :label="t('common_add.customerName')" required prop="name">
<el-input disabled v-model="addFormData.name"
@ -213,9 +214,11 @@
</el-form-item>
<el-form-item :label="t('common_add.activity')" required prop="activity">
<el-select v-model="addFormData.activity" :placeholder="t('common_add.activityPlaceholder')"
filterable clearable>
filterable clearable
@change="handleFieldInput('activity')"
>
<el-option v-for="item in activityList" :key="item.id" :label="item.activityName"
:value="item.id" />
:value="item.id"/>
</el-select>
</el-form-item>
<el-form-item :label="t('common_add.productName')" required prop="goodsName">
@ -225,7 +228,8 @@
<el-form-item v-show="!isGold" :label="t('common_add.productNum')" required>
<div style="display: flex;">
<el-input style="padding-right: 30px; flex: 3;" v-model="addFormData.goodNum"
:placeholder="t('common_add.productNumPlaceholder')" />
:placeholder="t('common_add.productNumPlaceholder')"
@input="handleFieldInput('goodNum')"/>
<CurrencySelect v-model="addFormData.numUnit" :items="numUnitList" style="flex: 1.5;"
:placeholder="t('common_add.numUnit')" @change="handleCurrencyChange" />
</div>
@ -236,7 +240,7 @@
t('common_add.permanentGold') }}：</span>
<el-input placeholder="0"
style="padding-right: 10px; padding-left: 10px; height: 30px; width: 110px;"
v-model="addFormData.permanentGold" />
v-model="addFormData.permanentGold"/>
</div>
<div style="padding-right: 5px; display: flex;">
<span style="color: #999999; display: flex; white-space: nowrap;align-items: center;">{{
@ -248,25 +252,28 @@
</div>
<el-form-item :label="t('common_add.payCurrency')" required prop="paymentCurrency">
<CurrencySelect v-model="addFormData.paymentCurrency" :items="customOptions"
:placeholder="t('common_add.payCurrencyPlaceholder')" @change="handleCurrencyChange" />
:placeholder="t('common_add.payCurrencyPlaceholder')" @change="handleCurrencyChange"
@update:modelValue="handleFieldInput('paymentCurrency')"/>
</el-form-item>
<el-form-item :label="t('common_add.payAmount')" required prop="paymentAmount">
<el-input v-model="addFormData.paymentAmount" :placeholder="t('common_add.payAmountPlaceholder')" />
<el-input v-model="addFormData.paymentAmount" :placeholder="t('common_add.payAmountPlaceholder')"
@input="handleFieldInput('paymentAmount')"/>
</el-form-item>
<el-form-item :label="t('common_add.payMethod')" required prop="payType">
<CurrencySelect v-model="addFormData.payType" :items="paytypeOptions"
:placeholder="t('common_add.payMethodPlaceholder')" @change="ifGroup">
:placeholder="t('common_add.payMethodPlaceholder')" @change="handlePayTypeChange($event)">
</CurrencySelect>
</el-form-item>
<el-form-item :label="t('common_add.receiveArea')" prop="receivedMarket">
<CurrencySelect v-model="addFormData.receivedMarket" :items="MoneyAddressOptions"
:placeholder="t('common_add.receiveAreaPlaceholder')" :disabled="isGroup"
@change="showWallet(addFormData.receivedMarket)">
@change="handleMarketChange($event)">
</CurrencySelect>
</el-form-item>
<el-form-item :label="t('common_add.receiveWallet')" required prop="receivedWallet" v-if="isGold">
<CurrencySelect v-model="addFormData.receivedWallet" :items="MoneyWalletOptions"
:placeholder="t('common_add.receiveWalletPlaceholder')" :disabled="!selectWallet || isGroup"
@update:modelValue="handleFieldInput('receivedWallet')"
</CurrencySelect>
</el-form-item>
@ -622,6 +629,26 @@ const isGold = ref(false) // 是否为金币充值产品
const productSelectRef = ref(null) // 产品选择器引用
const uploadRef = ref(null) // 上传组件引用
const handleFieldInput = (fieldName) => {
if (addFormRef.value) {
addFormRef.value.validateField(fieldName, (errorMessage) => {
});
}
};
const handlePayTypeChange = (val) => {
ifGroup(val);
if (addFormRef.value) {
addFormRef.value.validateField('payType');
}
};
const handleMarketChange = (val) => {
showWallet(val);
if (addFormRef.value) {
addFormRef.value.validateField('receivedMarket');
}
};
// 产品选择变更：判断是否为金币充值
const ifGold = () => {
if (addFormData.value.goodsName === t('cash.coinRecharge')) {
@ -717,6 +744,10 @@ const ifGroup = () => {
isGroup.value = false
selectWallet.value = true
}
if (addFormRef.value) {
addFormRef.value.validateField('receivedMarket');
addFormRef.value.validateField('receivedWallet');
}
}
//选择地区之后 钱包下拉框显示对应地区的钱包
const MoneyWalletOptions = ref([])
@ -748,6 +779,9 @@ const showWallet = (receivedMarket) => {
selectWallet.value = false
addFormData.value.receivedWallet = t('cash.wallet.BeijingWallet')
}
if (addFormRef.value) {
addFormRef.value.validateField('receivedWallet');
}
}
//失焦和回车查询仅选一个
@ -791,6 +825,10 @@ const jwcodeSeachMarket = async () => {
addFormData.value.market = result.data.market
addFormData.value.marketName = result.data.marketName
addFormData.value.name = result.data.name
if (addFormRef.value) {
addFormRef.value.validateField('name');
addFormRef.value.validateField('market');
}
} else if (result.code == 0) {
const region = result.data && result.data.market
if (region) {

Write Preview
Loading…
Cancel
Save