修改居家服务提出的需求

src/views/elderly/nursing/records/dispatchList/AddForm.vue

@@ -93,7 +93,7 @@
                 format="YYYY-MM-DD HH:mm:ss"
                 date-format="YYYY-MM-DD HH:mm:ss"
               />
-              <el-text v-else>{{dataForm.serviceBeginTime}}</el-text>
+              <el-text v-else>{{ (dataForm.serviceBeginTime)}}</el-text>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
@@ -112,7 +112,7 @@
                 format="YYYY-MM-DD HH:mm:ss"
                 date-format="YYYY-MM-DD HH:mm:ss"
               />
-              <el-text v-else>{{dataForm.serviceEndTime}}</el-text>
+              <el-text v-else>{{(dataForm.serviceEndTime)}}</el-text>
             </el-form-item>
           </el-col>
         </el-row>
@@ -337,8 +337,12 @@ const open = async (tenantId, id?: any, detail: boolean = false) => {
       const res = await elderlyServiceOrderGet(id)
       dataForm.value = res
       dataForm.value.image = res.image?JSON.parse(res.image):[]
-      dataForm.value.comeTime = formatTimestamp(res.comeTime)
+
       dataForm.value.orderTime = formatTimestamp(res.orderTime)
+      dataForm.value.serviceBeginTime = formatTimestamp(res.serviceBeginTime)
+      dataForm.value.serviceEndTime = formatTimestamp(res.serviceEndTime)
+      dataForm.value.comeTime = formatTimestamp(res.comeTime)
+     // console.log("dataForm.value.serviceEndTime",dataForm.value.serviceEndTime)
       //elderUp(res.elderlyInfo)
       loading.value = false
       //selectElderRef.value.upData(res.elderName)

src/views/elderly/nursing/records/dispatchList/index.vue

@@ -68,24 +68,24 @@
       </el-table-column>
 
 
-      <el-table-column prop="elderName" header-align="center" align="center" label="长者姓名" min-width="150" show-overflow-tooltip/>
-      <el-table-column prop="elderSex" header-align="center" align="center" label="性别" min-width="200" show-overflow-tooltip/>
-      <el-table-column prop="elderAge" header-align="center" align="center" label="年龄" min-width="200" show-overflow-tooltip/>
+      <el-table-column prop="elderName" header-align="center" align="center" label="长者姓名" min-width="120" show-overflow-tooltip/>
+      <el-table-column prop="elderSex" header-align="center" align="center" label="性别" min-width="90" show-overflow-tooltip/>
+      <el-table-column prop="elderAge" header-align="center" align="center" label="年龄" min-width="90" show-overflow-tooltip/>
       <el-table-column prop="serviceItem" header-align="center" align="center" label="服务项目" min-width="200" show-overflow-tooltip/>
-      <el-table-column prop="serviceName" header-align="center" align="center" label="服务人员姓名" min-width="200" show-overflow-tooltip/>
-      <el-table-column prop="elderAddress" header-align="center" align="center" label="地址" min-width="200" show-overflow-tooltip/>
-      <el-table-column prop="orderTime" header-align="center" align="center" label="订单时间" min-width="150" show-overflow-tooltip>
+      <el-table-column prop="serviceName" header-align="center" align="center" label="服务人员姓名" min-width="160" show-overflow-tooltip/>
+      <el-table-column prop="orderTime" header-align="center" align="center" label="订单时间" min-width="180" show-overflow-tooltip>
         <template #default="scope">
           {{(formatToDateTime(scope.row.orderTime))}}
         </template>
       </el-table-column>
-      <el-table-column prop="comeTime" header-align="center" align="center" label="上门时间" min-width="150" show-overflow-tooltip>
+      <el-table-column prop="comeTime" header-align="center" align="center" label="上门时间" min-width="180" show-overflow-tooltip>
         <template #default="scope">
-          {{formatToDateTime(scope.row.comeTime)}}
+          {{formatToDateTime(scope.row.serviceBeginTime)}}
         </template>
       </el-table-column>
-      <el-table-column prop="isExpire" header-align="center" align="center" label="是否过期" min-width="220" show-overflow-tooltip/>
-      <el-table-column prop="orderStatus" header-align="center" align="center" label="订单状态" min-width="220" show-overflow-tooltip/>
+      <el-table-column prop="elderAddress" header-align="center" align="center" label="地址" min-width="220" show-overflow-tooltip/>
+      <el-table-column prop="isExpire" header-align="center" align="center" label="是否过期" min-width="120" show-overflow-tooltip/>
+      <el-table-column prop="orderStatus" header-align="center" align="center" label="订单状态" min-width="160" show-overflow-tooltip/>
 
       <el-table-column label="操作" align="center" width="200" fixed="right">
         <template #default="scope">
@@ -166,7 +166,7 @@ import {
 } from "@/api/member/appointment";
 import download from "@/utils/download";
 import { useUserStore } from '@/store/modules/user'
-import {formatToDateTime, getCurrentMonthRange} from "@/utils/dateUtil";
+import {formatToDate, formatToDateTime, getCurrentMonthRange} from "@/utils/dateUtil";
 import * as UserApi from "@/api/system/user";
 import Import from "@/components/ImportFile/index.vue";
 const message = useMessage() // 消息弹窗
@@ -197,7 +197,7 @@ let queryParams = reactive({
   pageSize: 10,
   elderName: '',
   elderPhone: '',
-  discoveryTime: getCurrentMonthRange(),
+  discoveryTime: ["2025-12-01",formatToDate()],
   tenantIds: userStore.orgTenantId[0]
 })
 const queryFormRef = ref() // 搜索的表单
@@ -292,7 +292,7 @@ const handleQuery = async () => {
 const resetQuery = () => {
   queryParams.elderName = ''
   queryParams.tenantId = userStore.orgTenantId[0]
-  queryParams.discoveryTime= getCurrentMonthRange()
+  queryParams.discoveryTime= ["2025-12-01",formatToDate()]
   queryFormRef.value.resetFields()
   handleQuery()
 }

src/views/elderly/nursing/records/nutrition-record/index.vue

@@ -62,7 +62,7 @@
       <el-table-column prop="bedInfo" header-align="center" align="center" label="床位号" min-width="200" show-overflow-tooltip/>
       <el-table-column prop="recordTime" header-align="center" align="center" label="记录时间" min-width="150" show-overflow-tooltip>
         <template #default="scope">
-          {{(scope.row.recordTime)}}
+          {{formatToDateTime(scope.row.recordTime)}}
         </template>
       </el-table-column>
       <el-table-column prop="recordContent" header-align="center" align="center" label="营养情况描述" min-width="220" show-overflow-tooltip/>