From 15877d15f4b29d6a15ba103f470c2697d605d63e Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 2 Jun 2022 17:54:06 +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

---
 packages/conv/creditScore/scorePersonal/detail.vue  | 13 +++++++++++--
 .../conv/creditScore/scoreRules/AppScoreRules.vue   |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/conv/creditScore/scorePersonal/detail.vue b/packages/conv/creditScore/scorePersonal/detail.vue
index a895643a..584c780a 100644
--- a/packages/conv/creditScore/scorePersonal/detail.vue
+++ b/packages/conv/creditScore/scorePersonal/detail.vue
@@ -22,8 +22,17 @@
         <template #content>
           <ai-search-bar>
             <template #left>
-              <ai-select v-model="type" placeholder="请选择类型" @change="page.current=1,getList()"
-                         :selectList="dict.getDict('integralDetailType')"/>
+              <ai-select v-model="type" placeholder="请选择类型" @change="page.current=1,getList()" :selectList="dict.getDict('integralDetailType')"/>
+            </template>
+            <template #right>
+              <ai-download
+                :instance="instance"
+                url="/app/appvillagerintegraldetail/export"
+                :disabled="!Boolean(tableData.length)"
+                :params="{residentId:detailInfo.id,type}"
+                fileName="余额变动明细">
+                <el-button type="text" icon="iconfont iconExported">导出</el-button>
+              </ai-download>
             </template>
           </ai-search-bar>
           <ai-table :tableData="tableData" :col-configs="colConfigs"
diff --git a/packages/conv/creditScore/scoreRules/AppScoreRules.vue b/packages/conv/creditScore/scoreRules/AppScoreRules.vue
index 3e2c3f72..98f4eddd 100644
--- a/packages/conv/creditScore/scoreRules/AppScoreRules.vue
+++ b/packages/conv/creditScore/scoreRules/AppScoreRules.vue
@@ -63,7 +63,7 @@
             <el-cascader v-model="form.eventType" :props="etOps" clearable placeholder="请选择" @change="handleTypeForm"
                          :options="cacheOps"/>
           </el-form-item>
-          <el-form-item label="规则" prop="ruleType" v-if="form.ruleType>-1">
+          <el-form-item label="规则" prop="ruleType" v-if="form.ruleType>-1" required>
             <el-row type="flex" justify="space-between">
               <div v-text="dict.getLabel('integralRuleRuleType',form.ruleType)"/>
               <el-button v-if="form.ruleType==1" type="text" icon="iconfont iconAdd"