浏览代码

优化代码修复bug

xiaochan 2 年之前
父节点
当前提交
dc35fb3762

+ 1 - 1
src/components/xiao-chan/sd-table/table-header/SdTableHeader.vue

@@ -29,7 +29,7 @@ onMounted(async () => {
 })
 </script>
 
-<style>
+<style lang="scss">
 .sd-table-header {
     display: flex;
     border-bottom: 1px solid black;

+ 1 - 1
src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrOrderList.vue

@@ -47,8 +47,8 @@
                     <vxe-colgroup title="停止">
                         <vxe-column title="停止时间" field="endTime" width="120"/>
                         <vxe-column title="停止医生" field="modifierName" width="120"/>
+                        <vxe-column title="停止护士" field="executer1" width="120"/>
                     </vxe-colgroup>
-
                 </vxe-table>
             </template>
         </el-auto-resizer>

+ 4 - 2
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/Home.vue

@@ -69,7 +69,7 @@ import EmrLeaveHospitalPatient from "@/components/zhu-yuan-yi-sheng/emr/EmrLeave
 import EmrSelectPat from "@/components/zhu-yuan-yi-sheng/EmrSelectPat.vue";
 import XcDialogV2 from "@/components/xiao-chan/dialog/XcDialogV2.vue";
 import {emrSocketUnlockApi, repeatedlyOpenTheSamePatient} from "@/api/zhu-yuan-yi-sheng/emr-socket";
-import {stringIsBlank} from "@/utils/blank-utils";
+import {stringIsBlank, stringNotBlank} from "@/utils/blank-utils";
 import EmrQualityControlRelieve
     from "@/components/zhu-yuan-yi-sheng/emr/EmrQualityControlRelieve/EmrQualityControlRelieve.vue";
 import {getMyUnlockByPatNo} from "@/api/zhu-yuan-yi-sheng/emr-control-rule";
@@ -262,7 +262,9 @@ const emrSocketUnlock = async () => {
         let editor = emrMitt.emit('editor')
         let id = editor.documentData._id
         let userData = store.state.user.info
-        documentSid = 'documentEmr_' + id + '_' + userData.code
+        if (stringNotBlank(id)) {
+            documentSid = 'documentEmr_' + id + '_' + userData.code;
+        }
     } catch {
 
     }