|
|
@@ -18,9 +18,9 @@
|
|
|
label-width="68px"
|
|
|
class="operation-fill-query bg-white dark:bg-[#1d1e1f] rounded-lg shadow px-6 py-3 min-w-0">
|
|
|
<div class="query-row">
|
|
|
- <el-form-item :label="t('operationFill.name')" prop="orderName">
|
|
|
+ <el-form-item :label="t('operationFill.name')" prop="fillContent">
|
|
|
<el-input
|
|
|
- v-model="queryParams.orderName"
|
|
|
+ v-model="queryParams.fillContent"
|
|
|
:placeholder="t('operationFill.nameHolder')"
|
|
|
clearable
|
|
|
@keyup.enter="handleQuery"
|
|
|
@@ -283,7 +283,6 @@
|
|
|
|
|
|
<script setup lang="ts">
|
|
|
import type { FormInstance } from 'element-plus'
|
|
|
-import dayjs from 'dayjs'
|
|
|
import { dateFormatter } from '@/utils/formatTime'
|
|
|
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
|
|
|
import { onMounted, ref } from 'vue'
|
|
|
@@ -303,14 +302,9 @@ const rootDeptId = 156
|
|
|
const userDeptId = useUserStore().getUser.deptId
|
|
|
|
|
|
interface QueryParams extends PageParam {
|
|
|
- orderName?: string
|
|
|
- inspectOrderTitle?: string
|
|
|
- inspectOrderCode?: string
|
|
|
- status?: string
|
|
|
- remark?: string
|
|
|
+ fillContent?: string
|
|
|
createTime: string[]
|
|
|
deptId?: number | string
|
|
|
- deviceIds?: string
|
|
|
orderStatus?: string | number | null
|
|
|
}
|
|
|
|
|
|
@@ -329,14 +323,9 @@ const total = ref(0) // 列表的总页数
|
|
|
const queryParams = reactive<QueryParams>({
|
|
|
pageNo: 1,
|
|
|
pageSize: 10,
|
|
|
- orderName: undefined,
|
|
|
- inspectOrderTitle: undefined,
|
|
|
- inspectOrderCode: undefined,
|
|
|
- status: undefined,
|
|
|
- remark: undefined,
|
|
|
+ fillContent: undefined,
|
|
|
createTime: [],
|
|
|
deptId: userDeptId,
|
|
|
- deviceIds: undefined,
|
|
|
orderStatus: undefined
|
|
|
//userId:useUserStore().getUser.id
|
|
|
})
|
|
|
@@ -411,26 +400,11 @@ const handleDeptNodeClick = async (row: Tree) => {
|
|
|
queryParams.pageNo = 1
|
|
|
await getList()
|
|
|
}
|
|
|
-
|
|
|
-const normalizeCreateTime = () => {
|
|
|
- if (!Array.isArray(queryParams.createTime) || queryParams.createTime.length !== 2) return
|
|
|
-
|
|
|
- const [startTime, endTime] = queryParams.createTime
|
|
|
- const start = dayjs(startTime)
|
|
|
- const end = dayjs(endTime)
|
|
|
- if (!start.isValid() || !end.isValid()) return
|
|
|
-
|
|
|
- queryParams.createTime = [
|
|
|
- start.startOf('day').format('YYYY-MM-DD HH:mm:ss'),
|
|
|
- end.endOf('day').format('YYYY-MM-DD HH:mm:ss')
|
|
|
- ]
|
|
|
-}
|
|
|
-
|
|
|
/** 查询列表 */
|
|
|
const getList = async () => {
|
|
|
loading.value = true
|
|
|
try {
|
|
|
- const data = await IotOpeationFillApi.getIotOpeationFillPage1(queryParams)
|
|
|
+ const data = await IotOpeationFillApi.getOperationRecordPage(queryParams)
|
|
|
list.value = data.list
|
|
|
total.value = data.total
|
|
|
} finally {
|
|
|
@@ -467,10 +441,22 @@ const openWrite = (id?: string) => {
|
|
|
/** 初始化 **/
|
|
|
onMounted(async () => {
|
|
|
// 计算近一周时间
|
|
|
- queryParams.createTime = [
|
|
|
- dayjs().subtract(7, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
|
|
|
- dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss')
|
|
|
- ]
|
|
|
+ const end = new Date()
|
|
|
+ const start = new Date()
|
|
|
+ start.setTime(start.getTime() - 7 * 24 * 60 * 60 * 1000)
|
|
|
+
|
|
|
+ // 格式化日期为后端需要的格式
|
|
|
+ const formatDate = (date: Date) => {
|
|
|
+ const year = date.getFullYear()
|
|
|
+ const month = String(date.getMonth() + 1).padStart(2, '0')
|
|
|
+ const day = String(date.getDate()).padStart(2, '0')
|
|
|
+ const hours = String(date.getHours()).padStart(2, '0')
|
|
|
+ const minutes = String(date.getMinutes()).padStart(2, '0')
|
|
|
+ const seconds = String(date.getSeconds()).padStart(2, '0')
|
|
|
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
|
|
|
+ }
|
|
|
+
|
|
|
+ queryParams.createTime = [formatDate(start), formatDate(end)]
|
|
|
|
|
|
if (deptId != null) {
|
|
|
queryParams.deptId = deptId
|