Sfoglia il codice sorgente

新增人数显示,医嘱闪烁变成 1200 毫秒 ,优化第一次开医嘱不会下拉,新增批量复制粘贴。

xiaochan 2 anni fa
parent
commit
6eed239776

+ 4 - 2
src/components/xiao-chan/checkbox/XcCheckbox.vue

@@ -1,11 +1,13 @@
 <template>
   <label class="xc_checkbox">
-    <input type="checkbox" v-model="tempValue" @keydown.enter="enterEvent" @change="changeCheckbox">
+    <input type="checkbox" v-model="tempValue"
+           @keydown.enter="enterEvent"
+           @change="changeCheckbox">
     {{ label }}
   </label>
 </template>
 
-<script setup name='XcCheckbox'>
+<script setup>
 const props = defineProps({
   modelValue: {
     type: [String, Number, Boolean]

+ 7 - 1
src/components/zhu-yuan-yi-sheng/public/PatientList.vue

@@ -9,7 +9,13 @@
                :value="item.code"/>
   </el-select>
   <br>
-  <xc-checkbox v-model="myPatient" @change="myPatientChange" label="我的病人"/>
+  <div style="display: flex ; align-content: center">
+    <xc-checkbox v-model="myPatient" @change="myPatientChange" label="我的病人"/>
+    <div style="color:red;">
+      {{ overviews.length }}人
+    </div>
+  </div>
+
   <el-table :data="cptOverviews"
             :height="props.height"
             @row-click="handleClickOverview"

+ 3 - 2
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/table/YzTableV2.vue

@@ -249,7 +249,7 @@ const rowClick = (data) => {
 
 const rowClass = (data) => {
   if (typeof twinkleList.value[data.actOrderNo] !== 'undefined') {
-    sleep(3000).then(() => {
+    sleep(1200).then(() => {
       delete twinkleList.value[data.actOrderNo]
     })
     return 'animation_hzfirst'
@@ -388,6 +388,7 @@ onMounted(() => {
 
 
   yzMitt.on('setOrderNoTwinkle', async (val) => {
+    val = parseInt(val)
     twinkleList.value[val] = true
     let index = -1
 
@@ -400,7 +401,7 @@ onMounted(() => {
       })
     } catch {
     }
-    tableRef.value.scrollTo(index);
+    tableRef.value.scrollTo(index - 2);
   })
 
   yzMitt.on('getSelectedData', () => {

+ 3 - 1
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/yz-edit/YzEditor.vue

@@ -659,7 +659,9 @@ const toAddAnOrder = async () => {
     // 数据完全没问题
     if (res != null && res.code && res.code === 200) {
       errorMessageData.value = {}
-      await setOrderDataAndTwinkle(yiZhuData.value.actOrderNo, res.data)
+      let orderNo = typeof yiZhuData.value.actOrderNo === 'string'
+          ? parseInt(yiZhuData.value.actOrderNo) : yiZhuData.value.actOrderNo
+      await setOrderDataAndTwinkle(orderNo, res.data)
     }
     setTheTemporaryVariableMedicalOrder()
   } catch (e) {

+ 5 - 2
src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/components/table/CopyTableDataOrder.vue

@@ -41,6 +41,11 @@ const confirmClick = () => {
     })
     yzMitt.emit('scrollEndAndTwinkle', temp)
     modelValue.value = false
+
+    XEUtils.arrayEach(yzMitt.emit('getSelectedData'), (item) => {
+      item.$selected = false
+    })
+
   })
 }
 
@@ -63,8 +68,6 @@ onMounted(async () => {
     item.startTime = now
     item.endTime = null
   });
-
-
 })
 
 </script>