From f15c87f5b666f968c65a60b1e2e632e7613a1410 Mon Sep 17 00:00:00 2001
From: MO <448233645@qq.com>
Date: Thu, 19 Oct 2023 17:44:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=9F=E9=98=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/borrow/apply/index.vue  | 28 +++++-----------------------
 src/views/borrow/record/index.vue |  6 +++---
 2 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/views/borrow/apply/index.vue b/src/views/borrow/apply/index.vue
index 9e7a31ce..2ec0be27 100644
--- a/src/views/borrow/apply/index.vue
+++ b/src/views/borrow/apply/index.vue
@@ -17,10 +17,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="借阅申请状态" prop="borrowState">
+      <!-- <el-form-item label="借阅状态" prop="borrowState">
         <el-select
           v-model="queryParams.borrowState"
-          placeholder="请选择借阅申请状态"
+          placeholder="请选择借阅状态"
         >
           <el-option
             v-for="item in borrowStateOptions"
@@ -30,7 +30,7 @@
           >
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="借阅人" prop="userName">
         <el-input
           v-model="queryParams.userName"
@@ -84,7 +84,7 @@
       <el-table-column label="借阅人名称" align="center" prop="userName" />
       <el-table-column label="借阅部门名称" align="center" prop="deptName" />
       <el-table-column label="借阅事由" align="center" prop="reason" />
-      <el-table-column label="借阅申请状态" align="center" prop="borrowState">
+      <el-table-column label="借阅状态" align="center" prop="borrowState">
         <template v-slot="scope">
           <dict-tag
             :type="DICT_TYPE.BORROW_APPLY"
@@ -135,7 +135,6 @@
             size="mini"
             type="text"
             icon="el-icon-check"
-            v-if="scope.row.borrowState == null"
             @click="handlePass(scope.row)"
             v-hasPermi="['archives:borrowAapply:update']"
             >通过</el-button
@@ -144,7 +143,6 @@
             size="mini"
             type="text"
             icon="el-icon-close"
-            v-if="scope.row.borrowState == null"
             @click="handleUnpass(scope.row)"
             v-hasPermi="['archives:borrowAapply:update']"
             >驳回</el-button
@@ -223,22 +221,6 @@
         </el-row>
 
         <el-row>
-          <!-- <el-col :span="8">
-            <el-form-item label="借阅申请状态" prop="borrowState">
-              <el-select
-                v-model="form.borrowState"
-                placeholder="请选择借阅申请状态"
-              >
-                <el-option
-                  v-for="item in borrowStateOptions"
-                  :key="item.id"
-                  :value="item.value"
-                  :label="item.label"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
           <el-col :span="8">
             <el-form-item label="借阅事由" prop="reason">
               <el-input
@@ -482,7 +464,7 @@ export default {
       this.form = {
         id: undefined,
         borrowCode: undefined,
-        borrowState: undefined,
+        borrowState: "1",
         reason: undefined,
         describe: undefined,
         userId: undefined,
diff --git a/src/views/borrow/record/index.vue b/src/views/borrow/record/index.vue
index 5aed91a0..8ae379dd 100644
--- a/src/views/borrow/record/index.vue
+++ b/src/views/borrow/record/index.vue
@@ -17,10 +17,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="借阅申请状态" prop="borrowState">
+      <el-form-item label="借阅状态" prop="borrowState">
         <el-select
           v-model="queryParams.borrowState"
-          placeholder="请选择借阅申请状态"
+          placeholder="请选择借阅状态"
         >
           <el-option
             v-for="item in borrowStateOptions"
@@ -81,7 +81,7 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="借阅申请编码" align="center" prop="borrowCode" />
-      <el-table-column label="借阅申请状态" align="center" prop="borrowState">
+      <el-table-column label="借阅状态" align="center" prop="borrowState">
         <template v-slot="scope">
           <dict-tag
             :type="DICT_TYPE.BORROW_APPLY"