From b7ce4df611c11605aef94dac1b7056be5138b792 Mon Sep 17 00:00:00 2001
From: tian <3072314689@qq.com>
Date: 星期二, 23 九月 2025 19:38:31 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/archiveFrontEnd
---
src/views/archiveManager/archiveMaterial/index.vue | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/views/archiveManager/archiveMaterial/index.vue b/src/views/archiveManager/archiveMaterial/index.vue
index f0787cf..aec4630 100644
--- a/src/views/archiveManager/archiveMaterial/index.vue
+++ b/src/views/archiveManager/archiveMaterial/index.vue
@@ -24,9 +24,8 @@
value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨鏃ユ湡">
</el-date-picker> -->
- <el-col :span="8">
- <el-input v-model="form.date" placeholder="璇疯緭鍏ユ棩鏈�" />
- </el-col>
+ <el-input v-model="form.date" placeholder="璇疯緭鍏ユ棩鏈� (鏍煎紡锛歽yyy-mm-dd)" style="width: 450px;" />
+ <!-- <div style="color: #999; font-size: 12px; margin-top: 4px;">璇疯緭鍏ユ纭殑鏃ユ湡鏍煎紡锛歽yyy-mm-dd</div> -->
</el-form-item>
@@ -52,10 +51,9 @@
</el-form-item>
<el-form-item
- label="椤靛彿"
- prop="pageNumber"
- v-if=" form.fileStyle !== '鍏朵粬鏉愭枡'"
->
+ label="椤靛彿"
+ prop="pageNumber"
+ v-if=" form.fileStyle !== '鍏朵粬鏉愭枡'">
<el-col :span="8">
<el-input
v-model="form.pageNumber"
@@ -315,7 +313,7 @@
<el-table-column label="瀹藉害" align="center" prop="width" />
<el-table-column label="楂樺害" align="center" prop="height" />
<el-table-column label="澶у皬" align="center" prop="fileSize" />
- <el-table-column label="闄勪欢鍙婂巻鍙插彂闂彿" align="center" prop="attachmentHistoryNumbers" />
+ <el-table-column label="闄勪欢鍙婂巻鍙插彂鏂囧彿" align="center" prop="attachmentHistoryNumbers" />
<el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding ">
<template slot-scope="scope">
@@ -356,7 +354,7 @@
<el-form ref="forms" :model="forms" :rules="rules" label-width="100px">
<el-row>
<el-col :span="8">
- 8<el-form-item label="璐ｄ换鑰�" prop="creator">
+ <el-form-item label="璐ｄ换鑰�" prop="creator">
<el-input v-model="forms.creator" placeholder="璇疯緭鍏ヨ矗浠昏��" />
</el-form-item>
</el-col>
@@ -367,15 +365,13 @@
</el-col>
</el-row>
<el-form-item label="鏃ユ湡" prop="date">
+ <el-input v-model="forms.date" placeholder="璇疯緭鍏ユ棩鏈� (鏍煎紡锛歽yyy-mm-dd)" style="width: 200px;" />
<!-- <el-date-picker clearable
v-model="forms.date"
- type="date"
+ type="date"
value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨鏃ユ湡">
</el-date-picker> -->
-
- <el-input v-model="forms.date" placeholder="璇疯緭鍏ユ棩鏈�" prop="date"/>
-
</el-form-item>
<!-- <el-form-item label="椤垫" prop="pageOrder">
<el-input v-model="forms.pageOrder" placeholder="璇疯緭鍏ラ〉娆�" />
@@ -530,12 +526,14 @@
/>
</el-form-item>
<el-form-item label="鏃ユ湡" prop="date">
- <el-date-picker clearable
+ <el-input v-model="queryParams.date" placeholder="璇疯緭鍏ユ棩鏈� (鏍煎紡锛歽yyy-mm-dd)" />
+ <div style="color: #999; font-size: 12px; margin-top: 4px;">璇疯緭鍏ユ纭殑鏃ユ湡鏍煎紡锛歽yyy-mm-dd</div>
+ <!-- <el-date-picker clearable
v-model="queryParams.date"
type="date"
value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨鏃ユ湡">
- </el-date-picker>
+ </el-date-picker> -->
</el-form-item>
<el-form-item label="椤靛彿" prop="pageNumber">
<el-input
@@ -811,7 +809,8 @@
{ required: true, message: "妗堝嵎棰樺悕涓嶈兘涓虹┖", trigger: "blur" }
],
date: [
- { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" },
+ { pattern: /^\d{4}-\d{2}-\d{2}$/, message: "鏃ユ湡鏍煎紡蹇呴』涓簓yyy-mm-dd", trigger: "blur" }
],
}
}
--
Gitblit v1.9.1