浏览代码

优化表格和检验检查时间

xiaochan 2 年之前
父节点
当前提交
6d9a874cd0

+ 5 - 1
src/components/xiao-chan/xc-table-v2/XcTableV2.vue

@@ -4,6 +4,7 @@
     <div class="xc-table_v2"
          ref="tableRef">
       <div class="header"
+           style="margin-right: 15px"
            ref="headerRef">
         <template v-for="(item,index) in props.columns">
           <div class="th"
@@ -15,6 +16,7 @@
             {{ item.name }}
           </div>
         </template>
+
       </div>
       <div v-bind="containerProps"
            class="xc-body_v2"
@@ -352,7 +354,7 @@ defineExpose({
       height: 22px;
       display: flex;
       align-items: center;
-      border-bottom: 1px solid #ebeef5;
+
 
       &:hover {
         background-color: #e0ecff;
@@ -361,6 +363,7 @@ defineExpose({
     }
 
     .cell {
+      box-sizing: border-box;
       overflow: hidden;
       display: flex;
       align-items: center;
@@ -371,6 +374,7 @@ defineExpose({
       flex-shrink: 0;
       background-color: inherit;
       color: inherit;
+      border-bottom: 1px solid #ebeef5;
     }
   }
 }

+ 20 - 0
src/views/hospitalization/zhu-yuan-yi-sheng/jian-cha-jian-yan-shen-qing/components/public/JianChaJianYanTable.vue

@@ -9,6 +9,8 @@ import {
   viewInspectionItemDetails
 } from "@/api/zhu-yuan-yi-sheng/jian-yan-jian-cha-shen-qing";
 import XcSelectV3 from "@/components/xiao-chan/select-v3/XcSelectV3.vue";
+import {computed} from "vue";
+import store from "@/store";
 
 const {data, isCheck, publicData} = defineProps({
   data: {
@@ -101,6 +103,14 @@ const getFeeList = (row) => {
   })
 }
 
+const userInfo = computed(() => {
+  return store.getters['user/info']
+})
+
+const showStartTime = () => {
+  return userInfo.value.deptCode === '1160000' || userInfo.value.deptCode === '3100000'
+}
+
 onMounted(() => {
   watch(() => data.length, () => {
     if (data.length === 0) {
@@ -183,6 +193,16 @@ onMounted(() => {
         </el-button-group>
       </template>
     </el-table-column>
+    <el-table-column label="医嘱时间" prop="startTime" width="180" v-if="showStartTime()">
+      <template #default="scope">
+        <el-date-picker
+            style="width: 150px;"
+            type="datetime"
+            v-model="scope.row.startTime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </template>
+    </el-table-column>
     <el-table-column label="项目名称"
                      prop="orderName"
                      show-overflow-tooltip>