Browse Source

Merge remote-tracking branch 'origin/20230223_pad_vue_new_branch' into 20230223_pad_vue_new_branch

yq1 3 days ago
parent
commit
83fd1fa74f
2 changed files with 11 additions and 3 deletions
  1. 1 1
      build/cdn.json
  2. 10 2
      src/pages/main/newActionBar/dialysisPrescription.vue

+ 1 - 1
build/cdn.json View File

1
 {
1
 {
2
-  "version": "2999.999.13754"
2
+  "version": "2999.999.13755"
3
 }
3
 }

+ 10 - 2
src/pages/main/newActionBar/dialysisPrescription.vue View File

1775
         blood_access_part_id:"",
1775
         blood_access_part_id:"",
1776
         anticoagulant_weichi_hour:"",
1776
         anticoagulant_weichi_hour:"",
1777
         dialyzate:"",
1777
         dialyzate:"",
1778
+        dialysis_dialyszers_id:0,
1779
+        dialysis_strainer_id:0,
1780
+        dialysis_irrigation_id:0
1778
       },
1781
       },
1779
       anticoagulant: {
1782
       anticoagulant: {
1780
         id: 0,
1783
         id: 0,
1926
         dialysisStrainer.push(arrThree[i].GoodInfo[j])
1929
         dialysisStrainer.push(arrThree[i].GoodInfo[j])
1927
       }
1930
       }
1928
     }
1931
     }
1932
+
1929
     this.dialysisDialyszers = dialyzer
1933
     this.dialysisDialyszers = dialyzer
1930
     this.dialysisIrrigation = irrigation
1934
     this.dialysisIrrigation = irrigation
1931
     this.dialysisStrainerList = dialysisStrainer
1935
     this.dialysisStrainerList = dialysisStrainer
3787
         title: '提示',
3791
         title: '提示',
3788
         message:
3792
         message:
3789
           '确认保存为长期透析处方',
3793
           '确认保存为长期透析处方',
3790
-      })
3791
-        .then(() => {
3794
+      }).then(() => {
3792
           // on confirm
3795
           // on confirm
3793
           // console.log('确认');
3796
           // console.log('确认');
3797
+             
3798
+         
3794
           if (this.his_is_open == 1) {
3799
           if (this.his_is_open == 1) {
3795
             this.is_open = 0;
3800
             this.is_open = 0;
3796
           }
3801
           }
3903
               }
3908
               }
3904
               let result = [];
3909
               let result = [];
3905
               let filedList = this.$store.getters.user.fileds;
3910
               let filedList = this.$store.getters.user.fileds;
3911
+              
3912
+              
3913
+             
3906
               let new_arr = Object.entries(newParams);
3914
               let new_arr = Object.entries(newParams);
3907
               new_arr.forEach((el) => {
3915
               new_arr.forEach((el) => {
3908
                 if (el[1] === "" || el[1] === 0 ) {
3916
                 if (el[1] === "" || el[1] === 0 ) {