|
@@ -22,6 +22,8 @@
|
|
|
<el-date-picker
|
|
|
v-model="formInline.date"
|
|
|
type="daterange"
|
|
|
+ value-format="yyyy-MM-DD"
|
|
|
+ :disabled-date="disabledDate"
|
|
|
range-separator="-"
|
|
|
start-placeholder="开始时间"
|
|
|
end-placeholder="结束时间"
|
|
@@ -216,7 +218,11 @@ const lunxun = () => {
|
|
|
}, 5000);
|
|
|
};
|
|
|
|
|
|
-const handleExceed = (files) => {
|
|
|
+const disabledDate = val => {
|
|
|
+ return val.getTime() > Date.now()
|
|
|
+}
|
|
|
+
|
|
|
+const handleExceed = files => {
|
|
|
up.value.clearFiles();
|
|
|
const file = files[0];
|
|
|
file.uid = genFileId();
|
|
@@ -242,11 +248,14 @@ const change = e => {
|
|
|
};
|
|
|
|
|
|
const getProList = (noload = false) => {
|
|
|
+ console.log(formInline.value.date);
|
|
|
getList({
|
|
|
data: {
|
|
|
page: page.value,
|
|
|
pageSize: 10,
|
|
|
- keyword: formInline.value.user
|
|
|
+ keyword: formInline.value.user,
|
|
|
+ start: formInline.value.date[0] || "",
|
|
|
+ end: formInline.value.date[1] || ""
|
|
|
},
|
|
|
noload
|
|
|
}).then(res => {
|