医嘱停止时间

src/components/medical-insurance/charge-list/Charge.vue

@@ -11,6 +11,7 @@ import { getLodop } from "@/utils/c-lodop";
 import {
   formatDate,
   formatDatetime,
+  formatDatetimeEndTime,
   getDateRangeFormatDate,
 } from "@/utils/date";
 
@@ -68,7 +69,8 @@ function openDateRange(row) {
     row.times !== currentRow.value.times
   ) {
     dateRange.value[0] = new Date(row.admdate);
-    dateRange.value[1] = row.disdate ? new Date(row.disdate) : new Date();
+    // console.log("row.disdate",formatDatetimeEndTime(row.disdate));
+    dateRange.value[1] = row.disdate ? formatDatetimeEndTime(row.disdate) : new Date();
   }
   currentRow.value = row;
   showDateRange.value = true;
@@ -82,6 +84,7 @@ function confirmDateRange() {
   console.log(dateRange.value);
   currentRow.value.begndate = formatDatetime(dateRange.value[0]);
   currentRow.value.enddate = formatDatetime(dateRange.value[1]);
+  console.log("dfdfd",formatDatetimeEndTime(dateRange.value[1]))
   // currentRow.value.begndate = formatDate(dateRange.value[0])
   // currentRow.value.enddate = formatDate(dateRange.value[1])
   fetchBriefPatInfo();

src/utils/date.js

@@ -73,6 +73,9 @@ export function formatDatetime(date) {
     clock += ss
     return clock
 }
+export function formatDatetimeEndTime(date) {
+    return getFormatDatetime(date, 'YYYY-MM-DD') + ' 23:59:59'
+}
 
 export function formatDate(date) {
     if (typeof date === 'undefined') return null

src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/components/table/YzTableV3.vue

@@ -280,7 +280,7 @@ const rowClick = ({ row }) => {
 };
 
 const endDateStyle = item => {
-  if (item.endTimeTemp && tableRef.value!.isCheckedByCheckboxRow(item)) {
+  if ((item.endTimeTemp && tableRef.value!.isCheckedByCheckboxRow(item))) {
     return {
       width: "140px",
       color: "white",
@@ -419,6 +419,7 @@ yzMitt.on("getTableRef", () => tableRef.value);
         {{ timeFomat(row.enterTime) }}
       </template>
     </vxe-column>
+    <vxe-column field="physicianName" title="开立医生" width="65" />
     <vxe-column field="startTime" title="开始时间" width="100">
       <template #default="{ row }">
         {{ timeFomat(row.startTime) }}
@@ -435,10 +436,10 @@ yzMitt.on("getTableRef", () => tableRef.value);
           :style="endDateStyle(scope.row)"
           v-model="scope.row.endTimeTemp"
         />
-        <span v-else>{{ timeFomat(scope.row.endTime) }}</span>
+        <span v-else style="color: white;backgroundColor: red;border: 0">{{ timeFomat(scope.row.endTime) }}</span>
       </template>
     </vxe-column>
-
+    <vxe-column field="endPhysicianName" title="结束医生" width="65" />
     <vxe-column field="emergencyFlag" title="紧急" width="30">
       <template #default="{ row }">
         {{ row.emergencyFlag === "1" ? "√" : "" }}
@@ -451,7 +452,7 @@ yzMitt.on("getTableRef", () => tableRef.value);
       </template>
     </vxe-column>
 
-    <vxe-column field="physicianName" title="医生" width="65" />
+    
     <vxe-column field="selfBuyName" title="费用标志" width="60" />
     <vxe-column field="execUnitName" title="执行科室" width="80" />