From a9baabaaa66f11f8b735e03c54ad5a526d6ace1a Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 17 Jul 2020 13:26:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E6=97=A5=E6=9C=9F=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/archives-add-or-update.vue | 13 ++++++-------
 src/views/modules/custom/archives.vue               |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/custom/archives-add-or-update.vue b/src/views/modules/custom/archives-add-or-update.vue
index 03d2219..2ba6b29 100644
--- a/src/views/modules/custom/archives-add-or-update.vue
+++ b/src/views/modules/custom/archives-add-or-update.vue
@@ -18,13 +18,11 @@
         <el-input v-model="dataForm.responsible" placeholder="责任人" maxlength="50"></el-input>
       </el-form-item>
           <el-form-item label="归档日期" prop="archiveTime">
-            <el-date-picker v-model="dataForm.archiveTime"
-                            type="datetime"
-                            value-format="yyyy-MM-dd HH:mm"
-                            format="yyyy-MM-dd HH:mm"
-                            placeholder="选择日期时间">
-            </el-date-picker>
-      </el-form-item>
+            <el-input type="number" v-model="dataForm.archiveTime" placeholder="归档日期"></el-input>
+            <br>
+            示例：'2020'  '202001'  '20200101'
+          </el-form-item>
+
           <el-form-item label="页数" prop="pageSize">
           <el-input-number v-model="dataForm.pageSize" :min="0" placeholder="页数"></el-input-number>
       </el-form-item>
@@ -125,6 +123,7 @@ export default {
           ...this.dataForm,
           ...res.data
         }
+        this.ids = res.data.allDeptIdsShow
       }).catch(() => {})
     },
     // 表单提交
diff --git a/src/views/modules/custom/archives.vue b/src/views/modules/custom/archives.vue
index 630d302..3ad557c 100644
--- a/src/views/modules/custom/archives.vue
+++ b/src/views/modules/custom/archives.vue
@@ -12,7 +12,7 @@
             <el-date-picker v-model="dataForm.startTime"
                             type="date"
                             :picker-options="pickerBeginDateBefore"
-                            value-format="yyyy-MM-dd"
+                            value-format="yyyyMMdd"
                             format="yyyy-MM-dd"
                             placeholder="选择日期时间">
             </el-date-picker>
@@ -23,7 +23,7 @@
             <el-date-picker v-model="dataForm.endTime"
                             type="date"
                             :picker-options="pickerBeginDateAfter"
-                            value-format="yyyy-MM-dd"
+                            value-format="yyyyMMdd"
                             format="yyyy-MM-dd"
                             placeholder="选择日期时间">
             </el-date-picker>