|
|
@@ -88,8 +88,8 @@
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
:shortcuts="dateShortcuts"
|
|
|
+ @change="handleClearTime(createTime)"
|
|
|
class="!w-240px"
|
|
|
- @change="handleClearTime"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
@@ -151,9 +151,8 @@
|
|
|
import * as ReplaceApi from '@/api/material/replace/index'
|
|
|
import * as lockerApi from '@/api/material/lockers/index'
|
|
|
import * as TypeApi from '@/api/material/type'
|
|
|
-import { dateFormatter } from '@/utils/formatTime'
|
|
|
+import { getDateRange} from '@/utils/formatTime'
|
|
|
import { handleTree } from '@/utils/tree'
|
|
|
-import router from "@/router";
|
|
|
defineOptions({ name: 'MaterialReplaceRecord' })
|
|
|
|
|
|
const { t } = useI18n() // 国际化
|
|
|
@@ -224,9 +223,11 @@ const getList = async () => {
|
|
|
try {
|
|
|
// 格式化日期
|
|
|
if (Array.isArray(createTime.value) && createTime.value.length === 2) {
|
|
|
- queryParams.startTime = dateFormatter(createTime.value[0])
|
|
|
- queryParams.endTime = dateFormatter(createTime.value[1])
|
|
|
+ const [startTime, endTime] = getDateRange(createTime.value[0], createTime.value[1])
|
|
|
+ queryParams.startTime = startTime
|
|
|
+ queryParams.endTime = endTime
|
|
|
}
|
|
|
+
|
|
|
if(props.cabinetId||props.recordId){
|
|
|
queryParams.cabinetId = Number(props.cabinetId)
|
|
|
if(props.recordId){
|
|
|
@@ -245,6 +246,7 @@ const getList = async () => {
|
|
|
if (route.query.cabinetId || props.cabinetId) {
|
|
|
visibleSelect.value = true
|
|
|
}
|
|
|
+ console.log(queryParams,'查询参数')
|
|
|
const data = await ReplaceApi.listChangeRecord(queryParams)
|
|
|
changeRecordList.value = data.list
|
|
|
total.value = data.total
|
|
|
@@ -277,6 +279,8 @@ const queryFormRef=ref()
|
|
|
/** 重置按钮操作 */
|
|
|
const resetQuery = () => {
|
|
|
createTime.value = []
|
|
|
+ queryParams.startTime = undefined
|
|
|
+ queryParams.endTime = undefined
|
|
|
queryFormRef.value?.resetFields()
|
|
|
handleQuery()
|
|
|
}
|