diff --git a/src/views/dayPlan/LngMeasureSales/index.vue b/src/views/dayPlan/LngMeasureSales/index.vue index ff8df86..e0fc33b 100644 --- a/src/views/dayPlan/LngMeasureSales/index.vue +++ b/src/views/dayPlan/LngMeasureSales/index.vue @@ -57,7 +57,7 @@ const logId = ref('') const logPath = ref('/dayPlan/lngMeasureSales/datalog'); import { DataLog } from '/@/components/pcitc'; - import { ref, computed, onMounted, onUnmounted, createVNode, } from 'vue'; + import { ref, computed, onMounted, onUnmounted, createVNode, watch} from 'vue'; import { Modal } from 'ant-design-vue'; import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; @@ -129,6 +129,7 @@ const btnEvent = {add : handleAdd,refresh : handleRefresh,datalog : handleDatalog,delete : handleDelete,save: handleSave, submit: handleSubmit, cancel: handleCancel} const { currentRoute } = useRouter(); + const tableData = ref([]) const router = useRouter(); const formIdComputedRef = ref(); formIdComputedRef.value = currentRoute.value.meta.formId @@ -158,6 +159,11 @@ return { ...params, FormId: formIdComputedRef.value, PK: 'id',page:params.limit,cuCode:curCuCode.value }; }, afterFetch: (res) => { + tableData.value = res || [] + tableData.value.forEach(v => { + v.timeIn = v.timeIn ? dayjs(v.timeIn) : null + v.timeOut = v.timeOut ? dayjs(v.timeOut) : null + }) tableRef.value.setToolBarWidth(); }, @@ -181,6 +187,21 @@ }, }); + watch( + () => tableData.value, + (val) => { + if (val) { + + if (tableData.value.length) { + setTableData(tableData.value) + } + } + }, + { + immediate: true, + deep: true, + } + ); function onSelectChange(selectedRowKeys: [], selectedRows) { selectedKeys.value = selectedRowKeys; selectedRowsData.value = selectedRows;