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
39f947a908

+ 4 - 4
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue View File

@@ -1758,25 +1758,25 @@
1758 1758
                           style="width: 80px;text-align: left"
1759 1759
                           v-if="!record.check"
1760 1760
                         ></div>
1761
-                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.dialysis_order == null">
1761
+                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.check != null && record.dialysis_order == null">
1762 1762
                         <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(record.check, 'creater') == ''">
1763 1763
                          {{getAdminUser(record.check, "creater")? getAdminUser(record.check, "creater") : "/" }}
1764 1764
                         </span>
1765 1765
                         <img style="height:30px;" :src="setAdminUserES(record.check, 'creater')" alt="" srcset="" v-else />
1766 1766
                       </div>
1767
-                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.dialysis_order != null && record.dialysis_order.start_nurse == record.check.modifier">
1767
+                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.check != null && record.dialysis_order != null && record.dialysis_order.start_nurse == record.check.modifier">
1768 1768
                         <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(record.check, 'creater') == ''">
1769 1769
                          {{getAdminUser(record.check, "creater")? getAdminUser(record.check, "creater") : "/" }}
1770 1770
                         </span>
1771 1771
                         <img style="height:30px;" :src="setAdminUserES(record.check, 'creater')" alt="" srcset="" v-else />
1772 1772
                       </div>
1773
-                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.dialysis_order != null && record.dialysis_order.start_nurse == record.check.creater">
1773
+                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.check != null && record.dialysis_order != null && record.dialysis_order.start_nurse == record.check.creater">
1774 1774
                         <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(record.check, 'modifier') == ''">
1775 1775
                           {{getAdminUser(record.check, "modifier")? getAdminUser(record.check, "modifier") : "/" }}
1776 1776
                         </span>
1777 1777
                         <img style="height:30px;" :src="setAdminUserES(record.check, 'modifier')" alt="" srcset="" v-else />
1778 1778
                       </div>
1779
-                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.dialysis_order  != null && record.dialysis_order.start_nurse != record.check.creater && record.dialysis_order.start_nurse != record.check.modifier">
1779
+                      <div class="under_line" style="width: 80px;text-align: center" v-if="record.check != null && record.dialysis_order  != null && record.dialysis_order.start_nurse != record.check.creater && record.dialysis_order.start_nurse != record.check.modifier">
1780 1780
                         <span style="height: 30px;display: inline-block;" v-if="setAdminUserES(record.check, 'creater') == ''">
1781 1781
                           {{getAdminUser(record.check, "creater")? getAdminUser(record.check, "creater") : "/" }}
1782 1782
                         </span>

+ 2 - 2
src/xt_pages/dialysis/details/DialysisPrescription.vue View File

@@ -111,8 +111,8 @@
111 111
           <label>目标超滤量 : </label>
112 112
           <span class="content">{{ target_ultrafiltration != "0" ? target_ultrafiltration : ""}}</span>
113 113
           
114
-          <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.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.template_id != 47 && this.$store.getters.xt_user.template_info.org_id != 9555"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
115
-          <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.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.template_id != 46 || this.$store.getters.xt_user.template_info.template_id != 47 || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
114
+          <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.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 40 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 45  && this.$store.getters.xt_user.template_info.template_id != 46  && this.$store.getters.xt_user.template_info.org_id != 9555"  class="unit">{{ target_ultrafiltration != "0" ? "L" : "" }}</span>
115
+          <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.template_id == 38 || this.$store.getters.xt_user.template_info.template_id != 40 || this.$store.getters.xt_user.template_info.template_id != 43 || this.$store.getters.xt_user.template_info.template_id != 45 || this.$store.getters.xt_user.template_info.template_id != 46  || this.$store.getters.xt_user.template_info.org_id == 9555" class="unit">{{ target_ultrafiltration != "0" ? "ml" : "" }}</span>
116 116
         </li>
117 117
 
118 118
          <li v-if="isShow('目标超滤量') && this.$store.getters.xt_user.template_info.org_id == 10290">

+ 2 - 2
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue View File

@@ -87,7 +87,7 @@
87 87
                     </el-col>
88 88
 
89 89
                     <el-col :span="8"
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.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46 ||  this.$store.getters.xt_user.template_info.template_id == 47 || this.$store.getters.xt_user.template_info.org_id == 9555 )">
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.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 38 ||  this.$store.getters.xt_user.template_info.template_id == 40 ||  this.$store.getters.xt_user.template_info.template_id == 43 ||  this.$store.getters.xt_user.template_info.template_id == 45  ||  this.$store.getters.xt_user.template_info.template_id == 46  || this.$store.getters.xt_user.template_info.org_id == 9555 )">
91 91
                         <el-form-item label="目标超滤量(ml):">
92 92
                             <el-input
93 93
                                     type="number"
@@ -98,7 +98,7 @@
98 98
 
99 99
 
100 100
                     <el-col :span="8"
101
-                            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.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46  &&  this.$store.getters.xt_user.template_info.template_id != 47 && this.$store.getters.xt_user.template_info.org_id != 9555 ">
101
+                            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.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 38 &&  this.$store.getters.xt_user.template_info.template_id != 40 &&  this.$store.getters.xt_user.template_info.template_id != 43 &&  this.$store.getters.xt_user.template_info.template_id != 45 &&  this.$store.getters.xt_user.template_info.template_id != 46   && this.$store.getters.xt_user.template_info.org_id != 9555 ">
102 102
                         <el-form-item label="目标超滤量(L):">
103 103
                             <el-input
104 104
                                     type="number"

+ 1 - 1
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue View File

@@ -1578,7 +1578,7 @@ export default {
1578 1578
     // this.form.monitoring_time = parseTime(new Date(), "{h}:{i}")
1579 1579
     this.form.operate_time = new Date().getTime();
1580 1580
     var symptoms = getDataConfig("hemodialysis", "symptoms");
1581
-    console.log("sysmptoms3333333333", symptoms);
1581
+    
1582 1582
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
1583 1583
     //console.log("抗凝剂",this.anticoagulantsConfit)
1584 1584
     this.bloodPressureMmonitoringSite = getDataConfig(

+ 2 - 1
src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/index.vue View File

@@ -13,7 +13,7 @@
13 13
       </template> -->
14 14
 
15 15
       <div class='dialysisPage' style="padding-top:40px;">
16
-        <printOne :printData="printData"></printOne>
16
+        <printOne :printData="printData" ref="printOne"></printOne>
17 17
       </div>
18 18
   </div>
19 19
 </template>
@@ -85,6 +85,7 @@ export default {
85 85
 
86 86
   created() {
87 87
     this.org_id = this.$store.getters.xt_user.org_id
88
+    console.log('oo')
88 89
   },
89 90
 
90 91
 };

+ 56 - 33
src/xt_pages/outpatientDoctorStation/batch_print_checkTemplate/printOne.vue View File

@@ -1,6 +1,13 @@
1 1
 <template>
2 2
   <div id="prescriptionPrint" class="prescription-print">
3
-    <div v-for="(i, index) in printData" :key="index" style="box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;">
3
+    <div
4
+      v-for="(i, index) in printData"
5
+      :key="index"
6
+      style="
7
+        box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27),
8
+          0 0 40px rgba(0, 0, 0, 0.06) inset;
9
+      "
10
+    >
4 11
       <!--            <img style="width:100%;height:80px" v-if="org_id == 10138" src="https://kuyi.shengws.com/bailin/bltotle.jpg" alt="">-->
5 12
       <!--/*             <img style="width:100%;height:80px" v-if="org_id == 10278" src="https://kuyi.shengws.com/bailinbeier.png" alt="">*/-->
6 13
       <div
@@ -32,7 +39,12 @@
32 39
                   : ""
33 40
               }}
34 41
             </div>
35
-            <div>金额:{{ total }}</div>
42
+             <div
43
+                v-for="item in getSingleTeam(i.prescriptions)" :key="item"
44
+                style="margin-bottom: 10px"
45
+              >
46
+                金额:{{ item }}
47
+              </div>
36 48
           </div>
37 49
           <div
38 50
             style="
@@ -74,11 +86,12 @@
74 86
             <div>
75 87
               <div
76 88
                 v-for="item in getTeam(i.prescriptions)"
89
+                :key="item.id"
77 90
                 style="margin-bottom: 10px"
78 91
               >
79 92
                 {{ item.team.project_team }}
80 93
               </div>
81
-              <div v-for="item in getSingleTeam(i.prescriptions)" style="margin-bottom:10px;">{{ item.project.project_name }}</div>
94
+             
82 95
             </div>
83 96
           </div>
84 97
           <div
@@ -135,6 +148,7 @@ export default {
135 148
       doctor: "",
136 149
       org_id: "",
137 150
       singleProjectPrint: [],
151
+      total_copy:[]
138 152
     };
139 153
   },
140 154
 
@@ -164,8 +178,9 @@ export default {
164 178
       return "";
165 179
     },
166 180
 
167
-    getTeam(prescriptions) {
168
-      // console.log(prescriptions, "prescriptions");
181
+
182
+    getTeam(prescriptions, isUpdate = false) {
183
+      console.log(prescriptions, "prescriptions");
169 184
       let projectPrint = [];
170 185
       let total = 0;
171 186
       prescriptions.map((item) => {
@@ -174,7 +189,6 @@ export default {
174 189
             if (it.type == 2) {
175 190
               if (it.project.cost_classify == 3) {
176 191
                 projectPrint.push(it);
177
-                total += it.project.price * parseInt(it.count);
178 192
               }
179 193
             }
180 194
           });
@@ -182,43 +196,41 @@ export default {
182 196
       });
183 197
       let data = [];
184 198
       projectPrint.map((item) => {
185
-        if (item.team.id != 0) {
199
+        if (item.team.id == 0) {
200
+          data.push(item);
201
+        } else {
186 202
           let status = data.some((it) => it.team.id == item.team.id);
187 203
           if (!status) {
188 204
             data.push(item);
189
-            console.log(data, "oodata");
190 205
           }
191 206
         }
192 207
       });
193
-      this.total = total.toFixed(2);
194
-      this.projectPrint = data;
208
+      if (isUpdate) {
209
+        this.projectPrint = data;
210
+      }
195 211
       return data;
196 212
     },
197 213
 
198
-     getSingleTeam(prescriptions){
199
-        let projectPrint = []
200
-        let total = 0
201
-        prescriptions.map(item => {
202
-          if(item.project.length > 0){
203
-              item.project.map(it => {
204
-                    if(it.type == 2){
205
-                        if(it.project.cost_classify == 3){
206
-                            projectPrint.push(it)
207
-                            total += (it.project.price*parseInt(it.count))
208
-                        }
209
-                    }
210
-              })
211
-          }
212
-        })
213
-        let data = []
214
-        projectPrint.map(item => {
215
-          if(item.team.id == 0){
216
-                data.push(item)
214
+    // 计算金额(单独从上面的方法割开来,防止进入死循环)
215
+    getSingleTeam(prescriptions) {
216
+      let projectPrint = [];
217
+      let total = 0;
218
+      prescriptions.map((item) => {
219
+        if (item.project.length > 0) {
220
+          item.project.map((it) => {
221
+            if (it.type == 2) {
222
+              if (it.project.cost_classify == 3) {
223
+                projectPrint.push(it);
224
+                total += it.project.price * parseInt(it.count);
217 225
               }
218
-        })
219
-        this.total = total.toFixed(2)
220
-        return data
221
-     },
226
+            }
227
+          });
228
+        }
229
+      });
230
+      let total_copy=[]
231
+      total_copy.push(total.toFixed(2))
232
+      return total_copy;
233
+    },
222 234
 
223 235
     getInitData() {
224 236
       getInitData().then((response) => {
@@ -329,6 +341,7 @@ export default {
329 341
       newNameArr.push(...nameArr);
330 342
       return newNameArr.join(" ");
331 343
     },
344
+
332 345
     compare(property) {
333 346
       return function (a, b) {
334 347
         var value1 = a[property];
@@ -445,6 +458,16 @@ export default {
445 458
       this.ids = val;
446 459
       this.getPrescriptionPrint();
447 460
     },
461
+    // printData: {
462
+    //   immediate: true,
463
+    //   deep: true,
464
+    //   handler(val) {
465
+    //     console.log(val, "val");
466
+    //     val.forEach((el) => {
467
+    //       this.getTeam(el.prescriptions, true);
468
+    //     });
469
+    //   },
470
+    // },
448 471
   },
449 472
 };
450 473
 </script>

+ 1 - 1
src/xt_pages/outpatientDoctorStation/batch_print_treatTemplate/printOne.vue View File

@@ -14,7 +14,7 @@
14 14
                 <div>就诊日期:{{getTime(i.info.ctime,'{y}-{m}-{d}')}}</div>
15 15
             </div>
16 16
 
17
-            <div class="printTitle">{{orgname}}</div>
17
+            <div class="printTitle">{{orgname}}测试</div>
18 18
             <div class="printTitle">处方、治疗单</div>
19 19
 
20 20
             <div class="infoTitle">

+ 1 - 0
src/xt_pages/outpatientDoctorStation/pastInquiries.vue View File

@@ -341,6 +341,7 @@ export default {
341 341
         this.$message.error("请至少选择一条需要打印的内容");
342 342
         return false;
343 343
       } else {
344
+
344 345
         var sch_ids = [];
345 346
         for (let index = 0; index < this.selecting_schs.length; index++) {
346 347
           sch_ids.push(this.selecting_schs[index].patient_id);