2 Commits 89a746b802 ... a3641c263d

Auteur SHA1 Bericht Datum
  28169 a3641c263d Merge branch '20230223_pad_vue_new_branch' of http://git.shengws.com/csx/Pad_New into 20230223_pad_vue_new_branch 3 dagen geleden
  28169 aa813a45e2 Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch 3 dagen geleden
2 gewijzigde bestanden met toevoegingen van 3 en 2 verwijderingen
  1. 1 1
      build/cdn.json
  2. 2 1
      src/pages/main/template/DialysisPrintOrderSix.vue

+ 1 - 1
build/cdn.json Bestand weergeven

@@ -1,3 +1,3 @@
1 1
 {
2
-  "version": "2999.999.13759"
2
+  "version": "2999.999.13761"
3 3
 }

+ 2 - 1
src/pages/main/template/DialysisPrintOrderSix.vue Bestand weergeven

@@ -929,7 +929,8 @@
929 929
                           <span  v-if="advice.single_dose != 0"> {{advice.single_dose}}{{advice.single_dose_unit}}</span>
930 930
                           <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
931 931
                           <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
932
-                          <span v-if="advice.parent_id == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
932
+                          <span v-if="advice.parent_id == 0 && advice.remark.length > 0 && org_id!=10644" >({{advice.remark}})</span>
933
+                          <span v-if="(org_id == 0 || org_id == 10644) && advice.remark.length>0" >({{ advice.remark }})</span>
933 934
                         </td>
934 935
                         <!-- <td colspan="2" height="60px" style="text-align: center" v-else >
935 936
                           <span>{{advice.delivery_way}}</span>