From 5f208c4510299f427d4e797b744a287add74a294 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 20 Jun 2022 14:52:15 +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

---
 .../AppIntegralAudit/components/Detail.vue    | 93 ++++++++++++-------
 .../apps/AppIntegralAudit/components/List.vue |  6 +-
 2 files changed, 61 insertions(+), 38 deletions(-)

diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
index ba3e6bd7..d6c1077c 100644
--- a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
+++ b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
@@ -11,27 +11,28 @@
               label-width="120px">
             <ai-info-item label="申请人" :value="info.residentName"></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="dict.getLabel('atWillReportType', info.applyIntegralType)"></ai-info-item>
+            <ai-info-item label="规则类型" :value="info.residentName"></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>
+            <!-- <ai-info-item label="联系电话" isLine :value="info.residentPhone"></ai-info-item> -->
+            <ai-info-item label="图片资料" isLine v-show="info.applyFiles">
               <ai-uploader v-model="info.applyFiles" disabled></ai-uploader>
             </ai-info-item>
           </ai-wrapper>
         </template>
       </ai-card>
-      <ai-card title="处理结果" v-if="info.auditStatus !== '0'">
+      <ai-card title="审核详情" v-if="info.auditStatus !== '0'">
         <div slot="content" style="margin-top: 16px;margin-bottom:24px">
           <ai-wrapper
               label-width="120px">
-            <ai-info-item label="审核结果" :value="info.auditStatus === '1' ? '通过' : '拒绝'" isLine></ai-info-item>
-            <ai-info-item label="审核意见" v-if="info.auditStatus === '2'" isLine :value="info.auditOpinion"></ai-info-item>
-            <!--            <ai-info-item label="积分规则类别" v-if="info.auditStatus === '1'" :value="dict.getLabel('atWillReportType', info.auditIntegralType)"></ai-info-item>-->
-            <!--            <ai-info-item label="积分规则事项" v-if="info.auditStatus === '1'" :value="info.auditRuleName"></ai-info-item>-->
+            <ai-info-item label="审核结果" :value="info.auditStatus === '1' ? '通过' : '拒绝'"></ai-info-item>
             <ai-info-item label="积分调整" isLine v-if="info.auditStatus === '1'"
                           :value="(info.auditIntegral >= 0 ? info.auditIntegral : info.auditIntegral) + '分'"></ai-info-item>
             <ai-info-item label="审核人" :value="info.auditUserName"></ai-info-item>
             <ai-info-item label="审核时间" :value="info.auditTime"></ai-info-item>
+            <ai-info-item label="审核意见" v-if="info.auditStatus === '2'" isLine :value="info.auditOpinion"></ai-info-item>
+            <!-- <ai-info-item label="积分规则类别" v-if="info.auditStatus === '1'" :value="dict.getLabel('atWillReportType', info.auditIntegralType)"></ai-info-item> -->
+            <!-- <ai-info-item label="积分规则事项" v-if="info.auditStatus === '1'" :value="info.auditRuleName"></ai-info-item> -->
           </ai-wrapper>
         </div>
       </ai-card>
@@ -42,49 +43,71 @@
           title="事件审核"
           @onConfirm="onConfirm">
         <el-form class="ai-form" label-width="120px" :model="form" ref="form">
+
           <el-form-item label="是否通过审核" prop="pass" style="width: 100%;" :rules="[{ required: true, message: '请选择是否通过审核' }]">
             <el-radio-group v-model="form.pass" @change="onStatusChange">
               <el-radio label="0">否</el-radio>
               <el-radio label="1">是</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="form.pass === '1'" label="积分调整" prop="auditIntegral" style="width: 100%;" :rules="[{ required: true, message: '请输入积分调整' }]">
-            <el-input v-model.number="form.auditIntegral" clearable placeholder="请输入积分调整" @keyup.native="form.auditIntegral=Math.abs(form.auditIntegral)"/>
+
+          <el-form-item label="积分分值" prop="pass" style="width: 100%;" :rules="[{ required: true, message: '请输入积分分值' }]">
+            <el-input v-model="num" placeholder="请输入1-10的整数"></el-input>
           </el-form-item>
-          <!--          <el-form-item v-if="form.pass === '1'" label="积分规则类别" prop="auditRuleId" style="width: 100%;" :rules="[{ required: true, message: '' }]">-->
-          <!--            <div class="flex-warpper">-->
-          <!--               <el-form-item  label-width="0" prop="auditIntegralType" :rules="[{ required: true, message: '请选择积分规则类别' }]">-->
-          <!--                <ai-select-->
-          <!--                  v-model="form.auditIntegralType"-->
-          <!--                  clearable-->
-          <!--                  style="width: 180px;"-->
-          <!--                  placeholder="请选择积分规则类别"-->
-          <!--                  :selectList="dict.getDict('atWillReportType')"-->
-          <!--                  @change="onChange">-->
-          <!--                </ai-select>-->
-          <!--               </el-form-item>-->
-          <!--               <el-form-item style="margin: 0 10px;" prop="auditRuleId" :rules="[{ required: true, message: '请选择积分规则事项' }]">-->
-          <!--                <ai-select-->
-          <!--                  v-model="form.auditRuleId"-->
-          <!--                  clearable-->
-          <!--                  style="width: 180px;"-->
-          <!--                  placeholder="请选择积分规则事项"-->
-          <!--                  :selectList="ruleList">-->
-          <!--                </ai-select>-->
-          <!--               </el-form-item>-->
-          <!--              <span>{{ integralText }}</span>-->
-          <!--            </div>-->
-          <!--          </el-form-item>-->
+
+          <el-form-item label="积分分值" prop="pass" style="width: 100%;" :rules="[{ required: true, message: '请输入积分分值' }]">
+            <el-input v-model="num" placeholder="请输入1-10的整数"></el-input>
+          </el-form-item>
+
+          <el-form-item label="加分项" prop="pass" style="width: 100%;" :rules="[{ required: true, message: '请选择加分项' }]">
+            <!-- <ai-select v-model="form.integralCalcType" :selectList="dict.getDict('integralCalcType')"/> -->
+          </el-form-item>
+
+          <el-form-item label="积分分值" prop="pass" style="width: 100%;" :rules="[{ required: true, message: '请输入积分分值' }]">
+            <el-input v-model="num" placeholder="请输入1-10的整数"></el-input>
+          </el-form-item>
+
+          <!-- <el-form-item v-if="form.pass === '1'" label="积分调整" prop="auditIntegral" style="width: 100%;" :rules="[{ required: true, message: '请输入积分调整' }]">
+            <el-input v-model.number="form.auditIntegral" clearable placeholder="请输入积分调整" @keyup.native="form.auditIntegral=Math.abs(form.auditIntegral)"/>
+          </el-form-item> -->
+
+          <!-- <el-form-item v-if="form.pass === '1'" label="积分规则类别" prop="auditRuleId" style="width: 100%;" :rules="[{ required: true, message: '' }]">
+            <div class="flex-warpper">
+              <el-form-item  label-width="0" prop="auditIntegralType" :rules="[{ required: true, message: '请选择积分规则类别' }]">
+                <ai-select
+                  v-model="form.auditIntegralType" clearable
+                  style="width: 180px;"
+                  placeholder="请选择积分规则类别"
+                  :selectList="dict.getDict('atWillReportType')"
+                  @change="onChange">
+                </ai-select>
+              </el-form-item>
+              <el-form-item style="margin: 0 10px;" prop="auditRuleId" :rules="[{ required: true, message: '请选择积分规则事项' }]">
+                <ai-select
+                  v-model="form.auditRuleId"
+                  clearable
+                  style="width: 180px;"
+                  placeholder="请选择积分规则事项"
+                  :selectList="ruleList">
+                </ai-select>
+              </el-form-item>
+              <span>{{ integralText }}</span>
+            </div>
+          </el-form-item> -->
+
           <el-form-item label="审核意见" v-if="form.pass === '0'" prop="opinion" style="width: 100%;" :rules="[{ required: true, message: '请输入审核意见' }]">
             <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
           </el-form-item>
+
         </el-form>
       </ai-dialog>
     </template>
+
     <template #footer v-if="info.auditStatus === '0'">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="isShow = true">审核</el-button>
     </template>
+
   </ai-detail>
 </template>
 
@@ -114,7 +137,7 @@ export default {
         auditStatus: '0'
       },
       id: '',
-      isShow: false,
+      isShow: true,
       form: {
         auditIntegralType: '',
         auditRuleId: '',
diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/List.vue b/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
index c20e9e4e..6cfb0703 100644
--- a/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
+++ b/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
@@ -15,13 +15,13 @@
       <div class="content">
         <ai-search-bar>
           <template #left>
-            <ai-select
+            <!-- <ai-select
               v-model="search.applyIntegralType"
               clearable
               placeholder="请选择积分类型"
               :selectList="dict.getDict('atWillReportType')"
               @change="search.current = 1, getList()">
-            </ai-select>
+            </ai-select> -->
             <ai-select
               v-model="search.auditStatus"
               clearable
@@ -50,7 +50,7 @@
             <el-input
               v-model="search.residentName"
               size="small"
-              placeholder="请输入姓名"
+              placeholder="请输入姓名/事件类型"
               clearable
               v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.residentName = '', getList()"