diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue index 25125611..8cd24aea 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue @@ -132,7 +132,7 @@ export default { }) }, - // 事件汇总 暂定 + // 事件汇总 getEventSummary() { this.instance.post(`/app/appintegraluser/eventSummary`,null,{ params: { diff --git a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue index 603789fd..dbeb7243 100644 --- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue +++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue @@ -52,7 +52,7 @@ @onConfirm="onConfirm" @closed="form={},chooseUserList=[]"> - + @@ -69,10 +69,10 @@ - + - + @@ -98,6 +98,8 @@ export default { girdId: '', current: 1, size: 10, + sortFiled: '', + sortRule: '', }, tableData: [], page: {size: 10, total: 0}, @@ -120,14 +122,6 @@ export default { checkStrictly: true, }, chooseUserList: [], - sortFiled: '', - sortRule: '', - rules: { - residentId: [{required: true, message: '请选择人员', trigger: 'blur'}], - eventDesc: [{required: true, message: '请输入调整说明', trigger: 'blur'}], - integralCalcType: [{required: true, message: '请选择类型', trigger: 'change'}], - integral: [{required: true, validator: (r, v, cb) => v > 0 ? cb() : cb("请输入正数")}], - } } }, created() { @@ -147,14 +141,14 @@ export default { { slot: "options" }, ] }, - // rules() { - // return { - // residentId: [{required: true, message: '请选择人员', trigger: 'blur'}], - // eventDesc: [{required: true, message: '请输入调整说明', trigger: 'blur'}], - // integralCalcType: [{required: true, message: '请选择类型', trigger: 'change'}], - // integral: [{required: true, validator: (r, v, cb) => v > 0 ? cb() : cb("请输入正数")}], - // } - // }, + rules() { + return { + ids: [{required: true, message: '请选择人员', trigger: 'blur'}], + eventDesc: [{required: true, message: '请输入调整说明', trigger: 'blur'}], + integralCalcType: [{required: true, message: '请选择类型', trigger: 'change'}], + integral: [{required: true, validator: (r, v, cb) => v > 0 ? cb() : cb("请输入正数")}], + } + }, }, methods: { getTableData() { @@ -163,8 +157,8 @@ export default { ...this.page, ...this.search, current: this.current, - sortFiled: this.sortFiled, - sortRule: this.sortRule + // sortFiled: this.sortFiled, + // sortRule: this.sortRule } }).then(res => { if(res?.data) { @@ -233,36 +227,36 @@ export default { changeTableSort(col) { if(col.prop === 'integral') { // 剩余积分 if(col.order === 'ascending') { - this.sortFiled = 0 - this.sortRule = true + this.search.sortFiled = 0 + this.search.sortRule = true } else if(col.order === 'descending') { - this.sortFiled = 0 - this.sortRule = false + this.search.sortFiled = 0 + this.search.sortRule = false } else if(col.order === null) { - this.sortFiled = '' - this.sortRule = '' + this.search.sortFiled = '' + this.search.sortRule = '' } } else if(col.prop === 'totalIntegral') { // 累计积分 if(col.order === 'ascending') { - this.sortFiled = 1 - this.sortRule = true + this.search.sortFiled = 1 + this.search.sortRule = true } else if(col.order === 'descending') { - this.sortFiled = 1 - this.sortRule = false + this.search.sortFiled = 1 + this.search.sortRule = false } else if(col.order === null) { - this.sortFiled = '' - this.sortRule = '' + this.search.sortFiled = '' + this.search.sortRule = '' } } else if(col.prop === 'usedIntegral') { // 已用积分 if(col.order === 'ascending') { - this.sortFiled = 2 - this.sortRule = true + this.search.sortFiled = 2 + this.search.sortRule = true } else if(col.order === 'descending') { - this.sortFiled = 2 - this.sortRule = false + this.search.sortFiled = 2 + this.search.sortRule = false } else if(col.order === null) { - this.sortFiled = '' - this.sortRule = '' + this.search.sortFiled = '' + this.search.sortRule = '' } } this.getTableData() @@ -272,21 +266,26 @@ export default { if(this.form.file?.length) { this.form.enclosure = this.form.file[0].url } - this.instance.post(`/app/appintegraluser/changeIntegral`,{ - ids: this.form.ids, - eventDesc: this.form.eventDesc, - enclosure: this.form.enclosure, // 附件 - integralCalcType: this.form.integralCalcType, - integral: this.form.integral, - }).then(res => { - if(res.code == 0) { - this.$message.success('调整积分成功') - setTimeout(() =>{ - this.getTableData() - this.dialog = false + this.$refs.form.validate((valid)=> { + if(valid) { + this.instance.post(`/app/appintegraluser/changeIntegral`,{ + ids: this.form.ids, + eventDesc: this.form.eventDesc, + enclosure: this.form.enclosure, // 附件 + integralCalcType: this.form.integralCalcType, + integral: this.form.integral, + }).then(res => { + if(res.code == 0) { + this.$message.success('调整积分成功') + setTimeout(() =>{ + this.getTableData() + this.dialog = false + }) + } }) } }) + }, toDetail(id) {