Merge branch 'lukeyan' of http://8.136.197.230:3000/ZheJiangNingBo/pingAnQiYeWeb into lukeyan

src/views/enterpriseArchives/result.vue

@@ -29,9 +29,18 @@
                     <div class="itemAddress">
                         {{ item.companyAddress }}
                     </div>
+                    <div class="renyuan" v-if="item.resultList.length">
+                        人员：<span v-for="(a, ind) in item.resultList" :key="ind" v-html="a"></span>
+                    </div>
                     <div class="renyuan" v-if="item.legalPerson">
-                        人员：<span v-html="item.legalPerson"></span> &nbsp; 车辆：<span v-html="item.plateNo"></span>
+                        车辆：<span v-html="item.plateNo"></span>
+                    </div>
                 </div>
+                <div class="block">
+                    <el-pagination style="float:right;margin:5px;" class="msg-pagination-container" :background="true"
+                        @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageNum"
+                        :page-sizes="[10]" layout="total, sizes, prev, pager, next, jumper" :total="total1">
+                    </el-pagination>
                 </div>
             </div>
             <div class="resultHistory">
@@ -57,10 +66,12 @@ export default {
         return {
             numList: [],
             totalNum: '',
-            isShow: false,
+            // isShow: false,
             regex: {},
             total1: this.total,
             resultList1: [],
+            pageNum: 1,
+            pageSize: 10,
             historyList1: this.historyList,
             modifiedText: this.searchVal
         }
@@ -92,6 +103,17 @@ export default {
                 return item
             })
         },
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`);
+            this.pageNum = 1;
+            this.pageSize = val;
+            this.showResult(this.modifiedText)
+        },
+        handleCurrentChange(val) {
+            console.log(`当前页: ${val}`);
+            this.pageNum = val;
+            this.showResult(this.modifiedText)
+        },
         goArchives(val) {
             console.log(val, 'val');
             this.$router.push({
@@ -100,18 +122,19 @@ export default {
             })
         },
         showResult(val) {
-            console.log(!val.length, val.length);
-            if (!val.length) {
+            this.modifiedText = val ? val : this.modifiedText
+            //console.log(!val.length, val.length);
+            if (!this.modifiedText.length) {
                 this.$message.warning('请输入要查询的关键词')
                 return
             }
-            this.modifiedText = val
-            searchList({ searchValue: val }).then(res => {
+
+            searchList({ searchValue: this.modifiedText }).then(res => {
                 if (res.total || res.data.length) {
                     this.$set(this, 'resultList1', res.data)
                     console.log(this.resultList1, 'this.resultList1');
                     this.total1 = res.total
-                    this.isShow = true
+                    //this.isShow = true
                     this.gethistoryList()
                     this.checkKeyWords()
                 } else {