|
|
@@ -246,12 +246,30 @@
|
|
|
</div>
|
|
|
<el-form-item prop="reportDetails" class="table-form-item">
|
|
|
<ZmTable :data="reportDetails" :loading="false" class="mb-4">
|
|
|
- <ZmTableColumn
|
|
|
- label="日期"
|
|
|
- :width="105"
|
|
|
- cover-formatter
|
|
|
- :real-value="() => createTime"
|
|
|
- />
|
|
|
+ <ZmTableColumn label="日期" :width="180" prop="reportDate">
|
|
|
+ <template #default="{ row, $index }">
|
|
|
+ <el-form-item
|
|
|
+ v-if="$index >= 0"
|
|
|
+ class="mb-0!"
|
|
|
+ :prop="`reportDetails.${$index}.reportDate`"
|
|
|
+ :rules="{
|
|
|
+ required: true,
|
|
|
+ message: '请选择日期',
|
|
|
+ trigger: ['change', 'blur'],
|
|
|
+ type: 'number'
|
|
|
+ }"
|
|
|
+ >
|
|
|
+ <el-date-picker
|
|
|
+ v-model="row.reportDate"
|
|
|
+ placeholder="选择日期"
|
|
|
+ clearable
|
|
|
+ class="w-full!"
|
|
|
+ value-format="x"
|
|
|
+ :disabled="fillStatus === '1'"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </template>
|
|
|
+ </ZmTableColumn>
|
|
|
|
|
|
<ZmTableColumn :width="130" label="开始时间" prop="startTime">
|
|
|
<template #default="{ row, $index }">
|
|
|
@@ -427,6 +445,7 @@ import { useRoute } from 'vue-router'
|
|
|
import { calculateDuration, formatT } from '@/utils/formatTime'
|
|
|
import { Delete, Plus } from '@element-plus/icons-vue'
|
|
|
import { useDebounceFn } from '@vueuse/core'
|
|
|
+import dayjs from 'dayjs'
|
|
|
|
|
|
/** 运行记录填报 列表 */
|
|
|
defineOptions({ name: 'FillOrderInfo' })
|
|
|
@@ -474,6 +493,7 @@ const queryParams = reactive<any>({
|
|
|
})
|
|
|
|
|
|
interface ReportDetail {
|
|
|
+ reportDate: number
|
|
|
startTime: string
|
|
|
endTime: string
|
|
|
duration: number
|
|
|
@@ -489,6 +509,7 @@ const addProductionStatusRow = () => {
|
|
|
reportDetails.value = []
|
|
|
}
|
|
|
reportDetails.value.push({
|
|
|
+ reportDate: createTime ? dayjs(createTime).valueOf() : dayjs().valueOf(),
|
|
|
startTime: '',
|
|
|
endTime: '',
|
|
|
duration: 0,
|
|
|
@@ -732,6 +753,7 @@ const getList = async () => {
|
|
|
await getAttrList()
|
|
|
IotOpeationFillApi.getReportDetails(deptId.split(',')[3]).then((res) => {
|
|
|
reportDetails.value = (res ? (res as any[]) : []).map((item) => ({
|
|
|
+ reportDate: item.reportDate ?? dayjs(createTime).valueOf(),
|
|
|
startTime: formatT(item.startTime),
|
|
|
endTime: formatT(item.endTime),
|
|
|
duration: item.duration,
|