From 39f5bcbd5a111ba29aea60184371d915f47555b5 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 29 Jun 2022 18:44:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sanjianxi/apps/AppPartyScore/psList.vue | 31 ---------------- .../apps/AppScoreManage/pointsDetails.vue | 24 ++++++------ .../apps/AppScoreManage/scoreChange.vue | 4 +- .../components/applyForIntegral.vue | 37 ++++++------------- .../components/automaticallyAddCent.vue | 18 ++++++--- 5 files changed, 36 insertions(+), 78 deletions(-) diff --git a/project/sanjianxi/apps/AppPartyScore/psList.vue b/project/sanjianxi/apps/AppPartyScore/psList.vue index 5c0af2cc..16f859c6 100644 --- a/project/sanjianxi/apps/AppPartyScore/psList.vue +++ b/project/sanjianxi/apps/AppPartyScore/psList.vue @@ -34,19 +34,12 @@ @getList="getTableData" :col-configs="colConfigs" :dict="dict"> - @@ -70,18 +63,6 @@ export default { {slot: "options"} ] }, - familyCols() { - return [ - { - label: '与户主关系', prop: 'householdRelation', align: 'center', width: 165, - render: (h, {row}) => h('p', this.dict.getLabel('householdRelation', row.householdRelation || "户主")) - }, - {label: '类型', prop: 'residentType', align: 'center', dict: "residentType"}, - {label: '姓名', prop: 'name', align: 'center'}, - {label: '身份证号', render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber)), width: 165}, - {label: '联系电话', prop: 'phone', align: 'center', width: 120} - ] - } }, data() { return { @@ -90,8 +71,6 @@ export default { }, page: {current: 1, size: 10, total: 0}, tableData: [], - dialog: false, - familyList: [], organizationName: '', organizationTree: [], defaultExpanded: [], @@ -148,16 +127,6 @@ export default { showDetail(id) { this.$router.push({query: {id}}) }, - getFamilyByPartyId(idNumber) { - this.instance.post("/app/appresident/queryHomeMember", null, { - params: {idNumber} - }).then(res => { - if (res?.data) { - this.familyList = res.data?.family || [] - this.dialog = true - } - }) - } }, created() { this.getTableData() diff --git a/project/sanjianxi/apps/AppScoreManage/pointsDetails.vue b/project/sanjianxi/apps/AppScoreManage/pointsDetails.vue index ea86bff2..f6e49a13 100644 --- a/project/sanjianxi/apps/AppScoreManage/pointsDetails.vue +++ b/project/sanjianxi/apps/AppScoreManage/pointsDetails.vue @@ -47,15 +47,13 @@ - - - - - - {{ dialogInfo.changeIntegral >= 0 ? '增加' : '减少' }} - 分 + + + + {{ dialogInfo.partyIntegralDetailType == 1 ? '加分' : '减分' }} - + +
关闭 @@ -100,7 +98,7 @@ export default { }, mounted() { - this.$dict.load(["integralDeclareDoType","integralDetailType",]).then(() => { + this.$dict.load(["integralDeclareDoType","integralDetailType","partyIntegralDetailType"]).then(() => { this.getList(); }); }, @@ -122,11 +120,11 @@ export default { timeChange() { if (this.searchDotime) { - this.search.doTimeStart = this.searchDotime[0] - this.search.doTimeEnd = this.searchDotime[1] + this.search.startTime = this.searchDotime[0] + this.search.endTime = this.searchDotime[1] } else { - this.search.doTimeStart = null - this.search.doTimeEnd = null + this.search.startTime = null + this.search.endTime = null } this.search.current = 1 this.getList() diff --git a/project/sanjianxi/apps/AppScoreManage/scoreChange.vue b/project/sanjianxi/apps/AppScoreManage/scoreChange.vue index 96be19cc..d1a8b074 100644 --- a/project/sanjianxi/apps/AppScoreManage/scoreChange.vue +++ b/project/sanjianxi/apps/AppScoreManage/scoreChange.vue @@ -7,8 +7,6 @@ 添加 - - + diff --git a/project/sanjianxi/apps/AppScoreRules/components/applyForIntegral.vue b/project/sanjianxi/apps/AppScoreRules/components/applyForIntegral.vue index b9c178d7..2262e5ec 100644 --- a/project/sanjianxi/apps/AppScoreRules/components/applyForIntegral.vue +++ b/project/sanjianxi/apps/AppScoreRules/components/applyForIntegral.vue @@ -162,8 +162,6 @@ export default { search: {status: "", eventName: ""}, page: {current: 1, size: 10, total: 0}, colConfigs: [ - // {prop: "event", label: "事件", dict: "integralRuleEvent", align: "center"}, - // {prop: "type", label: "类型", dict: "integralRuleEventType", align: "center"}, {prop: "eventName", label: "事件名称", dict: "integralRuleEvent", align: "center"}, {prop: "eventDesc", label: "简介", dict: "integralRuleEventType", align: "center"}, {prop: "ruleType", label: "规则", dict: "integralRuleRuleType", align: "center"}, @@ -179,10 +177,10 @@ export default { tableData: [], dialog: false, form: { - classify: 0, + classify: '0', eventName: '', eventDesc: '', - ruleType: 0, + ruleType: '0', scoringCycle: '', numberLimit: '', //奖励次数 integral: '', // 常规 @@ -231,25 +229,14 @@ export default { this.form.ladderIntegral.push({ viewCount: null, integral: null }) }, toEdit(row) { - console.log(row); - this.form = { ...row } - this.form.ruleType = row.ruleType - this.dialog = true - // 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.instance.post(`/app/apppartyintegralrule/queryDetailById?id=${row.id}`).then((res) => { + if(res?.data) { + this.form = res.data + this.form.ladderIntegral = JSON.parse(res.data.ladderRule) + this.form.ruleType = res.data.ruleType + this.dialog = true + } + }) }, close() { @@ -319,8 +306,8 @@ export default { onConfirm(id) { this.$refs.DialogForm.validate((valid) => { 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`, { diff --git a/project/sanjianxi/apps/AppScoreRules/components/automaticallyAddCent.vue b/project/sanjianxi/apps/AppScoreRules/components/automaticallyAddCent.vue index a54cbf24..7c2da998 100644 --- a/project/sanjianxi/apps/AppScoreRules/components/automaticallyAddCent.vue +++ b/project/sanjianxi/apps/AppScoreRules/components/automaticallyAddCent.vue @@ -122,13 +122,19 @@ export default { } }, created() { - this.dict.load("integralRuleStatus", "integralRuleRuleType", 'integralRuleScoringCycle', 'integralRuleEvent', 'integralRuleEventType','partyIntegralRuleEvent','integralRuleEvent4').then(() => { + this.$dict.load("integralRuleStatus", "integralRuleRuleType", 'integralRuleScoringCycle', 'integralRuleEvent', 'integralRuleEventType','partyIntegralRuleEvent','integralRuleEvent4').then(() => { this.getList(); - 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 + + // 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 + }) }) }); },