From 3624b48511109a4f85aef8e7833fbc636e4466da Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 29 Jun 2022 19:02:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/AppIntegralAudit/components/Detail.vue | 13 +++++++------ .../apps/AppIntegralAudit/components/List.vue | 12 ++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue index fd537bbd..a765f9eb 100644 --- a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue +++ b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue @@ -9,10 +9,11 @@ @@ -92,8 +92,8 @@ export default { tableData: [], page: {current: 1, size: 10, total: 0}, colConfigs: [ - {prop: "event", label: "事件", dict: "integralRuleEvent", align: "center"}, - {prop: "type", label: "类型", dict: "integralRuleEventType", align: "center"}, + {prop: "event", label: "事件", dict: "partyIntegralRuleEvent", align: "center"}, + {prop: "type", label: "类型", dict: "integralRuleEvent4", align: "center"}, {prop: "ruleType", label: "规则", dict: "integralRuleRuleType"}, {prop: "scoringCycle", label: "周期范围", dict: "integralRuleScoringCycle", align: "center"}, {prop: "status", label: "状态", align: "center", width: 96, dict: "integralRuleStatus"}, @@ -122,20 +122,8 @@ export default { } }, created() { - this.$dict.load("integralRuleStatus", "integralRuleRuleType", 'integralRuleScoringCycle', 'integralRuleEvent', 'integralRuleEventType','partyIntegralRuleEvent','integralRuleEvent4').then(() => { + this.$dict.load("integralRuleStatus", "integralRuleRuleType", 'integralRuleScoringCycle', 'integralRuleEvent', 'integralRuleEventType','partyIntegralRuleEvent','partyIntegralRuleEvent4','integralRuleEvent4').then(() => { this.getList(); - - // let {,event, type} = this.form, - let dict = 'integralRuleEvent4' + this.form.event - this.$dict.load(dict).then(() => { - // this.form.eventType = [event, type] - this.cacheOps = this.dict.getDict('partyIntegralRuleEvent').map(e => { - if (e.dictValue == this.form.event) { - e.children = this.$dict.getDict(dict).map(d => ({...d, leaf: true})) - } - return e - }) - }) }); }, computed: { @@ -150,7 +138,7 @@ export default { lazyLoad: (node, resolve) => { if (node.level == 0) resolve(this.dict.getDict('partyIntegralRuleEvent')) else if (node.level == 1) { - let dict = 'integralRuleEvent4' + node.value + let dict = 'integralRuleEvent4' this.dict.load(dict).then(() => { let nodes = this.dict.getDict(dict).map(e => ({...e, leaf: true})) resolve(nodes) @@ -186,19 +174,29 @@ export default { } }, close() { - + this.form = { + classify: 1, + eventType: '', + event: '', + type: '', + ruleType: 0, + scoringCycle: '', + integral: '', + integralArr: [], + } }, - onConfirm(id) { + onConfirm() { this.$refs.DialogForm.validate((valid) => { this.flag = true if (valid) { this.instance.post(`/app/apppartyintegralrule/addOrUpdate`, { ...this.form, - id: id || '' + id: this.form.id }).then((res) => { if (res.code == 0) { this.$message.success(`${this.isEdit ? '编辑成功' : '添加成功'}`) this.dialog = false; + this.getList() } }).catch(() => { this.flag = false; @@ -207,24 +205,24 @@ export default { this.flag = false; } }); + }, toEdit(row) { - // this.form = this.$copy(row) - // let {ladderRule, event, type} = this.form, - // dict = 'integralRuleEvent' + event - // this.dict.load(dict).then(() => { - // this.form.eventType = [event, type] - // this.form.ladderRule = JSON.parse(ladderRule || "[]") - // this.cacheOps = this.dict.getDict('integralRuleEvent').map(e => { - // if (e.dictValue == event) { - // e.children = this.dict.getDict(dict).map(d => ({...d, leaf: true})) - // } - // return e - // }) - // this.$nextTick(() => { - // this.dialog = true - // }) - // }) + this.form = this.$copy(row) + let {event, type} = this.form, + dict = 'partyIntegralRuleEvent' + event + this.$dict.load(dict).then(() => { + this.form.eventType = [event, type] + this.cacheOps = this.$dict.getDict('partyIntegralRuleEvent').map(e => { + if (e.dictValue == event) { + e.children = this.dict.getDict(dict).map(d => ({...d, leaf: true})) + } + return e + }) + this.$nextTick(() => { + this.dialog = true + }) + }) }, remove(id) { this.$confirm("删除后不可恢复，是否要删除该事项？", { From 6de41e883ab0db0f0b7ffc1f65a4a6cb230a56fc Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 30 Jun 2022 10:05:00 +0800 Subject: [PATCH 3/4] name --- .../{AppIntegralAudit.vue => AppPartyIntegralAudit.vue} | 6 +++--- .../{AppPartyScore.vue => AppPartyMemberScore.vue} | 6 +++--- .../{AppScoreManage.vue => AppPartyScoreManage.vue} | 6 +++--- .../{AppScoreRules.vue => AppPartyScoreRules.vue} | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) rename project/sanjianxi/apps/AppPartyIntegralAudit/{AppIntegralAudit.vue => AppPartyIntegralAudit.vue} (92%) rename project/sanjianxi/apps/AppPartyMemberScore/{AppPartyScore.vue => AppPartyMemberScore.vue} (85%) rename project/sanjianxi/apps/AppPartyScoreManage/{AppScoreManage.vue => AppPartyScoreManage.vue} (94%) rename project/sanjianxi/apps/AppPartyScoreRules/{AppScoreRules.vue => AppPartyScoreRules.vue} (95%) diff --git a/project/sanjianxi/apps/AppPartyIntegralAudit/AppIntegralAudit.vue b/project/sanjianxi/apps/AppPartyIntegralAudit/AppPartyIntegralAudit.vue similarity index 92% rename from project/sanjianxi/apps/AppPartyIntegralAudit/AppIntegralAudit.vue rename to project/sanjianxi/apps/AppPartyIntegralAudit/AppPartyIntegralAudit.vue index 2636ceff..0f953398 100644 --- a/project/sanjianxi/apps/AppPartyIntegralAudit/AppIntegralAudit.vue +++ b/project/sanjianxi/apps/AppPartyIntegralAudit/AppPartyIntegralAudit.vue @@ -1,5 +1,5 @@