按钮交互,更新记录

src/views/components/resiInfo.vue

@@ -824,6 +824,43 @@
                               </el-col>
                           </el-row>
                       </el-tab-pane>
+
+                      <el-tab-pane label="更新记录">
+                        <el-table
+                          class="m-table-item"
+                          :data="tableData"
+                          v-loading="tableLoading"
+                          border
+                          style="width: 100%"
+                          :height="tableHeight"
+                          @select-all="selectAll"
+                          @selection-change="selectionChange"
+                        >
+      
+                  <el-table-column
+                    label="序号"
+                    type="index"
+                    fixed="left"
+                    align="left"
+                    width="50"
+                  >
+                   </el-table-column>
+        <el-table-column
+          v-for="item in tableHeader"
+          :key="item.columnName"
+          :prop="item.columnName"
+          :label="item.label"
+          align="left"
+          :show-overflow-tooltip="true"
+          :width="item.width || ''"
+        >
+          <template slot-scope="scope">
+            <span >{{ handleFilterSpan(scope.row, item) }}</span>
+          </template>
+        </el-table-column>
+      
+      </el-table>
+                      </el-tab-pane>
                 </el-tabs>
 
   </div>
@@ -845,6 +882,16 @@ export default {
     resiDetailObj:{},
     activeName:0,
     eduInfoDto:{},
+    tableHeader: [
+        { columnName: "name", label: "变更类型", width: 80 },
+        { columnName: "birthday", label: "原因", width: 150 },
+        { columnName: "gender", label: "变更时间", width: 150 },
+        { columnName: "gridName", label: "变更前" , width: 200 },
+        { columnName: "homeName", label: "变更后" , width: 200 },
+        { columnName: "idNum", label: "操作人", width: 80 },
+        { columnName: "categoryInfo", label: "调整时间", width: 150 },
+        { columnName: "mobile", label: "备注", width: 100 },
+      ],
     hobbyInfoObj:{},
     residentReligionObj:{},
     resiHealthInfonObj:{},//健康

src/views/modules/base/resi.vue

@@ -44,7 +44,13 @@
         <el-col :span="24">
           <el-button
             size="small"
-            class="diy-button--blue"
+            type="primary"
+            @click="handleSearchFrom"
+            >智能查询</el-button
+          >
+          <el-button
+            size="small"
+            type="primary"
             @click="handleSearchFrom"
             >查询</el-button
           >
@@ -52,11 +58,10 @@
           <el-button
             style="margin-left: 10px"
             size="small"
-            class="diy-button--white"
+            plain
+            class=" f-right5"
             @click="resetSearchForm"
-            >重置</el-button
-          >
-          <!-- resetSearchForm -->
+            >重置</el-button>
         </el-col>
       </el-row>
     </div>
@@ -65,10 +70,11 @@
       <div class="div_btn">
         <div class="div_btn_left">
           <el-button
+            style="height:32px;"
             v-if="btnAuths.ic_resi_add"
             size="small"
             @click="handleAdd"
-            class="diy-button--blue"
+            type="primary"
             icon="el-icon-plus"
           >
             新增</el-button
@@ -78,7 +84,7 @@
             style="margin-left: 10px"
             size="small"
             @click="diyExport"
-            class="diy-button--white"
+            plain
             >导出</el-button
           >
 
@@ -120,8 +126,8 @@
             style="margin-left: 10px"
             v-if="btnAuths.ic_resi_batch_del"
             size="small"
+            plain
             @click="deleteBatch"
-            class="diy-button--white"
             >批量删除</el-button
           >
           <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
@@ -212,9 +218,6 @@
                   {{scope.row.categoryInfo.veteranFlag == 1?'退役军人 ':'' }}
                   {{scope.row.categoryInfo.volunteerFlag == 1?'志愿者 ':'' }}
                 </template>
-                <template v-else>
-                    --
-                </template>
             </div>
             <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>