소스 검색

bug修改

XMLWAN 5 년 전
부모
커밋
75fbdedf47

+ 7 - 12
src/api/data.js 파일 보기

17
 }
17
 }
18
 
18
 
19
 export function updateChildConfig(params) {
19
 export function updateChildConfig(params) {
20
+  console.log('params', params)
20
   return request({
21
   return request({
21
     url: '/api/updatechildconfig',
22
     url: '/api/updatechildconfig',
22
     method: 'post',
23
     method: 'post',
40
   })
41
   })
41
 }
42
 }
42
 
43
 
43
-
44
-export function updateFieldIsShow(id,is_show) {
44
+export function updateFieldIsShow(id, is_show) {
45
   return request({
45
   return request({
46
-    url: '/api/filed/show?id='+id+'&is_show='+is_show,
47
-    method: 'post',
46
+    url: '/api/filed/show?id=' + id + '&is_show=' + is_show,
47
+    method: 'post'
48
   })
48
   })
49
 }
49
 }
50
 
50
 
51
-
52
-
53
-
54
-
55
 export function postPrintTemplate(params) {
51
 export function postPrintTemplate(params) {
56
   return request({
52
   return request({
57
-    url: '/api/print/template/commit?template_id='+params,
58
-    method: 'post',
53
+    url: '/api/print/template/commit?template_id=' + params,
54
+    method: 'post'
59
   })
55
   })
60
 }
56
 }
61
 
57
 
62
 export function getPrintTemplate() {
58
 export function getPrintTemplate() {
63
   return request({
59
   return request({
64
     url: '/api/print/template/get',
60
     url: '/api/print/template/get',
65
-    method: 'get',
61
+    method: 'get'
66
   })
62
   })
67
 }
63
 }
68
-

+ 8 - 3
src/views/layout/components/Navbar.vue 파일 보기

99
             <el-dropdown-item command="modifyUserInfoAction"
99
             <el-dropdown-item command="modifyUserInfoAction"
100
               >个人信息</el-dropdown-item
100
               >个人信息</el-dropdown-item
101
             >
101
             >
102
-            <el-dropdown-item command="modifyOrgInfoAction"
102
+            <el-dropdown-item
103
+              command="modifyOrgInfoAction"
104
+              v-if="is_super_admin === 1"
103
               >机构信息</el-dropdown-item
105
               >机构信息</el-dropdown-item
104
             >
106
             >
105
             <el-dropdown-item divided command="logout">{{
107
             <el-dropdown-item divided command="logout">{{
143
     return {
145
     return {
144
       orgs: [],
146
       orgs: [],
145
       org_id: this.$store.getters.xt_user.org.id,
147
       org_id: this.$store.getters.xt_user.org.id,
146
-      org_name: this.$store.getters.xt_user.org.org_name
147
-
148
+      org_name: this.$store.getters.xt_user.org.org_name,
149
+      is_super_admin: 0
148
       // scrm_role_exist: $store.getters.xt_user.scrm_role_exist
150
       // scrm_role_exist: $store.getters.xt_user.scrm_role_exist
149
     };
151
     };
150
   },
152
   },
282
         console.log("org", this.orgs);
284
         console.log("org", this.orgs);
283
         var creator = response.data.data.creator;
285
         var creator = response.data.data.creator;
284
         console.log("creator", creator);
286
         console.log("creator", creator);
287
+        var admin = response.data.data.admin;
288
+        console.log("admin", admin);
289
+        this.is_super_admin = admin.is_super_admin;
285
         for (let i = 0; i < this.orgs.length; i++) {
290
         for (let i = 0; i < this.orgs.length; i++) {
286
           if (this.orgs[i].id == this.org_id) {
291
           if (this.orgs[i].id == this.org_id) {
287
             this.org_name = this.orgs[i].org_name;
292
             this.org_name = this.orgs[i].org_name;

+ 0 - 1
src/xt_pages/data/components/table.vue 파일 보기

192
   },
192
   },
193
   created() {
193
   created() {
194
     this.getList();
194
     this.getList();
195
-    console.log("list是-----------", this.list);
196
   },
195
   },
197
   methods: {
196
   methods: {
198
     fieldChange: function(newValue) {
197
     fieldChange: function(newValue) {

+ 7 - 4
src/xt_pages/data/components/tableson.vue 파일 보기

78
             <el-form-item label="排序" prop="order">
78
             <el-form-item label="排序" prop="order">
79
               <el-input
79
               <el-input
80
                 type="age"
80
                 type="age"
81
-                v-model.number="temp.order"
81
+                v-model.number="temp.orders"
82
                 placeholder="请输入排序值,数值越大,排序越靠前"
82
                 placeholder="请输入排序值,数值越大,排序越靠前"
83
               ></el-input>
83
               ></el-input>
84
             </el-form-item>
84
             </el-form-item>
202
         name: "",
202
         name: "",
203
         field_name: undefined,
203
         field_name: undefined,
204
         value: "",
204
         value: "",
205
-        remark: ""
205
+        remark: "",
206
+        orders: 0
206
       },
207
       },
207
       dialogFormVisible: false,
208
       dialogFormVisible: false,
208
       dialogStatus: "",
209
       dialogStatus: "",
269
         name: "",
270
         name: "",
270
         field_name: undefined,
271
         field_name: undefined,
271
         value: "",
272
         value: "",
272
-        remark: ""
273
+        remark: "",
274
+        orders: ""
273
       };
275
       };
274
     });
276
     });
275
   },
277
   },
348
         name: "",
350
         name: "",
349
         field_name: undefined,
351
         field_name: undefined,
350
         value: "",
352
         value: "",
351
-        remark: ""
353
+        remark: "",
354
+        orders: 0
352
       };
355
       };
353
     },
356
     },
354
     handleCreate() {
357
     handleCreate() {

+ 164 - 100
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue 파일 보기

705
                           class="under_line"
705
                           class="under_line"
706
                           style="width: 150px;text-align: center"
706
                           style="width: 150px;text-align: center"
707
                         >
707
                         >
708
-                          {{
709
-                            record.prescription &&
710
-                            record.prescription.anticoagulant_name
711
-                              ? record.prescription.anticoagulant_name
712
-                              : "/"
713
-                          }}
708
+                          <span
709
+                            class="under-line"
710
+                            v-if="record.prescription.anticoagulant == 0"
711
+                            >&nbsp;/</span
712
+                          >
713
+                          <span
714
+                            class="under-line"
715
+                            v-if="record.prescription.anticoagulant == 1"
716
+                            >&nbsp;无肝素</span
717
+                          >
718
+                          <span
719
+                            class="under-line"
720
+                            v-if="record.prescription.anticoagulant == 2"
721
+                            >&nbsp;普通肝素</span
722
+                          >
723
+                          <span
724
+                            class="under-line"
725
+                            v-if="record.prescription.anticoagulant == 3"
726
+                            >&nbsp;低分子肝素</span
727
+                          >
728
+                          <span
729
+                            class="under-line"
730
+                            v-if="record.prescription.anticoagulant == 4"
731
+                            >&nbsp;阿加曲班</span
732
+                          >
733
+                          <span
734
+                            class="under-line"
735
+                            v-if="record.prescription.anticoagulant == 5"
736
+                            >&nbsp;枸橼酸钠</span
737
+                          >
738
+                          <span
739
+                            class="under-line"
740
+                            v-if="record.prescription.anticoagulant == 6"
741
+                            >&nbsp;低分子肝素钙</span
742
+                          >
743
+                          <span
744
+                            class="under-line"
745
+                            v-if="record.prescription.anticoagulant == 7"
746
+                            >&nbsp;低分子肝素钠</span
747
+                          >
714
                         </div>
748
                         </div>
715
                       </div>
749
                       </div>
716
                       <div class="inline_block" style="margin-left:20px;">
750
                       <div class="inline_block" style="margin-left:20px;">
719
                           class="under_line"
753
                           class="under_line"
720
                           style="width: 50px;text-align: center;"
754
                           style="width: 50px;text-align: center;"
721
                         >
755
                         >
722
-                          {{
723
-                            record.prescription &&
756
+                          <span class="under-line">{{
724
                             record.prescription.anticoagulant_shouji
757
                             record.prescription.anticoagulant_shouji
725
                               ? record.prescription.anticoagulant_shouji
758
                               ? record.prescription.anticoagulant_shouji
726
                               : "/"
759
                               : "/"
727
-                          }}
760
+                          }}</span>
761
+                          <span
762
+                            v-if="
763
+                              record.prescription.anticoagulant == '枸橼酸钠'
764
+                            "
765
+                            >mg</span
766
+                          >
767
+                          <span
768
+                            v-if="
769
+                              record.prescription.anticoagulant == '阿加曲班'
770
+                            "
771
+                            >mg</span
772
+                          >
773
+                          <span
774
+                            v-if="
775
+                              record.prescription.anticoagulant == '低分子肝素'
776
+                            "
777
+                            >iu</span
778
+                          >
779
+                          <span
780
+                            v-if="
781
+                              record.prescription.anticoagulant == '普通肝素'
782
+                            "
783
+                            >iu</span
784
+                          >
785
+                          <span
786
+                            v-if="record.prescription.anticoagulant == '无肝素'"
787
+                            >mg</span
788
+                          >
789
+                          <span v-if="record.prescription.anticoagulant == 6"
790
+                            >iu</span
791
+                          >
792
+                          <span v-if="record.prescription.anticoagulant == 7"
793
+                            >iu</span
794
+                          >
795
+                          &nbsp;
728
                         </div>
796
                         </div>
729
-                        lu
730
                       </div>
797
                       </div>
731
                       <div class="inline_block" style="margin-left:20px;">
798
                       <div class="inline_block" style="margin-left:20px;">
732
                         维持:
799
                         维持:
733
                         <div
800
                         <div
734
-                          v-if="
735
-                            record.prescription &&
736
-                              record.prescription.anticoagulant == 1
737
-                          "
738
-                          class="under_line"
739
-                          style="width: 50px;text-align: center;"
740
-                        >
741
-                          {{
742
-                            record.prescription &&
743
-                            record.prescription.anticoagulant_weichi
744
-                              ? record.prescription.anticoagulant_weichi
745
-                              : "/"
746
-                          }}
747
-                        </div>
748
-                        <div
749
-                          v-if="
750
-                            record.prescription &&
751
-                              record.prescription.anticoagulant != 1
752
-                          "
753
                           class="under_line"
801
                           class="under_line"
754
                           style="width: 50px;text-align: center;"
802
                           style="width: 50px;text-align: center;"
755
                         >
803
                         >
756
-                          {{
757
-                            record.prescription &&
758
-                            record.prescription.anticoagulant_weichi
759
-                              ? record.prescription.anticoagulant_weichi
760
-                              : 0
761
-                          }}
804
+                          <span class="under-line"
805
+                            >&nbsp;{{
806
+                              record.prescription.anticoagulant_weichi
807
+                                ? record.prescription.anticoagulant_weichi
808
+                                : "/"
809
+                            }}</span
810
+                          >
811
+                          <span
812
+                            v-if="
813
+                              record.prescription.anticoagulant == '枸橼酸钠'
814
+                            "
815
+                            >ml/h</span
816
+                          >
817
+                          <span
818
+                            v-if="
819
+                              record.prescription.anticoagulant == '阿加曲班'
820
+                            "
821
+                            >mg/h</span
822
+                          >
823
+                          <span
824
+                            v-if="
825
+                              record.prescription.anticoagulant == '低分子肝素'
826
+                            "
827
+                            >iu/h</span
828
+                          >
829
+                          <span
830
+                            v-if="
831
+                              record.prescription.anticoagulant == '普通肝素'
832
+                            "
833
+                            >iu/h</span
834
+                          >
835
+                          <span
836
+                            v-if="record.prescription.anticoagulant == '无肝素'"
837
+                            >mg/h</span
838
+                          >
839
+                          <span v-if="record.prescription.anticoagulant == 6"
840
+                            >iu/h</span
841
+                          >
842
+                          <span v-if="record.prescription.anticoagulant == 7"
843
+                            >iu/h</span
844
+                          >
762
                         </div>
845
                         </div>
763
-                        lu
764
                       </div>
846
                       </div>
765
                       <div class="inline_block" style="margin-left:20px;">
847
                       <div class="inline_block" style="margin-left:20px;">
766
                         总量:
848
                         总量:
768
                           class="under_line"
850
                           class="under_line"
769
                           style="width: 50px;text-align: center;"
851
                           style="width: 50px;text-align: center;"
770
                         >
852
                         >
771
-                          {{
772
-                            record.prescription &&
773
-                            record.prescription.anticoagulant_zongliang
774
-                              ? record.prescription.anticoagulant_zongliang
775
-                              : "/"
776
-                          }}
853
+                          <span class="under-line"
854
+                            >&nbsp;{{
855
+                              record.prescription.anticoagulant_zongliang
856
+                                ? record.prescription.anticoagulant_zongliang
857
+                                : "0"
858
+                            }}</span
859
+                          >
860
+                          <span
861
+                            v-if="
862
+                              record.prescription.anticoagulant == '枸橼酸钠'
863
+                            "
864
+                            >mg</span
865
+                          >
866
+                          <span
867
+                            v-if="
868
+                              record.prescription.anticoagulant == '阿加曲班'
869
+                            "
870
+                            >mg</span
871
+                          >
872
+                          <span
873
+                            v-if="
874
+                              record.prescription.anticoagulant == '低分子肝素'
875
+                            "
876
+                            >iu</span
877
+                          >
878
+                          <span
879
+                            v-if="
880
+                              record.prescription.anticoagulant == '普通肝素'
881
+                            "
882
+                            >iu</span
883
+                          >
884
+                          <span
885
+                            v-if="record.prescription.anticoagulant == '无肝素'"
886
+                            >mg</span
887
+                          >
888
+                          <span v-if="record.prescription.anticoagulant == 6"
889
+                            >iu</span
890
+                          >
891
+                          <span v-if="record.prescription.anticoagulant == 7"
892
+                            >iu</span
893
+                          >
777
                         </div>
894
                         </div>
778
-                        lu
779
                       </div>
895
                       </div>
780
                       <div class="inline_block" style="margin-left:20px;">
896
                       <div class="inline_block" style="margin-left:20px;">
781
                         透析机号:
897
                         透析机号:
1500
                         穿刺护士:
1616
                         穿刺护士:
1501
                         <div
1617
                         <div
1502
                           class="under_line"
1618
                           class="under_line"
1503
-                          style="width: 80px;text-align: center"
1619
+                          style="width: 60px;text-align: center"
1504
                         >
1620
                         >
1505
                           <span
1621
                           <span
1506
                             v-if="
1622
                             v-if="
1540
                         治疗护士:
1656
                         治疗护士:
1541
                         <div
1657
                         <div
1542
                           class="under_line"
1658
                           class="under_line"
1543
-                          style="width: 80px;text-align: center"
1659
+                          style="width: 60px;text-align: center"
1544
                         >
1660
                         >
1545
                           <span
1661
                           <span
1546
                             v-if="
1662
                             v-if="
1575
                       </div>
1691
                       </div>
1576
                       <div class="inline_block" style="flex:1;">
1692
                       <div class="inline_block" style="flex:1;">
1577
                         核对人员:
1693
                         核对人员:
1578
-                        <div
1579
-                          class="under_line"
1580
-                          style="width: 80px;text-align: left"
1581
-                          v-if="record.dialysis_order == null"
1582
-                        ></div>
1583
                         <div v-if="record.check">
1694
                         <div v-if="record.check">
1584
                           <div
1695
                           <div
1585
                             class="under_line"
1696
                             class="under_line"
1586
-                            style="width: 80px;text-align: left"
1697
+                            style="width: 60px;text-align: left"
1587
                             v-if="
1698
                             v-if="
1588
                               record.dialysis_order != null &&
1699
                               record.dialysis_order != null &&
1589
                                 record.dialysis_order.start_nurse ==
1700
                                 record.dialysis_order.start_nurse ==
1609
                               style="height: 40px;"
1720
                               style="height: 40px;"
1610
                             />
1721
                             />
1611
                           </div>
1722
                           </div>
1612
-                          <div
1613
-                            class="under_line"
1614
-                            style="width: 80px;text-align: left"
1615
-                            v-if="
1616
-                              record.dialysis_order != null &&
1617
-                                record.dialysis_order.start_nurse ==
1618
-                                  record.check.modifier
1619
-                            "
1620
-                          >
1621
-                            <span
1622
-                              v-if="
1623
-                                setAdminUserES(record.check, 'creater') == ''
1624
-                              "
1625
-                              >{{ getAdminUser(record.check, "creater") }}</span
1626
-                            >
1627
-                            <img
1628
-                              class="es-img"
1629
-                              :src="setAdminUserES(record.check, 'creater')"
1630
-                              alt=""
1631
-                              srcset=""
1632
-                              v-else
1633
-                            />
1634
-                          </div>
1635
-                          <div
1636
-                            class="under_line"
1637
-                            style="width: 80px;text-align: left"
1638
-                            v-if="
1639
-                              record.dialysis_order != null &&
1640
-                                record.dialysis_order.start_nurse !=
1641
-                                  record.check.modifier &&
1642
-                                record.dialysis_order.start_nurse !=
1643
-                                  record.check.creater
1644
-                            "
1645
-                          >
1646
-                            <span
1647
-                              v-if="
1648
-                                setAdminUserES(record.check, 'creater') == ''
1649
-                              "
1650
-                              >{{ getAdminUser(record.check, "creater") }}</span
1651
-                            >
1652
-                            <img
1653
-                              class="es-img"
1654
-                              :src="setAdminUserES(record.check, 'creater')"
1655
-                              alt=""
1656
-                              srcset=""
1657
-                              v-else
1658
-                            />
1659
-                          </div>
1660
                         </div>
1723
                         </div>
1724
+
1661
                         <div
1725
                         <div
1662
                           class="under_line"
1726
                           class="under_line"
1663
                           style="width: 80px;text-align: left"
1727
                           style="width: 80px;text-align: left"
1668
                         下机护士:
1732
                         下机护士:
1669
                         <div
1733
                         <div
1670
                           class="under_line"
1734
                           class="under_line"
1671
-                          style="width: 80px;text-align: center"
1735
+                          style="width: 60px;text-align: center"
1672
                         >
1736
                         >
1673
                           <span
1737
                           <span
1674
                             v-if="
1738
                             v-if="

+ 12 - 1
src/xt_pages/dialysis/bloodPresssWatch.vue 파일 보기

566
       this.getSchedualPatientList();
566
       this.getSchedualPatientList();
567
     },
567
     },
568
     batchPrintAction: function() {
568
     batchPrintAction: function() {
569
+      if (this.selecting_schs.length === 0) {
570
+        this.$message.error("请至少选择一条需要打印的内容");
571
+        return false;
572
+      }
569
       // 模板ID为6
573
       // 模板ID为6
570
       var sch_ids = [];
574
       var sch_ids = [];
571
 
575
 
594
       }
598
       }
595
     },
599
     },
596
     batchPrintActionOne: function() {
600
     batchPrintActionOne: function() {
601
+      if (this.selecting_schs.length === 0) {
602
+        this.$message.error("请至少选择一条需要打印的内容");
603
+        return false;
604
+      }
597
       var sch_ids = [];
605
       var sch_ids = [];
598
       for (let index = 0; index < this.selecting_schs.length; index++) {
606
       for (let index = 0; index < this.selecting_schs.length; index++) {
599
         sch_ids.push(this.selecting_schs[index].sch_id);
607
         sch_ids.push(this.selecting_schs[index].sch_id);
600
       }
608
       }
601
-      console.log("第二个", sch_ids);
602
       this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids);
609
       this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids);
603
       if (this.template_id == 2 || this.template_id == 0) {
610
       if (this.template_id == 2 || this.template_id == 0) {
604
         this.$router.push({ path: "/dialysis/print/batch/otherone" });
611
         this.$router.push({ path: "/dialysis/print/batch/otherone" });
609
       }
616
       }
610
     },
617
     },
611
     batchPrintActionTwo: function() {
618
     batchPrintActionTwo: function() {
619
+      if (this.selecting_schs.length === 0) {
620
+        this.$message.error("请至少选择一条需要打印的内容");
621
+        return false;
622
+      }
612
       var sch_ids = [];
623
       var sch_ids = [];
613
       for (let index = 0; index < this.selecting_schs.length; index++) {
624
       for (let index = 0; index < this.selecting_schs.length; index++) {
614
         sch_ids.push(this.selecting_schs[index].sch_id);
625
         sch_ids.push(this.selecting_schs[index].sch_id);