From fae3f04927b64c09d9a8f8893be9c28bcb8840cd Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Wed, 16 Feb 2022 18:53:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppIntegralAudit/AppIntegralAudit.vue | 109 ++++++++---------- src/apps/AppIntegralAudit/detail.vue | 64 ++++++++-- .../AppVillagersCircle/AppVillagersCircle.vue | 36 ------ src/saas/AppConflictMediation/detail.vue | 1 - 4 files changed, 103 insertions(+), 107 deletions(-) diff --git a/src/apps/AppIntegralAudit/AppIntegralAudit.vue b/src/apps/AppIntegralAudit/AppIntegralAudit.vue index ecc0d481..5f8a8d70 100644 --- a/src/apps/AppIntegralAudit/AppIntegralAudit.vue +++ b/src/apps/AppIntegralAudit/AppIntegralAudit.vue @@ -6,69 +6,31 @@ -
-
-
积分类型
- +
+
+
{{ type? type : '积分类型' }}
+
-
-
-
本人于12月6日在中医院接种第二针…
+
+
+
{{ item.description }}
-
新冠疫苗接种
-
2021-12-06
+
{{ $dict.getLabel('atWillReportType',item.applyIntegralType) }}
+
{{ item.createTime }}
-
审核通过
+
{{ $dict.getLabel('integralDeclareStatus',item.auditStatus) }}
＋20
- + - -
- -
- 待审核 -
-
-
本人于12月6日在中医院接种第二针…
-
-
新冠疫苗接种
-
2021-12-06
-
-
-
审核通过
-
＋20
-
-
-
- -
- - -
- 已审核 -
-
-
本人于12月6日在中医院接种第二针…
-
-
新冠疫苗接种
-
2021-12-06
-
-
-
审核通过
-
＋20
-
-
-
- -
@@ -83,29 +45,60 @@ export default { showType: false, keyword: '', typeList: [], - + current: 1, + integralList: [], + type: '', + applyIntegralType: '', // 积分类型 } }, + created() { + this.$dict.load('atWillReportType','integralDeclareStatus').then(()=>{ + this.getList() + }) + }, methods: { - tabClick(index) { + this.current=1 + this.integralList=[] this.tabIndex = index + this.getList() + }, + + getList() { + this.$http.post('/app/appvillagerintegraldeclare/list',null,{ + params: { + current: 1, + description : this.keyword, + auditStatus: this.tabIndex== 0 ? "" : this.tabIndex == 1 ? 0 : this.tabIndex == 2 ? "1|2" : '' + } + }).then(res => { + if(res.code==0){ + this.integralList = res.data.records + this.$forceUpdate() + } + }) + }, + search() { + this.current = 1, + this.getList() }, confirmTypeSelect(e) { console.log(e); + this.type = e[0].label + this.applyIntegralType = e[0].value + this.current = 1, + this.integralList = [] + this.getList() }, - toDetail() { - uni.navigateTo({url: './detail'}) + toDetail(item) { + uni.navigateTo({url: `./detail?id=${item.id}`}) } }, onShow() { document.title = '积分审核' }, - onLoad() { - // this.$dict.load('yesOrNo') - }, } @@ -155,7 +148,7 @@ export default { box-sizing: border-box; .integral-types { - width: 30%; + width: 45%; } } diff --git a/src/apps/AppIntegralAudit/detail.vue b/src/apps/AppIntegralAudit/detail.vue index f327b9c0..8e75a6c8 100644 --- a/src/apps/AppIntegralAudit/detail.vue +++ b/src/apps/AppIntegralAudit/detail.vue @@ -2,22 +2,22 @@
-
申请人:李毅
-
新冠疫苗接种
+ +
申请人:{{form.corpId}}
+
{{ $dict.getLabel('atWillReportType',form.applyIntegralType) }}
-
2020-05-06 13:45
+
{{ form.createTime }}
- 新港镇三联村 + {{ form.areaId }}
- 经村两委及村篮球队青年商讨决定，我村赴黎平参加百村杯篮球赛经费分两阶段分发，第一阶段为小组循环赛，第二阶段为淘汰赛。 - 第一阶段费用预计一万元整，其中包括队员球服两套，住宿、饮食 + {{ form.description }}
- +
@@ -115,6 +115,7 @@ export default { name: 'detail', data () { return { + id: '', data: { files: [], }, @@ -124,18 +125,56 @@ export default { isShowType: false, isShowOption: false, getList: [], - reason: '' + reason: '', + form: { + uploadUserName: '', + applyIntegralType: '', + areaId: "", + auditIntegral: null, + auditIntegralType: null, + auditOpinion: null, + auditRuleId: null, + auditRuleName: null, + auditStatus: "0", + auditTime: null, + auditUserId: null, + auditUserName: null, + corpId: '', + createTime: "2022-02-16 17:16:18", + createTimeEnd: null, + createTimeStart: null, + description: "是的1", + familyId: null, + familyName: null, + id: "dedaae6e992c4f4c9670a88a726939be", + residentId: "fba455ddf8e9494da93a533e8da57989", + residentName: "陶瑞武", + residentPhone: "15802784240", + } + } }, + onLoad(o) { + this.$dict.load('atWillReportType','integralDeclareStatus').then(()=>{ + this.id = o.id + this.getDetail() + }) + }, methods: { - previewImage() {} + previewImage() {}, + getDetail() { + this.$http.post(`/app/appvillagerintegraldeclare/queryDetailById?id=${this.id}`).then(res => { + console.log(res); + if(res.code==0) { + this.form = res.data + } + }) + } }, onShow() { document.title = '积分审核' }, - onLoad() { - // this.$dict.load('yesOrNo') - }, + } @@ -192,6 +231,7 @@ export default { .detail-text { color: #333333; font-size: 30px; + margin-bottom: 30px; } .detail-img { diff --git a/src/apps/AppVillagersCircle/AppVillagersCircle.vue b/src/apps/AppVillagersCircle/AppVillagersCircle.vue index 1afc8069..cfc2c2e5 100644 --- a/src/apps/AppVillagersCircle/AppVillagersCircle.vue +++ b/src/apps/AppVillagersCircle/AppVillagersCircle.vue @@ -31,42 +31,6 @@
- - -
-
-
-
阳光美丽，空气格外清新
-
-
发布信息
-
美丽庭院
-
2021-12-06
-
-
-
审核通过
-
-
-
- -
- - -
-
-
-
阳光美丽，空气格外清新
-
-
发布信息
-
美丽庭院
-
2021-12-06
-
-
-
审核通过
-
-
-
- -
diff --git a/src/saas/AppConflictMediation/detail.vue b/src/saas/AppConflictMediation/detail.vue index 78d1a2fd..dd9e54ec 100644 --- a/src/saas/AppConflictMediation/detail.vue +++ b/src/saas/AppConflictMediation/detail.vue @@ -139,7 +139,6 @@ export default { }, methods: { transTxt(str){ - console.log(str.split("$")); return str.split("$") },