Merge branch 'master' of http://git.cc-lotus.info/financial_platform/admin-cms

src/layout/common/searchInfo.vue

@@ -18,6 +18,7 @@
 
           <el-col :span="8">
             <el-button class="btnSearch" @click="resetForm(search)">查询</el-button>
+            <el-button class="btnSearch qing" @click="toClear(search)">清空</el-button>
           </el-col>
         </el-form>
       </el-col>
@@ -39,6 +40,9 @@ export default {
     resetForm(search) {
       this.$emit('sousuo', search);
     },
+    toClear() {
+      this.search = {};
+    },
   },
 };
 </script>

src/layout/common/topInfo.vue

@@ -11,12 +11,12 @@
         </el-col>
         <span v-if="display === 'block'">
           <el-col :span="4" class="btn">
-            <el-button>批量导出</el-button>
+            <!-- <el-button>批量导出</el-button> -->
           </el-col>
         </span>
         <span v-else>
           <el-col :span="4" class="btn">
-            <el-button>批量导出</el-button>
+            <!-- <el-button>批量导出</el-button> -->
             <el-button @click="add">创建任务</el-button>
           </el-col>
         </span>

src/layout/companyidentify/detailInfo.vue

@@ -1,8 +1,11 @@
 <template>
   <div id="detailInfo">
     <el-row>
+       <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="140px" class="demo-ruleForm">
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="demo-ruleForm">
           <span v-if="ruleForm.status === '1' || ruleForm.status === '1'">
             <el-form-item label="认证状态:">
               <span>{{ ruleForm.status === '0' ? '认证中' : ruleForm.status === '1' ? '认证通过' : '认证失败' }}</span>
@@ -32,13 +35,13 @@
           <el-form-item label="统一社会信用代码:">
             <el-input v-model="ruleForm.code" disabled></el-input>
           </el-form-item>
-          <el-form-item label="注册资本:">
+          <el-form-item label="注册资本(万):">
             <el-input v-model="ruleForm.registered_capital" disabled></el-input>
           </el-form-item>
-          <el-form-item label="资金总额:">
+          <el-form-item label="资金总额(万):">
             <el-input v-model="ruleForm.total_assets" disabled></el-input>
           </el-form-item>
-          <el-form-item label="营业收入:">
+          <el-form-item label="营业收入(万):">
             <el-input v-model="ruleForm.taking" disabled></el-input>
           </el-form-item>
           <el-form-item label="从业人员数量:">
@@ -105,6 +108,7 @@ export default {
   name: 'detailInfo',
   props: {
     ruleForm: null,
+    formTitle: null,
   },
   components: {},
   data: () => ({
@@ -167,6 +171,20 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+.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);
+}
 .form {
   padding: 0 200px 0 0;
 }

src/layout/companyidentify/newsInfo.vue

@@ -1,138 +1,71 @@
 <template>
   <div id="newsInfo">
     <el-row>
+      <el-col :span="24" class="search">
+        <el-col :span="5">
+          <span>筛选条件：</span>
+          <el-select v-model="search.status" 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-col>
+        <el-col :span="4">
+          <span>输入条件：</span>
+          <el-input v-model="search.company_name" :placeholder="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" @click="toQuery">查询</el-button>
+          <el-button class="btnSearch qing" @click="toClear">清空</el-button>
+        </el-col>
+      </el-col>
       <el-col :span="24">
         <template>
-          <el-tabs v-model="activeName" @tab-click="handleClicks">
-            <el-tab-pane label="认证中" name="first">
-              <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="company_name" label="企业名称" align="center"> </el-table-column>
-                <el-table-column label="状态" align="center">
-                  <template slot-scope="scope">
-                    <span style="margin-left: 10px">{{ scope.row.status === '0' ? '认证中' : scope.row.status === '1' ? '认证成功' : '认证失败' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column property="registered_capital" label="注册资本" align="center"> </el-table-column>
-                <el-table-column property="number" label="从业人员数量" align="center"> </el-table-column>
-                <el-table-column property="taking" label="营业收入" align="center"> </el-table-column>
-                <el-table-column property="type" 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-view"></i></el-button> -->
-                    <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></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"
-                  background
-                  layout="total, prev, pager, next, jumper"
-                  :total="total"
-                  :page-size="pageSize"
-                >
-                </el-pagination>
-              </el-col>
-            </el-tab-pane>
-            <el-tab-pane label="认证成功" name="second">
-              <el-table
-                ref="shenheTable"
-                :data="shenheTable"
-                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
+            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="company_name" label="企业名称" align="center"> </el-table-column>
-                <el-table-column label="状态" align="center">
-                  <template slot-scope="scope">
-                    <span style="margin-left: 10px">{{ scope.row.status === '0' ? '认证中' : scope.row.status === '1' ? '认证成功' : '认证失败' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column property="registered_capital" label="注册资本" align="center"> </el-table-column>
-                <el-table-column property="number" label="从业人员数量" align="center"> </el-table-column>
-                <el-table-column property="taking" label="营业收入" align="center"> </el-table-column>
-                <el-table-column property="type" 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-view"></i></el-button> -->
-                    <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-col class="page" :span="24">
-                <el-pagination
-                  @size-change="handleSizeChange"
-                  @current-change="handleCurrentChanges"
-                  :current-page="currentPage"
-                  background
-                  layout="total,  prev, pager, next, jumper"
-                  :total="totals"
-                  :page-size="pageSize"
-                >
-                </el-pagination>
-              </el-col>
-            </el-tab-pane>
-            <el-tab-pane label="认证失败" name="third">
-              <el-table
-                ref="noshenhetable"
-                :data="noshenhetable"
-                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="company_name" label="企业名称" align="center"> </el-table-column>
+            <el-table-column label="状态" align="center">
+              <template slot-scope="scope">
+                <span style="margin-left: 10px">{{ scope.row.status === '0' ? '认证中' : scope.row.status === '1' ? '认证成功' : '认证失败' }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column property="registered_capital" label="注册资本" align="center"> </el-table-column>
+            <el-table-column property="number" label="从业人员数量" align="center"> </el-table-column>
+            <el-table-column property="taking" label="营业收入" align="center"> </el-table-column>
+            <el-table-column property="type" 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-view"></i></el-button> -->
+                <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
+              </template>
+            </el-table-column>
+          </el-table>
 
-                <el-table-column type="index" label="序号" width="50" align="center"> </el-table-column>
-                <el-table-column property="company_name" label="企业名称" align="center"> </el-table-column>
-                <el-table-column label="状态" align="center">
-                  <template slot-scope="scope">
-                    <span style="margin-left: 10px">{{ scope.row.status === '0' ? '认证中' : scope.row.status === '1' ? '认证成功' : '认证失败' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column property="registered_capital" label="注册资本" align="center"> </el-table-column>
-                <el-table-column property="number" label="从业人员数量" align="center"> </el-table-column>
-                <el-table-column property="taking" label="营业收入" align="center"> </el-table-column>
-                <el-table-column property="type" 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-view"></i></el-button> -->
-                    <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-
-              <el-col class="page" :span="24">
-                <el-pagination
-                  @size-change="handleSizeChange"
-                  @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>
-          </el-tabs>
+          <el-col class="page" :span="24">
+            <el-pagination
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="currentPage"
+              background
+              layout="total,  prev, pager, next, jumper"
+              :total="total"
+              :page-size="pageSize"
+            >
+            </el-pagination>
+          </el-col>
         </template>
       </el-col>
     </el-row>
@@ -144,25 +77,17 @@ export default {
   name: 'newsInfo',
   props: {
     debtTable: null,
-    shenheTable: null,
-    noshenhetable: null,
     total: null,
-    totals: null,
-    totalss: null,
   },
   components: {},
   data: () => ({
-    activeName: 'first',
-    input: '',
+    placeholder: '请输入企业名称',
+    search: {},
     currentPage: 0,
     pageSize: 10,
   }),
   created() {},
-  computed: {
-    status() {
-      return this.$route.params.status;
-    },
-  },
+  computed: {},
   methods: {
     handleSelectionChange(val) {
       this.multipleSelection = val;
@@ -174,23 +99,19 @@ export default {
       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);
-    },
     handleClick(id) {
       let newid = id.id;
 
       this.$emit('handleClick', newid);
     },
+    toQuery() {
+      this.$set(this, `currentPage`, 1);
+      this.$emit('select', { skip: 0, limit: this.limit, ...this.search });
+    },
+    toClear() {
+      let keys = Object.keys(this.search);
+      this.search = {};
+    },
   },
 };
 </script>
@@ -229,4 +150,30 @@ export default {
 /deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
   background-color: red;
 }
+.input {
+  width: 150px;
+}
+
+/deep/ .el-input__inner {
+  height: 35px;
+}
+.search {
+  background: #ffffff;
+  width: 97%;
+  height: 35px;
+  margin: 20px;
+  margin-left: 0px;
+}
+.btnSearch {
+  width: 80px;
+  height: 34px;
+  background: rgba(233, 2, 29, 1);
+  border-radius: 4px;
+  padding: 0;
+  color: #fff;
+}
+
+.qing {
+  background: rgba(185, 185, 185, 1);
+}
 </style>

src/layout/companyup/detailInfo.vue

@@ -1,6 +1,9 @@
 <template>
   <div id="detailInfo">
     <el-row>
+      <el-col :span="24" class="top">
+        <span class="shu"></span><span class="title">{{ formTitle }}</span>
+      </el-col>
       <el-col :span="24">
         <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
           <span v-if="ruleForm.status === '1' || ruleForm.status === '2'">
@@ -54,6 +57,7 @@
 export default {
   name: 'detailInfo',
   props: {
+    formTitle: null,
     ruleForm: null,
     rules: null,
   },
@@ -73,6 +77,20 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.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-button {
   color: #fff;
   background-color: red;

src/layout/companyup/newsInfo.vue

@@ -1,140 +1,73 @@
 <template>
   <div id="newsInfo">
     <el-row>
+      <el-col :span="24" class="search">
+        <el-col :span="5">
+          <span>筛选条件：</span>
+          <el-select v-model="search.status" 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-col>
+        <el-col :span="4">
+          <span>输入条件：</span>
+          <el-input v-model="search.company_name" :placeholder="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" @click="toQuery">查询</el-button>
+          <el-button class="btnSearch qing" @click="toClear">清空</el-button>
+        </el-col>
+      </el-col>
       <el-col :span="24">
-        <template>
-          <el-tabs v-model="activeName" @tab-click="handleClicks">
-            <el-tab-pane label="审核中" name="first">
-              <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="company_name" label="企业名称" align="center"> </el-table-column>
-                <el-table-column label="状态" align="center">
-                  <template slot-scope="scope">
-                    <span style="margin-left: 10px">{{ scope.row.status === '0' ? '审核中' : scope.row.status === '1' ? '审核通过' : '审核拒绝' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column property="contacts" label="融资联系人" align="center"> </el-table-column>
-                <el-table-column property="contact_position" label="联系人职位" align="center"> </el-table-column>
-                <el-table-column property="contact_email" label="联系人邮箱" align="center"> </el-table-column>
-                <el-table-column property="telephone" label="固定电话" align="center"> </el-table-column>
-                <el-table-column label="操作" align="center" width="300px">
-                  <template slot-scope="scope">
-                    <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
-                  </template>
-                </el-table-column>
-                <!-- 
+        <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="company_name" label="企业名称" align="center"> </el-table-column>
+          <el-table-column label="状态" align="center">
+            <template slot-scope="scope">
+              <span style="margin-left: 10px">{{ scope.row.status === '0' ? '审核中' : scope.row.status === '1' ? '审核通过' : '审核拒绝' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column property="contacts" label="融资联系人" align="center"> </el-table-column>
+          <el-table-column property="contact_position" label="联系人职位" align="center"> </el-table-column>
+          <el-table-column property="contact_email" label="联系人邮箱" align="center"> </el-table-column>
+          <el-table-column property="telephone" label="固定电话" align="center"> </el-table-column>
+          <el-table-column label="操作" align="center" width="300px">
+            <template slot-scope="scope">
+              <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
+            </template>
+          </el-table-column>
+          <!-- 
                 <el-table-column label="操作" align="center" width="300px">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" class="view" icon="el-icon-view"></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"
-                  background
-                  layout="total,  prev, pager, next, jumper"
-                  :total="total"
-                  :page-size="pageSize"
-                >
-                </el-pagination>
-              </el-col>
-            </el-tab-pane>
-            <el-tab-pane label="审核通过" name="second">
-              <el-table
-                ref="shenheTable"
-                :data="shenheTable"
-                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="company_name" label="企业名称" align="center"> </el-table-column>
-                <el-table-column label="状态" align="center">
-                  <template slot-scope="scope">
-                    <span style="margin-left: 10px">{{ scope.row.status === '0' ? '审核中' : scope.row.status === '1' ? '审核通过' : '审核拒绝' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column property="contacts" label="融资联系人" align="center"> </el-table-column>
-                <el-table-column property="contact_position" label="联系人职位" align="center"> </el-table-column>
-                <el-table-column property="contact_email" label="联系人邮箱" align="center"> </el-table-column>
-                <el-table-column property="telephone" label="固定电话" align="center"> </el-table-column>
-                <el-table-column label="操作" align="center" width="300px">
-                  <template slot-scope="scope">
-                    <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <el-col class="page" :span="24">
-                <el-pagination
-                  @size-change="handleSizeChange"
-                  @current-change="handleCurrentChanges"
-                  :current-page="currentPage"
-                  background
-                  layout="total, prev, pager, next, jumper"
-                  :total="totals"
-                  :page-size="pageSize"
-                >
-                </el-pagination>
-              </el-col>
-            </el-tab-pane>
-            <el-tab-pane label="审核拒绝" name="third">
-              <el-table
-                ref="noshenhetable"
-                :data="noshenhetable"
-                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="company_name" label="企业名称" align="center"> </el-table-column>
-                <el-table-column label="状态" align="center">
-                  <template slot-scope="scope">
-                    <span style="margin-left: 10px">{{ scope.row.status === '0' ? '审核中' : scope.row.status === '1' ? '审核通过' : '审核拒绝' }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column property="contacts" label="融资联系人" align="center"> </el-table-column>
-                <el-table-column property="contact_position" label="联系人职位" align="center"> </el-table-column>
-                <el-table-column property="contact_email" label="联系人邮箱" align="center"> </el-table-column>
-                <el-table-column property="telephone" label="固定电话" align="center"> </el-table-column>
-
-                <el-table-column label="操作" align="center" width="300px">
-                  <template slot-scope="scope">
-                    <el-button size="mini" type="text" @click="handleClick(scope.row)" class="view" icon="el-icon-view"></el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-
-              <el-col class="page" :span="24">
-                <el-pagination
-                  @size-change="handleSizeChange"
-                  @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>
-          </el-tabs>
-        </template>
+        </el-table>
+        <el-col class="page" :span="24">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            background
+            layout="total,  prev, pager, next, jumper"
+            :total="total"
+            :page-size="pageSize"
+          >
+          </el-pagination>
+        </el-col>
       </el-col>
     </el-row>
   </div>
@@ -145,17 +78,13 @@ export default {
   name: 'newsInfo',
   props: {
     debtTable: null,
-    shenheTable: null,
-    noshenhetable: null,
     total: null,
-    totals: null,
-    totalss: null,
   },
   components: {},
   data: () => ({
+     placeholder: '请输入企业名称',
+    search: {},
     currentPage: 1,
-    activeName: 'first',
-    input: '',
     currentPage: 0,
     pageSize: 10,
   }),
@@ -194,6 +123,14 @@ export default {
 
       this.$emit('handleClick', newid);
     },
+     toQuery() {
+      this.$set(this, `currentPage`, 1);
+      this.$emit('select', { skip: 0, limit: this.limit, ...this.search });
+    },
+    toClear() {
+      let keys = Object.keys(this.search);
+      this.search = {};
+    },
   },
 };
 </script>
@@ -232,4 +169,30 @@ export default {
 /deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
   background-color: red;
 }
+.input {
+  width: 150px;
+}
+
+/deep/ .el-input__inner {
+  height: 35px;
+}
+.search {
+  background: #ffffff;
+  width: 97%;
+  height: 35px;
+  margin: 20px;
+  margin-left: 0px;
+}
+.btnSearch {
+  width: 80px;
+  height: 34px;
+  background: rgba(233, 2, 29, 1);
+  border-radius: 4px;
+  padding: 0;
+  color: #fff;
+}
+
+.qing {
+  background: rgba(185, 185, 185, 1);
+}
 </style>

src/layout/financeclaims/stockDetailInfo.vue

@@ -74,18 +74,18 @@
             </el-col>
 
             <el-col :span="24">
-              <el-form-item label="管理资金规模" prop="size">
+              <el-form-item label="管理资金规模(亿)" prop="size">
                 <el-input v-model="ruleForm.size" placeholder="请输入管理资金规模" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="注册资本" prop="registered_capital">
+              <el-form-item label="注册资本(万)" prop="registered_capital">
                 <el-input v-model="ruleForm.registered_capital" placeholder="请输入注册资本" disabled></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
-              <el-form-item label="实缴资金" prop="contributed_capital">
+              <el-form-item label="实缴资金(万)" prop="contributed_capital">
                 <el-input v-model="ruleForm.contributed_capital" placeholder="请输入实缴资金" disabled></el-input>
               </el-form-item>
             </el-col>

src/layout/institution/detailInfo.vue

@@ -6,7 +6,7 @@
           <span class="shu"></span><span class="title">{{ formTitle }}</span>
         </el-col>
         <el-col :span="24">
-          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+          <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
             <el-col :span="24">
               <el-form-item label="金融机构名称" prop="name">
                 <el-input v-model="ruleForm.name" placeholder="请输入金融机构名称"></el-input>
@@ -85,18 +85,18 @@
             </el-col>
 
             <el-col :span="24">
-              <el-form-item label="管理资金规模" prop="size">
+              <el-form-item label="管理资金规模(亿)" prop="size">
                 <el-input v-model="ruleForm.size" placeholder="请输入管理资金规模"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="注册资本" prop="registered_capital">
+              <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">
-              <el-form-item label="实缴资金" prop="contributed_capital">
+              <el-form-item label="实缴资金(万)" prop="contributed_capital">
                 <el-input v-model="ruleForm.contributed_capital" placeholder="请输入实缴资金"></el-input>
               </el-form-item>
             </el-col>
@@ -136,6 +136,9 @@ export default {
       name: [{ required: true, message: '请输入机构名称', trigger: 'blur' }],
       type: [{ required: true, message: '请选择机构类型', trigger: 'blur' }],
       logo: [{ required: true, message: '请上传机构logo', trigger: 'blur' }],
+      size: [{ pattern: /^\+?[1-9]\d*$/, message: '请输入大于0的正整数' }],
+      registered_capital: [{ pattern: /^\+?[1-9]\d*$/, message: '请输入大于0的正整数' }],
+      contributed_capital: [{ pattern: /^\+?[1-9]\d*$/, message: '请输入大于0的正整数' }],
       // profession: [{ required: true, message: '请选择所属行业', trigger: 'blur' }],
       // form: [{ required: true, message: '请输人组织形式', trigger: 'blur' }],
       // round: [{ required: true, message: '请选择融资轮次', trigger: 'blur' }],

src/layout/region/regionForm.vue

@@ -9,12 +9,12 @@
           <el-form-item label="地区名称" prop="name">
             <el-input v-model="ruleForm.name" placeholder="请输入地区名称"></el-input>
           </el-form-item>
-          <el-form-item label="路径" prop="url">
-            <el-input v-model="ruleForm.url" placeholder="请输入路径"></el-input>
-          </el-form-item>
           <el-form-item label="排序" prop="order">
             <el-input v-model="ruleForm.order" placeholder="请输入排序"></el-input>
           </el-form-item>
+          <el-form-item label="路径" prop="url">
+            <el-input v-model="ruleForm.url" placeholder="请输入路径"></el-input>
+          </el-form-item>
 
           <el-col :span="24" class="clickBtn">
             <el-form-item>
@@ -40,7 +40,7 @@ export default {
   data: () => ({
     rules: {
       name: [{ required: true, message: '请输入地区名称', trigger: 'blur' }],
-      url: [{ required: true, message: '请输入路径', trigger: 'blur' }],
+      order: [{ required: true, message: '请输入排序', trigger: 'blur' }],
     },
   }),
   created() {},

src/layout/tDeclarationApproval/tDeclarationApprovalList.vue

@@ -9,8 +9,8 @@
             <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="10"></el-option>
-            <el-option label="停用" value="-1"></el-option>
+            <el-option label="完成" value="9"></el-option>
+            <el-option label="停用" value="3"></el-option>
           </el-select>
         </el-col>
           <el-col :span="4">
@@ -66,9 +66,9 @@
             <el-table-column property="current_approval" label="审核人" align="center"> </el-table-column>
             <el-table-column label="操作" align="center" width="300px">
               <template slot-scope="scope">
-                <!--<el-button size="mini" type="text" class="other" @click="updateState(scope.row,'10')" v-if="scope.row.current_state === '1'">完成</el-button>
+                <!--<el-button size="mini" type="text" class="other" @click="updateState(scope.row,'9')" v-if="scope.row.current_state === '1'">完成</el-button>
                 <el-button size="mini" type="text" class="other" @click="updateState(scope.row,'-2')" v-if="scope.row.current_state === '0'">审核</el-button>
-                <el-button size="mini" type="text" class="other" @click="updateState(scope.row,'-1')">停用</el-button>-->
+                <el-button size="mini" type="text" class="other" @click="updateState(scope.row,'3')">停用</el-button>-->
                 <el-button size="mini" type="text" class="view" icon="el-icon-view"
                            @click="$router.push({ path: '/tDeclarationApproval/detail', query: { id: scope.row.id } })"></el-button>
                 <!--<el-button size="mini" type="text" class="edit" icon="el-icon-edit"
@@ -201,13 +201,13 @@
             break;
           case '2':
             break;
-          case '-1':
+          case '3':
             this.$emit('updateState', {id:this.tempId,state:this.tempState,result:this.input,skip: (this.currentPage - 1) * this.limit, limit: this.limit, ...this.search});
             break;
           case '-2':
             this.$emit('updateState', {id:this.tempId,state:'1',result:this.input,skip: (this.currentPage - 1) * this.limit, limit: this.limit, ...this.search});
             break;
-          case '10':
+          case '9':
             this.$emit('updateState', {id:this.tempId,state:this.tempState,result:this.input,skip: (this.currentPage - 1) * this.limit, limit: this.limit, ...this.search});
             break;
         }
@@ -222,12 +222,12 @@
             break;
           case '2':
             break;
-          case '-1':
+          case '3':
             break;
           case '-2':
             this.$emit('updateState', {id:this.tempId,state:'2',result:this.input,skip: (this.currentPage - 1) * this.limit, limit: this.limit, ...this.search});
             break;
-          case '10':
+          case '9':
             break;
         }
       },
@@ -242,7 +242,7 @@
             break;
           case '2':
             break;
-          case '-1':
+          case '3':
             if(row.current_state === state){
               this.$message.error('已停用');
             }else{
@@ -256,7 +256,7 @@
             this.$set(this, `cancel`, '审核拒绝');
             this.$set(this, `dialogFormVisible`, true);
             break;
-          case '10':
+          case '9':
             this.$set(this, `confirm`, '完成');
             this.$set(this, `cancel`, '取消');
             this.$set(this, `dialogFormVisible`, true);
@@ -272,9 +272,9 @@
             return '审核通过';
           case '2':
             return '审核拒绝';
-          case '10':
+          case '9':
             return '完成';
-          case '-1':
+          case '3':
             return '停用';
         }
       },

src/views/banner/detail.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="debt">
         <el-col :span="24" class="top">
-          <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
+          <detailTopInfo :topTitle="topTitle" :display="display" @goBack="goBack"></detailTopInfo>
         </el-col>
         <el-col :span="24" class="main">
           <el-col :span="24" class="info">
@@ -16,8 +16,7 @@
 </template>
 
 <script>
-import detailTopInfo from '@/layout/common/detailTopInfo.vue';
-import detailTop from '@/layout/common/detailTop.vue';
+import detailTopInfo from '@/layout/custom/detailTopInfo.vue';
 import bannerForm from '@/layout/banner/bannerForm.vue';
 import { createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: banner } = createNamespacedHelpers('banner');
@@ -26,13 +25,12 @@ export default {
   props: {},
   components: {
     detailTopInfo, //头部导航
-
     bannerForm, //添加其他用户
   },
   data: () => ({
     display: 'block',
     topTitle: '首页轮播管理',
-    formTitle: '首页轮播图',
+    formTitle: '首页轮播信息',
     ruleForm: {
       passwd: '123456',
       roles: [],

src/views/character/detail.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="debt">
         <el-col :span="24" class="top">
-          <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
+          <detailTopInfo :topTitle="topTitle" :display="display" @goBack="goBack"></detailTopInfo>
         </el-col>
         <el-col :span="24" class="main">
           <el-col :span="24" class="info">
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import detailTopInfo from '@/layout/common/detailTopInfo.vue';
+import detailTopInfo from '@/layout/custom/detailTopInfo.vue';
 import characterForm from '@/layout/character/characterForm.vue';
 import { createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: character } = createNamespacedHelpers('character');
@@ -29,9 +29,9 @@ export default {
     detailTopInfo,
   },
   data: () => ({
-    formTitle: '角色管理',
+    formTitle: '角色信息',
     display: 'block',
-    topTitle: '用户信息管理',
+    topTitle: '角色信息管理',
     ruleForm: {
       passwd: '123456',
       roles: [],

src/views/companyidentify/detail.vue

@@ -3,14 +3,11 @@
     <el-row>
       <el-col :span="24" class="debt">
         <el-col :span="24" class="top">
-          <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
+          <detailTopInfo :topTitle="topTitle" :display="display" @goBack="goBack"></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>
+            <detailInfo :ruleForm="ruleForm" @submitForm="submitForm" @resetForm="resetForm" :formTitle="formTitle"></detailInfo>
           </el-col>
         </el-col>
       </el-col>
@@ -19,8 +16,7 @@
 </template>
 
 <script>
-import detailTopInfo from '@/layout/common/detailTopInfo.vue';
-import detailTop from '@/layout/common/detailTop.vue';
+import detailTopInfo from '@/layout/custom/detailTopInfo.vue';
 import detailInfo from '@/layout/companyidentify/detailInfo.vue';
 import { createNamespacedHelpers } from 'vuex';
 const { mapActions: companyidentify } = createNamespacedHelpers('companyidentify');
@@ -32,12 +28,12 @@ export default {
   props: {},
   components: {
     detailTopInfo, //头部导航
-    detailTop, //头部返回
     detailInfo, //审核
   },
   data: () => ({
-    display: 'none',
+    display: 'block',
     topTitle: '企业认证信息审核',
+    formTitle: '企业认证信息',
     ruleForm: {},
   }),
   created() {

src/views/companyidentify/index.vue

@@ -5,18 +5,7 @@
         <topInfo :topTitle="topTitle" :display="display"></topInfo>
       </el-col>
       <el-col :span="24" class="main">
-        <newsInfo
-          :debtTable="debtTable"
-          :total="total"
-          :totals="totals"
-          :totalss="totalss"
-          @handleClick="handleClick"
-          :noshenhetable="noshenhetable"
-          :shenheTable="shenheTable"
-          @handleCurrentChange="handleCurrentChange"
-          @handleCurrentChanges="handleCurrentChanges"
-          @handleCurrentChangess="handleCurrentChangess"
-        ></newsInfo>
+        <newsInfo :debtTable="debtTable" :total="total" @select="select" @handleClick="handleClick" @handleCurrentChange="handleCurrentChange"></newsInfo>
       </el-col>
     </el-col>
   </div>
@@ -39,62 +28,28 @@ export default {
     topTitle: '企业认证',
     display: 'block',
     debtTable: [],
-    shenheTable: [],
-    noshenhetable: [],
     total: 0,
-    totals: 0,
-    totalss: 0,
     skip: '',
   }),
   created() {
-    this.search();
-    this.searchinfo();
-    this.searchinfos();
+    this.select();
   },
   computed: {},
   methods: {
     ...companyidentify({ companyidentifyQuery: 'query' }),
-    async search({ skip, limit = 10, ...info } = {}) {
-      let sea = { status: 0 };
-      info = sea;
-      skip = this.skip;
+    async select({ skip = 0, limit = 10, ...info } = {}) {
       const res = await this.companyidentifyQuery({ skip, limit, ...info });
-      var weishenhe = res.data.filter(item => item.status === '0');
-      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.companyidentifyQuery({ 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.companyidentifyQuery({ skip, limit, ...info });
-      var shibai = res.data.filter(item => item.status === '2');
-      this.$set(this, `noshenhetable`, shibai);
-      this.$set(this, `totalss`, res.total);
+      if (this.$checkRes(res)) {
+        this.$set(this, `debtTable`, res.data);
+        this.$set(this, `total`, res.total);
+      }
     },
     handleClick(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();
+      this.select({ skip, limit, ...info });
     },
   },
 };

src/views/companyup/detail.vue

@@ -3,14 +3,11 @@
     <el-row>
       <el-col :span="24" class="debt">
         <el-col :span="24" class="top">
-          <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
+          <detailTopInfo :topTitle="topTitle" :display="display" @goBack="goBack"></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" :rules="rules" @submitForm="submitForm" @resetForm="resetForm"></detailInfo>
+            <detailInfo :ruleForm="ruleForm" :rules="rules" @submitForm="submitForm" @resetForm="resetForm" :formTitle="formTitle"></detailInfo>
           </el-col>
         </el-col>
       </el-col>
@@ -19,7 +16,7 @@
 </template>
 
 <script>
-import detailTopInfo from '@/layout/common/detailTopInfo.vue';
+import detailTopInfo from '@/layout/custom/detailTopInfo.vue';
 import detailTop from '@/layout/common/detailTop.vue';
 import detailInfo from '@/layout/companyup/detailInfo.vue';
 import { createNamespacedHelpers } from 'vuex';
@@ -30,13 +27,13 @@ export default {
   props: {},
   components: {
     detailTopInfo, //头部导航
-    detailTop, //返回
     detailInfo, //提交
   },
   data: () => ({
     rules: {},
-    display: 'none',
-    topTitle: '企业信息审核',
+    display: 'block',
+    topTitle: '企业修改信息审核',
+    formTitle: '企业修改信息',
     ruleForm: {},
   }),
   created() {

src/views/companyup/index.vue

@@ -8,18 +8,7 @@
         <searchInfo></searchInfo>
       </el-col> -->
       <el-col :span="24" class="main">
-        <newsInfo
-          :debtTable="debtTable"
-          :total="total"
-          :totals="totals"
-          :totalss="totalss"
-          @handleClick="handleClick"
-          :noshenhetable="noshenhetable"
-          :shenheTable="shenheTable"
-          @handleCurrentChange="handleCurrentChange"
-          @handleCurrentChanges="handleCurrentChanges"
-          @handleCurrentChangess="handleCurrentChangess"
-        ></newsInfo>
+        <newsInfo :debtTable="debtTable" :total="total" @select="select" @handleClick="handleClick" @handleCurrentChange="handleCurrentChange"></newsInfo>
       </el-col>
     </el-col>
   </div>
@@ -43,58 +32,24 @@ export default {
     topTitle: '企业修改信息审核',
     display: 'block',
     debtTable: [],
-    shenheTable: [],
-    noshenhetable: [],
     total: 0,
-    totals: 0,
-    totalss: 0,
   }),
   created() {
-    this.search();
-    this.searchinfo();
-    this.searchinfos();
+    this.select();
   },
   computed: {},
   methods: {
     ...companyup({ companyupQuery: 'query' }),
-    async search({ skip, limit = 10, ...info } = {}) {
-      let status = { status: 0 };
-      info = status;
-      skip = this.skip;
+     async select({ skip = 0, limit = 10, ...info } = {}) {
       const res = await this.companyupQuery({ skip, limit, ...info });
-      var weishenhe = res.data.filter(item => item.status === '0');
-      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.companyupQuery({ skip, limit, ...info });
-      var success = res.data.filter(item => item.status === '1');
-      this.$set(this, `totals`, res.total);
-      this.$set(this, `shenheTable`, success);
-    },
-    async searchinfos({ skip, limit = 10, ...info } = {}) {
-      let status = { status: 2 };
-      info = status;
-      skip = this.skip;
-      const res = await this.companyupQuery({ skip, limit, ...info });
-      var shibai = res.data.filter(item => item.status === '2');
-      this.$set(this, `totalss`, res.total);
-      this.$set(this, `noshenhetable`, shibai);
+      if (this.$checkRes(res)) {
+        this.$set(this, `debtTable`, res.data);
+        this.$set(this, `total`, res.total);
+      }
     },
     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();
+      this.select({ skip, limit, ...info });
     },
     // 修改
     handleClick(newid) {

src/views/companyuser/detail.vue

@@ -29,10 +29,10 @@ export default {
     userForm, //头部返回
   },
   data: () => ({
-    topTitle: '用户信息管理',
+    topTitle: '其他用户管理',
     display: 'block',
 
-    formTitle: '其他用户管理',
+    formTitle: '用户信息',
     ruleForm: {
       passwd: '123456',
       characterid: '',

src/views/financeclaims/stockDetail.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24">
         <el-col :span="24" class="top">
-          <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
+          <detailTopInfo :topTitle="topTitle" :display="display" @goBack="goBack"></detailTopInfo>
         </el-col>
         <el-col :span="24" class="main">
           <detailInfo :ruleForm="ruleForm" @submitForm="submitForm" @resetForm="resetForm" @outForm="outForm" :formTitle="formTitle"></detailInfo>
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import detailTopInfo from '@/layout/common/detailTopInfo.vue';
+import detailTopInfo from '@/layout/custom/detailTopInfo.vue';
 import detailInfo from '@/layout/financeclaims/stockDetailInfo.vue';
 
 import { createNamespacedHelpers } from 'vuex';
@@ -28,9 +28,9 @@ export default {
     detailInfo, //表单内容
   },
   data: () => ({
-    topTitle: '股权产品详细',
+    topTitle: '股权产品管理',
     display: 'block',
-    formTitle: '信息管理',
+    formTitle: '股权产品信息',
     ruleForm: {},
   }),
   created() {

src/views/institution/detail.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24">
         <el-col :span="24" class="top">
-          <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
+          <detailTopInfo :topTitle="topTitle" :display="display" @goBack="goBack"></detailTopInfo>
         </el-col>
         <el-col :span="24" class="main">
           <detailInfo :ruleForm="ruleForm" :rzlc="rzlc" :sshy="sshy" @submitForm="submitForm" @resetForm="resetForm" :formTitle="formTitle"></detailInfo>
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import detailTopInfo from '@/layout/common/detailTopInfo.vue';
+import detailTopInfo from '@/layout/custom/detailTopInfo.vue';
 import detailInfo from '@/layout/institution/detailInfo.vue';
 
 import { createNamespacedHelpers } from 'vuex';

src/views/institution/index.vue

@@ -2,7 +2,7 @@
   <div id="index">
     <el-row>
       <el-col :span="24" class="top">
-        <topInfo :topTitle="topTitle" :display="display" @add="add"></topInfo>
+        <topInfo :topTitle="topTitle" :display="display"></topInfo>
       </el-col>
       <el-col :span="24" class="main">
         <el-col :span="24" class="search">
@@ -106,10 +106,6 @@ export default {
     },
   },
   methods: {
-    add() {
-      // this.$router.push({ path: '/test/detail' });
-    },
-
     ...mapActions(['query', 'delete']),
     async search({ skip = 0, limit = 10, ...info } = {}) {
       // console.log(this.info.name);

src/views/otheruser/detail.vue

@@ -4,7 +4,7 @@
       <el-col :span="24" class="debt">
         <el-col :span="24" class="top">
           <!-- <topInfo :topTitle="topTitle" :display="display"></topInfo> -->
-          <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
+          <detailTopInfo :topTitle="topTitle" :display="display" @goBack="goBack"></detailTopInfo>
         </el-col>
         <el-col :span="24" class="main">
           <otheruserForm :ruleForm="ruleForm" :formTitle="formTitle" :charList="charList" @submitForm="submitForm" @resetForm="resetForm"></otheruserForm>
@@ -16,7 +16,7 @@
 
 <script>
 import topInfo from '@/layout/common/topInfo.vue';
-import detailTopInfo from '@/layout/common/detailTopInfo.vue';
+import detailTopInfo from '@/layout/custom/detailTopInfo.vue';
 import otheruserForm from '@/layout/otheruser/otheruserForm.vue';
 import { createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: otheruser } = createNamespacedHelpers('otheruser');
@@ -29,10 +29,10 @@ export default {
     otheruserForm, //头部返回
   },
   data: () => ({
-    topTitle: '用户信息管理',
+    topTitle: '其他用户管理',
     display: 'block',
 
-    formTitle: '其他用户管理',
+    formTitle: '用户信息',
     ruleForm: {
       passwd: process.env.VUE_APP_USER_PASSWD,
       characterid: '',

src/views/region/detail.vue

@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="24" class="debt">
         <el-col :span="24" class="top">
-          <detailTopInfo :topTitle="topTitle" :display="display"></detailTopInfo>
+          <detailTopInfo :topTitle="topTitle" :display="display" @goBack="goBack"></detailTopInfo>
         </el-col>
         <el-col :span="24" class="main">
           <el-col :span="24" class="info">
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import detailTopInfo from '@/layout/common/detailTopInfo.vue';
+import detailTopInfo from '@/layout/custom/detailTopInfo.vue';
 import detailTop from '@/layout/common/detailTop.vue';
 import regionForm from '@/layout/region/regionForm.vue';
 import { createNamespacedHelpers, mapGetters } from 'vuex';
@@ -26,17 +26,13 @@ export default {
   props: {},
   components: {
     detailTopInfo, //头部导航
-
-    regionForm, //添加其他用户
+    regionForm, //添加地区
   },
   data: () => ({
     display: 'block',
     topTitle: '地区信息管理',
-    formTitle: '地区管理',
-    ruleForm: {
-      passwd: '123456',
-      roles: [],
-    },
+    formTitle: '地区信息',
+    ruleForm: {},
   }),
   created() {
     this.searchInfo();

src/views/tDeclarationApproval/index.vue

@@ -75,11 +75,11 @@
             res = await this.state({id:id,current_approval_id:this.user.uid,state:state,state_description:'',result_description:result});
             this.$checkRes(res, '审核成功', '审核失败');
             break;
-          case '-1':
+          case '3':
             res = await this.state({id:id,current_approval_id:this.user.uid,state:state,state_description:'',result_description:result});
             this.$checkRes(res, '停用成功', '停用失败');
             break;
-          case '10':
+          case '9':
             res = await this.state({id:id,current_approval_id:this.user.uid,state:state,state_description:'',result_description:result});
             this.$checkRes(res, '完成成功', '完成失败');
             break;

src/views/uppasswd/index.vue

@@ -29,7 +29,7 @@ export default {
   },
   data: () => ({
     topTitle: '账号设置',
-    display: 'block',
+    display: 'none',
 
     formTitle: '修改密码',
     form: {},

src/views/userInfo/index.vue

@@ -29,7 +29,7 @@ export default {
   },
   data: () => ({
     topTitle: '账号设置',
-    display: 'block',
+    display: 'none',
 
     formTitle: '个人信息管理',
     ruleForm: {},