kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
shijingjing
2022-06-30 20:30:34 +08:00
parent 4e3632e4b5
commit 1b55f8d643
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/sanjianxi/apps/AppPartyMemberScore/psList.vue
View File

@@ -20,7 +20,7 @@
<template #left> <template #left>
<div>统计周期</div> <div>统计周期</div>
<el-date-picker size="small" v-model="searchDotime" type="daterange" range-separator="至" @change="timeChange" <el-date-picker size="small" v-model="searchDotime" type="daterange" range-separator="至" @change="timeChange"
start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker> start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
</template> </template>
<template #right> <template #right>
<el-input size="small" placeholder="党员姓名" v-model="search.name" clearable <el-input size="small" placeholder="党员姓名" v-model="search.name" clearable

22
project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue
View File

@@ -88,7 +88,7 @@
<el-input placeholder="请输入" v-model="form.integral" clearable/> <el-input placeholder="请输入" v-model="form.integral" clearable/>
</el-form-item> </el-form-item>
<!-- 区间 --> <!-- 区间 -->
<el-form-item label="积分分值" prop="integralArr" v-if="form.ruleType == '2'"> <el-form-item label="积分分值" v-if="form.ruleType == '2'">
<ai-range v-model="form.integralArr" clearable/> <ai-range v-model="form.integralArr" clearable/>
</el-form-item> </el-form-item>
<!-- 阶梯 --> <!-- 阶梯 -->
@@ -198,7 +198,7 @@ export default {
scoringCycle: [{required: true, message: "请选择周期范围" }], scoringCycle: [{required: true, message: "请选择周期范围" }],
integral: [{required: true, pattern: /^\d*[.\d]\d?$/, message: "请输入积分分值,最多保留一位小数"}], integral: [{required: true, pattern: /^\d*[.\d]\d?$/, message: "请输入积分分值,最多保留一位小数"}],
numberLimit: [{pattern: /^\d*$/, message: "请输入正整数"}], numberLimit: [{pattern: /^\d*$/, message: "请输入正整数"}],
integralArr: [{required: true, message: "请输入积分分值", trigger: "change"}], // integralArr: [{required: true, message: "请输入积分分值", trigger: "change"}],
ladderIntegral: [{required: true, message: "请输入积分分值"}] ladderIntegral: [{required: true, message: "请输入积分分值"}]
}, },
cacheOps: [], cacheOps: [],
@@ -307,14 +307,22 @@ export default {
this.getList(); this.getList();
}, },
onConfirm() { onConfirm() {
this.form.integralMin = this.form.integralArr?.[0] || '' if(this.ruleType == 2) {
this.form.integralMax = this.form.integralArr?.[1] || '' if(!this.form.integralArr) {
this.form.ladderRule = JSON.stringify(this.form.ladderIntegral) return this.$message.error('请输入积分分值')
}
this.form.integralMin = this.form.integralArr?.[0] || ''
this.form.integralMax = this.form.integralArr?.[1] || ''
this.form.ladderRule = JSON.stringify(this.form.ladderIntegral)
if(this.form.integralMin >= this.form.integralMax) {
return this.$message.error('请输入正确的区间范围')
}
if(this.form.integralMin >= this.form.integralMax) {
return this.$message.error('请输入正确的区间范围')
} }
this.$refs.DialogForm.validate((valid) => { this.$refs.DialogForm.validate((valid) => {
if (valid) { if (valid) {
this.instance.post(`/app/apppartyintegralrule/addOrUpdate`, { this.instance.post(`/app/apppartyintegralrule/addOrUpdate`, {