Commit 0cc32818 authored by chenwei's avatar chenwei

fix excahange record operation page--- "select gift is required"

parent 2c9cdfa8
......@@ -278,7 +278,7 @@
:rules="rules.dateRangeCreateTime"
>
<el-date-picker
type="datetimerange"
type="daterange"
clearable
placement="bottom-start"
v-model="queryParams.dateRangeCreateTime"
......@@ -957,11 +957,6 @@ export default {
this.$refs["queryForm"].validate((valid) => {
if (valid) {
let params = deepClone(this.queryParams);
params.showPlatform = this.queryParams.showPlatform?.join();
params.extraOrderV.orderEntry =
this.queryParams.extraOrderV?.orderEntry?.join();
params.extraRegister.registerPlatform =
this.queryParams.extraRegister.registerPlatform?.join();
integralRuleUpdated(params).then((res) => {
this.$message.success(this.$t("更新成功"));
this.$router.go(-1);
......@@ -993,11 +988,14 @@ export default {
params.pushActivity = res.data.pushActivity.toString();
}
if (isNumber(res.data.extraShare?.shareStatus)) {
params.extraShare.shareStatus.toString();
params.extraShare.shareStatus =
params.extraShare.shareStatus.toString();
}
if (isNumber(res.data.extraRecommend?.shareStatus)) {
params.extraRecommend.shareStatus.toString();
params.extraRecommend.shareStatus =
res.data.extraRecommend?.shareStatus.toString();
}
console.log(params);
params.dateRangeCreateTime = [
parseTime(res.data.startTime),
parseTime(res.data.endTime),
......
......@@ -43,7 +43,11 @@
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/>
</el-form-item>
<el-form-item :label="$t('礼品选择')" id="colorRedInput">
<el-form-item
:label="$t('礼品选择')"
prop="rewardName"
id="colorRedInput"
>
<el-input
:placeholder="$t('请选择礼品')"
clearable
......@@ -433,6 +437,13 @@ export default {
trigger: "blur",
},
],
rewardName: [
{
required: true,
message: this.$t("请选择礼品"),
trigger: "blur",
},
],
expenses: [
{
required: true,
......
......@@ -124,9 +124,7 @@
<template v-slot="{ row }">
<el-button
type="text"
@click="
$router.push('/member/member/member-details/' + row.memberId)
"
@click="$router.push('/member/member/member-details/' + row.id)"
>{{ isChinese ? row.memberNameZh : row.memberNameEn }}</el-button
>
</template></el-table-column
......
......@@ -295,7 +295,7 @@
{{
isChinese
? handleSourceType(scope.row.sourceType).label
: handleholdScore(scope.row.sourceType).labelEn
: handleSourceType(scope.row.sourceType).labelEn
}}
</template>
</el-table-column>
......@@ -872,7 +872,7 @@ export default {
scoreCountOperate: "",
endTime: "",
pageNo: 1,
pageSize: 100,
pageSize: 10,
startTime: "",
},
dateRangeCreateTime: [],
......@@ -1095,7 +1095,7 @@ export default {
},
handleSourceType(id) {
return this.getDictDatas(DICT_TYPE.SCORE_RULE_TYPE).filter(
return this.getDictDatas(DICT_TYPE.MEMBER_SCORE_SOURCE).filter(
(item) => item.value == id
)[0];
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment