更新分页搜索及其整理

src/layout/character/characterList.vue

@@ -29,6 +29,8 @@
             background
             layout="total,  prev, pager, next, jumper"
             :total="total"
+            :page-size="pageSize"
+            
           >
           </el-pagination>
         </el-row>
@@ -47,6 +49,7 @@ export default {
   components: {},
   data: () => ({
     currentPage: 0,
+    pageSize: 10,
   }),
   created() {},
   computed: {},
@@ -57,8 +60,11 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+
+    handleCurrentChange(currentPage) {
+      console.log(currentPage);
+
+      this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
     },
     deleteRow(id) {
       this.$emit('deleteRow', id);

src/layout/common/searchInfo.vue

@@ -2,25 +2,27 @@
   <div id="searchInfo">
     <el-row>
       <el-col :span="24">
-        <el-col :span="5">
-          <span>筛选条件：</span>
-          <el-select v-model="search.region" placeholder="请选择">
-            <el-option label="类型一" value="0"></el-option>
-            <el-option label="类型二" value="1"></el-option>
-          </el-select>
-        </el-col>
-        <el-col :span="4">
-          <span>输入条件：</span>
-          <el-input v-model="search.input" placeholder="请输入" class="input"></el-input>
-        </el-col>
-        <!-- <el-col :span="7">
+        <el-form :model="search" ref="search">
+          <!-- <el-col :span="5">
+            <span>筛选条件：</span>
+
+            <el-select v-model="search.region" placeholder="请选择">
+              <el-option label="类型一" value="0"></el-option>
+              <el-option label="类型二" value="1"></el-option>
+            </el-select>
+          </el-col> -->
+          <el-col :span="4">
+            <span>输入条件：</span>
+            <el-input v-model="search.name" placeholder="请输入名称" class="input"></el-input>
+          </el-col>
+          <!-- <el-col :span="7">
           <span>时间选择：</span>
           <el-date-picker v-model="search.date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
         </el-col> -->
-        <el-col :span="8">
-          <el-button class="btnSearch">查询</el-button>
-          <!-- <el-button class="btnSearch qing">清空</el-button> -->
-        </el-col>
+          <el-col :span="8">
+            <el-button class="btnSearch" @click="resetForm(search)">查询</el-button>
+          </el-col>
+        </el-form>
       </el-col>
     </el-row>
   </div>
@@ -36,7 +38,11 @@ export default {
   }),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    resetForm(search) {
+      this.$emit('sousuo', search);
+    },
+  },
 };
 </script>
 

src/layout/companyidentify/detailInfo.vue

@@ -8,7 +8,6 @@
               <span>{{ ruleForm.status === '0' ? '认证中' : ruleForm.status === '1' ? '认证通过' : '认证失败' }}</span>
             </el-form-item>
           </span>
-
           <el-form-item label="营业执照图片:">
             <el-image :src="ruleForm.business_license"></el-image>
           </el-form-item>

src/layout/companyidentify/newsInfo.vue

@@ -42,6 +42,7 @@
                   background
                   layout="total, prev, pager, next, jumper"
                   :total="total"
+                  :page-size="pageSize"
                 >
                 </el-pagination>
               </el-col>
@@ -78,11 +79,12 @@
               <el-col class="page" :span="24">
                 <el-pagination
                   @size-change="handleSizeChange"
-                  @current-change="handleCurrentChange"
+                  @current-change="handleCurrentChanges"
                   :current-page="currentPage"
                   background
                   layout="total,  prev, pager, next, jumper"
                   :total="totals"
+                  :page-size="pageSize"
                 >
                 </el-pagination>
               </el-col>
@@ -120,11 +122,12 @@
               <el-col class="page" :span="24">
                 <el-pagination
                   @size-change="handleSizeChange"
-                  @current-change="handleCurrentChange"
+                  @current-change="handleCurrentChangess"
                   :current-page="currentPage"
                   background
                   layout="total,  prev, pager, next, jumper"
                   :total="totalss"
+                  :page-size="pageSize"
                 >
                 </el-pagination>
               </el-col>
@@ -151,7 +154,8 @@ export default {
   data: () => ({
     activeName: 'first',
     input: '',
-    currentPage: 1,
+    currentPage: 0,
+    pageSize: 10,
   }),
   created() {},
   computed: {
@@ -166,8 +170,17 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+    handleCurrentChange(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    },
+    handleCurrentChanges(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChanges', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    },
+    handleCurrentChangess(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChangess', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
     },
 
     handleClicks(tab, event) {

src/layout/companyup/newsInfo.vue

@@ -45,6 +45,7 @@
                   background
                   layout="total,  prev, pager, next, jumper"
                   :total="total"
+                  :page-size="pageSize"
                 >
                 </el-pagination>
               </el-col>
@@ -80,11 +81,12 @@
               <el-col class="page" :span="24">
                 <el-pagination
                   @size-change="handleSizeChange"
-                  @current-change="handleCurrentChange"
+                  @current-change="handleCurrentChanges"
                   :current-page="currentPage"
                   background
                   layout="total, prev, pager, next, jumper"
                   :total="totals"
+                  :page-size="pageSize"
                 >
                 </el-pagination>
               </el-col>
@@ -122,11 +124,12 @@
               <el-col class="page" :span="24">
                 <el-pagination
                   @size-change="handleSizeChange"
-                  @current-change="handleCurrentChange"
+                  @current-change="handleCurrentChangess"
                   :current-page="currentPage"
                   background
                   layout="total,  prev, pager, next, jumper"
                   :total="totalss"
+                  :page-size="pageSize"
                 >
                 </el-pagination> </el-col
             ></el-tab-pane>
@@ -153,6 +156,8 @@ export default {
     currentPage: 1,
     activeName: 'first',
     input: '',
+    currentPage: 0,
+    pageSize: 10,
   }),
   created() {},
   computed: {
@@ -167,9 +172,20 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+
+    handleCurrentChange(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    },
+    handleCurrentChanges(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChanges', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    },
+    handleCurrentChangess(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChangess', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
     },
+
     handleClicks(tab, event) {
       console.log(tab, event);
     },

src/layout/companyuser/companyuserList.vue

@@ -18,7 +18,7 @@
             <el-table-column property="phone" label="手机号" align="center"> </el-table-column>
             <el-table-column label="操作" align="center" width="300px">
               <template slot-scope="scope">
-                <el-button @click.native.prevent="deleteRow(scope.$index, debtTable)" type="text"><i class="el-icon-delete"></i></el-button>
+                <el-button class="delete" @click.prevent="deleteRow(scope.row.id)" type="text"><i class="el-icon-delete"></i></el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -30,6 +30,7 @@
               background
               layout="total, prev, pager, next, jumper"
               :total="total"
+              :page-size="pageSize"
             >
             </el-pagination>
           </el-row>
@@ -49,6 +50,7 @@ export default {
   components: {},
   data: () => ({
     currentPage: 0,
+    pageSize: 10,
   }),
   created() {},
   computed: {},
@@ -59,13 +61,17 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+
+    deleteRow(id) {
+      this.$emit('deleteRow', id);
+    },
+    handleCurrentChange(currentPage) {
+      console.log(currentPage);
+      this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
     },
     handleClick(id) {
       console.log(id.id);
       let newid = id.id;
-
       this.$emit('handleClick', newid);
     },
   },

src/layout/institution/detailInfo.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="top">
           <span class="shu"></span><span class="title">{{ formTitle }}</span>
         </el-col>
-        <el-col :span="24" class="form">
+        <el-col :span="24">
           <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
             <el-col :span="24">
               <el-form-item label="金融机构名称" prop="name">
@@ -13,93 +13,85 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <!-- <el-form-item label="logo" prop="logo">
+              <el-form-item label="机构logo" prop="logo">
                 <upload
                   :limit="1"
+                  tip="请上传500×500px的图片，大小不超过2M"
                   :data="ruleForm.logo"
                   type="logo"
-                  tip="请上传500×500px的图片，大小不超过2M"
-                  :url="`/files/test/upload`"
+                  :url="`/files/teacher/upload`"
                   @upload="uploadSuccess"
                 ></upload>
-              </el-form-item> -->
+              </el-form-item>
             </el-col>
-            <el-form-item label="机构logo" prop="logo">
-              <upload
-                :limit="1"
-                tip="请上传500×500px的图片，大小不超过2M"
-                :data="ruleForm.logo"
-                type="logo"
-                :url="`/files/teacher/upload`"
-                @upload="uploadSuccess"
-              ></upload>
-            </el-form-item>
-            <el-col :span="24" class="form">
-              <el-form-item label="融资轮次">
+            <el-col :span="24">
+              <el-form-item label="融资轮次" prop="round">
                 <el-select v-model="ruleForm.round" multiple placeholder="请选择融资轮次">
-                  <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                  <el-option v-for="item in rzlc" :key="item.value" :label="item.name" :value="item.id"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="form">
-              <el-form-item label="组织形式">
+            <el-col :span="24">
+              <el-form-item label="组织形式" prop="form">
                 <el-input v-model="ruleForm.form" placeholder="请输入组织形式"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="form">
-              <el-form-item label="法定代表人">
-                <el-input v-model="ruleForm.representative" placeholder="请输入组织形式"></el-input>
+            <el-col :span="24">
+              <el-form-item label="法定代表人" prop="representative">
+                <el-input v-model="ruleForm.representative" placeholder="请输入法定代表人"></el-input>
               </el-form-item>
             </el-col>
 
-            <el-col :span="24" class="form">
-              <el-form-item label="办公区域">
+            <el-col :span="24">
+              <el-form-item label="办公区域" prop="business_addr">
                 <el-input v-model="ruleForm.business_addr" placeholder="请输入办公区域"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="form">
-              <el-form-item label="注册地址">
+            <el-col :span="24">
+              <el-form-item label="注册地址" prop="registered_addr">
                 <el-input v-model="ruleForm.registered_addr" placeholder="请输入注册地址"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="form">
-              <el-form-item label="创立时间">
+            <el-col :span="24">
+              <el-form-item label="创立时间" prop="establish_time">
                 <el-input v-model="ruleForm.establish_time" placeholder="请输入创立时间"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="form">
-              <el-form-item label="所属行业">
+            <el-col :span="24">
+              <el-form-item label="所属行业" prop="profession">
                 <el-select v-model="ruleForm.profession" multiple placeholder="请选择">
-                  <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+                  <el-option v-for="item in options" :key="item.value" :label="item.name" :value="item.id"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="form">
-              <el-form-item label="组织机构号码">
+            <el-col :span="24">
+              <el-form-item label="组织机构号码" prop="code">
                 <el-input v-model="ruleForm.code" placeholder="请输入组织机构号码"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="form">
-              <el-form-item label="管理资金规模">
-                <el-input v-model="ruleForm.size" placeholder="请输入管理资金规模"></el-input>
+            <el-col :span="24">
+              <el-form-item label="所属地区" prop="belong_addr">
+                <el-input v-model="ruleForm.belong_addr" placeholder="请输入所属地区"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="form">
-              <el-form-item label="注册资本">
-                <el-input v-model="ruleForm.registered_capital" placeholder="请输入注册资本"></el-input>
+
+            <el-col :span="24">
+              <el-form-item label="管理资金规模" prop="size">
+                <el-input v-model="ruleForm.size" placeholder="请输入管理资金规模"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="form">
-              <el-form-item label="注册资本">
+            <el-col :span="24">
+              <el-form-item label="注册资本" prop="registered_capital">
                 <el-input v-model="ruleForm.registered_capital" placeholder="请输入注册资本"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="form">
-              <el-form-item label="实缴资金">
+
+            <el-col :span="24">
+              <el-form-item label="实缴资金" prop="contributed_capital">
                 <el-input v-model="ruleForm.contributed_capital" placeholder="请输入实缴资金"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24" class="form">
+            <el-col :span="24">
               <el-form-item label="机构简介" prop="introduction">
                 <el-input v-model="ruleForm.introduction" type="textarea" placeholder="请输入机构简介"></el-input>
               </el-form-item>
@@ -114,6 +106,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="发布状态" prop="status">
+                <el-select v-model="ruleForm.status" placeholder="请选择发布状态">
+                  <el-option label="草稿" value="0"></el-option>
+                  <el-option label="待审核" value="1"></el-option>
+                  <el-option label="已发布" value="2"></el-option>
+                  <el-option label="已下架" value="3"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
             <el-col :span="24" class="clickBtn">
               <el-form-item>
                 <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
@@ -134,6 +136,8 @@ export default {
   props: {
     formTitle: null,
     ruleForm: null,
+    options: null,
+    rzlc: null,
   },
   components: {
     upload, //图片上传
@@ -141,7 +145,6 @@ export default {
   data: () => ({
     rules: {
       name: [{ required: true, message: '请输入机构名称', trigger: 'blur' }],
-
       type: [{ required: true, message: '请选择机构类型', trigger: 'blur' }],
       profession: [{ required: true, message: '请选择所属行业', trigger: 'blur' }],
       form: [{ required: true, message: '请输人组织形式', trigger: 'blur' }],
@@ -155,10 +158,10 @@ export default {
       size: [{ required: true, message: '请输入管理资金规模', trigger: 'blur' }],
       registered_capital: [{ required: true, message: '请输入注册资本', trigger: 'blur' }],
       introduction: [{ required: true, message: '请输入机构简介', trigger: 'blur' }],
-      size: [{ required: true, message: '请输入管理资金规模', trigger: 'blur' }],
       registered_capital: [{ required: true, message: '请输入注册资本', trigger: 'blur' }],
       contributed_capital: [{ required: true, message: '请输入实缴资金', trigger: 'blur' }],
       status: [{ required: true, message: '请选择发布状态', trigger: 'blur' }],
+      belong_addr: [{ required: true, message: '请输入所属地区', trigger: 'blur' }],
     },
 
     props: { multiple: true },
@@ -166,28 +169,28 @@ export default {
     value: [],
     value: [],
 
-    options: [
-      {
-        value: '选项1',
-        label: '黄金糕',
-      },
-      {
-        value: '选项2',
-        label: '双皮奶',
-      },
-      {
-        value: '选项3',
-        label: '蚵仔煎',
-      },
-      {
-        value: '选项4',
-        label: '龙须面',
-      },
-      {
-        value: '选项5',
-        label: '北京烤鸭',
-      },
-    ],
+    // options: [
+    //   {
+    //     value: '选项1',
+    //     label: '黄金糕',
+    //   },
+    //   {
+    //     value: '选项2',
+    //     label: '双皮奶',
+    //   },
+    //   {
+    //     value: '选项3',
+    //     label: '蚵仔煎',
+    //   },
+    //   {
+    //     value: '选项4',
+    //     label: '龙须面',
+    //   },
+    //   {
+    //     value: '选项5',
+    //     label: '北京烤鸭',
+    //   },
+    // ],
     value1: [],
     value2: [],
   }),

src/layout/institution/newsInfo.vue

@@ -43,6 +43,7 @@
               background
               layout="total, prev, pager, next, jumper"
               :total="total"
+              :page-size="pageSize"
             >
             </el-pagination>
           </el-row>
@@ -64,6 +65,7 @@ export default {
   components: {},
   data: () => ({
     currentPage: 0,
+    pageSize: 10,
   }),
   created() {},
   computed: {},
@@ -74,12 +76,14 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-    },
     deleteRow(id) {
       this.$emit('deleteRow', id);
     },
+    handleCurrentChange(currentPage) {
+      console.log(currentPage);
+
+      this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
+    },
     handleClick(id) {
       console.log(id.id);
       let newid = id.id;

src/layout/layout-part/heads.vue

@@ -6,7 +6,7 @@
           吉林省小微企业金融管理后台
         </el-col>
         <el-col :span="3" class="admin"> </el-col>
-        <el-dialog title="修改密码" :visible.sync="dialogFormVisible">
+        <el-dialog title="修改密码" :visible.sync="dialogFormVisible" style="">
           <el-form :model="form" :rules="rules">
             <el-form-item label="旧密码" :label-width="formLabelWidth" prop="oldpasswd">
               <el-input type="password" v-model="form.oldpasswd" autocomplete="off" placeholder="请输入旧密码"></el-input>
@@ -24,7 +24,7 @@
         </el-dialog>
         <el-col :span="6" class="admin">
           <el-tooltip class="item" effect="dark" content="修改密码" placement="bottom">
-            <el-button type="text" @click="dialogFormVisible = true"><i class="el-icon-share"></i></el-button>
+            <el-button type="text" @click="dialogFormVisible = true"><i class="el-icon-unlock"></i></el-button>
           </el-tooltip>
           <i class="el-icon-user icon"></i>
           <span class="name"> 管理员：{{ user.name }}</span>
@@ -126,4 +126,13 @@ export default {
 .ccc {
   text-align: center;
 }
+/deep/.el-icon-unlock:before {
+  content: '\e6e4';
+  color: #ffffff;
+}
+/deep/.el-dialog {
+  height: 340px;
+
+  width: 33%;
+}
 </style>

src/layout/otheruser/otheruserList.vue

@@ -30,7 +30,7 @@
                 <el-button @click="$router.push({ path: '/otheruser/detail', query: { id: scope.row.id } })" type="text"
                   ><i class="el-icon-edit"></i
                 ></el-button>
-                <el-button @click.prevent="deleteRow(scope.row.id)" type="text"><i class="el-icon-delete"></i></el-button>
+                <el-button class="delete" @click.prevent="deleteRow(scope.row.id)" type="text"><i class="el-icon-delete"></i></el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -42,6 +42,7 @@
               background
               layout="total,  prev, pager, next, jumper"
               :total="total"
+              :page-size="pageSize"
             >
             </el-pagination>
           </el-row>
@@ -61,6 +62,7 @@ export default {
   components: {},
   data: () => ({
     currentPage: 0,
+    pageSize: 10,
   }),
   created() {},
   computed: {},
@@ -77,8 +79,11 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+
+    handleCurrentChange(currentPage) {
+      console.log(currentPage);
+
+      this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
     },
   },
 };

src/layout/region/regionList.vue

@@ -31,6 +31,7 @@
             background
             layout="total,  prev, pager, next, jumper"
             :total="total"
+            :page-size="pageSize"
           >
           </el-pagination>
         </el-row>
@@ -49,6 +50,7 @@ export default {
   components: {},
   data: () => ({
     currentPage: 0,
+    pageSize: 10,
   }),
   created() {},
   computed: {},
@@ -62,8 +64,9 @@ export default {
     deleteRow(id) {
       this.$emit('deleteRow', id);
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+
+    handleCurrentChange(currentPage) {
+      this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
     },
   },
 };

src/store/dictionary.js

@@ -0,0 +1,34 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import _ from 'lodash';
+Vue.use(Vuex);
+const api = {
+  companyuserInfo: `/api/financial/dictionary`,
+};
+const state = () => ({});
+const mutations = {};
+
+const actions = {
+  async query({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.companyuserInfo}`, { skip, limit, ...info });
+    return res;
+  },
+  async fetch({ commit }, payload) {
+    const res = await this.$axios.$get(`${api.companyuserInfo}/${payload}`);
+    return res;
+  },
+  async update({ commit }, { id, ...data }) {
+    const res = await this.$axios.$post(`${api.companyuserInfo}/update/${id}`, data);
+    return res;
+  },
+  async delete({ commit }, payload) {
+    const res = await this.$axios.$delete(`${api.companyuserInfo}/${payload}`);
+    return res;
+  },
+};
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

src/store/index.js

@@ -9,6 +9,7 @@ import character from './character';
 import menurole from './menurole';
 import region from './region';
 import profession from './profession';
+import dictionary from './dictionary';
 import login from './login';
 import * as muta from './user/mutations';
 import * as states from './user/state';
@@ -27,6 +28,7 @@ export default new Vuex.Store({
     region,
     profession,
     login,
+    dictionary,
   },
   state: { ...states },
   mutations: { ...muta },

src/views/character/index.vue

@@ -6,10 +6,10 @@
       </el-col>
       <el-col :span="24" class="main">
         <el-col :span="24" class="search">
-          <searchInfo></searchInfo>
+          <searchInfo @sousuo="sousuo"></searchInfo>
         </el-col>
         <el-col :span="24" class="list">
-          <characterList :total="total" :debtTable="debtTable" @deleteRow="deleteRow"></characterList>
+          <characterList :total="total" @handleCurrentChange="handleCurrentChange" :debtTable="debtTable" @deleteRow="deleteRow"></characterList>
         </el-col>
       </el-col>
     </el-col>
@@ -35,6 +35,8 @@ export default {
     topTitle: '角色管理',
     display: 'bk',
     debtTable: [],
+    skip: '',
+    info: {},
   }),
   created() {
     this.searchInfo();
@@ -43,10 +45,11 @@ export default {
   methods: {
     ...character(['query', 'delete']),
 
-    async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
+    async searchInfo({ skip, limit = 10, ...info } = {}) {
+      info = this.info;
+      skip = this.skip;
       const res = await this.query({ skip, limit, ...info });
       console.log(res.total);
-
       this.$set(this, `debtTable`, res.data);
       this.$set(this, `total`, res.total);
     },
@@ -60,6 +63,16 @@ export default {
       this.$checkRes(res, '删除成功', '删除失败');
       this.searchInfo();
     },
+    async handleCurrentChange({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+
+      this.searchInfo();
+    },
+    async sousuo(search) {
+      console.log(search);
+      this.$set(this, `info`, search);
+      this.searchInfo();
+    },
   },
 };
 </script>

src/views/companyidentify/detail.vue

@@ -108,15 +108,16 @@ export default {
       this.ruleForm.status = 1;
       console.log(this.ruleForm);
       let res = this.update(this.ruleForm);
-      this.$checkRes(res, '发布成功', '发布失败');
+      this.$checkRes(res, '认证成功', '发布失败');
+      this.$router.push({ path: '/companyidentify/index' });
     },
     // 取消
     resetForm(ruleForm) {
       this.ruleForm.status = 2;
       console.log(this.ruleForm);
       let res = this.update(this.ruleForm);
-
-      // this.$router.push({ path: '/companyup/index' });
+      this.$checkRes(res, '认证失败', '发布失败');
+      this.$router.push({ path: '/companyidentify/index' });
     },
     // 返回
     goBack() {

src/views/companyidentify/index.vue

@@ -14,6 +14,9 @@
           @handleClick="handleClick"
           :noshenhetable="noshenhetable"
           :shenheTable="shenheTable"
+          @handleCurrentChange="handleCurrentChange"
+          @handleCurrentChanges="handleCurrentChanges"
+          @handleCurrentChangess="handleCurrentChangess"
         ></newsInfo>
       </el-col>
     </el-col>
@@ -43,30 +46,65 @@ export default {
     total: 0,
     totals: 0,
     totalss: 0,
+    skip: '',
   }),
   created() {
     this.search();
+    this.searchinfo();
+    this.searchinfos();
   },
   computed: {},
 
   methods: {
     ...mapActions(['query', 'delete']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip, limit = 10, ...info } = {}) {
+      let sea = { status: 0 };
+      info = sea;
+      skip = this.skip;
       const res = await this.query({ skip, limit, ...info });
+      console.log(res);
       var weishenhe = res.data.filter(item => item.status === '0');
-      var success = res.data.filter(item => item.status === '1');
-      var shibai = res.data.filter(item => item.status === '2');
       this.$set(this, `debtTable`, weishenhe);
+      this.$set(this, `total`, res.total);
+    },
+
+    async searchinfo({ skip, limit = 10, ...info } = {}) {
+      let sea = { status: 1 };
+      info = sea;
+      skip = this.skip;
+      const res = await this.query({ skip, limit, ...info });
+      var success = res.data.filter(item => item.status === '1');
       this.$set(this, `shenheTable`, success);
+      this.$set(this, `totals`, res.total);
+    },
+
+    async searchinfos({ skip, limit = 10, ...info } = {}) {
+      let sea = { status: 2 };
+      info = sea;
+      skip = this.skip;
+      const res = await this.query({ skip, limit, ...info });
+      var shibai = res.data.filter(item => item.status === '2');
       this.$set(this, `noshenhetable`, shibai);
-      this.$set(this, `total`, weishenhe.length);
-      this.$set(this, `totals`, success.length);
-      this.$set(this, `totalss`, shibai.length);
+      this.$set(this, `totalss`, res.total);
     },
+
     handleClick(newid) {
       console.log(newid);
       this.$router.push({ path: '/companyidentify/detail', query: { id: newid } });
     },
+    async handleCurrentChange({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+      this.search();
+    },
+    async handleCurrentChanges({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+      this.searchinfo();
+    },
+    async handleCurrentChangess({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+
+      this.searchinfos();
+    },
   },
 };
 </script>

src/views/companyup/index.vue

@@ -16,6 +16,9 @@
           @handleClick="handleClick"
           :noshenhetable="noshenhetable"
           :shenheTable="shenheTable"
+          @handleCurrentChange="handleCurrentChange"
+          @handleCurrentChanges="handleCurrentChanges"
+          @handleCurrentChangess="handleCurrentChangess"
         ></newsInfo>
       </el-col>
     </el-col>
@@ -49,27 +52,53 @@ export default {
   }),
   created() {
     this.search();
+    this.searchinfo();
+    this.searchinfos();
   },
   computed: {},
   methods: {
     ...mapActions(['query', 'delete']),
-    async search({ skip = 0, limit = 10, ...info } = {}) {
+    async search({ skip, limit = 10, ...info } = {}) {
+      let status = { status: 0 };
+      info = status;
+      skip = this.skip;
       const res = await this.query({ skip, limit, ...info });
       var weishenhe = res.data.filter(item => item.status === '0');
-      var success = res.data.filter(item => item.status === '1');
-      var shibai = res.data.filter(item => item.status === '2');
-      console.log(shibai);
-      console.log(weishenhe);
-      console.log(success);
-      success.length;
-      this.$set(this, `total`, weishenhe.length);
-      this.$set(this, `totals`, success.length);
-      this.$set(this, `totalss`, shibai.length);
+      this.$set(this, `total`, res.total);
       this.$set(this, `debtTable`, weishenhe);
+    },
+
+    async searchinfo({ skip, limit = 10, ...info } = {}) {
+      let status = { status: 1 };
+      info = status;
+      skip = this.skip;
+      const res = await this.query({ skip, limit, ...info });
+      var success = res.data.filter(item => item.status === '1');
+      this.$set(this, `totals`, res.total);
       this.$set(this, `shenheTable`, success);
-      this.$set(this, `noshenhetable`, shibai);
     },
 
+    async searchinfos({ skip, limit = 10, ...info } = {}) {
+      let status = { status: 2 };
+      info = status;
+      skip = this.skip;
+      const res = await this.query({ skip, limit, ...info });
+      var shibai = res.data.filter(item => item.status === '2');
+      this.$set(this, `totalss`, res.total);
+      this.$set(this, `noshenhetable`, shibai);
+    },
+    async handleCurrentChange({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+      this.search();
+    },
+    async handleCurrentChanges({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+      this.searchinfo();
+    },
+    async handleCurrentChangess({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+      this.searchinfos();
+    },
     // 修改
     handleClick(newid) {
       this.$router.push({ path: '/companyup/detail', query: { id: newid } });

src/views/companyuser/index.vue

@@ -6,10 +6,10 @@
       </el-col>
       <el-col :span="24" class="main">
         <el-col :span="24" class="search">
-          <searchInfo></searchInfo>
+          <searchInfo @sousuo="sousuo"></searchInfo>
         </el-col>
         <el-col :span="24" class="list">
-          <companyuserList :debtTable="debtTable" @deleteRow="deleteRow" :total="total"></companyuserList>
+          <companyuserList @handleCurrentChange="handleCurrentChange" @deleteRow="deleteRow" :debtTable="debtTable" :total="total"></companyuserList>
         </el-col>
       </el-col>
     </el-row>
@@ -36,34 +36,38 @@ export default {
     total: 0,
     topTitle: '企业用户',
     display: 'block',
-    debtTable: [
-      // {
-      //   company_name: '测试企业1',
-      //   institution_name: '推荐单位1',
-      //   phone: '123456789',
-      // },
-      // {
-      //   company_name: '测试企业2',
-      //   institution_name: '推荐单位2',
-      //   phone: '123456789',
-      // },
-    ],
+    debtTable: [],
+    skip: '',
+    info: {},
   }),
   created() {
     this.searchInfo();
   },
   computed: {},
   methods: {
-    ...companyuser(['query']),
-    async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
+    ...companyuser(['query', 'delete']),
+    async searchInfo({ skip, limit = 10, ...info } = {}) {
+      skip = this.skip;
+      info = this.info;
       const res = await this.query({ skip, limit, ...info });
       console.log(res);
       this.$set(this, `debtTable`, res.data);
       this.$set(this, `total`, res.total);
     },
+    async handleCurrentChange({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+      this.searchInfo();
+    },
+    async sousuo(search) {
+      console.log(search);
+      this.$set(this, `info`, search);
+      this.searchInfo();
+    },
     // 删除
-    deleteRow(id) {
-      console.log(id);
+    async deleteRow(id) {
+      const res = await this.delete(id);
+      this.$checkRes(res, '删除成功', '删除失败');
+      this.searchInfo();
     },
     add() {
       this.$router.push({ path: '/companyuser/detail' });

src/views/institution/detail.vue

@@ -6,7 +6,7 @@
           <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
         </el-col>
         <el-col :span="24" class="main">
-          <detailInfo :ruleForm="ruleForm" @submitForm="submitForm" @resetForm="resetForm" :formTitle="formTitle"></detailInfo>
+          <detailInfo :ruleForm="ruleForm" :rzlc="rzlc" :options="options" @submitForm="submitForm" @resetForm="resetForm" :formTitle="formTitle"></detailInfo>
         </el-col>
       </el-col>
     </el-row>
@@ -19,6 +19,7 @@ import detailInfo from '@/layout/institution/detailInfo.vue';
 
 import { createNamespacedHelpers } from 'vuex';
 const { mapActions } = createNamespacedHelpers('institution');
+const { mapActions: Mapdictionary } = createNamespacedHelpers('dictionary');
 export default {
   name: 'detail',
   props: {},
@@ -31,9 +32,12 @@ export default {
     display: 'block',
     formTitle: '信息管理',
     ruleForm: {},
+    options: [],
+    rzlc: [],
   }),
   created() {
     this.search();
+    this.searchinfo();
   },
   computed: {
     id() {
@@ -42,17 +46,27 @@ export default {
   },
   methods: {
     ...mapActions(['query', 'delete', 'fetch', 'update']),
+    ...Mapdictionary({ list: 'query' }),
     async search() {
       const res = await this.fetch(this.id);
       console.log(res.data);
       this.$set(this, `ruleForm`, res.data);
     },
+
+    async searchinfo() {
+      const val = await this.list();
+      console.log(val.data);
+      // var options = res.data.filter(item => item.type === '0');
+      // var rzlc = res.data.filter(item => item.type === '1');
+      this.$set(this, `options`, val.data);
+      this.$set(this, `rzlc`, val.data);
+    },
     // 提交
     submitForm(ruleForm) {
       console.log(ruleForm);
       let res = this.update(this.ruleForm);
       this.$checkRes(res, '修改成功', '修改失败');
-      this.$router.push({ path: '/institution/index' });
+      this.$router.push({ path: '/institution/index/0' });
     },
     // 取消
     resetForm() {

src/views/institution/index.vue

@@ -6,10 +6,18 @@
       </el-col>
       <el-col :span="24" class="main">
         <el-col :span="24" class="search">
-          <searchInfo></searchInfo>
+          <searchInfo @sousuo="sousuo"></searchInfo>
         </el-col>
         <el-col :span="24" class="list">
-          <newsInfo :debtTable="debtTable" @deleteRow="deleteRow" :total="total" :totals="totals" :totalss="totalss" @handleClick="handleClick"></newsInfo>
+          <newsInfo
+            :debtTable="debtTable"
+            @handleCurrentChange="handleCurrentChange"
+            @deleteRow="deleteRow"
+            :total="total"
+            :totals="totals"
+            :totalss="totalss"
+            @handleClick="handleClick"
+          ></newsInfo>
         </el-col>
       </el-col>
     </el-row>
@@ -49,6 +57,9 @@ export default {
     total: 0,
     totals: 0,
     totalss: 0,
+    type: '',
+    skip: '',
+    info: {},
   }),
   created() {
     // this.search();
@@ -74,12 +85,18 @@ export default {
 
         if (oval == 0) {
           console.log('if');
+          this.skip = '';
+          this.info = {};
           this.search();
         } else if (oval == 1) {
+          this.skip = '';
+          this.info = {};
           console.log('elseif');
           this.searchstatus1();
         } else {
           console.log('else');
+          this.skip = '';
+          this.info = {};
           this.searchelse();
         }
       },
@@ -92,18 +109,17 @@ export default {
     add() {
       // this.$router.push({ path: '/test/detail' });
     },
-    // 修改
+
     ...mapActions(['query', 'delete']),
     async search({ skip = 0, limit = 10, ...info } = {}) {
-      console.log(status);
-
+      // console.log(this.info.name);
+      let type = { type: 0, name: this.info.name };
+      this.$set(this, `type`, type.type);
+      skip = this.skip;
+      info = type;
       const res = await this.query({ skip, limit, ...info });
-
-      var weishenhe = res.data.filter(item => item.type === '0');
-      console.log(weishenhe);
-      console.log(weishenhe.length);
-      this.$set(this, `debtTable`, weishenhe);
-      this.$set(this, `total`, weishenhe.length);
+      this.$set(this, `debtTable`, res.data);
+      this.$set(this, `total`, res.total);
     },
 
     async deleteRow(id) {
@@ -112,27 +128,48 @@ export default {
       this.search();
     },
     async searchstatus1({ skip = 0, limit = 10, ...info } = {}) {
-      console.log(status);
-
+      let type = { type: 1, name: this.info.name };
+      this.$set(this, `type`, type.type);
+      info = type;
+      skip = this.skip;
       const res = await this.query({ skip, limit, ...info });
 
-      var weishenhe = res.data.filter(item => item.type === '1');
-      console.log(weishenhe.length);
-      this.$set(this, `debtTable`, weishenhe);
-      this.$set(this, `total`, weishenhe.length);
+      this.$set(this, `debtTable`, res.data);
+      this.$set(this, `total`, res.total);
     },
     async searchelse({ skip = 0, limit = 10, ...info } = {}) {
-      console.log(status);
+      let type = { type: 2, name: this.info.name };
+      this.$set(this, `type`, type.type);
+      skip = this.skip;
+      info = type;
 
       const res = await this.query({ skip, limit, ...info });
-      console.log(res.data);
-      var weishenhe = res.data.filter(item => item.type === '2');
-      console.log(weishenhe);
 
-      this.$set(this, `debtTable`, weishenhe);
-      console.log(weishenhe.length);
+      this.$set(this, `debtTable`, res.data);
 
-      this.$set(this, `total`, weishenhe.length);
+      this.$set(this, `total`, res.total);
+    },
+    async handleCurrentChange({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+      console.log(this.type);
+      if (this.type == 0) {
+        this.search();
+      } else if (this.type == 1) {
+        this.searchstatus1();
+      } else if (this.type == 2) {
+        this.searchelse();
+      }
+    },
+    //搜索
+    async sousuo(search) {
+      this.$set(this, `info`, search);
+      if (this.type == 0) {
+        this.search();
+      } else if (this.type == 1) {
+        this.searchstatus1();
+      } else if (this.type == 2) {
+        this.searchelse();
+      }
     },
     handleClick(newid) {
       this.$router.push({ path: '/institution/detail', query: { id: newid } });

src/views/otheruser/index.vue

@@ -6,10 +6,17 @@
       </el-col>
       <el-col :span="24" class="main">
         <el-col :span="24" class="search">
-          <searchInfo></searchInfo>
+          <searchInfo @sousuo="sousuo"></searchInfo>
         </el-col>
         <el-col :span="24" class="list">
-          <otheruserList :debtTable="debtTable" :total="total" @deleteRow="deleteRow" @clickRest="clickRest"></otheruserList>
+          <otheruserList
+            :debtTable="debtTable"
+            @handleCurrentChange="handleCurrentChange"
+            :search="search"
+            :total="total"
+            @deleteRow="deleteRow"
+            @clickRest="clickRest"
+          ></otheruserList>
         </el-col>
       </el-col>
     </el-row>
@@ -36,6 +43,10 @@ export default {
     display: 'ck',
     debtTable: [],
     total: 0,
+    info: [],
+    search: {},
+    limit: '',
+    skip: '',
   }),
   created() {
     this.searchInfo();
@@ -46,8 +57,10 @@ export default {
     ...character({ userquery: 'query' }),
 
     ...otheruser(['query', 'delete', 'update']),
-    async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
-      const res = await this.query({ skip, limit, ...info });
+    async searchInfo({ skip, limit = 10, ...info } = {}) {
+      skip = this.skip;
+
+      const res = await this.query({ skip, limit, ...(info = this.info) });
       this.$set(this, `debtTable`, res.data);
       this.$set(this, `total`, res.total);
     },
@@ -73,6 +86,19 @@ export default {
         });
       }
     },
+    //搜索
+    async sousuo(search) {
+      console.log(search);
+      this.$set(this, `info`, search);
+      this.searchInfo();
+    },
+    //分页
+
+    async handleCurrentChange({ skip, limit, currentPage }) {
+      this.$set(this, `skip`, skip);
+      this.$set(this, `limit`, limit);
+      this.searchInfo();
+    },
   },
 };
 </script>

src/views/region/index.vue

@@ -6,11 +6,11 @@
       </el-col>
       <el-col :span="24" class="main">
         <el-col :span="24" class="search">
-          <searchInfo></searchInfo>
+          <searchInfo @sousuo="sousuo"></searchInfo>
         </el-col>
 
         <el-col :span="24" class="list">
-          <regionList :debtTable="debtTable" :total="total" @deleteRow="deleteRow"></regionList>
+          <regionList :debtTable="debtTable" @handleCurrentChange="handleCurrentChange" :total="total" @deleteRow="deleteRow"></regionList>
         </el-col>
       </el-col>
     </el-col>
@@ -36,6 +36,7 @@ export default {
     display: 'bck',
     total: 0,
     debtTable: [],
+    info: [],
   }),
   created() {
     this.searchInfo();
@@ -45,7 +46,10 @@ export default {
     ...region(['query', 'delete']),
 
     async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
+      info = this.info;
       const res = await this.query({ skip, limit, ...info });
+      console.log(res.data);
+
       this.$set(this, `debtTable`, res.data);
       this.$set(this, `total`, res.total);
     },
@@ -59,6 +63,17 @@ export default {
       this.$checkRes(res, '删除成功', '删除失败');
       this.searchInfo();
     },
+    //分页
+    async handleCurrentChange({ skip, limit, currentPage }) {
+      const res = await this.query({ skip, limit });
+      this.$set(this, `debtTable`, res.data);
+    },
+    //搜索
+    async sousuo(search) {
+      console.log(search);
+      this.$set(this, `info`, search);
+      this.searchInfo();
+    },
   },
 };
 </script>