From b4788e8b1c6f06244e92d8c0bfba23443b9f60cb Mon Sep 17 00:00:00 2001
From: MO <448233645@qq.com>
Date: Fri, 20 Oct 2023 11:21:53 +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  | 24 ++++++++++++------------
 src/views/borrow/record/index.vue |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/borrow/apply/index.vue b/src/views/borrow/apply/index.vue
index 06e97814..f16c6574 100644
--- a/src/views/borrow/apply/index.vue
+++ b/src/views/borrow/apply/index.vue
@@ -84,14 +84,14 @@
       <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"
             :value="scope.row.borrowState"
           />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         label="预计归还日期"
         align="center"
@@ -112,8 +112,8 @@
           <dict-tag :type="DICT_TYPE.ARCHIVES_MEDIA" :value="scope.row.media" />
         </template>
       </el-table-column>
-      <el-table-column label="业务实体名称" align="center" prop="company" />
-      <el-table-column label="描述" align="center" prop="remark" />
+      <!-- <el-table-column label="业务实体名称" align="center" prop="company" /> -->
+      <el-table-column label="借阅描述" align="center" prop="describes" />
       <el-table-column
         label="创建日期"
         align="center"
@@ -183,7 +183,7 @@
       width="1000px"
       append-to-body
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="8">
             <el-form-item label="借阅申请编码" prop="borrowCode">
@@ -234,7 +234,7 @@
                 clearable
                 v-model="form.returnTime"
                 type="date"
-                value-format="yyyy-MM-dd "
+                value-format="timestamp"
                 placeholder="选择预计归还日期"
               />
             </el-form-item>
@@ -268,7 +268,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="借阅档案" prop="recordId">
+            <el-form-item label="借阅档案案卷号" prop="recordId">
               <el-select v-model="form.recordId" placeholder="请选择借阅档案">
                 <el-option
                   v-for="item in filesNumOptions"
@@ -303,18 +303,18 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="借阅描述" prop="describe">
-              <el-input v-model="form.describe" placeholder="请输入借阅描述" />
+            <el-form-item label="借阅描述" prop="describes">
+              <el-input v-model="form.describes" placeholder="请输入借阅描述" />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="备注" prop="remark">
+        <!-- <el-form-item label="备注" prop="remark">
           <el-input
             v-model="form.remark"
             type="textarea"
             placeholder="请输入备注"
           />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -466,7 +466,7 @@ export default {
         borrowCode: undefined,
         borrowState: undefined,
         reason: undefined,
-        describe: undefined,
+        describes: undefined,
         userId: undefined,
         userName: undefined,
         deptId: undefined,
diff --git a/src/views/borrow/record/index.vue b/src/views/borrow/record/index.vue
index 8ae379dd..02066dd1 100644
--- a/src/views/borrow/record/index.vue
+++ b/src/views/borrow/record/index.vue
@@ -112,8 +112,8 @@
           <dict-tag :type="DICT_TYPE.ARCHIVES_MEDIA" :value="scope.row.media" />
         </template>
       </el-table-column>
-      <el-table-column label="业务实体名称" align="center" prop="company" />
-      <el-table-column label="描述" align="center" prop="remark" />
+      <!-- <el-table-column label="业务实体名称" align="center" prop="company" /> -->
+      <el-table-column label="借阅描述" align="center" prop="describes" />
       <el-table-column
         label="创建日期"
         align="center"