From bc1f9ba4cbaf38466bedd935e3aea5e4eff8f3b9 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 29 Jun 2022 10:17:54 +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/components/Detail.vue    | 49 +++++--------------
 .../apps/AppScoreRules/AppScoreRules.vue      | 31 +++++-------
 2 files changed, 25 insertions(+), 55 deletions(-)

diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
index b9b9e0f9..fd537bbd 100644
--- a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
+++ b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
@@ -26,13 +26,16 @@
           <ai-wrapper
               label-width="120px">
             <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>
+                          :value="'+' + (info.auditIntegral >= 0 ? info.auditIntegral : info.auditIntegral) + '分'"></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>
@@ -50,52 +53,24 @@
               <el-radio label="1">是</el-radio>
             </el-radio-group>
           </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: '请输入积分分值' }]">
-            <el-input v-model="num" placeholder="请输入1-10的整数"></el-input>
+            <ai-range v-model="form.num" ref="resetagefoo" />
           </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')"/> -->
+            <!-- <ai-select v-model="form.integralCalcType" :selectList="dict.getDict('integralCalcType')" @select="selectItem"/> -->
           </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-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>
 
diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
index b715e943..875a472a 100644
--- a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
+++ b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
@@ -7,8 +7,6 @@
       <template slot="content">
         <ai-search-bar bottomBorder>
           <template slot="left">
-            <!-- <el-cascader size="small" v-model="search.eventType" placeholder="请选择事件/类型" clearable
-                         :props="{...etOps,checkStrictly:true}" @change="handleTypeSearch" ref="eventTypeSearch"/> -->
             <ai-select
                 v-model="search.status"
                 @change="page.current = 1, getList()"
@@ -63,13 +61,10 @@
 
     <ai-empty v-else>暂无应用权限</ai-empty>
 
-    <ai-dialog :title="dialogTitle" :visible.sync="dialog" @onConfirm="onConfirm" @closed="form={ladderRule: []}" width="800px">
+    <ai-dialog :title="dialogTitle" :visible.sync="dialog" @onConfirm="onConfirm" @closed="form={ladderRule: [],pass: 0}" width="800px">
       <div class="form_div">
         <el-form ref="DialogForm" :model="form" :rules="formRules" size="small" label-suffix="：" label-width="100px">
-          <!-- <el-form-item label="事件/类型" prop="eventType">
-            <el-cascader v-model="form.eventType" :props="etOps" clearable placeholder="请选择" @change="handleTypeForm"
-                         :options="cacheOps"/>
-          </el-form-item> -->
+
           <el-form-item label="事件名称" prop="eventType">
             <el-input v-model="form.name" clearable placeholder="请输入事件名称" type="text" maxlength="30" show-word-limit/>
           </el-form-item>
@@ -78,7 +73,7 @@
           </el-form-item>
 
           <el-form-item label="规则" prop="ruleType" required>
-            <el-radio-group v-model.trim="form.pass" @change="typeChange">
+            <el-radio-group v-model="form.pass" @change="typeChange">
               <el-radio :label="0">常规</el-radio>
               <el-radio :label="1">区间</el-radio>
               <el-radio :label="2">阶梯</el-radio>
@@ -89,17 +84,17 @@
           </el-form-item>
 
           <el-form-item label="奖励次数">
-            <el-input placeholder="请输入,周期范围内,不填写表示不限制" v-model.number="form.numberLimit" clearable/>
+            <el-input placeholder="请输入，周期范围内，不填写表示不限制" v-model.number="form.numberLimit" clearable/>
           </el-form-item>
-
+          <!-- 常规 -->
           <el-form-item label="积分分值" prop="integral" v-if="form.pass == 0">
             <el-input placeholder="请输入" v-model="form.integral" clearable/>
           </el-form-item>
-
+          <!-- 区间 -->
           <el-form-item label="积分分值" prop="integral" v-if="form.pass == 1">
             <ai-range v-model="form.num" ref="resetagefoo" />
           </el-form-item>
-          
+          <!-- 阶梯 -->
           <el-form-item label="积分分值" prop="integral" v-if="form.pass == 2">
             <el-button type="text" @click="innerVisible  = true" style="float: right;">添加</el-button>
             <ai-table :tableData="integralData" :isShowPagination="false" :col-configs="integralConfigs" :dict="dict">
@@ -116,10 +111,10 @@
           <el-dialog width="30%" title="添加积分分值" :visible.sync="innerVisible" append-to-body>
             <el-form ref="innerForm" :model="table" :rules="formRules" size="small" label-suffix="：" label-width="100px">
               <el-form-item label="加分项" prop="integral">
-                <el-input placeholder="请输入" v-model="form.integral" clearable/>
+                <ai-select v-model="form.scoringCycle" :selectList="dict.getDict('integralRuleScoringCycle')"/>
               </el-form-item>
-              <el-form-item label="获得积分" prop="integral">
-                <el-input placeholder="请输入" v-model="form.integral" clearable/>
+              <el-form-item label="获得积分">
+                <el-input placeholder="请输入" v-model="form.integral" disabled/>
               </el-form-item>
             </el-form>
 
@@ -176,8 +171,8 @@ export default {
       search: {status: "", eventType: null},
       page: {current: 1, size: 10, total: 0},
       colConfigs: [
-        {prop: "event", label: "事件", dict: "integralRuleEvent"},
-        {prop: "type", label: "类型", dict: "integralRuleEventType"},
+        {prop: "event", label: "事件名称", dict: "integralRuleEvent"},
+        {prop: "type", label: "简介", dict: "integralRuleEventType"},
         {prop: "ruleType", label: "规则", dict: "integralRuleRuleType"},
         {prop: "scoringCycle", label: "周期范围", dict: "integralRuleScoringCycle"},
         {prop: "status", label: "状态", align: "center", width: 96, dict: "integralRuleStatus"},
@@ -192,7 +187,7 @@ export default {
       dialog: false,
       form: {
         ladderRule: [],
-        pass: '0',
+        pass: 0,
       },
       formRules: {
         eventType: [{required: true, message: "请选择事件/类型", trigger: "change"}],