xiaochan vor 1 Jahr
Ursprung
Commit
df9ab0121a

+ 22 - 10
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/BaoCuoXinXi.vue

@@ -4,7 +4,7 @@
                  :x="77"
                  :y="494"
                  width="420px">
-    <transition-group name="list" tag="div" class="box">
+    <TransitionGroup name="list" tag="div" class="box">
       <div
           v-for="(value, key) in  errorMsg.data "
           class="message"
@@ -12,34 +12,43 @@
           :class="yiZhuData.actOrderNo == key ? 'current_selected' : '' "
           @click="divClick(key,value)">
         <div class="name">
+          <span
+              @click.stop.prevent="errorMsgFunc.delByOrder(key)">
+            移除
+          </span>
           医嘱号: {{ key }}
           序号:{{ getYzIndex(key) + 1 }}
         </div>
-        <div v-if="value?.error" class="error">
+        <div v-if="value?.error"
+             class="error">
           <div>
             错误信息:
           </div>
-          <div v-for="(item,index) in value?.error">
+          <div
+              v-for="(item,index) in value?.error">
             {{ index + 1 }}、 {{ item }}
           </div>
         </div>
 
-        <div v-if="value?.warning" class="warning">
+        <div v-if="value?.warning"
+             class="warning">
           <div>
             警告信息:
           </div>
-          <div v-for="(item,index) in value?.warning">
+          <div
+              v-for="(item,index) in value?.warning">
             {{ index + 1 }}、 {{ item }}
           </div>
         </div>
       </div>
-    </transition-group>
+    </TransitionGroup>
   </FloatingFrame>
 </template>
 
 <script setup lang="ts">
 import {
-  errorMsg, errorMsgFunc,
+  errorMsg,
+  errorMsgFunc,
   getYzIndex,
   yiZhuData
 } from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
@@ -66,8 +75,6 @@ const clickToModify = (key: any) => {
 </script>
 
 <style scoped lang="scss">
-
-
 .box {
   margin: 5px;
   padding: 4px;
@@ -94,6 +101,12 @@ const clickToModify = (key: any) => {
       border-radius: 5px;
       background-color: #2c3e50;
       color: white;
+
+      span {
+        margin: auto;
+        color: #e82424;
+        cursor: pointer;
+      }
     }
 
     .error {
@@ -133,5 +146,4 @@ const clickToModify = (key: any) => {
   transform: translateX(30px);
 }
 
-
 </style>

+ 0 - 3
src/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng.ts

@@ -648,11 +648,8 @@ export const tempYzData = computed<YzType[]>(() => {
         } else if (queryParam.value.zhuangTai === 5) {
             zhuangTai = item.statusFlag === '5'
         }
-
         return flag && frequFlag && zhuangTai;
     })
-
-
     return XEUtils.orderBy(temp, [['actOrderNo', 'asc']])
 })