From 0be49b04327dc31e7924d55eca26607ae27ef099 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 17 Feb 2022 08:54:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppIntegralAudit/AppIntegralAudit.vue     |  6 +-
 src/apps/AppIntegralAudit/detail.vue          | 81 +++++++++----------
 2 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/src/apps/AppIntegralAudit/AppIntegralAudit.vue b/src/apps/AppIntegralAudit/AppIntegralAudit.vue
index 5f8a8d70..7d2f13e3 100644
--- a/src/apps/AppIntegralAudit/AppIntegralAudit.vue
+++ b/src/apps/AppIntegralAudit/AppIntegralAudit.vue
@@ -5,7 +5,7 @@
       <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{item}}<span></span></div>
     </div>
 
-    <!-- 全部 -->
+    <!-- 列表 -->
     <div>
       <div class="search-box" v-if="tabIndex==0">
         <div class="integral-types" @click="showType = true">{{ type? type : '积分类型' }}<u-icon name="arrow-down"></u-icon></div>
@@ -20,7 +20,7 @@
             <div class="time">{{ item.createTime }}</div>
           </div>
           <div class="card-type">
-            <div class="type">{{ $dict.getLabel('integralDeclareStatus',item.auditStatus) }}</div>
+            <div class="type" :style="{color: item.auditStatus==0? '#4181FF':item.auditStatus==1? '#baf07b' : '#dd5347'}">{{ $dict.getLabel('integralDeclareStatus',item.auditStatus) }}</div>
             <div class="num">＋20</div>
           </div>
         </div>
@@ -73,7 +73,7 @@ export default {
         }
       }).then(res => {
         if(res.code==0){
-          this.integralList = res.data.records
+          this.integralList = this.current > 1 ? [...this.integralList, ...res.data.records] : res.data.records
           this.$forceUpdate()
         } 
       })
diff --git a/src/apps/AppIntegralAudit/detail.vue b/src/apps/AppIntegralAudit/detail.vue
index 8e75a6c8..0f310398 100644
--- a/src/apps/AppIntegralAudit/detail.vue
+++ b/src/apps/AppIntegralAudit/detail.vue
@@ -26,42 +26,43 @@
       <div class="result">
         <div>积分审核结果</div>
         <div class="options">
-          <div class="opts-item" :class="!opts? 'current': ''" @click="opts = 0">通过</div>
-          <div class="opts-item" :class="opts? 'current': ''" @click="opts = 1">不通过</div>
+          <div class="opts-item" :class="opts? 'current': ''" @click="opts = 1">通过</div>
+          <div class="opts-item" :class="!opts? 'current': ''" @click="opts = 0">不通过</div>
         </div>
       </div>
 
       <!-- 通过 -->
-      <div class="integral-select" v-if="opts === 0">
-        <div class="integral-item">
+      <div class="integral-select" v-if="opts === 1">
+        <div class="integral-item" @click="isShowType = true">
           <div>积分类别</div>
           <div>
-            <span>请选择</span>
+            
+            <span :style="{color:data.auditIntegralType ? '' : '#999'}">{{ $dict.getLabel('atWillReportType',data.auditIntegralType) || '请选择' }}</span>
             <u-icon name="arrow-right" color="#E1E2E3"/>
           </div>
         </div>
         <div class="integral-item">
           <div>积分事项</div>
           <div>
-            <span>请选择</span>
+            <span :style="{color:data.auditIntegralType ? '' : '#999'}">{{ form.auditIntegralType || '请选择' }}</span>
             <u-icon name="arrow-right" color="#E1E2E3"/>
           </div>
         </div>
         <div class="integral-item last">
-          <div>积分事项</div>
+          <div>积分方式</div>
           <div style="color: #E6736E">+20</div>
         </div>
       </div>
       <!-- 不通过 -->
       <div class="reject" v-else>
         <div>不通过理由</div>
-        <textarea class="reasons" placeholder="请输入不通过理由" :maxlength="200" auto-height height="100"
-                    v-model="reason"></textarea>
-        <div class="tips">{{ reason.length }}/200</div>
+        <textarea class="reasons" placeholder="请输入不通过理由" :maxlength="200" 
+                    v-model="data.auditOpinion"></textarea>
+        <div class="tips">{{ data.auditOpinion.length }}/200</div>
       </div>
 
-      <u-select :list="getList" value-name="value" label-name="label"
-              v-model="isShowType" @confirm="answerChange"></u-select>
+      <u-select :list="$dict.getDict('atWillReportType')" value-name="dictValue" label-name="dictName"
+              v-model="isShowType" @confirm="integralType"></u-select>
       <u-select :list="getList" value-name="dictValue" label-name="dictName"
               v-model="isShowOption" @confirm="pointTypeChange"></u-select>
     </div>
@@ -106,7 +107,7 @@
     </div>
 
     <div style="height: 56px"></div>
-    <div class="saveBtn" v-if="admin === 1">保存</div>
+    <div class="saveBtn" v-if="admin === 1" @click="submit">保存</div>
   </div>
 </template>
 
@@ -116,42 +117,18 @@ export default {
   data () {
     return {
       id: '',
-      data: {
-        files: [],
-      },
       nopass: 1,
       admin: 1,
-      opts: 0,
+      opts: 1,
       isShowType: false,
       isShowOption: false,
       getList: [],
       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",
+      form: {},
+      data: {
+        auditIntegralType: '',
+        auditOpinion: '',
       }
-      
     }
   },
   onLoad(o) {
@@ -164,11 +141,26 @@ export default {
     previewImage() {},
     getDetail() {
       this.$http.post(`/app/appvillagerintegraldeclare/queryDetailById?id=${this.id}`).then(res => {
-        console.log(res);
         if(res.code==0) {
-          this.form = res.data
+          this.form = this.current > 1?  [...this.form, ...res.data] : res.data
+          this.$forceUpdate()
         }
       })
+    },
+    integralType(e) {
+      console.log(e);
+      this.data.auditIntegralType = e[0].label
+    },
+    submit() {
+      this.$http.post('/app/appvillagerintegraldeclare/examine',null,{
+        params: {
+          id: this.id,
+          pass: this.opts,
+          ...this.data
+        }
+      }).then(res=>{
+        console.log(res);
+      })
     }
   },
   onShow() {
@@ -302,6 +294,7 @@ export default {
       .reasons {
         margin-top: 30px;
         width: 100%;
+        height: 200px;
       }
 
       .tips {