From 7396cf0a915fffd70a474a26b83e0a660dd058d6 Mon Sep 17 00:00:00 2001
From: x_ying <2438792676@qq.com>
Date: Mon, 13 Jun 2022 11:16:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=9F=E9=98=85=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lendManage/borrowerManage/index.vue       | 10 +--
 .../lendManage/components/headSlot.vue        | 12 +++-
 .../lendManage/lendConfirm/index.vue          | 12 ++--
 .../lendManage/lendQuery/index.vue            | 20 +++---
 .../lendManage/returnArchives/index.vue       | 10 +--
 .../lendManage/toLend/index.vue               | 64 +++++++++++++------
 src/views/category/index.vue                  |  3 -
 src/views/category/sortDialog.vue             |  2 +-
 8 files changed, 83 insertions(+), 50 deletions(-)

diff --git a/src/views/archivesManage/lendManage/borrowerManage/index.vue b/src/views/archivesManage/lendManage/borrowerManage/index.vue
index 4b7ea75..c25e69f 100644
--- a/src/views/archivesManage/lendManage/borrowerManage/index.vue
+++ b/src/views/archivesManage/lendManage/borrowerManage/index.vue
@@ -3,9 +3,9 @@
     <head-slot>
       <el-button icon="el-icon-plus" size="mini">增加</el-button>
       <el-button icon="el-icon-edit" size="mini">修改</el-button>
-      <el-button icon="el-icon-delete" size="mini">删除</el-button>
+      <el-button icon="el-icon-delete" size="mini" class="margin-r">删除</el-button>
       <el-input size="small" clearable placeholder="请输入关键词" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" />
-      <span>
+      <span style="margin-left:-10px">
         <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" />
       </span>
     </head-slot>
@@ -13,7 +13,7 @@
     <el-table
       ref="fieldTable"
       style="min-width: 100%"
-      height="calc(100vh - 302px)"
+      height="calc(100vh - 355px)"
       @selection-change="selectionChangeHandler"
       @row-click="clickRowHandler"
     >
@@ -29,10 +29,10 @@
     <!-- 分页 -->
     <el-pagination
       :current-page="currentPage4"
-      :page-sizes="[100, 200, 300, 400]"
+      :page-sizes="[10, 20, 30, 50,100]"
       :page-size="100"
       layout="total, sizes, prev, pager, next, jumper"
-      :total="400"
+      :total="0"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     />
diff --git a/src/views/archivesManage/lendManage/components/headSlot.vue b/src/views/archivesManage/lendManage/components/headSlot.vue
index 6dc743f..0190322 100644
--- a/src/views/archivesManage/lendManage/components/headSlot.vue
+++ b/src/views/archivesManage/lendManage/components/headSlot.vue
@@ -14,9 +14,17 @@ export default {}
 .head{
   .head-container {
   padding: 0 20px 20px 20px;
+  margin-top:-10px ;
+  display: flex;
+  align-items: center;
 }
 }
-::v-deep.el-input-group__prepend{
-  background-color: #f00;
+::v-deep.head .head-container .filter-item input{
+  height: 30px;
+  line-height: 30px;
+}
+
+.margin-r{
+  margin-right: 10px;
 }
 </style>
diff --git a/src/views/archivesManage/lendManage/lendConfirm/index.vue b/src/views/archivesManage/lendManage/lendConfirm/index.vue
index 25883cb..d2e4b82 100644
--- a/src/views/archivesManage/lendManage/lendConfirm/index.vue
+++ b/src/views/archivesManage/lendManage/lendConfirm/index.vue
@@ -14,7 +14,7 @@
     <el-table
       ref="fieldTable"
       style="min-width: 100%"
-      height="calc(100vh - 302px)"
+      height="calc(100vh - 355px)"
       @selection-change="selectionChangeHandler"
       @row-click="clickRowHandler"
     >
@@ -47,17 +47,15 @@
       </div>
     </el-dialog>
 
-    <!-- 分页 -->
-    <!-- <el-pagination
+    <el-pagination
       :current-page="currentPage4"
-      :page-sizes="[100, 200, 300, 400]"
+      :page-sizes="[10, 20, 30, 50,100]"
       :page-size="100"
       layout="total, sizes, prev, pager, next, jumper"
-      :total="400"
+      :total="0"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-    /> -->
-    <!-- <pagination /> -->
+    />
   </div>
 </template>
 
diff --git a/src/views/archivesManage/lendManage/lendQuery/index.vue b/src/views/archivesManage/lendManage/lendQuery/index.vue
index 64f2031..664b5e8 100644
--- a/src/views/archivesManage/lendManage/lendQuery/index.vue
+++ b/src/views/archivesManage/lendManage/lendQuery/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="lend-query">
     <head-slot>
-      <el-button icon="el-icon-download" size="mini">导出</el-button>
-      <el-select v-model="lendState" class="filter-item" style="width: 100px">
+      <el-button icon="el-icon-download" size="mini" class="margin-r">导出</el-button>
+      <el-select v-model="lendState" class="filter-item" style="width: 100px;height:30px">
         <el-option
           v-for="item in lendStateOptions"
           :key="item.value"
@@ -41,14 +41,14 @@
         size="mini"
         type="success"
         icon="el-icon-search"
-      >搜索</el-button>
+      />
       <!-- <el-button type="primary" icon="el-icon-search">搜索</el-button> -->
     </head-slot>
     <!--表格渲染-->
     <el-table
       ref="fieldTable"
       style="min-width: 100%"
-      height="calc(100vh - 302px)"
+      height="calc(100vh - 355px)"
       @selection-change="selectionChangeHandler"
       @row-click="clickRowHandler"
     >
@@ -67,14 +67,13 @@
     <!-- 分页 -->
     <el-pagination
       :current-page="currentPage4"
-      :page-sizes="[100, 200, 300, 400]"
+      :page-sizes="[10, 20, 30, 50,100]"
       :page-size="100"
       layout="total, sizes, prev, pager, next, jumper"
-      :total="400"
+      :total="0"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     />
-    <!-- <pagination /> -->
   </div>
 </template>
 
@@ -119,9 +118,8 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.lend-query {
-}
 ::v-deep.input-prepend {
+  margin: 0 10px 0 -10px;
   background-color: #021941;
   border-radius: 3px;
     // word-spacing: -10px;
@@ -134,11 +132,13 @@ export default {
     background-color: #021941;
     border: none;
     caret-color:#fff;
+    height: 28px;
+    line-height: 28px;
   }
   .el-input-group__prepend {
-    // background-color: #021941;
     border: none;
   }
 
 }
+
 </style>
diff --git a/src/views/archivesManage/lendManage/returnArchives/index.vue b/src/views/archivesManage/lendManage/returnArchives/index.vue
index 0560e77..3049709 100644
--- a/src/views/archivesManage/lendManage/returnArchives/index.vue
+++ b/src/views/archivesManage/lendManage/returnArchives/index.vue
@@ -8,7 +8,7 @@
     <el-table
       ref="fieldTable"
       style="min-width: 100%"
-      height="calc(100vh - 302px)"
+      height="calc(100vh - 355px)"
       @selection-change="selectionChangeHandler"
       @row-click="clickRowHandler"
     >
@@ -28,19 +28,21 @@
     <!-- 分页 -->
     <el-pagination
       :current-page="currentPage4"
-      :page-sizes="[100, 200, 300, 400]"
+      :page-sizes="[10, 20, 30, 50,100]"
       :page-size="100"
       layout="total, sizes, prev, pager, next, jumper"
-      :total="400"
+      :total="0"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
     />
-    <!-- <pagination /> -->
+    <!-- <Pagination /> -->
   </div>
 </template>
 
 <script>
 import headSlot from '../components/headSlot.vue'
+// import Pagination from '@crud/Pagination'
+
 export default {
   components: { headSlot },
   data() {
diff --git a/src/views/archivesManage/lendManage/toLend/index.vue b/src/views/archivesManage/lendManage/toLend/index.vue
index 7ef53d2..957e12b 100644
--- a/src/views/archivesManage/lendManage/toLend/index.vue
+++ b/src/views/archivesManage/lendManage/toLend/index.vue
@@ -17,7 +17,7 @@
     <el-table
       ref="fieldTable"
       style="min-width: 100%"
-      height="calc(100vh - 302px)"
+      height="calc(100vh - 355px)"
       @selection-change="selectionChangeHandler"
       @row-click="clickRowHandler"
     >
@@ -120,29 +120,55 @@
     </el-dialog>
 
     <!-- 分页 -->
-    <!-- <el-pagination
+    <el-pagination
       :current-page="currentPage4"
-      :page-sizes="[100, 200, 300, 400]"
+      :page-sizes="[10, 20, 30, 50,100]"
       :page-size="100"
       layout="total, sizes, prev, pager, next, jumper"
-      :total="400"
+      :total="0"
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-    /> -->
-    <!-- <pagination /> -->
+    />
+    <!-- <Pagination /> -->
   </div>
 </template>
 
 <script>
-// import pagination from '@crud/Pagination'
+// import Pagination from '@crud/Pagination'
 // import crudOperation from '@crud/CRUD.operation'
-// import CRUD, { presenter } from '@crud/crud'
+// import CRUD, { presenter } from "@crud/crud";
+// import CRUD, { presenter, header, form } from '@crud/crud'
 import headSlot from '../components/headSlot.vue'
 import DateRangePicker from '@/components/DateRangePicker'
 
 export default {
   components: { headSlot, DateRangePicker },
-
+  // mixins: [
+  // presenter()
+  // header(),
+  // form({})
+  // ],
+  // cruds() {
+  //   return [
+  //     CRUD({
+  //       title: "字典内容",
+  //       url: "api/dictrionary/findSubsetById",
+  //       query: { id: "" },
+  //       crudMethod: { ...crudDictDetail },
+  //       optShow: {
+  //         add: false,
+  //         edit: true,
+  //         del: false,
+  //         reset: false,
+  //         download: false,
+  //         group: false,
+  //       },
+  //       queryOnPresenterCreated: false,
+  //       confirmDeleteMsg: "确认删除当前字典内容么？",
+  //       sort: ["dicSequence,asc"],
+  //     }),
+  //   ];
+  // },
   data() {
     return {
       tableData: [],
@@ -173,17 +199,19 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        this.$message({
-          type: 'success',
-          message: '删除成功!'
+      })
+        .then(() => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          })
         })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
+        .catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
         })
-      })
     },
     selectionChangeHandler() {
       console.log('selectionChangeHandler')
diff --git a/src/views/category/index.vue b/src/views/category/index.vue
index 1ab80ce..fd5ac92 100644
--- a/src/views/category/index.vue
+++ b/src/views/category/index.vue
@@ -149,9 +149,6 @@ export default {
         this.crud.selectionChangeHandler([val])
         this.$refs.eform.pid = val.id
         this.selectedCategory = val
-        if (val.isType === 1 || val.isType === 2) {
-          this.changeActiveTab(0)
-        }
       }
     },
     updateKeyChildren(data) {
diff --git a/src/views/category/sortDialog.vue b/src/views/category/sortDialog.vue
index 6dedb01..5c79171 100644
--- a/src/views/category/sortDialog.vue
+++ b/src/views/category/sortDialog.vue
@@ -7,7 +7,7 @@
       <i class="drag-tip">提示：请通过拖动鼠标来调整当前顺序</i>
       <el-table :data="sortTableData" class="category-sort" style="width: 100%;max-height: 70vh;" row-key="id">
         <el-table-column type="index" label="序号" width="100" align="center" />
-        <el-table-column prop="cnName" label="门类名称" />
+        <el-table-column prop="dicName" label="门类名称" />
       </el-table>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click.native="handleSort">保存</el-button>