Bladeren bron

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

陈少旭 1 jaar geleden
bovenliggende
commit
d64a3384a2

+ 24 - 15
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue Bestand weergeven

@@ -1215,9 +1215,12 @@
1215 1215
                         <span v-if="record.prescription.anticoagulant == 3"
1216 1216
                           >iu</span
1217 1217
                         >
1218
-                        <span v-if="record.prescription.anticoagulant == 2"
1218
+                        <span v-if="org_id!=9538&&record.prescription.anticoagulant == 2"
1219 1219
                           >mg</span
1220 1220
                         >
1221
+                        <span v-if="org_id==9538&&record.prescription.anticoagulant == 2"
1222
+                          >u</span
1223
+                        >
1221 1224
                         <span v-if="record.prescription.anticoagulant == 1"
1222 1225
                           >mg</span
1223 1226
                         >
@@ -1282,9 +1285,12 @@
1282 1285
                         <span v-if="record.prescription.anticoagulant == 3"
1283 1286
                           >iu/h</span
1284 1287
                         >
1285
-                        <span v-if="record.prescription.anticoagulant == 2"
1288
+                        <span v-if="org_id!=9538&&record.prescription.anticoagulant == 2"
1286 1289
                           >mg/h</span
1287 1290
                         >
1291
+                        <span v-if="org_id==9538&&record.prescription.anticoagulant == 2"
1292
+                          >u</span
1293
+                        >
1288 1294
                         <span v-if="record.prescription.anticoagulant == 1"
1289 1295
                           >mg/h</span
1290 1296
                         >
@@ -1329,9 +1335,12 @@
1329 1335
                         <span v-if="record.prescription.anticoagulant == 3"
1330 1336
                           >iu</span
1331 1337
                         >
1332
-                        <span v-if="record.prescription.anticoagulant == 2"
1338
+                        <span v-if="org_id!=9538&&record.prescription.anticoagulant == 2"
1333 1339
                           >mg</span
1334 1340
                         >
1341
+                        <span v-if="org_id==9538&&record.prescription.anticoagulant == 2"
1342
+                          >u</span
1343
+                        >
1335 1344
                         <span v-if="record.prescription.anticoagulant == 1"
1336 1345
                           >mg</span
1337 1346
                         >
@@ -3707,7 +3716,7 @@ export default {
3707 3716
              
3708 3717
             }
3709 3718
 
3710
-            // var delghTwo = 0;
3719
+            var delghTwo = this.records[recordIndex].advices.length
3711 3720
             // if (
3712 3721
             //   this.records[recordIndex].advices &&
3713 3722
             //   this.records[recordIndex].advices.length < 8
@@ -3717,17 +3726,17 @@ export default {
3717 3726
             //   delghTwo = 0;
3718 3727
             // }
3719 3728
 
3720
-            // if (delghTwo > 0) {
3721
-            //   if (
3722
-            //     typeof this.records[recordIndex].advices === "undefined" ||
3723
-            //     this.records[recordIndex].advices == null
3724
-            //   ) {
3725
-            //     this.records[recordIndex].advices = [];
3726
-            //   }
3727
-            //   for (let index = 0; index < delghTwo; index++) {
3728
-            //     this.records[recordIndex].advices.push([]);
3729
-            //   }
3730
-            // }
3729
+            if (delghTwo > 0) {
3730
+              if (
3731
+                typeof this.records[recordIndex].advices === "undefined" ||
3732
+                this.records[recordIndex].advices == null
3733
+              ) {
3734
+                this.records[recordIndex].advices = [];
3735
+              }
3736
+              for (let index = 0; index < delghTwo; index++) {
3737
+                this.records[recordIndex].advices.push([]);
3738
+              }
3739
+            }
3731 3740
 
3732 3741
 
3733 3742
 

+ 8 - 2
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue Bestand weergeven

@@ -1021,9 +1021,15 @@ export default {
1021 1021
 
1022 1022
       if(this.predialysis_evaluation!=null){
1023 1023
          
1024
-        this.form.additional_weight = this.predialysis_evaluation.additional_weight
1025
-      }
1024
+         this.form.additional_weight = this.predialysis_evaluation.additional_weight
1025
+       }
1026 1026
       
1027
+    },
1028
+    'form.additional_weight':function(){
1029
+      if(this.predialysis_evaluation!=null){
1030
+         
1031
+         this.form.additional_weight = this.predialysis_evaluation.additional_weight
1032
+       }
1027 1033
     }
1028 1034
   },
1029 1035
   methods: {

+ 9 - 5
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Bestand weergeven

@@ -1247,7 +1247,8 @@
1247 1247
                      <span v-if="prescription.anticoagulant == 13">iu</span>
1248 1248
                       <span v-if="prescription.anticoagulant == 4">mg</span>
1249 1249
                       <span v-if="prescription.anticoagulant == 3">iu</span>
1250
-                      <span v-if="prescription.anticoagulant == 2">mg</span>
1250
+                      <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
1251
+                      <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
1251 1252
                       <span v-if="prescription.anticoagulant == 1">mg</span>
1252 1253
                     </span>
1253 1254
 
@@ -1299,9 +1300,10 @@
1299 1300
                         <span v-if="prescription.anticoagulant == 11">iu/h</span>
1300 1301
                         <span v-if="prescription.anticoagulant == 13">iu/h</span>
1301 1302
                         <span v-if="prescription.anticoagulant == 5">ml/h</span>
1302
-                          <span v-if="prescription.anticoagulant == 4">mg/h</span>
1303
-                          <span v-if="prescription.anticoagulant == 3">iu/h</span>
1304
-                          <span v-if="prescription.anticoagulant == 2">mg/h</span>
1303
+                        <span v-if="prescription.anticoagulant == 4">mg/h</span>
1304
+                        <span v-if="prescription.anticoagulant == 3">iu/h</span>
1305
+                        <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg/h</span>
1306
+                        <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
1305 1307
                           <span v-if="prescription.anticoagulant == 1">mg/h</span>
1306 1308
                       </span>
1307 1309
                       <span v-if="org_id==9675 || org_id==10447 || org_id== 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460">
@@ -1380,7 +1382,9 @@
1380 1382
                       <span v-if="prescription.anticoagulant == 13">iu</span>
1381 1383
                       <span v-if="prescription.anticoagulant == 4">mg</span>
1382 1384
                       <span v-if="prescription.anticoagulant == 3">iu</span>
1383
-                      <span v-if="prescription.anticoagulant == 2">mg</span>
1385
+
1386
+                      <span v-if="org_id!=9538&& prescription.anticoagulant == 2">mg</span>
1387
+                      <span v-if="org_id==9538&& prescription.anticoagulant == 2">u</span>
1384 1388
                       <span v-if="prescription.anticoagulant == 1">mg</span>
1385 1389
                      </span>
1386 1390
                     <span v-if="org_id==9675 || org_id==10447 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471|| org_id == 10460">

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue Bestand weergeven

@@ -667,7 +667,7 @@
667 667
                 <table class="table-box">
668 668
                   <tbody>
669 669
                     <tr>
670
-                 d
670
+
671 671
 
672 672
                       <!-- <td width="60">
673 673
                           <div class="under-line">&nbsp;{{ prescription.anticoagulant == '依诺肝素' && prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : ""}}</div>

+ 152 - 19
src/xt_pages/user/Informed/Informedconsent.vue Bestand weergeven

@@ -84,47 +84,47 @@
84 84
               </div>
85 85
               <div style="width: 67%; margin-left: 10px;">
86 86
                 <div v-if="face_show">
87
-                  <Falloutbedprint :patient_id ="this.patientID" :listPrint="listPrint"></Falloutbedprint>
87
+                  <Fallout_Bed_Print :patient_id ="this.patientID" :listPrint="listPrint" ref="childOne" @getFallOutBedPrintList="getFallOutBedPrintList"></Fallout_Bed_Print>
88 88
                 </div>
89 89
                 <div v-if="filter_show">
90 90
                   <!-- filter_show -->
91
-                  <Filter_informed :patient_id ="this.patientID" :filterList="filterList" ></Filter_informed>
91
+                  <Filter_informed :patient_id ="this.patientID" :filterList="filterList" ref="childTwo" @getFilterInformed="getFilterInformed"></Filter_informed>
92 92
                 </div>
93 93
                 <div v-if="profunda_show">
94
-                  <profunda_informed :patient_id ="this.patientID" :profundaPrint="profundaPrint"></profunda_informed>
94
+                  <profunda_informed :patient_id ="this.patientID" :profundaPrint="profundaPrint" ref="childThree" @getProfundaInformed="getProfundaInformed"></profunda_informed>
95 95
                 </div>
96 96
                 <div v-if="arteriovenous_show">
97
-                  <arteriovenous_informed :patient_id ="this.patientID" :arterOvenousPrint="arterOvenousPrint"></arteriovenous_informed>
97
+                  <arteriovenous_informed :patient_id ="this.patientID" :arterOvenousPrint="arterOvenousPrint" ref="childFour" @getArterOvernous="getArterOvernous"></arteriovenous_informed>
98 98
                 </div>
99 99
                 <div v-if="Highrisk_show" >
100
-                  <Highrisk_informed :patient_id ="this.patientID" :highRiskPrint="highRiskPrint"></Highrisk_informed>
100
+                  <Highrisk_informed :patient_id ="this.patientID" :highRiskPrint="highRiskPrint" ref="childFive" @getHighRiskInformed="getHighRiskInformed"></Highrisk_informed>
101 101
                 </div>
102 102
                 <div v-if="anticoagulation_show">
103
-                  <anticoagulation_informed :patient_id ="this.patientID"></anticoagulation_informed>
103
+                  <anticoagulation_informed :patient_id ="this.patientID" :auncoagulationPrint="auncoagulationPrint" @getAnticoagulationInformed="getAnticoagulationInformed" ref="childSix"></anticoagulation_informed>
104 104
                 </div>
105 105
                 <div v-if="critical_show">
106
-                  <critical_informed :patient_id ="this.patientID"></critical_informed>
106
+                  <critical_informed :patient_id ="this.patientID" @getCriticalInformed="getCriticalInformed" :criticalInforPrint="criticalInforPrint" ref="childSeven"></critical_informed>
107 107
                 </div>
108 108
                 <div v-if="hemoperfusion_show">
109
-                  <hemoperfusion_informed :patient_id ="this.patientID"></hemoperfusion_informed>
109
+                  <hemoperfusion_informed :patient_id ="this.patientID" @getHemoperfusionInformed="getHemoperfusionInformed" :hemoperfusionPrint="hemoperfusionPrint" ref="childEight"></hemoperfusion_informed>
110 110
                 </div>
111 111
                 <div v-if="Bring_show">
112
-                  <Bring_informed :patient_id ="this.patientID"></Bring_informed>
112
+                  <Bring_informed :patient_id ="this.patientID" @getInformedConsent="getInformedConsent" :informedConsentPrint="informedConsentPrint" ref="childNight"></Bring_informed>
113 113
                 </div>
114 114
                 <div v-if="catheterization_show">
115
-                  <catheterization_informed :patient_id ="this.patientID"></catheterization_informed>
115
+                  <catheterization_informed :patient_id ="this.patientID" @getCatheterization="getCatheterization" ref="childTwely" :cathetherizationPrint="cathetherizationPrint"></catheterization_informed>
116 116
                 </div>
117 117
                 <div v-if="dialyzer_show">
118
-                  <dialyzer_informed :patient_id ="this.patientID"></dialyzer_informed>
118
+                  <dialyzer_informed :patient_id ="this.patientID" :dialyzerInformedPrint="dialyzerInformedPrint" ref="childTen" @getDialyzerInformed="getDialyzerInformed"></dialyzer_informed>
119 119
                 </div>
120 120
                 <div v-if="therapy_show">
121
-                  <therapy_informed :patient_id ="this.patientID"></therapy_informed>
121
+                  <therapy_informed :patient_id ="this.patientID"ref="childEleven" :therapyinformePrint="therapyinformePrint" @getTherapyInformed="getTherapyInformed"></therapy_informed>
122 122
                 </div>
123 123
                 <div v-if="history_show">
124
-                  <Medicalhistory :patient_id ="this.patientID" :medicalList="medicalList" ref="childThrity"></Medicalhistory>
124
+                  <Medicalhistory :patient_id ="this.patientID" :medicalList="medicalList" ref="childThrity" @getPatientMeDicalList="getPatientMeDicalList"></Medicalhistory>
125 125
                 </div>
126 126
                 <div v-if="show14">
127
-                  <heal_informed :patient_id ="this.patientID"></heal_informed>
127
+                  <heal_informed :patient_id ="this.patientID" ></heal_informed>
128 128
                 </div>
129 129
                 <div v-if="show15">
130 130
                   <criticalpatient_informed :patient_id ="this.patientID"></criticalpatient_informed>
@@ -144,7 +144,7 @@
144 144
 
145 145
 <script>
146 146
 import PatientSidebar from '../components/PatientSidebar'
147
-import Falloutbedprint from './components/Falloutbedprint'
147
+import Fallout_Bed_Print from './components/Falloutbedprint'
148 148
 import Filter_informed from './components/Filter_informed'
149 149
 import profunda_informed from './components/profunda_informed'
150 150
 import arteriovenous_informed from './components/arteriovenous_informed'
@@ -160,12 +160,12 @@ import Medicalhistory from './components/Medicalhistory'
160 160
 import heal_informed from './components/heal_informed'
161 161
 import criticalpatient_informed from './components/criticalpatient_informed'
162 162
 import criticalpatient_informed2 from './components/criticalpatient_informed2'
163
-import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,getArterOvernous,getHighRiskInformed,getPatientMeDicalList  } from '@/api/patient'
163
+import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,getArterOvernous,getHighRiskInformed,getPatientMeDicalList,getAnticoagulationInformed,getCriticalInformed,getHemoperfusionInformed,getInformedConsent,getCatheterization,getDialyzerInformed, getTherapyInformed } from '@/api/patient'
164 164
 export default {
165 165
 
166 166
   components: {
167 167
     PatientSidebar,
168
-    Falloutbedprint,
168
+    Fallout_Bed_Print,
169 169
     Filter_informed,
170 170
     profunda_informed,
171 171
     arteriovenous_informed,
@@ -217,7 +217,14 @@ export default {
217 217
       profundaPrint:{},
218 218
       arterOvenousPrint:{},
219 219
       highRiskPrint:{},
220
-      medicalList:{}
220
+      medicalList:{},
221
+      auncoagulationPrint:{},
222
+      criticalInforPrint:{},
223
+      hemoperfusionPrint:{},
224
+      informedConsentPrint:{},
225
+      cathetherizationPrint:{},
226
+      dialyzerInformedPrint:{},
227
+      therapyinformePrint:{}
221 228
     }
222 229
 
223 230
   },
@@ -238,6 +245,7 @@ export default {
238 245
       }
239 246
     })
240 247
    },
248
+   
241 249
    getPatientMeDicalList(){
242 250
       var params = {
243 251
          patient_id:this.patientID,
@@ -250,6 +258,118 @@ export default {
250 258
         }
251 259
      })
252 260
    },
261
+
262
+   getFallOutBedPrintList(){
263
+      
264
+      getFallOutBedPrintList().then(response=>{
265
+         if(response.data.state ==1){
266
+            var list = response.data.data.list
267
+            this.listPrint = list
268
+            this.$refs.childOne.show(list)
269
+         }
270
+      })
271
+    },
272
+    getFilterInformed(){
273
+      getFilterInformed().then(response=>{
274
+        if(response.data.state ==1){
275
+          var list = response.data.data.list
276
+          this.filterList = list
277
+          this.$refs.childTwo.show(list)
278
+        }
279
+      })
280
+    },
281
+    getProfundaInformed(){
282
+      console.log("出发阿道夫奥德赛佛")
283
+      getProfundaInformed().then(response=>{
284
+        if(response.data.state ==1){
285
+          var list = response.data.data.list
286
+          this.profundaPrint = list
287
+          this.$refs.childThree.show(list)
288
+        }
289
+      })
290
+    },
291
+    getArterOvernous(){
292
+      getArterOvernous().then(response=>{
293
+        if(response.data.state==1){
294
+          var list = response.data.data.list
295
+          this.arterOvenousPrint= list
296
+          this.$refs.childFour.show(list)
297
+        }
298
+      })
299
+    },
300
+    getHighRiskInformed(){
301
+      getHighRiskInformed().then(response=>{
302
+        if(response.data.state ==1){
303
+           var list = response.data.data.list
304
+           this.highRiskPrint = list
305
+           this.$refs.childFive.show(list)
306
+        }
307
+      })
308
+    },
309
+    getAnticoagulationInformed(){
310
+      getAnticoagulationInformed().then(response=>{
311
+         if(response.data.state==1){
312
+           var list =  response.data.data.list
313
+           this.auncoagulationPrint =list
314
+           this.$refs.childSix.show(list)
315
+         }
316
+      })
317
+    },
318
+    getCriticalInformed(){
319
+      getCriticalInformed().then(response=>{
320
+         if(response.data.state ==1){
321
+            var list = response.data.data.list
322
+            this.criticalInforPrint =list
323
+            this.$refs.childSeven.show(list)
324
+         }
325
+      })
326
+    },
327
+    getHemoperfusionInformed(){
328
+      getHemoperfusionInformed().then(response=>{
329
+        if(response.data.state==1){
330
+          var list = response.data.data.list
331
+          this.hemoperfusionPrint = list
332
+          this.$refs.childEight.show(list)
333
+        }
334
+      })
335
+    },
336
+    getInformedConsent(){
337
+      getInformedConsent().then(response=>{
338
+         if(response.data.state ==1){
339
+          var list = response.data.data.list
340
+          this.informedConsentPrint = list
341
+          this.$refs.childNight.show(list)
342
+         }
343
+      })
344
+    },
345
+    getCatheterization(){
346
+      getCatheterization().then(response=>{
347
+        if(response.data.state==1){
348
+          var list = response.data.data.list
349
+          this.cathetherizationPrint= list
350
+          this.$refs.childTwely.show(list)
351
+        }
352
+      })
353
+    },
354
+    getDialyzerInformed(){
355
+      getDialyzerInformed().then(response=>{
356
+        if(response.data.state==1){
357
+          var list = response.data.data.list
358
+          this.dialyzerInformedPrint = list
359
+          this.$refs.childTen.show(list)
360
+        }
361
+      })
362
+    },
363
+    getTherapyInformed(){
364
+      getTherapyInformed().then(response=>{
365
+        if(response.data.state ==1){
366
+          var list = response.data.data.list
367
+          this.therapyinformePrint= list
368
+          this.$refs.childEleven.show(list)
369
+        }
370
+      })
371
+    },
372
+   
253 373
     rowClick(row, column, event){
254 374
      console.log('1111',row);
255 375
       // console.log('2222',column);
@@ -272,6 +392,7 @@ export default {
272 392
           this.show14=false,
273 393
           this.show15=false,
274 394
           this.show16=false
395
+          this.getFallOutBedPrintList()
275 396
         }
276 397
         if(row.value==2){
277 398
           this.filter_show=true
@@ -290,6 +411,7 @@ export default {
290 411
           this.show14=false,
291 412
           this.show15=false,
292 413
           this.show16=false
414
+          this.getFilterInformed()
293 415
         }
294 416
         if(row.value==3){
295 417
           this.face_show=false
@@ -308,6 +430,7 @@ export default {
308 430
           this.show14=false,
309 431
           this.show15=false,
310 432
           this.show16=false
433
+          this.getProfundaInformed()
311 434
         }
312 435
         if(row.value==4){
313 436
           this.filter_show=false
@@ -326,6 +449,7 @@ export default {
326 449
           this.show14=false,
327 450
           this.show15=false,
328 451
           this.show16=false
452
+          this.getArterOvernous()
329 453
         }
330 454
         if(row.value==5){
331 455
           this.face_show=false
@@ -344,6 +468,7 @@ export default {
344 468
           this.show14=false,
345 469
           this.show15=false,
346 470
           this.show16=false
471
+          this.getHighRiskInformed()
347 472
         }
348 473
         if(row.value==6){
349 474
           this.filter_show=false
@@ -362,6 +487,7 @@ export default {
362 487
           this.show14=false,
363 488
           this.show15=false,
364 489
           this.show16=false
490
+          this.getAnticoagulationInformed()
365 491
         }
366 492
         if(row.value==7){
367 493
           this.face_show=false
@@ -380,6 +506,7 @@ export default {
380 506
           this.show14=false,
381 507
           this.show15=false,
382 508
           this.show16=false
509
+          this.getCriticalInformed()
383 510
         }
384 511
         if(row.value==8){
385 512
           this.filter_show=false
@@ -398,6 +525,7 @@ export default {
398 525
           this.show14=false,
399 526
           this.show15=false,
400 527
           this.show16=false
528
+          this.getHemoperfusionInformed()
401 529
         }
402 530
         if(row.value==9){
403 531
           this.face_show=false
@@ -416,6 +544,7 @@ export default {
416 544
           this.show14=false,
417 545
           this.show15=false,
418 546
           this.show16=false
547
+          this.getInformedConsent()
419 548
         }
420 549
         if(row.value==10){
421 550
           this.filter_show=false
@@ -434,6 +563,7 @@ export default {
434 563
           this.show14=false,
435 564
           this.show15=false,
436 565
           this.show16=false
566
+         
437 567
         }
438 568
         if(row.value==11){
439 569
           this.face_show=false
@@ -452,6 +582,7 @@ export default {
452 582
           this.show14=false,
453 583
           this.show15=false,
454 584
           this.show16=false
585
+          this.getDialyzerInformed()
455 586
         }
456 587
         if(row.value==12){
457 588
           this.filter_show=false
@@ -470,6 +601,7 @@ export default {
470 601
           this.show14=false,
471 602
           this.show15=false,
472 603
           this.show16=false
604
+          this.getTherapyInformed()
473 605
         }
474 606
         if(row.value==13){
475 607
           this.filter_show=false
@@ -544,7 +676,8 @@ export default {
544 676
           this.show15=false,
545 677
           this.show16=true
546 678
         }
547
-      },
679
+    },
680
+   
548 681
   }
549 682
 }
550 683
 </script>

+ 2 - 2
src/xt_pages/user/Informed/components/Falloutbedprint.vue Bestand weergeven

@@ -242,10 +242,10 @@ export default{
242 242
            if(response.data.state ==1){
243 243
               var list = response.data.data.list
244 244
               this.$message.success("保存成功!")
245
-             
245
+              this.$emit("getFallOutBedPrintList","");
246 246
               this.dialogVisible = false
247 247
 
248
-              this.$emit("getFallOutBedPrintList","");
248
+             
249 249
             
250 250
 
251 251
            }

+ 25 - 14
src/xt_pages/workforce/appointment.vue Bestand weergeven

@@ -158,7 +158,7 @@
158 158
               <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
159 159
               <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
160 160
               <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
161
-                导出排班
161
+                导出排班333
162 162
               </el-button>
163 163
               <el-button
164 164
                   @click="generateLog()"
@@ -373,10 +373,9 @@ export default {
373 373
       week_date:"",
374 374
       guanliu_show:false,
375 375
       mode:[{id:1,name:'HD'},{id:2,name:'HDF'},{id:3,name:'HD+HP'},{id:4,name:'HP'},{id:5,name:'HF'},{id:6,name:'SCUF'},{id:7,name:'IUF'}
376
-      ,{id:8,name:'HFHD'},{id:9,name:'HFHD+HP'},{id:10,name:'PHF'},{id:11,name:'HFR'},{id:12,name:'HDF+HP'},{id:13,name:'CRRT'},{id:14,name:'腹水回输'}
377
-      ,{id:15,name:'IUF+HD'},{id:16,name:'UF'},{id:17,name:'HD+'},{id:18,name:'血浆胆红素吸附+HDF'},{id:19,name:'H血浆胆红素吸附'},{id:20,name:'I-HDF'},{id:21,name:'HD高通'}
378
-      ,{id:22,name:'CVVH'},{id:23,name:'CVVHD'},{id:24,name:'CVVHDF'},{id:25,name:'PE'},{id:26,name:'血浆胆红素吸附+HP'},{id:27,name:'HPD'},{id:28,name:'HDP'}
379
-      ,{id:29,name:'HFD'},{id:30,name:'HDF100'},{id:31,name:'HDF600'},{id:32,name:'HDF800'},{id:33,name:'HDF1000'}]
376
+      ,{id:8,name:'HFHD'},{id:9,name:'HFHD+HP'},{id:10,name:'PHF'},{id:11,name:'HFR'},{id:12,name:'HDF+HP'},{id:13,name:'CRRT'},{id:14,name:'腹水回输'},{id:19,name:'IUF+HD'},{id:20,name:'UF'},{id:21,name:'HD+'}
377
+      ,{id:22,name:'血浆胆红素吸附+HDF'},{id:23,name:'血浆胆红素吸附'},{id:24,name:'I-HDF'},{id:25,name:'HD高通'},{id:26,name:'CVVH'},{id:27,name:'CVVHD'},{id:28,name:'CVVHDF'}
378
+      ,{id:29,name:'PE'},{id:30,name:"血浆胆红素吸附+HP"},{id:31,name:"HPD"},{id:32,name:"HDP"},{id:33,name:"HFD"},{id:34,name:'HDF100'},{id:35,name:'HDF600'},{id:36,name:'HDF800'},{id:37,name:'HDF1000'}]
380 379
     }
381 380
   },
382 381
   components: {
@@ -833,7 +832,7 @@ export default {
833 832
       // this.export_file_step_twos()
834 833
     },
835 834
     export_file_step_two: function(){
836
-
835
+     
837 836
       this.downloadLoading = true
838 837
       import('@/vendor/Export2Excel').then(excel => {
839 838
         const filterVal = [
@@ -873,9 +872,13 @@ export default {
873 872
             data.push(Object.values(item))
874 873
           })
875 874
 
875
+          console.log("tablelist",this.tableList)
876
+          
877
+
876 878
           const filename = '排班模版'
877 879
 
878 880
           console.log('333333333',multiHeader),
881
+          
879 882
           excel.export_json_to_excel({
880 883
 
881 884
             multiHeader,
@@ -2980,10 +2983,10 @@ export default {
2980 2983
           if (this.export_type == 1) {
2981 2984
             week = scheduleList
2982 2985
           }
2983
-          console.log("list")
2984
-          console.log(list)
2985
-          console.log("week")
2986
-          console.log(week)
2986
+          // console.log("list")
2987
+          // console.log(list)
2988
+          // console.log("week")
2989
+          console.log("week-------------------",week)
2987 2990
 
2988 2991
           if (week.length > 0) {
2989 2992
             console.log('qqqqqqqqq122',this.$refs.tableData.modename_value);
@@ -2999,8 +3002,7 @@ export default {
2999 3002
                       list[i].shangwu = week[j].name+" "+week[j].dialysis_machine_name
3000 3003
                     }else if(this.$refs.tableData.value1==false && this.$refs.tableData.modename_value==true){
3001 3004
                       list[i].shangwu = week[j].name+" "+this.getmode(week[j].mode_id)
3002
-                    }
3003
-                    else{
3005
+                    }else{
3004 3006
                       list[i].shangwu = week[j].name+" "+this.getmode(week[j].mode_id)+" "+week[j].dialysis_machine_name
3005 3007
                     }
3006 3008
                   }
@@ -5043,11 +5045,20 @@ export default {
5043 5045
 
5044 5046
     },
5045 5047
     getmode(ids){
5046
-      for(let i in this.mode){
5048
+      // for(let i in this.mode){
5049
+      //   if(ids==this.mode[i].id){
5050
+      //     return this.mode[i].name
5051
+      //   }
5052
+      // }
5053
+    
5054
+      var mode_name =""
5055
+      for(let i=0;i<this.mode.length;i++){
5047 5056
         if(ids==this.mode[i].id){
5048
-          return this.mode[i].name
5057
+          mode_name = this.mode[i].name
5049 5058
         }
5050 5059
       }
5060
+      console.log("mode_name--",mode_name)
5061
+      return mode_name
5051 5062
     }
5052 5063
   },
5053 5064
   created() {

+ 2 - 0
src/xt_pages/workforce/components/tableData.vue Bestand weergeven

@@ -1455,7 +1455,9 @@ export default {
1455 1455
     },
1456 1456
     cellstyle({ row, column, rowIndex, columnIndex }){
1457 1457
       // return 'border-bottom: 1px solid #707174;'
1458
+      console.log('555555',this.subzone);
1458 1459
       return 'border: 1px solid #707174;'
1460
+      
1459 1461
       // 分区蓝线
1460 1462
       // for(let i=0;i<this.subzone.length;i++){
1461 1463
       //   var subslice=this.subzone[i].jihaos.slice(-1)