Commit 8849fbe9 authored by chenwei's avatar chenwei

修复问题

parent ff4def43
......@@ -15,7 +15,7 @@
:placeholder="$t('请输入')"
:disabled="isDisable"
clearable
v-trim
v-trim
/>
</el-form-item>
</el-col>
......@@ -26,7 +26,7 @@
:disabled="isDisable"
:placeholder="$t('请输入')"
clearable
v-trim
v-trim
/>
</el-form-item>
</el-col>
......@@ -79,11 +79,9 @@
:rules="rules.nodeIds.points"
>
<el-input
type="number"
v-model.trim="item.points"
v-model.trim.number="item.points"
:placeholder="$t('请输入')"
:disabled="isDisable"
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/> </el-form-item
></el-col>
<el-col :span="1">
......@@ -130,12 +128,10 @@
<el-form-item :label="$t('允许兑换次数')" prop="allowCount">
<el-input
class="input-item-width"
type="number"
v-model.trim="queryParams.allowCount"
v-model.trim.number="queryParams.allowCount"
:placeholder="$t('请输入')"
clearable
:disabled="isDisable"
onkeyup="this.value=this.value.replace(/(^\s*)|(\s*$)/g,'')"
/>
</el-form-item>
<el-row :gutter="10">
......@@ -351,16 +347,17 @@ export default {
message: this.$t("请输入兑换积分"),
trigger: "blur",
},
{ type: "number", message: "输入数字", trigger: "blur" },
],
},
quantityRemain: [
{
required: true,
message: this.$t("请输入剩余数量"),
trigger: "blur",
},
],
quantityRemain: [
{
required: true,
message: this.$t("请输入剩余数量"),
trigger: "blur",
},
],
pickMethod: [
{
required: true,
......@@ -374,6 +371,7 @@ export default {
message: this.$t("请输入允许兑换次数"),
trigger: "blur",
},
{ type: "number", message: "输入数字", trigger: "blur" },
],
remarkZh: [
{
......@@ -444,7 +442,7 @@ export default {
imgZh: null,
nodeId: null,
pickMethod: null,
pointsRequire: null,
pointsRequire: null,
remarkEn: null,
remarkFr: null,
remarkZh: null,
......@@ -459,7 +457,7 @@ export default {
};
</script>
<style>
.input-item-width{
.input-item-width {
width: 194px;
}
</style>
This diff is collapsed.
......@@ -5,6 +5,7 @@
ref="queryForm"
size="small"
:rules="rules"
class="integral-rule-operate"
:disabled="showViewTime"
label-width="120px"
>
......@@ -24,7 +25,7 @@
v-model="queryParams.titleZh"
:placeholder="$t('请输入查找')"
clearable
v-trim
v-trim
/>
<el-button
size="mini"
......@@ -43,7 +44,7 @@
v-model="queryParams.titleEn"
:placeholder="$t('请输入查找')"
clearable
v-trim
v-trim
/> </el-form-item
></el-col>
</el-row>
......@@ -108,7 +109,7 @@
v-model="queryParams.extraRecommend.shareContentZh"
:placeholder="$t('请输入分享文案')"
clearable
v-trim
v-trim
/> </el-form-item
></el-col>
<el-col :span="12">
......@@ -122,7 +123,7 @@
v-model="queryParams.extraRecommend.shareContentEn"
:placeholder="$t('请输入分享文案')"
clearable
v-trim
v-trim
/> </el-form-item
></el-col>
</el-row>
......@@ -177,11 +178,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item
:label="$t('积分')"
v-if="queryParams.type == '1'"
required
>
<el-form-item :label="$t('积分')" v-if="queryParams.type == '1'" required>
<el-row
type="flex"
justify="start"
......@@ -283,7 +280,7 @@
clearable
placement="bottom-start"
v-model="queryParams.dateRangeCreateTime"
style="width: 240px"
style="width: 300px"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="-"
:start-placeholder="$t('开始日期')"
......@@ -591,6 +588,8 @@ export default {
};
const validatehigh = (rule, value, callback) => {
const index = Number(rule.field.split(".")[2]);
console.log("000000", index);
console.log("0000001", this.queryParams.extraOrderV);
if (index == "0") {
if (
this.queryParams.extraOrderV.orderVRule[index].low &&
......@@ -608,7 +607,7 @@ export default {
} else {
callback();
}
} else if (index > "0") {
} else if (index > 0) {
if (
this.queryParams.extraOrderV.orderVRule[index].low &&
this.queryParams.extraOrderV.orderVRule[index].low >=
......@@ -616,8 +615,9 @@ export default {
) {
callback(this.$t("本次最终积分应大于本次开始积分"));
} else if (
this.queryParams.extraOrderV.orderVRule[index + 1]?.low &&
this.queryParams.extraOrderV.orderVRule[index].high <=
this.queryParams.extraOrderV.orderVRule[index + 1].low
this.queryParams.extraOrderV.orderVRule[index + 1].low
) {
callback(this.$t("本次最终积分应小于下一次开始积分"));
} else {
......@@ -1057,6 +1057,7 @@ export default {
},
//保存
handleSaveIntegralRule() {
console.log("23333");
this.$refs["queryForm"].validate((valid) => {
if (valid) {
let params = deepClone(this.queryParams);
......@@ -1139,6 +1140,9 @@ export default {
};
</script>
<style lang="scss" scoped>
::v-deep .integral-rule-operate .el-input {
width: 300px;
}
.del-btn {
color: red;
padding-left: 120px;
......
......@@ -325,7 +325,7 @@ export default {
pointsRequireSymbol: null,
pickMethod: null,
nodeId: null,
status: null,
status: "1",
remark: null,
quantityRemainSymbol: null,
quantityRemain: null,
......@@ -363,7 +363,7 @@ export default {
pointsRequireSymbol: null,
pickMethod: null,
nodeId: null,
status: null,
status: "1",
remark: null,
quantityRemainSymbol: null,
quantityRemain: null,
......@@ -478,7 +478,7 @@ export default {
level: null,
source: null,
customerService: null,
status: null,
status: "1",
department: null,
creditLevel: null,
country: null,
......
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