Browse Source

feat(消费信息): 添加红包使用选项并更新相关验证逻辑

zhangyong/feature-20260113094820-现金重构
zhangrenyuan 1 month ago
parent
commit
68a6e82253
  1. 22
      src/views/consume/gold/addCoinConsume.vue

22
src/views/consume/gold/addCoinConsume.vue

@ -64,7 +64,8 @@ const addConsume = ref({
taskGold: null, // taskGold: null, //
remark: "",// remark: "",//
adminId: null,// id adminId: null,// id
adminName: adminData.value.adminName
adminName: adminData.value.adminName,
redMoney: 1 // 使1-使0-使
}) })
const Ref = ref(null) const Ref = ref(null)
const rules = reactive({ const rules = reactive({
@ -193,7 +194,7 @@ function validateInput() {
return true; return true;
} }
// blursumGold
// blur +
function validateRedLimit() { function validateRedLimit() {
const sumGold = parseFloat(addConsume.value.sumGold); const sumGold = parseFloat(addConsume.value.sumGold);
const price = Number(addConsume.value.price || 0); const price = Number(addConsume.value.price || 0);
@ -245,7 +246,7 @@ function calculateCoins(sumGold) {
remaining = parseFloat((remaining - permanentUsed).toFixed(4)); remaining = parseFloat((remaining - permanentUsed).toFixed(4));
} }
// 3.
//
if (remaining > 0 && nowTaskGold > 0) { if (remaining > 0 && nowTaskGold > 0) {
const availableTaskGold = parseFloat(nowTaskGold.toFixed(4)); const availableTaskGold = parseFloat(nowTaskGold.toFixed(4));
taskUsed = Math.min(availableTaskGold, remaining); taskUsed = Math.min(availableTaskGold, remaining);
@ -352,7 +353,8 @@ function resetForm() {
taskGold: null, taskGold: null,
remark: "", remark: "",
adminId: adminData.value.id, adminId: adminData.value.id,
adminName: adminData.value.adminName
adminName: adminData.value.adminName,
redMoney: 1 // 使
} }
// //
@ -455,7 +457,7 @@ const addBefore = () => {
}); });
return; return;
} }
if (!validateInput()) {
if (!validateInput() || !validateRedLimit()) {
return; return;
} }
ReadCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName.value}` ReadCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName.value}`
@ -600,8 +602,6 @@ watch(
} }
); );
/* 红包逻辑已在当前分支移除 */
/* /*
====================红包逻辑================================= ====================红包逻辑=================================
*/ */
@ -738,6 +738,10 @@ onMounted(async function () {
<el-input v-model="addConsume.price" style="width: 120px" disabled /> <el-input v-model="addConsume.price" style="width: 120px" disabled />
</el-form-item> </el-form-item>
<!-- <el-form-item prop="sumGold" :label="t('common_add.consumeTotalGold')">
<el-input v-model="addConsume.sumGold" style="width: 120px"
@blur="validateRedLimit()" />
</el-form-item> -->
<el-form-item prop="sumGold" :label="t('common_add.consumeTotalGold')"> <el-form-item prop="sumGold" :label="t('common_add.consumeTotalGold')">
<el-input v-model="addConsume.sumGold" style="width: 120px" @blur="validateRedLimit()" :disabled="addConsume.redMoney === 1" /> <el-input v-model="addConsume.sumGold" style="width: 120px" @blur="validateRedLimit()" :disabled="addConsume.redMoney === 1" />
<el-radio v-model="addConsume.redMoney" :label="1" style="margin-left: 10px;">使用红包</el-radio> <el-radio v-model="addConsume.redMoney" :label="1" style="margin-left: 10px;">使用红包</el-radio>
@ -868,11 +872,11 @@ onMounted(async function () {
<p>{{ user.market }}</p> <p>{{ user.market }}</p>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="14">
<el-col :span="14">
<el-form-item :label="$t('common_add_user.maxReductionAmount')"> <el-form-item :label="$t('common_add_user.maxReductionAmount')">
<p style="color: #2fa1ff">{{ user.red }} </p> <p style="color: #2fa1ff">{{ user.red }} </p>
</el-form-item> </el-form-item>
</el-col> -->
</el-col>
</el-row> </el-row>
</el-form> </el-form>
</el-card> </el-card>

Loading…
Cancel
Save