From 584eec0e78469e4a02c7508b8b497195fa22947e Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 30 Jun 2022 09:56:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=B6=A7=E6=BA=AA=E5=85=9A=E5=91=98?= =?UTF-8?q?=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creditScore/scoreRules/AppScoreRules.vue | 10 +-- .../AppIntegralAudit.vue | 0 .../components/Detail.vue | 0 .../components/List.vue | 0 .../AppPartyScore.vue | 0 .../psDetail.vue | 0 .../psList.vue | 11 ++- .../AppScoreManage.vue | 0 .../pointsDetails.vue | 0 .../scoreChange.vue | 2 +- .../AppScoreRules.vue | 0 .../components/applyForIntegral.vue | 26 +++---- .../components/automaticallyAddCent.vue | 70 +++++++++---------- 13 files changed, 59 insertions(+), 60 deletions(-) rename project/sanjianxi/apps/{AppIntegralAudit => AppPartyIntegralAudit}/AppIntegralAudit.vue (100%) rename project/sanjianxi/apps/{AppIntegralAudit => AppPartyIntegralAudit}/components/Detail.vue (100%) rename project/sanjianxi/apps/{AppIntegralAudit => AppPartyIntegralAudit}/components/List.vue (100%) rename project/sanjianxi/apps/{AppPartyScore => AppPartyMemberScore}/AppPartyScore.vue (100%) rename project/sanjianxi/apps/{AppPartyScore => AppPartyMemberScore}/psDetail.vue (100%) rename project/sanjianxi/apps/{AppPartyScore => AppPartyMemberScore}/psList.vue (95%) rename project/sanjianxi/apps/{AppScoreManage => AppPartyScoreManage}/AppScoreManage.vue (100%) rename project/sanjianxi/apps/{AppScoreManage => AppPartyScoreManage}/pointsDetails.vue (100%) rename project/sanjianxi/apps/{AppScoreManage => AppPartyScoreManage}/scoreChange.vue (97%) rename project/sanjianxi/apps/{AppScoreRules => AppPartyScoreRules}/AppScoreRules.vue (100%) rename project/sanjianxi/apps/{AppScoreRules => AppPartyScoreRules}/components/applyForIntegral.vue (96%) rename project/sanjianxi/apps/{AppScoreRules => AppPartyScoreRules}/components/automaticallyAddCent.vue (85%) diff --git a/packages/conv/creditScore/scoreRules/AppScoreRules.vue b/packages/conv/creditScore/scoreRules/AppScoreRules.vue index a53c0f33..9c52984a 100644 --- a/packages/conv/creditScore/scoreRules/AppScoreRules.vue +++ b/packages/conv/creditScore/scoreRules/AppScoreRules.vue @@ -122,15 +122,17 @@ export default { dialogTitle() { return this.isEdit ? "编辑积分规则" : "添加积分规则" }, - etOps() { + etOps() { return { lazy: true, value: "dictValue", label: "dictName", lazyLoad: (node, resolve) => { - if (node.level == 0) resolve(this.dict.getDict('integralRuleEvent')) + console.log(node) + if (node.level == 0) {resolve(this.dict.getDict('partyIntegralRuleEvent')) + console.log(this.dict.getDict('partyIntegralRuleEvent'))} else if (node.level == 1) { - let dict = 'integralRuleEvent' + node.value + let dict = 'integralRuleEvent4' this.dict.load(dict).then(() => { let nodes = this.dict.getDict(dict).map(e => ({...e, leaf: true})) resolve(nodes) @@ -165,7 +167,7 @@ export default { }; }, created() { - this.dict.load("integralRuleStatus", "integralRuleRuleType", 'integralRuleScoringCycle', 'integralRuleEvent', 'integralRuleEventType').then(() => { + this.dict.load("integralRuleStatus", "integralRuleRuleType", 'integralRuleScoringCycle', 'integralRuleEvent', 'integralRuleEventType','partyIntegralRuleEvent', 'integralRuleEvent4').then(() => { this.getList(); }); }, diff --git a/project/sanjianxi/apps/AppIntegralAudit/AppIntegralAudit.vue b/project/sanjianxi/apps/AppPartyIntegralAudit/AppIntegralAudit.vue similarity index 100% rename from project/sanjianxi/apps/AppIntegralAudit/AppIntegralAudit.vue rename to project/sanjianxi/apps/AppPartyIntegralAudit/AppIntegralAudit.vue diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue b/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue similarity index 100% rename from project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue rename to project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/List.vue b/project/sanjianxi/apps/AppPartyIntegralAudit/components/List.vue similarity index 100% rename from project/sanjianxi/apps/AppIntegralAudit/components/List.vue rename to project/sanjianxi/apps/AppPartyIntegralAudit/components/List.vue diff --git a/project/sanjianxi/apps/AppPartyScore/AppPartyScore.vue b/project/sanjianxi/apps/AppPartyMemberScore/AppPartyScore.vue similarity index 100% rename from project/sanjianxi/apps/AppPartyScore/AppPartyScore.vue rename to project/sanjianxi/apps/AppPartyMemberScore/AppPartyScore.vue diff --git a/project/sanjianxi/apps/AppPartyScore/psDetail.vue b/project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue similarity index 100% rename from project/sanjianxi/apps/AppPartyScore/psDetail.vue rename to project/sanjianxi/apps/AppPartyMemberScore/psDetail.vue diff --git a/project/sanjianxi/apps/AppPartyScore/psList.vue b/project/sanjianxi/apps/AppPartyMemberScore/psList.vue similarity index 95% rename from project/sanjianxi/apps/AppPartyScore/psList.vue rename to project/sanjianxi/apps/AppPartyMemberScore/psList.vue index 0751e859..80d9f006 100644 --- a/project/sanjianxi/apps/AppPartyScore/psList.vue +++ b/project/sanjianxi/apps/AppPartyMemberScore/psList.vue @@ -82,6 +82,7 @@ export default { label: 'name' }, createTime: '', + partyOrgId: '', } }, methods: { @@ -90,7 +91,7 @@ export default { }, getTableData() { this.instance.post("/app/apppartyintegralinfo/listByOrg", null, { - params: {...this.page, ...this.search} + params: {...this.page, ...this.search, partyOrgId: this.partyOrgId } // partyOrgId: }).then(res => { if (res?.data) { this.tableData = res.data?.records @@ -116,12 +117,10 @@ export default { }, onTreeChange(e) { - this.search.areaId = e.id - this.areaName = e.name - this.search.current = 1 - + console.log(e); + this.partyOrgId = e.id this.$nextTick(() => { - this.getList() + this.getTableData() }) }, diff --git a/project/sanjianxi/apps/AppScoreManage/AppScoreManage.vue b/project/sanjianxi/apps/AppPartyScoreManage/AppScoreManage.vue similarity index 100% rename from project/sanjianxi/apps/AppScoreManage/AppScoreManage.vue rename to project/sanjianxi/apps/AppPartyScoreManage/AppScoreManage.vue diff --git a/project/sanjianxi/apps/AppScoreManage/pointsDetails.vue b/project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue similarity index 100% rename from project/sanjianxi/apps/AppScoreManage/pointsDetails.vue rename to project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue diff --git a/project/sanjianxi/apps/AppScoreManage/scoreChange.vue b/project/sanjianxi/apps/AppPartyScoreManage/scoreChange.vue similarity index 97% rename from project/sanjianxi/apps/AppScoreManage/scoreChange.vue rename to project/sanjianxi/apps/AppPartyScoreManage/scoreChange.vue index d1a8b074..a94b919f 100644 --- a/project/sanjianxi/apps/AppScoreManage/scoreChange.vue +++ b/project/sanjianxi/apps/AppPartyScoreManage/scoreChange.vue @@ -110,7 +110,7 @@ export default { onConfirm() { this.$refs['form'].validate(valid => { if (valid) { - this.instance.post(`/app/appvillagerintegraldetail/changeIntegral`, this.form).then(res => { + this.instance.post(`/app/apppartyintegralinfo/changeIntegral`, this.form).then(res => { if (res.code == 0) { this.$message.success("添加成功") this.dialog = false diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppPartyScoreRules/AppScoreRules.vue similarity index 100% rename from project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue rename to project/sanjianxi/apps/AppPartyScoreRules/AppScoreRules.vue diff --git a/project/sanjianxi/apps/AppScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue similarity index 96% rename from project/sanjianxi/apps/AppScoreRules/components/applyForIntegral.vue rename to project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue index 2262e5ec..877b7803 100644 --- a/project/sanjianxi/apps/AppScoreRules/components/applyForIntegral.vue +++ b/project/sanjianxi/apps/AppPartyScoreRules/components/applyForIntegral.vue @@ -71,9 +71,9 @@ - 常规 - 区间 - 阶梯 + 常规 + 区间 + 阶梯 @@ -84,15 +84,15 @@ - + - + - +
{ if (valid) { - this.form.integralMin = this.form.integralArr[0] || '' - this.form.integralMax = this.form.integralArr[1] || '' + this.form.integralMin = this.form.integralArr?.[0] || '' + this.form.integralMax = this.form.integralArr?.[1] || '' this.form.ladderRule = JSON.stringify(this.form.ladderIntegral) 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 ? '编辑成功' : '添加成功'}`) @@ -341,7 +341,7 @@ export default { }, handleDelete(i) { this.$confirm("是否要删除该规则?").then(() => { - this.form.ladderRule.splice(i, 1) + this.form.ladderIntegral.splice(i, 1) }).catch(() => 0) }, checkIntegral(v) { diff --git a/project/sanjianxi/apps/AppScoreRules/components/automaticallyAddCent.vue b/project/sanjianxi/apps/AppPartyScoreRules/components/automaticallyAddCent.vue similarity index 85% rename from project/sanjianxi/apps/AppScoreRules/components/automaticallyAddCent.vue rename to project/sanjianxi/apps/AppPartyScoreRules/components/automaticallyAddCent.vue index 7c2da998..bf1c0312 100644 --- a/project/sanjianxi/apps/AppScoreRules/components/automaticallyAddCent.vue +++ b/project/sanjianxi/apps/AppPartyScoreRules/components/automaticallyAddCent.vue @@ -40,7 +40,7 @@ 停用 启用 - 编辑 + 编辑 删除 @@ -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("删除后不可恢复，是否要删除该事项？", {