From b9337cc06512cde45c7f8870770283598b49a52e Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 25 Jul 2022 10:42:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/policy/personListItem.vue |  6 ++++--
 .../modules/communityService/policy/rule.vue   | 18 +++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/communityService/policy/personListItem.vue b/src/views/modules/communityService/policy/personListItem.vue
index f1246935..225f674a 100644
--- a/src/views/modules/communityService/policy/personListItem.vue
+++ b/src/views/modules/communityService/policy/personListItem.vue
@@ -474,13 +474,15 @@ export default {
       this.exportBtn = true
       this.exportBtnTitle = '正在导出...'
       let params = {
-        ...this.formData
+        ...this.formData,
+        ruleId: this.ruleId,
+        ruleList: this.ruleList
       }
 
 
       await this.$http({
         method: 'POST',
-        url: '/heart/policy/export-resiuser',
+        url: '/data/aggregator/icuser/exportByPolicyRules',
         responseType: 'blob',
         data: params
       })
diff --git a/src/views/modules/communityService/policy/rule.vue b/src/views/modules/communityService/policy/rule.vue
index 2418f363..eae8e671 100644
--- a/src/views/modules/communityService/policy/rule.vue
+++ b/src/views/modules/communityService/policy/rule.vue
@@ -64,7 +64,7 @@
         <div>
 
           <el-select v-if="personItem.colType==='select'||personItem.colType==='radio'||personItem.colType==='checkbox'"
-                     class="item_width_1"
+                     class="item_width_2"
                      v-model="personItem.colVal"
                      size="mini"
                      placeholder="全部">
@@ -76,7 +76,7 @@
             </el-option>
           </el-select>
           <el-input-number v-else-if="personItem.colType==='inputNum'"
-                           class="item_width_1"
+                           class="item_width_2"
                            v-model="personItem.colVal"
                            :min="0"
                            size="mini"
@@ -91,7 +91,7 @@
                           placeholder="开始时间">
           </el-date-picker>
           <el-input v-else
-                    class="item_width_1"
+                    class="item_width_2"
                     size="mini"
                     placeholder="请输入"
                     v-model="personItem.colVal">
@@ -155,7 +155,7 @@
         <div>
 
           <el-select v-if="houseItem.colType==='select'||houseItem.colType==='radio'||houseItem.colType==='checkbox'"
-                     class="item_width_1"
+                     class="item_width_2"
                      v-model="houseItem.colVal"
                      size="mini"
                      placeholder="全部">
@@ -167,7 +167,7 @@
             </el-option>
           </el-select>
           <el-input-number v-else-if="houseItem.colType==='inputNum'"
-                           class="item_width_1"
+                           class="item_width_2"
                            v-model="houseItem.colVal"
                            :min="0"
                            size="mini"
@@ -182,7 +182,7 @@
                           placeholder="开始时间">
           </el-date-picker>
           <el-input v-else
-                    class="item_width_1"
+                    class="item_width_2"
                     size="mini"
                     placeholder="请输入"
                     v-model="houseItem.colVal">
@@ -250,7 +250,7 @@
         <div>
 
           <el-select v-if="staticItem.colType==='select'||staticItem.colType==='radio'||staticItem.colType==='checkbox'"
-                     class="item_width_1"
+                     class="item_width_2"
                      v-model="staticItem.colVal"
                      size="mini"
                      placeholder="全部">
@@ -262,7 +262,7 @@
             </el-option>
           </el-select>
           <el-input-number v-else-if="staticItem.colType==='inputNum'"
-                           class="item_width_1"
+                           class="item_width_2"
                            v-model="staticItem.colVal"
                            :min="0"
                            size="mini"
@@ -276,7 +276,7 @@
                           placeholder="开始时间">
           </el-date-picker>
           <el-input v-else
-                    class="item_width_1"
+                    class="item_width_2"
                     size="mini"
                     placeholder="请输入"
                     v-model="staticItem.colVal">