Merge remote-tracking branch 'origin/dev' into dev

src/views/system/studentInfo/index.vue

@@ -176,7 +176,21 @@
       </el-table-column>
       <el-table-column label="身份证号" align="center" prop="cardNumber" />
       <el-table-column label="曾用名" align="center" prop="onceName" />
-      <el-table-column label="家庭住址" align="center" prop="homeAddress" />
+      <el-table-column label="家庭住址" align="center" prop="homeAddress">
+        <template slot-scope="scope">
+          <span
+            :title="scope.row.homeAddress"
+            style="
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 3;
+              overflow: hidden;"
+          >
+            {{ scope.row.homeAddress  | ellipsis}}</span
+          >
+        </template>
+      </el-table-column>
+
       <el-table-column
         label="操作"
         align="center"
@@ -891,6 +905,17 @@ export default {
     this.getList();
   },
   methods: {
+      filters: {
+      // 版本号显示12位，超过12位显示...
+      ellipsis: function(homeAddress) {
+        if (!homeAddress) return "";
+        if (homeAddress.length > 15) {
+          return homeAddress.slice(0, 15) + "...";
+        }
+        return homeAddress;
+      }
+    },
+
     cancel2() {
       this.innerVisible3 = false;
       this.addparentlist = {