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] =?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 @@
         <template #content>
           <ai-wrapper
               label-width="120px">
-            <ai-info-item label="申请人" :value="info.residentName"></ai-info-item>
+            <ai-info-item label="申请人" :value="info.partyName"></ai-info-item>
             <ai-info-item label="申请时间" :value="info.createTime"></ai-info-item>
-            <ai-info-item label="积分类型" :value="dict.getLabel('atWillReportType', info.applyIntegralType)"></ai-info-item>
-            <ai-info-item label="规则类型" :value="info.residentName"></ai-info-item>
+            <ai-info-item label="积分类型" :value="info.integralRuleName"></ai-info-item>
+            <ai-info-item label="规则类型">
+            </ai-info-item>
             <ai-info-item label="申请描述" :value="info.description" isLine></ai-info-item>
             <!-- <ai-info-item label="联系电话" isLine :value="info.residentPhone"></ai-info-item> -->
             <ai-info-item label="图片资料" isLine v-show="info.applyFiles">
@@ -112,7 +113,7 @@ export default {
         auditStatus: '0'
       },
       id: '',
-      isShow: true,
+      isShow: false,
       form: {
         auditIntegralType: '',
         auditRuleId: '',
@@ -153,8 +154,8 @@ export default {
 
   methods: {
     getInfo(id) {
-      this.instance.post(`/app/appvillagerintegraldeclare/queryDetailById?id=${id}`).then(res => {
-        if (res.code === 0) {
+      this.instance.post(`/app/apppartyintegraldeclare/queryDetailById?id=${id}`).then(res => {
+        if (res?.data) {
           this.info = res.data
         }
       })
diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/List.vue b/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
index 59f202a1..5952f302 100644
--- a/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
+++ b/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
@@ -111,11 +111,11 @@
         }],
         info: {},
         colConfigs: [
-          { prop: 'residentName', label: '申请人' },
-          { prop: 'residentPhone', align: 'center', label: '联系电话' },
+          { prop: 'partyName', label: '申请人' },
+          { prop: 'partyPhone', align: 'center', label: '联系电话' },
           { prop: 'createTime', align: 'center', label: '申请时间' },
-          { prop: 'applyIntegralType', align: 'center', label: '积分类型', formart: v => this.dict.getLabel('atWillReportType', v) }, 
-          { prop: 'auditStatus', align: 'center', label: '状态', formart: v => v ? this.dict.getLabel('auditStatus', v) : '-' }, 
+          { prop: 'integralRuleName', align: 'center', label: '积分类型', }, 
+          { prop: 'auditStatus', align: 'center', label: '状态', formart: v => v ? this.dict.getLabel('integralDeclareStatus', v) : '-' }, 
           { prop: 'auditUserName', align: 'center', label: '审批人' }, 
           { prop: 'auditTime', align: 'center', label: '审批时间' }
         ],
@@ -140,14 +140,14 @@
       this.disabledLevel = this.user.info.areaList.length - 1
       this.search.areaId = this.user.info.areaId
       this.loading = true
-      this.dict.load(['atWillReportType', 'auditStatus']).then(() => {
+      this.dict.load(['atWillReportType', 'integralDeclareStatus']).then(() => {
         this.getList()
       })
     },
 
     methods: {
       getList () {
-        this.instance.post(`/app/appvillagerintegraldeclare/list`, null, {
+        this.instance.post(`/app/apppartyintegraldeclare/list`, null, {
           params: {
             ...this.search
           }