Browse Source

修复成组问题和退费问题

xiaochan 2 years ago
parent
commit
4f9d0cb51b

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

@@ -417,6 +417,7 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
     try {
       let queryKey = row.orderCode + '_' + '00' + '_' + props.patientInfo.zkWard + '_' + queryParam.value.groupNo + "_" + yiZhuData.value.superiorDoctor
       let res = await huoQuFeiYongXinXi(queryKey)
+      tiShiBiaoTi.value = res.prompt
       if (newData) {
         openTheOrderPopUpWindow('请输入处置医嘱名')
         if (stringNotBlank(res.prompt)) {
@@ -669,8 +670,9 @@ const toAddAnOrder = async () => {
         let list = Array.from(tempMap.values());
         yzData.value.push(...list);
       }
-      setYzOrderGroup()
+
       await nextTick()
+      setYzOrderGroup()
       // 设置高亮
       yzMitt.emit('setOrderNoTwinkle', yiZhuData.value.actOrderNo);
     }

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

@@ -368,7 +368,7 @@ export function yzDataToTree(data: yzType[]): yzType[] {
     // 没有匹配到父级的子节点
     let noParent: Map<number, yzType> = new Map();
     // 克隆一下原来的数据
-    let cloneData: yzType[] = JSON.parse(JSON.stringify(data))
+    let cloneData: yzType[] = JSON.parse(JSON.stringify(XEUtils.orderBy(data, [['actOrderNo', 'asc']])))
     // 转 map
     let tempMap: Map<number, yzType> = new Map();
     let tree: yzType[] = [];