头部高度统一

src/views/archivesManage/lendManage/borrowerManage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="to-lend">
-    <head-slot>
+    <div class="head-container">
       <!-- <crudOperation :permission="permission" /> -->
       <el-button icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       <el-button icon="el-icon-edit" size="mini" :disabled="selections.length===1 ? false : true " @click="handelEdit">修改</el-button>
@@ -18,7 +18,7 @@
         @keyup.enter.native="crud.toQuery"
       />
       <rrOperation />
-    </head-slot>
+    </div>
     <!--表格渲染-->
     <el-table
       ref="table"
@@ -59,7 +59,6 @@
 </template>
 
 <script>
-import headSlot from '../components/headSlot.vue'
 import pagination from '@crud/Pagination'
 import CRUD, { presenter, header } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
@@ -69,7 +68,7 @@ import editBorrower from './module/editBorrower.vue'
 import data1 from '../data1.json'
 export default {
   name: 'BorrowerManage',
-  components: { headSlot, pagination, rrOperation, addBorrower, editBorrower },
+  components: { pagination, rrOperation, addBorrower, editBorrower },
   mixins: [presenter(), header()],
   cruds() {
     return CRUD({

src/views/archivesManage/lendManage/components/headSlot.vue

@@ -1,30 +0,0 @@
-<template>
-  <div class="head">
-    <div class="head-container">
-      <slot />
-    </div>
-  </div>
-</template>
-
-<script>
-export default {}
-</script>
-
-<style lang="scss" scoped>
-.head{
-  .head-container {
-  padding: 0 20px 20px 20px;
-  margin-top:-10px ;
-  display: flex;
-  align-items: center;
-}
-}
-::v-deep.head .head-container .filter-item input{
-  height: 30px;
-  line-height: 30px;
-}
-
-.margin-r{
-  margin-right: 10px;
-}
-</style>

src/views/archivesManage/lendManage/index.vue

@@ -84,4 +84,7 @@ export default {
     border: 1px solid #113d72;
   }
 }
+.tab-content .tab-nav{
+  margin-bottom: 0;
+}
 </style>

src/views/archivesManage/lendManage/lendConfirm/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="lend-confirm">
-    <headSlot>
+  <div>
+    <div class="head-container">
       <el-button size="mini" @click="handleLendBtn">
         <svg-icon icon-class="jiechu-fanbai" class-name="svg-style" />借出</el-button>
       <el-button size="mini" @click="handelReRecord">
@@ -8,7 +8,7 @@
       <el-button size="mini" @click="handleRemove">
         <svg-icon icon-class="yichu-fanbai" class-name="svg-style" />移出</el-button>
       <crudOperation style="margin-left:10px" />
-    </headSlot>
+    </div>
     <!--表格渲染-->
     <el-table
       ref="table"
@@ -52,7 +52,6 @@
 </template>
 
 <script>
-import headSlot from '../components/headSlot.vue'
 import pagination from '@crud/Pagination'
 import CRUD, { presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
@@ -61,7 +60,7 @@ import archiveDetail from './module/archiveDetail.vue'
 import lendDialog from './module/lendDialog.vue'
 import data1 from '../data1.json'
 export default {
-  components: { headSlot, pagination, crudOperation, archiveDetail, delConfirm, lendDialog },
+  components: { pagination, crudOperation, archiveDetail, delConfirm, lendDialog },
   mixins: [presenter()],
   cruds() {
     return CRUD({
@@ -154,4 +153,7 @@ export default {
   padding: 0;
   margin: 0;
 }
+.crud-opts{
+  display: inline-block;
+}
 </style>

src/views/archivesManage/lendManage/lendProcess/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <headSlot>
+    <div class="head-container">
       <h2>借阅规则</h2>
-    </headSlot>
+    </div>
     <div class="content-container">
       <div class="state-radio">
         <p>
@@ -22,10 +22,7 @@
 </template>
 
 <script>
-import headSlot from '../components/headSlot.vue'
-
 export default {
-  components: { headSlot },
   data() {
     return {
       lineStateVal: ''

src/views/archivesManage/lendManage/lendQuery/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="lend-query">
-    <head-slot>
+    <div class="head-container">
       <!-- <el-button icon="el-icon-download" size="mini" class="margin-r" disabled
         >导出</el-button
       > -->
@@ -36,7 +36,7 @@
         </el-select>
       </el-input>
       <rrOperation />
-    </head-slot>
+    </div>
     <!--表格渲染-->
     <el-table
       ref="table"
@@ -74,7 +74,6 @@
 </template>
 
 <script>
-import headSlot from '../components/headSlot.vue'
 import CRUD, { presenter } from '@crud/crud'
 import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
@@ -83,7 +82,7 @@ import data3 from '../data3.json'
 import archiveDetail from '../returnArchives/module/archiveDetail.vue'
 export default {
   name: 'LendQuery',
-  components: { headSlot, pagination, rrOperation, crudOperation, archiveDetail },
+  components: { pagination, rrOperation, crudOperation, archiveDetail },
   mixins: [presenter()],
   cruds() {
     return CRUD({

src/views/archivesManage/lendManage/returnArchives/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="to-lend">
-    <head-slot>
+    <div class="head-container">
       <el-button size="mini" @click="handleReturn">
         <svg-icon icon-class="guihuan-fanbai" class-name="svg-style" />归还</el-button>
       <crudOperation style="margin-left:10px" />
-    </head-slot>
+    </div>
     <!--表格渲染-->
     <el-table
       ref="table"
@@ -58,7 +58,6 @@
 </template>
 
 <script>
-import headSlot from '../components/headSlot.vue'
 import pagination from '@crud/Pagination'
 import CRUD, { presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
@@ -66,7 +65,7 @@ import data3 from '../data3.json'
 import archiveDetail from './module/archiveDetail.vue'
 import returnDialog from './module/returnDialog.vue'
 export default {
-  components: { headSlot, pagination, crudOperation, archiveDetail, returnDialog },
+  components: { pagination, crudOperation, archiveDetail, returnDialog },
   mixins: [presenter()],
   cruds() {
     return CRUD({

src/views/archivesManage/lendManage/toLend/index.vue

@@ -1,12 +1,11 @@
 <template>
   <div class="to-lend">
-    <headSlot>
+    <div class="head-container">
       <el-button size="mini" @click="handleRecord">
         <svg-icon icon-class="dengji-fanbai" class-name="svg-style" />登记</el-button>
       <el-button size="mini" @click="handleRemove">
         <svg-icon icon-class="yichu-fanbai" class-name="svg-style" />移出</el-button>
-      <!-- <button @click="getTableData">测试按钮</button> -->
-    </headSlot>
+    </div>
 
     <!--表格渲染-->
     <el-table
@@ -52,14 +51,13 @@
 
 import pagination from '@crud/Pagination'
 // import crudOperation from '@crud/CRUD.operation'
-import headSlot from '../components/headSlot.vue'
 import CRUD, { presenter, crud } from '@crud/crud'
 import delConfirm from '../components/delConfirm.vue'
 import archiveDetail from './module/archiveDetail.vue'
 import lendRecord from './module/lendRecord.vue'
 import data2 from '../data2.json'
 export default {
-  components: { headSlot, pagination, delConfirm, archiveDetail, lendRecord },
+  components: { pagination, delConfirm, archiveDetail, lendRecord },
   mixins: [presenter(), crud()],
   cruds() {
     return CRUD({

src/views/archivesManage/outInStorage/inStorage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <head-slot>
+    <div class="head-container">
       <el-button size="mini" @click="handleIn">
         <svg-icon icon-class="dengji-fanbai" class-name="svg-style" />入库</el-button>
       <el-button size="mini" @click="handleManual">
@@ -25,12 +25,12 @@
       </el-input>
       <rrOperation />
       <!-- <button @click="getTableData">测试按钮</button> -->
-    </head-slot>
+    </div>
     <!--表格渲染-->
     <el-table
       ref="table"
       style="width: 100%"
-      height="calc(100vh - 355px)"
+      height="calc(100vh - 357px)"
       :data="tableData"
       :cell-class-name="cell"
       @row-click="clickRowHandler"
@@ -87,7 +87,6 @@
 </template>
 
 <script>
-import headSlot from '@/views/archivesManage/lendManage/components/headSlot.vue'
 import rrOperation from '@crud/RR.operation'
 import CRUD, { presenter, crud } from '@crud/crud'
 import pagination from '@crud/Pagination'
@@ -96,7 +95,7 @@ import inDialog from './module/inDialog.vue'
 import data1 from '../data1.json'
 export default {
   name: 'InStorage',
-  components: { headSlot, rrOperation, pagination, fieldDetail, inDialog },
+  components: { rrOperation, pagination, fieldDetail, inDialog },
   mixins: [presenter(), crud()],
   cruds() {
     return CRUD({

src/views/archivesManage/outInStorage/index.vue

@@ -61,5 +61,7 @@ export default {
   margin-top: 61px;
   border: 1px solid #113d72;
 }
-
+.tab-content .tab-nav{
+  margin-bottom: 0;
+}
 </style>

src/views/archivesManage/outInStorage/outInHistory/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <head-slot>
+    <div class="head-container">
       <crudOperation />
       <el-select v-model="stateVal" class="filter-item" style="width: 100px; height: 30px;margin:0 0 0 10px">
         <el-option v-for="item in StateOptions" :key="item.value" :label="item.label" :value="item.value" />
@@ -25,12 +25,12 @@
       </el-input>
       <rrOperation />
       <!-- <button @click="getTableData">测试按钮</button> -->
-    </head-slot>
+    </div>
     <!--表格渲染-->
     <el-table
       ref="table"
       style="width: 100%"
-      height="calc(100vh - 355px)"
+      height="calc(100vh - 357px)"
       :data="tableData"
       @row-click="clickRowHandler"
       @selection-change="selectionChangeHandler"
@@ -53,7 +53,6 @@
 </template>
 
 <script>
-import headSlot from '@/views/archivesManage/lendManage/components/headSlot.vue'
 import data1 from '../data1.json'
 import rrOperation from '@crud/RR.operation'
 import CRUD, { presenter, crud } from '@crud/crud'
@@ -62,7 +61,7 @@ import crudOperation from '@crud/CRUD.operation'
 
 export default {
   name: 'OutInHistory',
-  components: { headSlot, rrOperation, pagination, crudOperation },
+  components: { rrOperation, pagination, crudOperation },
   mixins: [presenter(), crud()],
   cruds() {
     return CRUD({

src/views/archivesManage/outInStorage/outStorage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <head-slot>
+    <div class="head-container">
       <el-button size="mini" @click="handleOut">
         <svg-icon icon-class="yichu-fanbai" class-name="svg-style" />出库</el-button>
       <el-input
@@ -23,12 +23,12 @@
       </el-input>
       <rrOperation />
       <!-- <button @click="getTableData">测试按钮</button> -->
-    </head-slot>
+    </div>
     <!--表格渲染-->
     <el-table
       ref="table"
       style="width: 100%"
-      height="calc(100vh - 355px)"
+      height="calc(100vh - 357px)"
       :data="tableData"
       @row-click="clickRowHandler"
       @selection-change="selectionChangeHandler"
@@ -62,13 +62,12 @@
 </template>
 
 <script>
-import headSlot from '@/views/archivesManage/lendManage/components/headSlot.vue'
 import data1 from '../data1.json'
 import rrOperation from '@crud/RR.operation'
 import CRUD, { presenter, crud } from '@crud/crud'
 import pagination from '@crud/Pagination'
 export default {
-  components: { headSlot, rrOperation, pagination },
+  components: { rrOperation, pagination },
   mixins: [presenter(), crud()],
   cruds() {
     return CRUD({

src/views/storeManage/tagManage/tagLog/index.vue

@@ -113,8 +113,6 @@ export default {
     handleExport() {
       this.crud.downloadLoading = true
       exportFile(this.baseApi + '/api/tag/exportTagLogList')
-      // exportFile('http://192.168.99.84:7070/api/tag/exportTagLogList')
-      console.log(this.baseApi)
       this.crud.downloadLoading = false
     },
     // 获取数据前的处理