diff --git a/src/apps/AppIntegralAudit/AppIntegralAudit.vue b/src/apps/AppIntegralAudit/AppIntegralAudit.vue index 211da132..771482da 100644 --- a/src/apps/AppIntegralAudit/AppIntegralAudit.vue +++ b/src/apps/AppIntegralAudit/AppIntegralAudit.vue @@ -4,12 +4,11 @@
{{item}}
-
@@ -21,7 +20,7 @@
{{ $dict.getLabel('integralDeclareStatus',item.auditStatus) }}
-
+20
+
{{ item.auditIntegral }}
@@ -54,6 +53,10 @@ export default { created() { this.$dict.load('atWillReportType','integralDeclareStatus').then(()=>{ this.getList() + uni.$on('update',()=>{ + this.current = 1 + this.getList() + }) }) }, methods: { @@ -71,10 +74,10 @@ export default { size: 10, description : this.keyword, applyIntegralType: this.applyIntegralType, - auditStatus: this.tabIndex== 0 ? "" : this.tabIndex == 1 ? 0 : this.tabIndex == 2 ? "1|2" : '' + auditType: this.tabIndex== 0 ? "" : this.tabIndex == 1 ? 0 : 1 } }).then(res => { - if(res.code==0){ + if(res?.data){ this.integralList = this.current > 1 ? [...this.integralList, ...res.data.records] : res.data.records this.$forceUpdate() } @@ -86,7 +89,6 @@ export default { }, confirmTypeSelect(e) { - console.log(e); this.type = e[0].label this.applyIntegralType = e[0].value this.current = 1, @@ -95,13 +97,12 @@ export default { }, toDetail(item) { - uni.navigateTo({url: `./detail?id=${item.id}`}) + uni.navigateTo({url: `./detail?id=${item.id}&nopass=${item.auditType}`}) } }, onShow() { document.title = '积分审核' }, - } @@ -186,10 +187,10 @@ export default { color: #999999; .name { - padding: 0 30px; + padding: 0 20px; background: #EEEEEE; border-radius: 24px; - margin-right: 40px; + margin-right: 24px; } } diff --git a/src/apps/AppIntegralAudit/detail.vue b/src/apps/AppIntegralAudit/detail.vue index c1f1f091..b6a8e97a 100644 --- a/src/apps/AppIntegralAudit/detail.vue +++ b/src/apps/AppIntegralAudit/detail.vue @@ -2,8 +2,7 @@
- -
申请人:{{form.corpId}}
+
申请人:{{form.residentName}}
{{ $dict.getLabel('atWillReportType',form.applyIntegralType) }}
@@ -21,8 +20,8 @@
- -
+ +
积分审核结果
@@ -63,51 +62,55 @@ -
- +
-
-
积分审核
-
通过
-
-
+
+
+
积分审核
+
通过
+
积分类别
-
乡村建设类
+
{{ form.auditIntegralType }}
积分事项
-
多字段显示
+
{{ form.auditRuleName }}
积分方式
-
+20
+
{{ form.auditIntegral }}
-
+
+
+
积分审核
+
不通过
+
不通过的理由
-
我村赴黎平参加百村杯篮球赛经费分两阶段分发, 第一阶段为小组循环赛,第二阶段为淘汰赛。第一 其中包括队员球服两套,住宿、饮食
+
{{ form.auditOpinion }}
审核人
-
李维民
+
{{ form.auditUserName }}
审核时间
-
2022-02-18 18:16:27
+
{{ form.auditTime }}
-
保存
+
保存
@@ -118,7 +121,7 @@ export default { return { id: '', nopass: 1, - admin: 1, + auditType: 1, opts: 1, isShowType: false, isShowOption: false, @@ -128,10 +131,9 @@ export default { data: { id: '', auditIntegralType: '', - // auditIntegralName: '', auditOpinion: '', // 不通过理由 ruleName: '', - integral: '' + integral: '', }, typeList: [], } @@ -139,11 +141,17 @@ export default { onLoad(o) { this.$dict.load('atWillReportType','integralDeclareStatus').then(()=>{ this.id = o.id + this.nopass = o.nopass this.getDetail() }) }, methods: { - previewImage() {}, + previewImage(images, img) { + uni.previewImage({ + urls: images.map(v => v.url), + current: img + }) + }, getDetail() { this.$http.post(`/app/appvillagerintegraldeclare/queryDetailById?id=${this.id}`).then(res => { if(res.code==0) { @@ -156,24 +164,26 @@ export default { if(!this.data.auditIntegralType) { return this.$u.toast('请选择积分类别') } else { - this.$http.post(`/app/appvillagerintegralrule/list?current=1&size=10&auditIntegralType=${this.data.auditIntegralType}`).then(res=>{ if(res.code == 0){ this.typeList = res.data.records this.isShowOption=true - // this.data.id = res.data.records.id } }) } }, typeChange(e) { console.log(e); - // this.data.id = e[0].id this.data.ruleName = e[0].label + this.data.id = e[0].value this.data.integral = e[0].value + this.typeList.map((item) => { + if(item.id == e[0].value) { + this.data.integral = item.integral + } + }) }, integralType(e) { - // this.data.auditIntegralName = e[0].label this.data.auditIntegralType = e[0].value }, submit() { @@ -194,13 +204,18 @@ export default { params: { id: this.id, pass: this.opts, - ...this.data + auditRuleId: this.data.id, + auditIntegralType: this.data.auditIntegralType, + auditIntegral: this.data.integral, + opinion: this.data.auditOpinion, + auditRuleName: this.data.ruleName } - }).then(res=>{ - console.log(res); + }).then(()=>{ this.$u.toast('保存成功') - }).catch(err=>{ - console.log(err); + uni.$emit('update') + setTimeout(()=>{ + uni.navigateBack() + },600) }) } }, diff --git a/src/apps/AppVillagersCircle/AppVillagersCircle.vue b/src/apps/AppVillagersCircle/AppVillagersCircle.vue index cfc2c2e5..a4822cd6 100644 --- a/src/apps/AppVillagersCircle/AppVillagersCircle.vue +++ b/src/apps/AppVillagersCircle/AppVillagersCircle.vue @@ -7,28 +7,27 @@
-