From bb7406c7c9f2eedfc27acdac80a77bcc5d870710 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 30 Jun 2022 18:02:37 +0800 Subject: [PATCH 01/30] 30425 --- project/sanjianxi/apps/AppPartyMemberScore/psList.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/project/sanjianxi/apps/AppPartyMemberScore/psList.vue b/project/sanjianxi/apps/AppPartyMemberScore/psList.vue index 2132e11a..be1c3608 100644 --- a/project/sanjianxi/apps/AppPartyMemberScore/psList.vue +++ b/project/sanjianxi/apps/AppPartyMemberScore/psList.vue @@ -53,12 +53,15 @@ export default { }, computed: { ...mapState(['user']), + orgTree() { + return this.$refs.tree?.$refs?.partyTree + }, colConfigs() { return [ {label: "排行榜", prop: "orderIndex", align: "center"}, {label: "党员姓名", prop: "name", align: "center"}, {label: "党员类型", prop: "partyType", dict: "partyType", align: "center"}, - {label: "获得积分", prop: "nowIntegral", align: "center"}, + {label: "获得积分", prop: "integral", align: "center"}, {slot: "options"} ] }, From 5d2c1279d8e4a7274db928497b539b991176091e Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 30 Jun 2022 18:39:39 +0800 Subject: [PATCH 02/30] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/AppPartyMemberScore/psDetail.vue | 30 ++++++++++++++----- .../apps/AppPartyMemberScore/psList.vue | 8 +++-- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue b/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue index 57e8c652..b5213a81 100644 --- a/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue +++ b/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue @@ -2,25 +2,30 @@
+ @@ -62,17 +67,26 @@ export default { {required: true, message: "请输入学习强国积分"}, {pattern: /^\d+$/g, message: "请输入正整数"} ] - } + }, + name: '', + nowIntegral: '', + page: {current: 1, size: 10, total: 0}, } }, methods: { getDetail() { - let {id} = this.$route.query - this.instance.post("/app/appparty/getPartyIntegralDetail", null, { - params: {id} + let { id, name, nowIntegral } = this.$route.query + this.instance.post("/app/apppartyintegralinfo/list", null, { + params: { + partyId: id, + ...this.page + } }).then(res => { if (res?.data) { this.detail = res.data + this.page.total = res.data.total + this.name = name + this.nowIntegral = nowIntegral } }) }, diff --git a/project/sanjianxi/apps/AppPartyMemberScore/psList.vue b/project/sanjianxi/apps/AppPartyMemberScore/psList.vue index be1c3608..2e5bac9b 100644 --- a/project/sanjianxi/apps/AppPartyMemberScore/psList.vue +++ b/project/sanjianxi/apps/AppPartyMemberScore/psList.vue @@ -8,6 +8,7 @@ @@ -133,8 +134,9 @@ export default { return data.name.indexOf(value) !== -1 }, - showDetail(id) { - this.$router.push({query: {id}}) + showDetail(row) { + console.log(row); + this.$router.push({query: { id: row.partyId, name: row.name, nowIntegral: row.nowIntegral}}) }, }, created() { From 071bd9daf5d391b3dabbc112750ba0b7d6bf354c Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 30 Jun 2022 19:21:09 +0800 Subject: [PATCH 03/30] 30418 --- .../apps/AppPartyMemberScore/psDetail.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue b/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue index b5213a81..4191d5d7 100644 --- a/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue +++ b/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue @@ -2,11 +2,6 @@
- From 4e3632e4b5c75deb95731e7d93a38d695c7079bf Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 30 Jun 2022 20:17:20 +0800 Subject: [PATCH 14/30] 30451 --- .../sanjianxi/apps/AppPartyIntegralAudit/components/List.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyIntegralAudit/components/List.vue b/project/sanjianxi/apps/AppPartyIntegralAudit/components/List.vue index dc578839..c3a6c51e 100644 --- a/project/sanjianxi/apps/AppPartyIntegralAudit/components/List.vue +++ b/project/sanjianxi/apps/AppPartyIntegralAudit/components/List.vue @@ -26,7 +26,7 @@ v ? this.dict.getLabel('integralDeclareStatus', v) : '-' }, { prop: 'auditUserName', align: 'center', label: '审批人' }, { prop: 'auditTime', align: 'center', label: '审批时间' } From 1b55f8d643f9b63d3c6c94e305b61e166be68814 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 30 Jun 2022 20:30:34 +0800 Subject: [PATCH 15/30] bug --- .../apps/AppPartyMemberScore/psList.vue | 2 +- .../components/applyForIntegral.vue | 22 +++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyMemberScore/psList.vue b/project/sanjianxi/apps/AppPartyMemberScore/psList.vue index 2e5bac9b..f8ed93df 100644 --- a/project/sanjianxi/apps/AppPartyMemberScore/psList.vue +++ b/project/sanjianxi/apps/AppPartyMemberScore/psList.vue @@ -20,7 +20,7 @@ From 0ec77d5a48a2818c8e596303cc1285c62dc34caf Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 30 Jun 2022 21:22:29 +0800 Subject: [PATCH 19/30] bug --- .../apps/AppPartyScoreRules/components/applyForIntegral.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue index 742d0d42..d73bf2e8 100644 --- a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue +++ b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue @@ -318,6 +318,8 @@ export default { return this.$message.error('请输入正确的区间范围') } + } else { + this.form.ladderRule = '' } From fc7067cff36d605089fa7c913d8ad65d23bf2043 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 30 Jun 2022 21:35:22 +0800 Subject: [PATCH 20/30] bug --- .../AppPartyScoreRules/components/applyForIntegral.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue index d73bf2e8..5aecc387 100644 --- a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue +++ b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue @@ -317,13 +317,8 @@ export default { if(this.form.integralMin >= this.form.integralMax) { return this.$message.error('请输入正确的区间范围') } - - } else { this.form.ladderRule = '' - } - - - + } this.$refs.DialogForm.validate((valid) => { if (valid) { From d8f13f09c5e2c9d18290fd8041bf39209ee4e2ef Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 1 Jul 2022 09:23:55 +0800 Subject: [PATCH 21/30] 30411 --- .../components/Detail.vue | 3 +- .../components/applyForIntegral.vue | 28 ++++++++++++------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue b/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue index bb1d4eb1..8bd7fc4f 100644 --- a/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue +++ b/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue @@ -54,7 +54,8 @@ - + + diff --git a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue index 5aecc387..44459f3a 100644 --- a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue +++ b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue @@ -240,10 +240,13 @@ export default { toEdit(row) { this.instance.post(`/app/apppartyintegralrule/queryDetailById?id=${row.id}`).then((res) => { if(res?.data) { + // console.log(res); this.form = res.data - this.form.ladderIntegral = JSON.parse(res.data.ladderRule) this.form.ruleType = res.data.ruleType this.form.integralArr = [ res.data.integralMin, res.data.integralMax ] + if(res.data.ruleType == 1) { + this.form.ladderIntegral = JSON.parse(res.data.ladderRule) + } this.dialog = true } }) @@ -307,24 +310,29 @@ export default { this.getList(); }, onConfirm() { - if(this.ruleType == 2) { - if(!this.form.integralArr) { + if(this.form.ruleType == 2) { + + this.form.integralMin = this.form.integralArr[0] || '' + this.form.integralMax = this.form.integralArr[1] || '' + + if(!this.form.integralArr[0] && !this.form.integralArr[1]) { 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('请输入正确的区间范围') + return this.$message.error('请输入正确积分区间') } - this.form.ladderRule = '' - } + } + if(this.form.ruleType == 1) { + this.form.ladderRule = JSON.stringify(this.form.ladderIntegral) + } this.$refs.DialogForm.validate((valid) => { if (valid) { this.instance.post(`/app/apppartyintegralrule/addOrUpdate`, { ...this.form, - id: this.form.id || '' + id: this.form.id || '', + integralMin: this.form.integralArr[0] || '', + integralMax: this.form.integralArr[1] || '', }).then((res) => { if (res?.code == 0) { this.$message.success(`${this.isEdit ? '编辑成功' : '添加成功'}`) From 0b0b15fd556215555898a81d7bff92900efc9c84 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 1 Jul 2022 09:41:51 +0800 Subject: [PATCH 22/30] 30465 --- .../apps/AppPartyIntegralAudit/components/Detail.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue b/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue index 8bd7fc4f..360ab9c8 100644 --- a/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue +++ b/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue @@ -53,9 +53,8 @@ - - - + + {{ integralInfo.ruleType == 0? '+'+ integralInfo.integral : '' }} @@ -158,6 +157,9 @@ export default { dictValue: e.integral.toString() } }) + if(res.data.integralRule.ruleType == 1) { + this.form.auditIntegral = this.integralInfo.integral + } } }) }, @@ -192,6 +194,9 @@ export default { if(this.integralInfo.ruleType == 2 && this.form.pass == 1) { this.form.integralItem = this.scoreItem.filter(e=> e.dictValue == this.form.auditIntegral)[0].dictName } + if(this.integralInfo.ruleType == 0 && this.form.pass == 1) { + this.form.auditIntegral = this.integralInfo.integral + } this.$refs.form.validate(v => { if (v) { this.instance.post('/app/apppartyintegraldeclare/examine', null, { From 53daf5309bb8aaddf9007ce7a7b296f19f17d7ac Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 1 Jul 2022 09:48:26 +0800 Subject: [PATCH 23/30] 30459 --- project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue b/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue index e0b5186a..454f82a3 100644 --- a/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue +++ b/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue @@ -24,7 +24,7 @@ @@ -71,7 +71,8 @@ export default { id: '', name: '', nowIntegral: '', - page: {current: 1, size: 10, total: 0}, + page: {current: 1, size: 10}, + total: 0 } }, methods: { @@ -85,7 +86,7 @@ export default { }).then(res => { if (res?.data) { this.detailTable = res.data.records - this.page.total = res.data.total + this.total = res.data.total this.name = name this.nowIntegral = nowIntegral this.id = id From cd76b41ba78fe3249ca86a4aef037dfffcd41f51 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 1 Jul 2022 10:22:03 +0800 Subject: [PATCH 24/30] bug --- .../apps/AppPartyScoreRules/components/applyForIntegral.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue index 44459f3a..9ca427e0 100644 --- a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue +++ b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue @@ -326,6 +326,10 @@ export default { this.form.ladderRule = JSON.stringify(this.form.ladderIntegral) } + if(this.form.ruleType == 2 && this.form.ruleType == 0) { + this.form.ladderRule = '' + } + this.$refs.DialogForm.validate((valid) => { if (valid) { this.instance.post(`/app/apppartyintegralrule/addOrUpdate`, { From e9d5e63a3e55e3c58ec46b4bd8a6e28bc8af2d2f Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 1 Jul 2022 11:11:58 +0800 Subject: [PATCH 25/30] bug --- .../AppPartyScoreRules/components/applyForIntegral.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue index 9ca427e0..ac0bda9b 100644 --- a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue +++ b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue @@ -162,11 +162,10 @@ export default { search: {status: "", eventName: ""}, page: {current: 1, size: 10, total: 0}, colConfigs: [ - {prop: "eventName", label: "事件名称", dict: "integralRuleEvent", "show-overflow-tooltip": true}, - {prop: "eventDesc", label: "简介", dict: "integralRuleEventType", "show-overflow-tooltip": true}, + {prop: "eventName", label: "事件名称", "show-overflow-tooltip": true}, + {prop: "eventDesc", label: "简介", "show-overflow-tooltip": true}, {prop: "ruleType", label: "规则", dict: "partyIntegralRuleRuleType", align: "center"}, {prop: "scoringCycle", label: "周期范围", dict: "integralRuleScoringCycle", align: "center"}, - {prop: "scoringCycle", label: "积分分值", dict: "integralRuleScoringCycle", align: "center"}, {prop: "status", label: "状态", align: "center", width: 96, dict: "integralRuleStatus"}, {slot: "options", label: "操作", align: "center"}, ], @@ -326,7 +325,7 @@ export default { this.form.ladderRule = JSON.stringify(this.form.ladderIntegral) } - if(this.form.ruleType == 2 && this.form.ruleType == 0) { + if(this.form.ruleType == 2 || this.form.ruleType == 0) { this.form.ladderRule = '' } From 4be5825cf1b57a980034e9f8f30613f4b144c883 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 1 Jul 2022 11:23:08 +0800 Subject: [PATCH 26/30] push --- .../components/applyForIntegral.vue | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue index ac0bda9b..7541c888 100644 --- a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue +++ b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue @@ -170,8 +170,8 @@ export default { {slot: "options", label: "操作", align: "center"}, ], integralConfigs: [ - {prop: "event", label: "加分项", dict: "integralRuleEvent"}, - {prop: "event", label: "获得积分", dict: "integralRuleEvent"}, + {prop: "event", label: "加分项",}, + {prop: "event", label: "获得积分",}, {slot: "options", label: "操作", align: "center"}, ], tableData: [], @@ -197,7 +197,6 @@ export default { scoringCycle: [{required: true, message: "请选择周期范围" }], integral: [{required: true, pattern: /^\d*[.\d]\d?$/, message: "请输入积分分值,最多保留一位小数"}], numberLimit: [{pattern: /^\d*$/, message: "请输入正整数"}], - // integralArr: [{required: true, message: "请输入积分分值", trigger: "change"}], ladderIntegral: [{required: true, message: "请输入积分分值"}] }, cacheOps: [], @@ -214,14 +213,7 @@ export default { this.getList(); }); }, - watch: { - integralArr: { - handler(v) { - this.form.integralMin = v?.[0] || '' - this.form.integralMax = v?.[1] || '' - } - } - }, + methods: { getList() { this.instance.post(`/app/apppartyintegralrule/list?classify=0`, null, { @@ -234,7 +226,7 @@ export default { }); }, addIntegral() { - this.form.ladderIntegral?.push({ viewCount: null, integral: null }) + this.form.ladderIntegral.push({ viewCount: null, integral: null }) }, toEdit(row) { this.instance.post(`/app/apppartyintegralrule/queryDetailById?id=${row.id}`).then((res) => { @@ -264,6 +256,7 @@ export default { integralMax: '', ladderRule: [], integralArr: [], + ladderIntegral: [] } }, @@ -273,7 +266,8 @@ export default { this.form.numberLimit = '' this.form.integral = '' this.form.integralArr = [] - this.form.ladderRule = [] + this.form.ladderRule = '' + this.form.ladderIntegral = [] }, remove(id) { @@ -340,6 +334,7 @@ export default { if (res?.code == 0) { this.$message.success(`${this.isEdit ? '编辑成功' : '添加成功'}`) this.dialog = false; + this.close() this.getList() } }); From da929c20a267fb6597e20e9a32f42d4fc28f82e2 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 1 Jul 2022 11:24:31 +0800 Subject: [PATCH 27/30] =?UTF-8?q?=E6=BC=8F=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/AppPartyScoreRules/components/applyForIntegral.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue index 7541c888..b2ddda8b 100644 --- a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue +++ b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue @@ -226,7 +226,7 @@ export default { }); }, addIntegral() { - this.form.ladderIntegral.push({ viewCount: null, integral: null }) + this.form.ladderIntegral?.push({ viewCount: null, integral: null }) }, toEdit(row) { this.instance.post(`/app/apppartyintegralrule/queryDetailById?id=${row.id}`).then((res) => { From 59f8671e90e177ef815725bbe1b0cb0c63a432dc Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 1 Jul 2022 12:34:19 +0800 Subject: [PATCH 28/30] total --- .../apps/AppPartyMemberScore/psDetail.vue | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue b/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue index 454f82a3..cde71cd1 100644 --- a/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue +++ b/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue @@ -30,13 +30,6 @@ - - - - - - -
@@ -60,7 +53,6 @@ export default { {label: "剩余积分", prop: "residualIntegral", align: 'center'}, {label: "调整说明", prop: "remark"}, ], - dialog: false, form: {}, rules: { learningIntegral: [ @@ -81,7 +73,8 @@ export default { this.instance.post("/app/apppartyintegralinfo/list", null, { params: { partyId: id, - ...this.page + ...this.page, + total: this.total } }).then(res => { if (res?.data) { @@ -96,21 +89,6 @@ export default { back() { this.$router.push({}) }, - submit() { - this.$refs.DialogForm.validate(v => { - if (v) { - this.instance.post("/app/appparty/editLearningIntegral", null,{ - params:this.form - }).then(res => { - if (res?.code == 0) { - this.$message.success("提交成功!") - this.dialog = false - this.getDetail() - } - }) - } - }) - }, handleEditLearningIntergral(partyMemberId) { this.dialog = true this.form = {partyMemberId} From 792d270446c75e82f3ba6d546aa33a3b2f64c6c1 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 1 Jul 2022 13:43:25 +0800 Subject: [PATCH 29/30] =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppPartyIntegralAudit/components/Detail.vue | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue b/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue index 360ab9c8..38916758 100644 --- a/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue +++ b/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue @@ -151,13 +151,15 @@ export default { if (res?.data) { this.info = res.data, this.integralInfo = res.data.integralRule - this.scoreItem = JSON.parse(res.data.integralRule.ladderRule).map(e=>{ - return { - dictName: e.viewCount, - dictValue: e.integral.toString() - } - }) if(res.data.integralRule.ruleType == 1) { + this.scoreItem = JSON.parse(res.data.integralRule.ladderRule)?.map(e=>{ + return { + dictName: e.viewCount, + dictValue: e.integral.toString() + } + }) + } + if(res.data.integralRule.ruleType == 0) { this.form.auditIntegral = this.integralInfo.integral } } @@ -192,7 +194,7 @@ export default { onConfirm() { if(this.integralInfo.ruleType == 2 && this.form.pass == 1) { - this.form.integralItem = this.scoreItem.filter(e=> e.dictValue == this.form.auditIntegral)[0].dictName + this.form.integralItem = this.scoreItem.filter(e=> e.dictValue == this.form.auditIntegral)[0]?.dictName } if(this.integralInfo.ruleType == 0 && this.form.pass == 1) { this.form.auditIntegral = this.integralInfo.integral From efb7ebeeee739c4888c2050d23c79d4227bdbdb1 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Fri, 1 Jul 2022 13:59:37 +0800 Subject: [PATCH 30/30] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppPartyScoreManage/AppPartyScoreManage.vue | 3 +-- .../apps/AppPartyScoreManage/pointsDetails.vue | 2 -- .../apps/AppPartyScoreManage/scoreChange.vue | 6 +----- .../apps/AppPartyScoreRules/AppPartyScoreRules.vue | 4 +--- .../components/applyForIntegral.vue | 13 ++++++------- .../components/automaticallyAddCent.vue | 9 ++++----- 6 files changed, 13 insertions(+), 24 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyScoreManage/AppPartyScoreManage.vue b/project/sanjianxi/apps/AppPartyScoreManage/AppPartyScoreManage.vue index 477655b5..faf438e6 100644 --- a/project/sanjianxi/apps/AppPartyScoreManage/AppPartyScoreManage.vue +++ b/project/sanjianxi/apps/AppPartyScoreManage/AppPartyScoreManage.vue @@ -8,7 +8,7 @@ + :instance="instance" :dict="dict"/> @@ -27,7 +27,6 @@ export default { props: { instance: Function, dict: Object, - permissions: Function }, computed: { diff --git a/project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue b/project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue index c4bb6fb1..8c1c3341 100644 --- a/project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue +++ b/project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue @@ -36,7 +36,6 @@ 详情 @@ -69,7 +68,6 @@ export default { props: { instance: Function, dict: Object, - areaId: String }, data() { diff --git a/project/sanjianxi/apps/AppPartyScoreManage/scoreChange.vue b/project/sanjianxi/apps/AppPartyScoreManage/scoreChange.vue index cc35ecac..e6b4efd6 100644 --- a/project/sanjianxi/apps/AppPartyScoreManage/scoreChange.vue +++ b/project/sanjianxi/apps/AppPartyScoreManage/scoreChange.vue @@ -4,9 +4,7 @@ @@ -27,7 +26,6 @@ export default { props: { instance: Function, dict: Object, - permissions: Function }, computed: { diff --git a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue index b2ddda8b..cc839a5a 100644 --- a/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue +++ b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue @@ -1,6 +1,6 @@