|
@@ -22,7 +22,7 @@
|
|
<el-date-picker
|
|
<el-date-picker
|
|
v-model="formInline.date"
|
|
v-model="formInline.date"
|
|
type="daterange"
|
|
type="daterange"
|
|
- value-format="yyyy-MM-DD"
|
|
|
|
|
|
+ value-format="YYYY-MM-DD"
|
|
:disabled-date="disabledDate"
|
|
:disabled-date="disabledDate"
|
|
range-separator="-"
|
|
range-separator="-"
|
|
start-placeholder="开始时间"
|
|
start-placeholder="开始时间"
|
|
@@ -219,8 +219,8 @@ const lunxun = () => {
|
|
};
|
|
};
|
|
|
|
|
|
const disabledDate = val => {
|
|
const disabledDate = val => {
|
|
- return val.getTime() > Date.now()
|
|
|
|
-}
|
|
|
|
|
|
+ return val.getTime() > Date.now();
|
|
|
|
+};
|
|
|
|
|
|
const handleExceed = files => {
|
|
const handleExceed = files => {
|
|
up.value.clearFiles();
|
|
up.value.clearFiles();
|
|
@@ -248,15 +248,18 @@ const change = e => {
|
|
};
|
|
};
|
|
|
|
|
|
const getProList = (noload = false) => {
|
|
const getProList = (noload = false) => {
|
|
- console.log(formInline.value.date);
|
|
|
|
|
|
+ const p = {
|
|
|
|
+ page: page.value,
|
|
|
|
+ pageSize: 10,
|
|
|
|
+ keyword: formInline.value.user
|
|
|
|
+ };
|
|
|
|
+ if (formInline.value.date && formInline.value.date.length) {
|
|
|
|
+ p.start = formInline.value.date[0];
|
|
|
|
+ p.end = formInline.value.date[1];
|
|
|
|
+ }
|
|
|
|
+
|
|
getList({
|
|
getList({
|
|
- data: {
|
|
|
|
- page: page.value,
|
|
|
|
- pageSize: 10,
|
|
|
|
- keyword: formInline.value.user,
|
|
|
|
- start: formInline.value.date[0] || "",
|
|
|
|
- end: formInline.value.date[1] || ""
|
|
|
|
- },
|
|
|
|
|
|
+ data: p,
|
|
noload
|
|
noload
|
|
}).then(res => {
|
|
}).then(res => {
|
|
tableData.value = res.records || [];
|
|
tableData.value = res.records || [];
|