XMLWAN 4 gadus atpakaļ
vecāks
revīzija
bb6dda580a

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 21 - 18231
package-lock.json


+ 2 - 7
src/xt_pages/dialysis/details/DialysisPrescription.vue Parādīt failu

@@ -81,13 +81,8 @@
81 81
           <span class="content">{{
82 82
             target_ultrafiltration != "0" ? target_ultrafiltration : ""
83 83
           }}</span>
84
-<<<<<<< HEAD
85
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
86
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
87
-=======
88
-          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
89
-          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 ||   this.$store.getters.xt_user.template_info.template_id != 32 ||  this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
90
->>>>>>> 42d7e0b219d9a83d624cd083c941f57f219af915
84
+          <span v-if="this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.org_id != 9555" class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
85
+          <span v-if="this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span
91 86
         </li>
92 87
         <li v-if="isShow('葡萄糖')">
93 88
           <label>葡萄糖 : </label>

+ 32 - 36
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Parādīt failu

@@ -87,11 +87,7 @@
87 87
           </el-col>
88 88
 
89 89
           <el-col :span="8"
90
-<<<<<<< HEAD
91
-                  v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
92
-=======
93 90
                   v-if="isShows('目标超滤量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22  || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28  || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
94
->>>>>>> 42d7e0b219d9a83d624cd083c941f57f219af915
95 91
             <el-form-item label="目标超滤量(ml):">
96 92
               <el-input
97 93
                 type="number"
@@ -101,11 +97,7 @@
101 97
           </el-col>
102 98
 
103 99
           <el-col :span="8"
104
-<<<<<<< HEAD
105
-                  v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
106
-=======
107 100
                   v-if="isShows('目标超滤量')  && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 &&this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
108
->>>>>>> 42d7e0b219d9a83d624cd083c941f57f219af915
109 101
             <el-form-item label="目标超滤量(L):">
110 102
               <el-input
111 103
                 type="number"
@@ -349,7 +341,7 @@
349 341
             </el-form-item>
350 342
           </el-col>
351 343
 
352
-      
344
+
353 345
 
354 346
           <el-col :span="8" v-if="isShows('透析器/灌流器')">
355 347
             <el-form-item label="透析器/灌流器">
@@ -1305,27 +1297,31 @@
1305 1297
         this.InnerDialogProps.visibility = true
1306 1298
         switch (val) {
1307 1299
           case '5': // 透析器/灌流器
1308
-             var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
1309
-             var newArr =  arr.split(",")
1310
-            console.log("透析器/灌流器",newArr)
1311
-            var Arr = []
1312
-            for(let i=0;i<newArr.length;i++){
1313
-              for(let j=0;j<this.dialyzerPerfusionApparatus.length;j++){
1314
-                 var newarr = newArr[i].toUpperCase()
1315
-
1316
-                 var dialy = this.dialyzerPerfusionApparatus[j].name.toUpperCase()
1317
-
1318
-                 if(newarr == dialy){
1319
-                    Arr.push(this.dialyzerPerfusionApparatus[j].name)
1320
-                 }
1321
-              }
1322
-            }
1323
-            var arrtwo = Arr.join(",")
1324
-            console.log("Arr",arrtwo)
1300
+            // var Arr = []
1301
+            // if(this.dialysisPrescription.dialyzer_perfusion_apparatus.length>0){
1302
+            //     var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
1303
+            //     var newArr =  arr.split(",")
1304
+            //     console.log("透析器/灌流器",newArr)
1305
+            //
1306
+            //     for(let i=0;i<newArr.length;i++){
1307
+            //       for(let j=0;j<this.dialyzerPerfusionApparatus.length;j++){
1308
+            //         var newarr = newArr[i].toUpperCase()
1309
+            //
1310
+            //         var dialy = this.dialyzerPerfusionApparatus[j].name.toUpperCase()
1311
+            //
1312
+            //         if(newarr == dialy){
1313
+            //           Arr.push(this.dialyzerPerfusionApparatus[j].name)
1314
+            //         }
1315
+            //       }
1316
+            //     }
1317
+            //     var arrtwo = Arr.join(",")
1318
+            //     console.log("Arr",arrtwo)
1319
+            //   }
1320
+
1325 1321
             this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
1326 1322
             this.InnerDialogProps.titles = '透析器/灌流器'
1327 1323
             this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
1328
-            this.InnerDialogProps.selected = arrtwo
1324
+            this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
1329 1325
             this.InnerDialogProps.isShowTextArea = false
1330 1326
             break
1331 1327
 
@@ -1335,10 +1331,10 @@
1335 1331
             this.InnerDialogProps.titles = '抽血'
1336 1332
             this.InnerDialogProps.type = 'blood'
1337 1333
             this.InnerDialogProps.selected = this.dialysisPrescription.blood
1338
-            this.InnerDialogProps.isShowTextArea = false    
1339
-          
1334
+            this.InnerDialogProps.isShowTextArea = false
1335
+
1340 1336
            case '7': // 透析器
1341
-          
1337
+
1342 1338
         }
1343 1339
       },
1344 1340
       innerDialogComfirm: function(val) {
@@ -1917,7 +1913,7 @@
1917 1913
         this.isVisibility = false
1918 1914
       },
1919 1915
       changeThisAnticoagulant: function(val) {
1920
-        
1916
+
1921 1917
         var thismode = val
1922 1918
         if (isNaN(thismode) || thismode <= 0) {
1923 1919
           return false
@@ -3195,9 +3191,9 @@
3195 3191
         const res = new Map();
3196 3192
         return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1));
3197 3193
       },
3198
-     
3194
+
3199 3195
     },
3200
-  
3196
+
3201 3197
     watch: {
3202 3198
       'dialysisPrescription.dialysis_duration_hour': function() {
3203 3199
         let dialysis_duration_minute = 0
@@ -3252,7 +3248,7 @@
3252 3248
           this.dialysisPrescription.anticoagulant_zongliang = ''
3253 3249
         }
3254 3250
 
3255
-       
3251
+
3256 3252
       },
3257 3253
       'dialysisPrescription.anticoagulant_shouji': function() {
3258 3254
         let dialysis_duration_minute = 0
@@ -3284,7 +3280,7 @@
3284 3280
           this.dialysisPrescription.anticoagulant_zongliang = ''
3285 3281
         }
3286 3282
 
3287
-        
3283
+
3288 3284
       },
3289 3285
       'dialysisPrescription.anticoagulant_weichi': function() {
3290 3286
         let dialysis_duration_minute = 0
@@ -3311,7 +3307,7 @@
3311 3307
           this.dialysisPrescription.anticoagulant_zongliang = ''
3312 3308
         }
3313 3309
 
3314
-      
3310
+
3315 3311
       },
3316 3312
       'prescription.id': {
3317 3313
         immediate: true,

+ 7 - 7
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue Parādīt failu

@@ -82,14 +82,14 @@
82 82
           >结算单
83 83
           </el-button>
84 84
 
85
-          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(10)" type="primary"-->
86
-          <!--&gt;退号-->
87
-          <!--</el-button>-->
85
+          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(10)" type="primary"-->
86
+          &gt;退号
87
+          </el-button>
88 88
 
89
-          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"-->
90
-                     <!--size="small" @click="open(11)" type="primary"-->
91
-          <!--&gt;撤销明细-->
92
-          <!--</el-button>-->
89
+          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
90
+                     size="small" @click="open(11)" type="primary"
91
+          &gt;撤销明细>
92
+          </el-button>
93 93
 
94 94
 
95 95
           <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(12)" type="primary"-->