Browse Source

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

csx 3 years ago
parent
commit
c7eae19b61

+ 4 - 0
src/store/modules/globalConfig.js View File

1871
         id: 35,
1871
         id: 35,
1872
         name: '本'
1872
         name: '本'
1873
       },
1873
       },
1874
+      {
1875
+        id: 36,
1876
+        name: '轴'
1877
+      },
1874
     ],
1878
     ],
1875
     body_fluid: [{
1879
     body_fluid: [{
1876
       id: 1,
1880
       id: 1,

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue View File

324
                     <div class="under_line" style="width: 100px;text-align: center">
324
                     <div class="under_line" style="width: 100px;text-align: center">
325
                       <!-- {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }} -->
325
                       <!-- {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }} -->
326
 
326
 
327
-                      <!-- {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "/" }} -->
327
+                      {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "/" }}
328
                     </div>
328
                     </div>
329
                   </div>
329
                   </div>
330
                   <div class="inline_block" style="flex:1;">
330
                   <div class="inline_block" style="flex:1;">

+ 103 - 22
src/xt_pages/workforce/components/tableWeeks.vue View File

34
           </li>
34
           </li>
35
         </ul>
35
         </ul>
36
       </div>
36
       </div>
37
-
38
-      <div  class="title"><span class="name">班 次</span> :</div>
37
+    </div>
38
+    <div  class="cell clearfix">
39
+     <div  class="title"><span class="name">班 次</span> :</div>
39
       <div class="time">
40
       <div class="time">
40
         <ul class>
41
         <ul class>
41
           <li
42
           <li
241
   data() {
242
   data() {
242
     return {
243
     return {
243
       weekArr: [
244
       weekArr: [
245
+        { id: 0, name: "全部" },
244
         { id: 1, name: "周一" },
246
         { id: 1, name: "周一" },
245
         { id: 2, name: "周二" },
247
         { id: 2, name: "周二" },
246
         { id: 3, name: "周三" },
248
         { id: 3, name: "周三" },
273
       modeOptions: null,
275
       modeOptions: null,
274
       org_id:0,
276
       org_id:0,
275
       dialogVisible:false,
277
       dialogVisible:false,
276
-      prescription_status:true,
277
-      week:true,
278
-      name:true,
279
-      zone:true,
280
-      classes:true,
281
-      number:true,
282
-      mode:true,
283
-      dialyzers:true,
284
-      perfusion_apparatus:true,
285
-      anticoagulant:true,
286
-      anticoagulant_zongliang:true,
278
+      prescription_status:false,
279
+      week:false,
280
+      name:false,
281
+      zone:false,
282
+      classes:false,
283
+      number:false,
284
+      mode:false,
285
+      dialyzers:false,
286
+      perfusion_apparatus:false,
287
+      anticoagulant:false,
288
+      anticoagulant_zongliang:false,
287
       doctor_advice:false,
289
       doctor_advice:false,
288
       form:{
290
       form:{
289
         id:0,
291
         id:0,
324
       }
326
       }
325
      },
327
      },
326
     getScheduleWeekDay() {
328
     getScheduleWeekDay() {
327
-        const params = {
328
-          week_type:this.week_type,
329
-          week_time:this.week_time,
330
-        }
331
-
329
+     
330
+      const params = {
331
+        week_type:this.week_type,
332
+        week_time:this.week_time,
333
+       }
334
+      console.log("param22222",params)
332
       getScheduleWeekDay(params).then(response => {
335
       getScheduleWeekDay(params).then(response => {
333
         this.scheduleData = [];
336
         this.scheduleData = [];
334
         if (response.data.state == 1) {
337
         if (response.data.state == 1) {
532
       }
535
       }
533
     },
536
     },
534
     printActionSetting(){
537
     printActionSetting(){
538
+       this.getlist()
535
        this.dialogVisible = true
539
        this.dialogVisible = true
540
+
536
     },
541
     },
537
     saveRemindPrint(){
542
     saveRemindPrint(){
538
        console.log("455555555",this.perfusion_apparatus)
543
        console.log("455555555",this.perfusion_apparatus)
633
              var settting = response.data.data.setting
638
              var settting = response.data.data.setting
634
              this.$message.success("保存成功")
639
              this.$message.success("保存成功")
635
              this.dialogVisible = false
640
              this.dialogVisible = false
641
+             this.getlist()
636
           }
642
           }
637
       })
643
       })
638
     },
644
     },
639
     getlist(){
645
     getlist(){
640
       getRemindPrintList().then(response=>{
646
       getRemindPrintList().then(response=>{
641
-
647
+         if(response.data.state == 1){
648
+            var list = response.data.data.list
649
+            console.log("list222332",list)
650
+            if(list.anticoagulant == 1){
651
+              console.log("进来22222")
652
+              this.anticoagulant = true
653
+            }
654
+            if(list.anticoagulant == 2){
655
+               this.anticoagulant = false
656
+            }
657
+            if(list.anticoagulant_zongliang == 1){
658
+              this.anticoagulant_zongliang = true
659
+            }
660
+            if(list.anticoagulant_zongliang == 2){
661
+               this.anticoagulant_zongliang = false 
662
+            }
663
+            if(list.classes == 1 ){
664
+                this.classes = true
665
+            }
666
+            if(list.classes == 2){
667
+                this.classes = false
668
+            }
669
+            if(list.dialyzers == 1){
670
+               this.dialyzers = true
671
+            }
672
+            if(list.dialyzers == 2){
673
+               this.dialyzers = false
674
+            }
675
+            if(list.doctor_advice == 1){
676
+               this.doctor_advice = true
677
+            }
678
+            if(list.doctor_advice == 2){
679
+               this.doctor_advice = false
680
+            }
681
+            if(list.name == 1){
682
+               this.name = true
683
+            }
684
+            if(list.name == 2){
685
+               this.name = false
686
+            }
687
+            if(list.number == 1){
688
+               this.number = true
689
+            }
690
+            if(list.number == 2){
691
+              this.number = false
692
+            }
693
+            if(list.perfusion_apparatus == 1){
694
+              this.perfusion_apparatus = true
695
+            }
696
+            if(list.perfusion_apparatus == 2){
697
+               this.perfusion_apparatus = false
698
+            }
699
+            if(list.prescription_status == 1){
700
+               this.prescription_status = true
701
+            }
702
+            if(list.prescription_status == 2){
703
+               this.prescription_status = false
704
+            }
705
+            if(list.week == 1){
706
+               this.week = true
707
+            } 
708
+            if(list.week == 2){
709
+               this.week = false
710
+            }
711
+            if(list.zone == 1){
712
+               this.zone = true
713
+            }
714
+            if(list.zone == 2){
715
+               this.zone = false
716
+            }
717
+            if(list.mode ==1){
718
+               this.mode = true
719
+            }
720
+            if(list.mode == 2){
721
+              this.mode = false
722
+            }
723
+            this.form.id = list.id
724
+         }
642
       })
725
       })
643
     }
726
     }
644
   },
727
   },
648
   created() {
731
   created() {
649
     this.modeOptions = this.$store.getters.treatment_mode;
732
     this.modeOptions = this.$store.getters.treatment_mode;
650
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit;
733
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit;
651
-    console.log("抗凝机", this.anticoagulants_confit);
652
     this.week_type = new Date().getDay();
734
     this.week_type = new Date().getDay();
653
     if (this.week_type == 0) {
735
     if (this.week_type == 0) {
654
       this.week_type = 7;
736
       this.week_type = 7;
657
     //   week_type: this.week_type
739
     //   week_type: this.week_type
658
     // };
740
     // };
659
     this.getScheduleWeekDay();
741
     this.getScheduleWeekDay();
660
-    console.log("org2222222",this.$store.getters.xt_user.org.id)
661
     this.org_id = this.$store.getters.xt_user.org.id
742
     this.org_id = this.$store.getters.xt_user.org.id
662
-   // this.getlist()
743
+    // this.getlist()
663
   }
744
   }
664
 };
745
 };
665
 </script>
746
 </script>