更新模板

src/layout/common/detailTopInfo.vue

@@ -0,0 +1,50 @@
+<template>
+  <div id="detailTopInfo">
+    <el-row>
+      <el-col :span="24">
+        <el-col :span="20" class="menu">
+          <el-breadcrumb separator-class="el-icon-arrow-right">
+            <el-breadcrumb-item>所在位置：</el-breadcrumb-item>
+            <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+            <el-breadcrumb-item>{{ topTitle }}</el-breadcrumb-item>
+          </el-breadcrumb>
+        </el-col>
+        <span v-if="display === 'block'">
+          <el-col :span="4" class="btn">
+            <el-button>操作按钮</el-button>
+          </el-col>
+        </span>
+        <span v-else> </span>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'detailTopInfo',
+  props: {
+    topTitle: null,
+    display: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+.menu {
+  padding: 14px 0;
+}
+.btn {
+  padding: 5px 0;
+  text-align: right;
+}
+/deep/.btn .el-button {
+  background: red;
+  color: #fff;
+}
+</style>

src/layout/common/searchInfo.vue

@@ -1,12 +1,25 @@
 <template>
   <div id="searchInfo">
     <el-row>
-      <el-col :span="24" class="info">
-        <el-col :span="10" class="input">
-          <el-input placeholder="请输入内容" v-model="input"> </el-input>
+      <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="2" class="btn">
-          <el-button type="primary" icon="el-icon-search" circle></el-button>
+        <el-col :span="4">
+          <span>输入条件：</span>
+          <el-input v-model="search.input" 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>
     </el-row>
@@ -19,7 +32,7 @@ export default {
   props: {},
   components: {},
   data: () => ({
-    input: '',
+    search: {},
   }),
   created() {},
   computed: {},
@@ -28,23 +41,22 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.info {
-  padding: 15px 0;
-}
-.info .input {
-  padding: 6px 0;
+.input {
+  width: 150px;
 }
-.info .btn {
-  text-align: center;
+/deep/.el-input__inner {
+  height: 35px;
+  line-height: 35px;
 }
-
-/deep/.el-button {
+.btnSearch {
+  width: 80px;
+  height: 34px;
+  background: rgba(233, 2, 29, 1);
+  border-radius: 4px;
+  padding: 0;
   color: #fff;
-  background-color: red;
-  border-color: red;
 }
-/deep/.el-input__inner {
-  height: 30px;
-  line-height: 30px;
+.qing {
+  background: rgba(185, 185, 185, 1);
 }
 </style>

src/layout/common/topInfo.vue

@@ -2,18 +2,20 @@
   <div id="topInfo">
     <el-row>
       <el-col :span="24">
-        <el-col :span="22" style="padding: 13px 0px;">
+        <el-col :span="20" class="menu">
           <el-breadcrumb separator-class="el-icon-arrow-right">
+            <el-breadcrumb-item>所在位置：</el-breadcrumb-item>
             <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
             <el-breadcrumb-item>{{ topTitle }}</el-breadcrumb-item>
           </el-breadcrumb>
         </el-col>
-        <el-col :span="2">
-          <span v-if="display === 'block'">
-            <el-button type="text" @click="clickBtn()" icon="el-icon-plus">添加信息</el-button>
-          </span>
-          <span v-else></span>
-        </el-col>
+        <span v-if="display === 'block'">
+          <el-col :span="4" class="btn">
+            <el-button>批量导出</el-button>
+            <el-button @click="add">创建任务</el-button>
+          </el-col>
+        </span>
+        <span v-else> </span>
       </el-col>
     </el-row>
   </div>
@@ -31,11 +33,23 @@ export default {
   created() {},
   computed: {},
   methods: {
-    clickBtn() {
-      this.$emit('clickBtn');
+    add() {
+      this.$emit('add');
     },
   },
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.menu {
+  padding: 14px 0;
+}
+.btn {
+  padding: 5px 0;
+  text-align: right;
+}
+/deep/.btn .el-button {
+  background: red;
+  color: #fff;
+}
+</style>

src/layout/institution/detailInfo.vue

@@ -1,99 +1,155 @@
 <template>
-  <div id="detailInfo">
+  <div id="mainForm">
     <el-row>
-      <el-col :span="24" class="info">
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
-          <el-form-item label="金融机构名称" prop="name">
-            <el-input v-model="ruleForm.name" placeholder="请输入金融机构名称"></el-input>
-          </el-form-item>
-          <el-form-item label="机构logo" prop="logo">
-            <upload :limit="1" :data="ruleForm.logo" type="logo" :url="`/files/teacher/upload`" @upload="uploadSuccess"></upload>
-          </el-form-item>
-          <el-form-item label="机构类型" prop="type">
-            <el-select v-model="ruleForm.type" placeholder="请选择机构类型">
-              <el-option label="能发布债权产品" value="0"></el-option>
-              <el-option label="能发布股权产品" value="1"></el-option>
-              <el-option label="既能发布债权产品又能发布股权产品" value="2"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="融资轮次">
-            <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-select>
-          </el-form-item>
+      <el-col :span="24" class="mainForm">
+        <el-col :span="24" class="top">
+          <span class="shu"></span><span class="title">{{ formTitle }}</span>
+        </el-col>
+        <el-col :span="24" class="form">
+          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+            <el-col :span="24">
+              <el-form-item label="金融机构名称" prop="name">
+                <el-input v-model="ruleForm.name" placeholder="请输入金融机构名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <!-- <el-form-item label="logo" prop="logo">
+                <upload
+                  :limit="1"
+                  :data="ruleForm.logo"
+                  type="logo"
+                  tip="请上传500×500px的图片，大小不超过2M"
+                  :url="`/files/test/upload`"
+                  @upload="uploadSuccess"
+                ></upload>
+              </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-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-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" class="form">
+              <el-form-item label="组织形式">
+                <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-form-item>
+            </el-col>
 
-          <el-form-item label="组织形式">
-            <el-input v-model="ruleForm.form" placeholder="请输入组织形式"></el-input>
-          </el-form-item>
+            <el-col :span="24" class="form">
+              <el-form-item label="办公区域">
+                <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-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-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-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-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" class="form">
+              <el-form-item label="组织机构号码">
+                <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-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-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-form-item>
+            </el-col>
+            <el-col :span="24" class="form">
+              <el-form-item label="实缴资金">
+                <el-input v-model="ruleForm.contributed_capital" placeholder="请输入实缴资金"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" class="form">
+              <el-form-item label="机构简介" prop="introduction">
+                <el-input v-model="ruleForm.introduction" type="textarea" placeholder="请输入机构简介"></el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-form-item label="法定代表人">
-            <el-input v-model="ruleForm.representative" placeholder="请输入组织形式"></el-input>
-          </el-form-item>
-
-          <el-form-item label="办公区域">
-            <el-input v-model="ruleForm.business_addr" placeholder="请输入办公区域"></el-input>
-          </el-form-item>
-          <el-form-item label="注册地址">
-            <el-input v-model="ruleForm.registered_addr" placeholder="请输入注册地址"></el-input>
-          </el-form-item>
-          <el-form-item label="创立时间">
-            <el-input v-model="ruleForm.establish_time" placeholder="请输入创立时间"></el-input>
-          </el-form-item>
-          <el-form-item label="所属行业">
-            <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-select>
-          </el-form-item>
-
-          <el-form-item label="组织机构号码">
-            <el-input v-model="ruleForm.code" placeholder="请输入组织机构号码"></el-input>
-          </el-form-item>
-          <el-form-item label="管理资金规模">
-            <el-input v-model="ruleForm.size" placeholder="请输入管理资金规模"></el-input>
-          </el-form-item>
-          <el-form-item label="注册资本">
-            <el-input v-model="ruleForm.registered_capital" placeholder="请输入注册资本"></el-input>
-          </el-form-item>
-          <el-form-item label="注册资本">
-            <el-input v-model="ruleForm.registered_capital" placeholder="请输入注册资本"></el-input>
-          </el-form-item>
-          <el-form-item label="实缴资金">
-            <el-input v-model="ruleForm.contributed_capital" placeholder="请输入实缴资金"></el-input>
-          </el-form-item>
-          <el-form-item label="机构简介">
-            <span v-if="toDisplay()">
-              <wang-editor :required="isNew" v-model="ruleForm.introduction" placeholder="请输入机构简介"></wang-editor>
-            </span>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
-            <el-button @click="resetForm('ruleForm')">取消</el-button>
-          </el-form-item>
-        </el-form>
+            <el-col :span="24"> </el-col>
+            <el-col :span="24">
+              <el-form-item label="机构类型" prop="type">
+                <el-select v-model="ruleForm.type" placeholder="请选择机构类型">
+                  <el-option label="能发布债权产品" value="0"></el-option>
+                  <el-option label="能发布股权产品" value="1"></el-option>
+                  <el-option label="既能发布债权产品又能发布股权产品" value="2"></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>
+                <el-button @click="resetForm('ruleForm')">取消</el-button>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-col>
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
-import WangEditor from '@/components/wang-editor.vue';
 import upload from '@/components/upload.vue';
 export default {
-  name: 'detailInfo',
+  name: 'mainForm',
   props: {
+    formTitle: null,
     ruleForm: null,
   },
   components: {
-    WangEditor, //富文本
-    upload, //图片
+    upload, //图片上传
   },
   data: () => ({
-    position: null,
-    selectArr: [],
-
     rules: {
-      name: [{ required: true, message: '请输入活动名称', trigger: 'blur' }],
-      logo: [{ required: true, message: '请上传机构logo', trigger: 'blur' }],
+      name1: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+      name2: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+      textarea: [{ required: true, message: '请输入文本框', trigger: 'blur' }],
+      change: [{ required: true, message: '请选择', trigger: 'blur' }],
+      radio: [{ required: true, message: '请选择', trigger: 'blur' }],
+      checkbox: [{ required: true, message: '请选择', trigger: 'blur' }],
+      term: [{ required: true, message: '请选择', trigger: 'blur' }],
+      onDown: [{ required: true, message: '请选择', trigger: 'blur' }],
+      file: [{ required: true, message: '请选择', trigger: 'blur' }],
     },
 
     props: { multiple: true },
@@ -127,50 +183,8 @@ export default {
     value2: [],
   }),
   created() {},
-  computed: {
-    isNew() {
-      return this.$route.query.id === undefined ? true : false;
-    },
-  },
-  watch: {
-    isNew: {
-      handler(val) {},
-      immediate: true,
-    },
-  },
+  computed: {},
   methods: {
-    addSelectList(index) {
-      return [
-        {
-          value: '选项1',
-          label: '选项2',
-        },
-        {
-          value: '选项2',
-          label: '选项2',
-        },
-        {
-          value: '选项3',
-          label: '选项3',
-        },
-      ];
-    },
-    selected(item) {
-      console.log(this.selectArr);
-      if (this.position >= 2 || this.position < 0) {
-      } else {
-        // console.log(item);  // item为当前选中项的对象
-        var nextSelect = this.addSelectList(this.position); //模拟获取下一级选项
-        this.selectList.splice(this.position + 1, this.selectList.length, nextSelect);
-        this.selectArr.splice(this.position + 1, this.selectArr.length);
-      }
-    },
-    toDisplay() {
-      if (this.isNew) return true;
-      else {
-        return !this.loading;
-      }
-    },
     handleChange(value) {
       console.log(value);
     },
@@ -194,12 +208,101 @@ export default {
         this.$set(this.ruleForm, `${type}`, data.uri);
       }
     },
+    clickDown() {},
   },
 };
 </script>
 
 <style lang="less" scoped>
-.info {
-  padding: 0 200px 0 0;
+p {
+  padding: 0;
+  margin: 0;
+}
+.top .shu {
+  float: left;
+  width: 4px;
+  height: 20px;
+  background: rgba(233, 2, 29, 1);
+}
+.top .title {
+  float: left;
+  padding: 0 10px;
+  font-size: 16px;
+  font-family: Source Han Sans SC;
+  font-weight: bold;
+  color: rgba(40, 40, 40, 1);
+}
+/deep/.el-textarea__inner {
+  min-height: 100px !important;
+}
+/deep/.select {
+  width: 632px;
+}
+.selects {
+  width: 473px;
+  margin: 0 15px 0 0;
+}
+/deep/.el-radio__input.is-checked + .el-radio__label {
+  color: #e9021d;
+}
+/deep/.el-radio__input.is-checked .el-radio__inner {
+  border-color: #e9021d;
+  background: #e9021d;
+}
+/deep/.el-checkbox__input.is-checked + .el-checkbox__label {
+  color: #e9021d;
+}
+/deep/.el-checkbox__input.is-checked .el-checkbox__inner,
+.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: #e9021d;
+  border-color: #e9021d;
+}
+/deep/.el-checkbox-button,
+.el-checkbox-button__inner {
+  margin: 0 15px 0 0;
+}
+/deep/.el-checkbox-button__inner {
+  padding: 7px 5px;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button__inner:hover {
+  color: #e9021d;
+}
+/deep/.el-checkbox-button:first-child .el-checkbox-button__inner {
+  border-left: 1px solid #ccc;
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button:last-child .el-checkbox-button__inner {
+  border-radius: 5px;
+}
+/deep/.el-checkbox-button.is-checked .el-checkbox-button__inner {
+  color: #e9021d;
+  background-color: #ffffff;
+  border-color: #e9021d;
+}
+/deep/.el-checkbox-button.is-checked .el-checkbox-button__inner {
+  box-shadow: none;
+}
+/deep/.el-switch.is-checked .el-switch__core {
+  border-color: #e9021d;
+  background-color: #e9021d;
+}
+.clickBtn .el-button {
+  width: 100px;
+  height: 40px;
+  padding: 0;
+  color: #ffffff;
+  background: #b9b9b9;
+  border-radius: 4px;
+  margin: 40px;
+}
+.clickBtn {
+  text-align: center;
+  margin: 40px 0;
+  border-top: 1px solid #ccc;
+}
+.clickBtn .el-button:first-child {
+  background-color: #e9021d;
 }
 </style>

src/layout/institution/newsInfo.vue

@@ -1,38 +1,53 @@
 <template>
-  <div id="newsInfo">
+  <div id="list">
     <el-row>
       <el-col :span="24">
-        <el-table ref="debtTable" :data="debtTable" style="width: 100%" border>
-          <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
-          <el-table-column property="name" label="机构名称" align="center"> </el-table-column>
-          <el-table-column label="机构类型" align="center">
-            <template slot-scope="scope">
-              <span style="margin-left: 10px">{{
-                scope.row.type === '0' ? '发布债权产品' : scope.row.type === '1' ? '发布股权产品' : scope.row.type === '2' ? '发布债权产品和股权产品' : ''
-              }}</span>
-            </template>
-          </el-table-column>
+        <el-col :span="24">
+          <el-table
+            ref="debtTable"
+            :data="debtTable"
+            tooltip-effect="dark"
+            :default-sort="{ prop: 'date', order: 'descending' }"
+            style="width: 100%"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column type="selection" align="center"> </el-table-column>
+            <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
+            <el-table-column property="name" label="机构名称" align="center"> </el-table-column>
+            <el-table-column label="机构类型" align="center">
+              <template slot-scope="scope">
+                <span style="margin-left: 10px">{{
+                  scope.row.type === '0' ? '发布债权产品' : scope.row.type === '1' ? '发布股权产品' : scope.row.type === '2' ? '发布债权产品和股权产品' : ''
+                }}</span>
+              </template>
+            </el-table-column>
 
-          <el-table-column property="profession" label="所属行业" align="center"> </el-table-column>
-          <el-table-column property="representative" label="法定代表人" align="center"> </el-table-column>
+            <el-table-column property="profession" label="所属行业" align="center"> </el-table-column>
+            <el-table-column property="representative" label="法定代表人" align="center"> </el-table-column>
 
-          <el-table-column property="establish_time" label="创立时间" align="center"> </el-table-column>
-          <el-table-column fixed="right" label="操作" align="center">
-            <template slot-scope="scope">
-              <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-edit"></i></el-button>
-              <el-button @click.native.prevent="deleteRow(scope.$index, debtTable)" type="text"><i class="el-icon-delete"></i></el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-col class="page" :span="24">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            layout="total,  prev, pager, next, jumper"
-            :total="total"
-          >
-          </el-pagination>
+            <el-table-column property="establish_time" label="创立时间" align="center"> </el-table-column>
+            <el-table-column label="操作" align="center" width="300px">
+              <template slot-scope="scope">
+                <!-- <el-button @click="handleClick(scope.row)" type="text"><i class="el-icon-edit"></i></el-button>
+                <el-button @click.native.prevent="deleteRow(scope.$index, debtTable)" type="text"><i class="el-icon-delete"></i></el-button> -->
+                <el-button size="mini" type="text" class="edit" icon="el-icon-edit" @click="handleClick(scope.row)"></el-button>
+                <el-button size="mini" type="text" class="delete" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, debtTable)"></el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              :page-sizes="[10, 20, 30, 40]"
+              :page-size="10"
+              background
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total"
+            >
+            </el-pagination>
+          </el-row>
         </el-col>
       </el-col>
     </el-row>
@@ -41,18 +56,21 @@
 
 <script>
 export default {
-  name: 'newsInfo',
+  name: 'list',
   props: {
     debtTable: null,
     total: null,
   },
   components: {},
   data: () => ({
-    currentPage: 1,
+    currentPage: 0,
   }),
   created() {},
   computed: {},
   methods: {
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
     },
@@ -69,4 +87,38 @@ export default {
 };
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+/deep/.el-checkbox__input.is-checked .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: red;
+  border-color: red;
+}
+/deep/.el-table th {
+  background-color: #f5f6fa;
+  padding: 8px 0;
+}
+/deep/.el-table td {
+  padding: 11px 0;
+}
+.other {
+  color: #f36302;
+}
+.view {
+  color: #f36302;
+}
+.edit {
+  color: #2ccc02;
+}
+.delete {
+  color: #e9021d;
+}
+/deep/.el-pagination {
+  padding: 26px 20px;
+}
+/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: red;
+}
+</style>

src/layout/layout-part/menus.vue

@@ -3,7 +3,7 @@
     <el-menu :default-active="thisRouter()" class="el-menu-vertical-demo" :router="false" :default-openeds="defalutMenu" @select="to">
       <el-menu-item index="/"> <i class="el-icon-s-grid"></i>首页 </el-menu-item>
 
-      <el-submenu index="1">
+      <!-- <el-submenu index="1">
         <template v-slot:title>
           <i class="el-icon-s-grid"></i>
           <span>金融数字超市</span>
@@ -12,8 +12,8 @@
           <el-menu-item index="/supermarket/debt">债权产品</el-menu-item>
           <el-menu-item index="/supermarket/stock">股权产品</el-menu-item>
         </el-menu-item-group>
-      </el-submenu>
-      <el-menu-item index="/finance/index"> <i class="el-icon-s-grid"></i>项目融资超市</el-menu-item>
+      </el-submenu> -->
+      <!-- <el-menu-item index="/finance/index"> <i class="el-icon-s-grid"></i>项目融资超市</el-menu-item> -->
 
       <el-submenu index="2">
         <template v-slot:title>
@@ -36,7 +36,7 @@
           <el-menu-item index="/otheruser/index">其他用户</el-menu-item>
         </el-menu-item-group>
       </el-submenu>
-      <el-submenu index="4">
+      <!-- <el-submenu index="4">
         <template v-slot:title>
           <i class="el-icon-s-grid"></i>
           <span>数字延伸服务管理</span>
@@ -45,9 +45,9 @@
           <el-menu-item index="/specialist/index">融资专家</el-menu-item>
           <el-menu-item index="/otheruser/index">其他用户</el-menu-item>
         </el-menu-item-group>
-      </el-submenu>
-      <el-menu-item index="/zhidao/index"> <i class="el-icon-s-grid"></i>指导单位管理</el-menu-item>
-      <el-menu-item index="/news/index"> <i class="el-icon-s-grid"></i>新闻中心内容管理</el-menu-item>
+      </el-submenu> -->
+      <!-- <el-menu-item index="/zhidao/index"> <i class="el-icon-s-grid"></i>指导单位管理</el-menu-item> -->
+      <!-- <el-menu-item index="/news/index"> <i class="el-icon-s-grid"></i>新闻中心内容管理</el-menu-item> -->
       <el-menu-item index="/companyup/index"> <i class="el-icon-s-grid"></i>企业信息管理</el-menu-item>
       <el-menu-item index="/companyidentify/index"> <i class="el-icon-s-grid"></i>企业认证管理</el-menu-item>
       <el-menu-item index="/character/index"> <i class="el-icon-s-grid"></i>角色管理</el-menu-item>

src/views/companyidentify/index.vue

@@ -2,7 +2,7 @@
   <div id="index">
     <el-col :span="24" class="debt">
       <el-col :span="24" class="top">
-        <topInfo :topTitle="topTitle" :display="display"></topInfo>
+        <topInfo :topTitle="topTitle" :display="display" @add="add"></topInfo>
       </el-col>
 
       <el-col :span="24" class="main">

src/views/companyup/detail.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="debt">
         <el-col :span="24" class="top">
-          <topInfo :topTitle="topTitle" :display="display"></topInfo>
+          <topInfo :topTitle="topTitle" :display="display" @add="add"></topInfo>
         </el-col>
         <el-col :span="24" class="main">
           <el-col :span="24" class="back">

src/views/companyuser/index.vue

@@ -1,5 +1,20 @@
 <template>
   <div id="index">
+    <el-row>
+      <el-col :span="24" class="top">
+        <topInfo :topTitle="topTitle" :display="display" @add="add"></topInfo>
+      </el-col>
+      <el-col :span="24" class="main">
+        <el-col :span="24" class="search">
+          <searchInfo></searchInfo>
+        </el-col>
+        <el-col :span="24" class="list">
+          <companyuserList :debtTable="debtTable" @deleteRow="deleteRow"></companyuserList>
+        </el-col>
+      </el-col>
+    </el-row>
+  </div>
+  <!-- <div id="index">
     <el-col :span="24" class="debt">
       <el-col :span="24" class="top">
         <topInfo :topTitle="topTitle" :display="display"></topInfo>
@@ -11,7 +26,7 @@
         <companyuserList :debtTable="debtTable" @deleteRow="deleteRow"></companyuserList>
       </el-col>
     </el-col>
-  </div>
+  </div> -->
 </template>
 
 <script>
@@ -23,6 +38,7 @@ const { mapActions: companyuser } = createNamespacedHelpers('companyuser');
 
 export default {
   name: 'index',
+  display: 'block',
   props: {},
   components: {
     topInfo, //头部导航
@@ -31,7 +47,7 @@ export default {
   },
   data: () => ({
     topTitle: '企业用户',
-    display: 'none',
+    display: 'block',
     debtTable: [
       {
         company_name: '测试企业1',
@@ -60,15 +76,26 @@ export default {
     deleteRow(id) {
       console.log(id);
     },
+    add() {},
   },
 };
 </script>
 
 <style lang="less" scoped>
-.debt {
-  padding: 20px;
-}
 .top {
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  margin: 0 0 10px 0;
+}
+.main {
+  height: 765px;
+  background: #ffffff;
+}
+.search {
+  width: 97%;
+  height: 35px;
+  margin: 20px;
+}
+.list {
+  padding: 0 20px;
 }
 </style>

src/views/institution/detail.vue

@@ -1,17 +1,12 @@
 <template>
   <div id="detail">
     <el-row>
-      <el-col :span="24" class="debt">
+      <el-col :span="24">
         <el-col :span="24" class="top">
-          <topInfo :topTitle="topTitle" :display="display"></topInfo>
+          <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
         </el-col>
         <el-col :span="24" class="main">
-          <el-col :span="24" class="back">
-            <detailTop @goBack="goBack"></detailTop>
-          </el-col>
-          <el-col :span="24" class="info">
-            <detailInfo :ruleForm="ruleForm" @submitForm="submitForm" @resetForm="resetForm"></detailInfo>
-          </el-col>
+          <detailInfo :ruleForm="ruleForm" @submitForm="submitForm" @resetForm="resetForm" :formTitle="formTitle"></detailInfo>
         </el-col>
       </el-col>
     </el-row>
@@ -19,22 +14,22 @@
 </template>
 
 <script>
-import topInfo from '@/layout/common/topInfo.vue';
-import detailTop from '@/layout/common/detailTop.vue';
+import detailTopInfo from '@/layout/common/detailTopInfo.vue';
 import detailInfo from '@/layout/institution/detailInfo.vue';
+
 import { createNamespacedHelpers } from 'vuex';
 const { mapActions } = createNamespacedHelpers('institution');
 export default {
   name: 'detail',
   props: {},
   components: {
-    topInfo, //头部导航
-    detailTop, //返回
-    detailInfo, //提交
+    detailTopInfo, //表单头部按钮
+    detailInfo, //表单内容
   },
   data: () => ({
-    display: 'none',
     topTitle: '金融机构',
+    display: 'block',
+    formTitle: '信息管理',
     ruleForm: {},
   }),
   created() {
@@ -56,7 +51,7 @@ export default {
     submitForm(ruleForm) {
       console.log(ruleForm);
       let res = this.update(this.ruleForm);
-      // this.$router.push({ path: '/financial/index' });
+      this.$router.push({ path: '/institution/index' });
     },
     // 取消
     resetForm() {
@@ -71,18 +66,13 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.debt {
-  padding: 20px;
-}
 .top {
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  margin: 0 0 10px 0;
 }
 .main {
-  border-radius: 10px;
-  margin: 20px 0 0 0;
-  box-shadow: 0 0 3px #666;
-}
-.main .back {
-  padding: 10px 0 10px 15px;
+  min-height: 765px;
+  background: #ffffff;
+  padding: 20px;
 }
 </style>

src/views/institution/index.vue

@@ -1,21 +1,32 @@
 <template>
   <div id="index">
     <el-row>
-      <el-col :span="24" class="debt">
-        <el-col :span="24" class="top">
-          <topInfo :topTitle="topTitle" :display="display"></topInfo>
-        </el-col>
+      <el-col :span="24" class="top">
+        <topInfo :topTitle="topTitle" :display="display" @add="add"></topInfo>
+      </el-col>
+      <el-col :span="24" class="main">
         <el-col :span="24" class="search">
           <searchInfo></searchInfo>
         </el-col>
-        <el-col :span="24" class="main">
+        <el-col :span="24" class="list">
           <newsInfo :debtTable="debtTable" :total="total" @handleClick="handleClick"></newsInfo>
         </el-col>
       </el-col>
     </el-row>
   </div>
+  <!--
+  <template>
+    <div id="index">
+      <el-row
+        <el-col :span="24" class="debt">
+           <el-col :span="24" class="top">  <topInfo :topTitle="topTitle" :display="display"></topInfo> // </el-col> //
+          <el-col :span="24" class="search">  <searchInfo></searchInfo>  </el-col> 
+          <el-col :span="24" class="main">  <newsInfo :debtTable="debtTable" :total="total" @handleClick="handleClick"></newsInfo> // </el-col> //
+        </el-col>
+      </el-row>
+    </div>
+  </template> -->
 </template>
-
 <script>
 import topInfo from '@/layout/common/topInfo.vue';
 import searchInfo from '@/layout/common/searchInfo.vue';
@@ -31,7 +42,8 @@ export default {
     newsInfo, //
   },
   data: () => ({
-    display: 'none',
+    // display: 'none',
+    display: 'block',
     topTitle: '金融机构',
     debtTable: [],
     total: 1,
@@ -75,6 +87,9 @@ export default {
     },
   },
   methods: {
+    add() {
+      // this.$router.push({ path: '/test/detail' });
+    },
     // 修改
     ...mapActions(['query', 'delete']),
     async search({ skip = 0, limit = 10, ...info } = {}) {
@@ -119,10 +134,20 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.debt {
-  padding: 20px;
-}
 .top {
-  border-bottom: 1px solid #ccc;
+  height: 50px;
+  margin: 0 0 10px 0;
+}
+.main {
+  height: 765px;
+  background: #ffffff;
+}
+.search {
+  width: 97%;
+  height: 35px;
+  margin: 20px;
+}
+.list {
+  padding: 0 20px;
 }
 </style>

src/views/otheruser/index.vue

@@ -1,8 +1,22 @@
 <template>
   <div id="index">
-    <el-col :span="24" class="debt">
+    <el-row>
       <el-col :span="24" class="top">
-        <topInfo :topTitle="topTitle" :display="display" @clickBtn="clickBtn"></topInfo>
+        <topInfo :topTitle="topTitle" :display="display" @add="add"></topInfo>
+      </el-col>
+      <el-col :span="24" class="main">
+        <el-col :span="24" class="search">
+          <searchInfo></searchInfo>
+        </el-col>
+        <el-col :span="24" class="list">
+          <otheruserList :debtTable="debtTable" :total="total" @deleteRow="deleteRow" @clickRest="clickRest"></otheruserList>
+        </el-col>
+      </el-col>
+    </el-row>
+
+    <!-- <el-col :span="24" class="debt">
+      <el-col :span="24" class="top">
+        <topInfo :topTitle="topTitle" :display="display" @clickBtn="clickBtn"></otheruserList>
       </el-col>
       <el-col :span="24" class="search">
         <searchInfo></searchInfo>
@@ -10,7 +24,7 @@
       <el-col :span="24" class="main">
         <otheruserList :debtTable="debtTable" :total="total" @deleteRow="deleteRow" @clickRest="clickRest"></otheruserList>
       </el-col>
-    </el-col>
+    </el-col> -->
   </div>
 </template>
 
@@ -50,7 +64,7 @@ export default {
       this.$set(this, `total`, res.total);
     },
     // 添加
-    clickBtn() {
+    add() {
       this.$router.push({ path: '/otheruser/detail' });
     },
     // 删除