Bläddra i källkod

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

28169 6 månader sedan
förälder
incheckning
a8da522577

+ 14 - 1
src/router/modules/dialysis.js Visa fil

@@ -781,6 +781,7 @@ export default {
781 781
         noCache: true
782 782
       }
783 783
     },
784
+    
784 785
     {
785 786
       path: '/dialysis/print/batch/thirtyTwo',
786 787
       component: () =>
@@ -1130,7 +1131,7 @@ export default {
1130 1131
         noCache: true
1131 1132
       }
1132 1133
     },
1133
-    {//80
1134
+    {//81
1134 1135
       path: '/dialysis/print/batch/eightyone',
1135 1136
       component: () =>
1136 1137
         import('@/xt_pages/dialysis/batch_print/batch_print_order_eightyone'),
@@ -1142,6 +1143,18 @@ export default {
1142 1143
         noCache: true
1143 1144
       }
1144 1145
     },
1146
+    {//82
1147
+      path: '/dialysis/print/batch/eightyTwo',
1148
+      component: () =>
1149
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_eightyTwo'),
1150
+      hidden: true,
1151
+      is_menu: false,
1152
+      name: 'batch_print_order_eightyTwo',
1153
+      meta: {
1154
+        title: '批量打印',
1155
+        noCache: true
1156
+      }
1157
+    },
1145 1158
     {
1146 1159
       path: '/dialysis/flow',
1147 1160
       component: () => import('@/xt_pages/dialysis/dialysisFlow'),

+ 121 - 19
src/xt_pages/Pharmacy/drugCode.vue Visa fil

@@ -94,8 +94,11 @@
94 94
         <el-table-column align="center" prop="name" label="操作" width="200">
95 95
           <template slot-scope="scope">
96 96
             <div>
97
-             <el-button v-if="scope.row.is_upload == 1" type="primary" @click="sigle_stock(scope.row)">未上传</el-button>
98
-            <el-button type="primary" v-if="scope.row.is_upload == 0 || scope.row.is_upload == 2" @click="toUpload(scope.row)">上传</el-button>
97
+<!--             <el-button v-if="scope.row.is_upload == 1" type="primary" @click="sigle_stock(scope.row)">未上传</el-button>-->
98
+<!--            <el-button type="primary" v-if="scope.row.is_upload == 0 || scope.row.is_upload == 2" @click="toUpload(scope.row)">上传</el-button>-->
99
+
100
+              <el-button v-if="scope.row.is_upload == 1" type="primary" @click="revokeDrugCode(scope.row)">撤销</el-button>
101
+              <el-button type="primary" v-if="scope.row.is_upload == 0" @click="toUpload(scope.row)">上传</el-button>
99 102
             <el-button v-if="faShow == true" type="primary" @click="toFaYao(scope.row)">发药</el-button>
100 103
             </div>
101 104
           </template>
@@ -189,6 +192,122 @@
189 192
       }
190 193
     },
191 194
     methods: {
195
+      toUpload(row){
196
+        if(row.drug_code.length == 0){
197
+          this.$message.error("追溯码不能为空");
198
+          return
199
+        }
200
+        let ids  = row.id
201
+        var that = this;
202
+        let params = {
203
+          id:ids,
204
+          admin_user_id:this.$store.getters.xt_user.user.id
205
+        };
206
+
207
+        axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
208
+          if (response.data.state == 0) {
209
+            // that.$message.error(response.data.data.msg);
210
+            that.$confirm("请检查医保程序是否有打开", "提示", {
211
+              confirmButtonText: "确 定",
212
+              cancelButtonText: "取 消",
213
+              type: "warning",
214
+            }).then(() => {
215
+
216
+
217
+            })
218
+              .catch(() => {});
219
+            return false
220
+          } else {
221
+
222
+            //有打开则调用接口
223
+            axios.get('http://127.0.0.1:9532/api/delete_xs_bg_three',{params:params}).then(function(response) {
224
+              if (response.data.state == 0) {
225
+                that.$message.error(response.data.data.msg);
226
+                return false
227
+              } else {
228
+                if(response.data.data.failed_code == -10){
229
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
230
+                    confirmButtonText: '确 定',
231
+                    type: 'warning'
232
+                  }).then(() => {
233
+
234
+                  }).catch(() => {
235
+                  })
236
+                }else{
237
+                  that.getlist()
238
+                }
239
+              }
240
+            }).catch(function(error) {
241
+            })
242
+          }
243
+        }).catch(function(error) {
244
+          that.$confirm("请检查医保程序是否有打开", "提示", {
245
+            confirmButtonText: "确 定",
246
+            cancelButtonText: "取 消",
247
+            type: "warning",
248
+          }).then(() => {
249
+          })
250
+            .catch(() => {});
251
+        })
252
+
253
+
254
+      },
255
+
256
+      revokeDrugCode(row){
257
+        let ids  = row.id
258
+        var that = this;
259
+        let params = {
260
+          id:ids,
261
+          admin_user_id:this.$store.getters.xt_user.user.id
262
+        };
263
+        axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
264
+          if (response.data.state == 0) {
265
+            // that.$message.error(response.data.data.msg);
266
+            that.$confirm("请检查医保程序是否有打开", "提示", {
267
+              confirmButtonText: "确 定",
268
+              cancelButtonText: "取 消",
269
+              type: "warning",
270
+            }).then(() => {
271
+
272
+            })
273
+              .catch(() => {});
274
+            return false
275
+          } else {
276
+            axios.get('http://127.0.0.1:9532/api/delete_xs_bg_three',{params:params}).then(function(response) {
277
+              if (response.data.state == 0) {
278
+
279
+                that.$message.error(response.data.data.msg);
280
+                return false
281
+              } else {
282
+                if(response.data.data.failed_code == -10){
283
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
284
+                    confirmButtonText: '确 定',
285
+                    type: 'warning'
286
+                  }).then(() => {
287
+
288
+                  }).catch(() => {
289
+                  })
290
+                }else{
291
+                  that.getlist()
292
+                }
293
+              }
294
+            }).catch(function(error) {
295
+            })
296
+          }
297
+        }).catch(function(error) {
298
+          that.$confirm("请检查医保程序是否有打开", "提示", {
299
+            confirmButtonText: "确 定",
300
+            cancelButtonText: "取 消",
301
+            type: "warning",
302
+          }).then(() => {
303
+          })
304
+            .catch(() => {});
305
+        })
306
+
307
+
308
+
309
+      },
310
+
192 311
         changeText(event){
193 312
         // 检查是否为特定的按键,例如回车键,来确认扫码枪输入完成
194 313
         if (event.key === 'Enter') {
@@ -376,23 +495,6 @@
376 495
       changeEndTime(val){
377 496
         this.end_time = val
378 497
       },
379
-      toUpload(row){
380
-        if(row.is_medicine == 0 || row.is_is_medicine == 2){
381
-          this.$message.error("该药品未发药,请先发药")
382
-          this.faShow = true
383
-          return
384
-        }
385
-        var params = {
386
-          drug_id:row.drug_id,
387
-          patient_id:row.patient_id,
388
-         advice_date:row.advice_date,
389
-        }
390
-        createUploadDrugCode(params).then(response=>{
391
-          if(response.data.state == 1){
392
-            this.$message.success("上传成功!")
393
-          }
394
-        })
395
-      },
396 498
       toFaYao(row){
397 499
 
398 500
         if(this.is_open == 1){

+ 3 - 3
src/xt_pages/dialysis/batch_print/batch_print_order_eighty.vue Visa fil

@@ -199,7 +199,7 @@
199 199
                               : ""
200 200
                           }}
201 201
                         </div>
202
-                        
202
+                        /
203 203
                         <div class="under_line" style="width: 50px; text-align: center">
204 204
                           {{
205 205
                             record.assessment_before_dislysis.diastolic_blood_pressure
@@ -603,7 +603,7 @@
603 603
                           <td>
604 604
                             {{
605 605
                               monitor_record.systolic_blood_pressure
606
-                                ? monitor_record.systolic_blood_pressure + ""
606
+                                ? monitor_record.systolic_blood_pressure + "/"
607 607
                                 : ""
608 608
                             }}
609 609
                             {{
@@ -1049,7 +1049,7 @@
1049 1049
                           </span>
1050 1050
                           <span v-else></span>
1051 1051
                         </div>
1052
-                        
1052
+                        /
1053 1053
                         <div class="under_line"
1054 1054
                           style="width: 50px; text-align: center"
1055 1055
                         >

Filskillnaden har hållits tillbaka eftersom den är för stor
+ 1505 - 0
src/xt_pages/dialysis/batch_print/batch_print_order_eightyTwo.vue


+ 18 - 11
src/xt_pages/dialysis/bloodPresssWatch.vue Visa fil

@@ -228,7 +228,7 @@
228 228
             >批量打印</el-button
229 229
           >
230 230
         </template>
231
-        
231
+
232 232
         <template v-if="template_id == 27">
233 233
           <el-button
234 234
             style=""
@@ -268,6 +268,7 @@
268 268
             >批量打印</el-button
269 269
           >
270 270
         </template>
271
+        
271 272
         <template v-if="this.template_id == 32">
272 273
           <el-button
273 274
             size="small"
@@ -548,6 +549,16 @@
548 549
             type="primary"
549 550
             >批量打印</el-button>
550 551
         </template>
552
+        <template v-if="this.template_id == 82">
553
+          <el-button
554
+            size="small"
555
+            icon="el-icon-printer"
556
+            :disabled="selecting_schs.length == 0"
557
+            @click="batchPrintAction"
558
+            type="primary"
559
+            >批量打印</el-button
560
+          >
561
+        </template>
551 562
       </div>
552 563
     </div>
553 564
     <div class="app-container">
@@ -1982,7 +1993,6 @@ export default {
1982 1993
       this.getSchedualPatientList()
1983 1994
     },
1984 1995
     changeEndTime(){
1985
-
1986 1996
       this.getSchedualPatientList()
1987 1997
     },
1988 1998
     getAllZone: function() {
@@ -2014,8 +2024,6 @@ export default {
2014 2024
         this.listQuery.schedul_time = "";
2015 2025
 
2016 2026
       }
2017
-
2018
-
2019 2027
       console.log("params332322332323232",this.listQuery.start_time)
2020 2028
       this.SchedualPatientsTableData = [];
2021 2029
       getSchedualPatient(this.listQuery).then(response => {
@@ -2027,7 +2035,8 @@ export default {
2027 2035
         } else {
2028 2036
           this.loading = false;
2029 2037
           this.total = response.data.data.total;
2030
-          console.log("世界文化遗产",response.data.data.schedule)
2038
+          console.log("世界文化遗产",response.data.data)
2039
+          // const schedualpatientsTableData2=[]
2031 2040
           for (let i = 0; i < response.data.data.schedule.length; i++) {
2032 2041
 
2033 2042
             if (response.data.data.schedule[i].patient&&response.data.data.schedule[i].patient.id > 0) {
@@ -2082,9 +2091,6 @@ export default {
2082 2091
                 SchedualPatientsTable["pressure_name"] =response.data.data.schedule[i].assessment_before_dislysis.systolic_blood_pressure+"/"+ response.data.data.schedule[i].assessment_before_dislysis.diastolic_blood_pressure;
2083 2092
               }
2084 2093
 
2085
-
2086
-
2087
-
2088 2094
               if(response.data.data.schedule[i].monitoring_record!=null &&response.data.data.schedule[i].monitoring_record.length >0 ){
2089 2095
                  SchedualPatientsTable["monitoring_record"]  = response.data.data.schedule[i].monitoring_record
2090 2096
               }
@@ -2107,7 +2113,6 @@ export default {
2107 2113
                }
2108 2114
               }
2109 2115
 
2110
-
2111 2116
               // 体温
2112 2117
               SchedualPatientsTable.tp = [];
2113 2118
 
@@ -2546,8 +2551,8 @@ export default {
2546 2551
                 SchedualPatientsTable["after_pressure_name"] =response.data.data.schedule[i].assessment_after_dislysis.systolic_blood_pressure+"/"+ response.data.data.schedule[i].assessment_after_dislysis.diastolic_blood_pressure;
2547 2552
               }
2548 2553
 
2549
-
2550
-
2554
+              // schedualpatientsTableData2.push(SchedualPatientsTable)
2555
+              // this.SchedualPatientsTableData = schedualpatientsTableData2
2551 2556
               this.SchedualPatientsTableData.push(SchedualPatientsTable);
2552 2557
               // console.log("wode数据",(-100).toString())
2553 2558
               // console.log("数据哦哦😯噢232o",this.SchedualPatientsTableData)
@@ -2782,6 +2787,8 @@ export default {
2782 2787
         this.$router.push({ path: "/dialysis/print/batch/eighty" });
2783 2788
       }else if (this.template_id == 81) {
2784 2789
         this.$router.push({ path: "/dialysis/print/batch/eightyone" });
2790
+      } else if (this.template_id == 82) {
2791
+        this.$router.push({ path: "/dialysis/print/batch/eightyTwo" });
2785 2792
       }
2786 2793
     },
2787 2794
     batchPrintActionOne: function() {

+ 5 - 7
src/xt_pages/dialysis/template/DialysisPrintOrderSeventynine.vue Visa fil

@@ -1389,14 +1389,12 @@ export default {
1389 1389
     },
1390 1390
     getcheckData(val){
1391 1391
       if(val.length >0){
1392
-        let message = `记录单未填数据:<br/><br/>&nbsp;&nbsp;${val.join("<br/><br/>&nbsp;&nbsp;")}`;
1393
-        this.$message({
1392
+        let message = `记录单未填数据:<br/>&nbsp;${val.join("<br/>&nbsp;")}`;
1393
+        this.$alert(message, '提示', {
1394
+          confirmButtonText: '确定',
1395
+          type: 'warning',
1394 1396
           dangerouslyUseHTMLString: true,
1395
-          message:message,
1396
-          duration:0,
1397
-          showClose:true,
1398
-          type:'error'
1399
-        })
1397
+        });
1400 1398
         return message
1401 1399
       }else{
1402 1400
         this.$message.success('核对完成')

+ 16 - 11
src/xt_pages/dialysis/template/DialysisPrintOrderSeventysix.vue Visa fil

@@ -2164,13 +2164,15 @@ export default {
2164 2164
       ) {
2165 2165
         const obj30 = '首剂'
2166 2166
         checkDate.push(obj30);
2167
-      } if (
2168
-        this.prescription.anticoagulant_weichi == "" &&
2169
-        this.prescription.anticoagulant != 1
2170
-      ) {
2171
-        const obj31 = '维持'
2172
-        checkDate.push(obj31);
2173
-      } if (
2167
+      } 
2168
+      // if (
2169
+      //   this.prescription.anticoagulant_weichi == "" &&
2170
+      //   this.prescription.anticoagulant != 1
2171
+      // ) {
2172
+      //   const obj31 = '维持'
2173
+      //   checkDate.push(obj31);
2174
+      // } 
2175
+      if (
2174 2176
         this.prescription.anticoagulant_zongliang == "" &&
2175 2177
         this.prescription.anticoagulant != 1 &&
2176 2178
         this.prescription.anticoagulant != 5
@@ -2945,10 +2947,13 @@ export default {
2945 2947
     },
2946 2948
     getcheckData(val){
2947 2949
       if(val.length >0){
2948
-        const a = val.join(',')
2949
-        console.log('a',a);
2950
-        this.$message.error(a +" 未填");
2951
-        return a
2950
+        let message = `记录单未填数据:<br/>&nbsp;${val.join("<br/>&nbsp;")}`;
2951
+        this.$alert(message, '提示', {
2952
+          confirmButtonText: '确定',
2953
+          type: 'warning',
2954
+          dangerouslyUseHTMLString: true,
2955
+          
2956
+        });
2952 2957
       }else{
2953 2958
         this.$message.success('核对完成')
2954 2959
       }

+ 7 - 7
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue Visa fil

@@ -1565,7 +1565,7 @@
1565 1565
                           style="padding-left: 7px"
1566 1566
                         >
1567 1567
                           <div >
1568
-                            <template v-if="advice.children!=undefined && (org_id==10551||org_id == 0)">
1568
+                            <template v-if="advice.children!=undefined && (org_id==10551)">
1569 1569
                               <div v-for="(item,index) in advice.children" :key="index">
1570 1570
                                 {{ item.advice_name }}
1571 1571
                                 <span v-if="item.advice_desc">
@@ -1578,7 +1578,7 @@
1578 1578
                                 <span v-if="item.single_dose !=''">
1579 1579
                                   {{ item.single_dose}}{{ item.single_dose_unit }}
1580 1580
                                 </span>
1581
-                                
1581
+
1582 1582
                               </div>
1583 1583
                             </template>
1584 1584
                             <span v-if="advice.parent_id > 0">---></span>
@@ -3358,7 +3358,7 @@ export default {
3358 3358
         this.users = response.data.data.users;
3359 3359
         this.patientInfo = response.data.data.patientInfo;
3360 3360
         console.log('response.data.data',response.data.data);
3361
-        
3361
+
3362 3362
         this.patientInfo.birth = uParseTime(
3363 3363
           this.patientInfo.birthday,
3364 3364
           "{y}-{m}-{d}"
@@ -3756,14 +3756,14 @@ export default {
3756 3756
           }
3757 3757
         }
3758 3758
 
3759
-        if(this.org_id ==10551 ||this.org_id ==0){
3759
+        if(this.org_id ==10551){
3760 3760
           for(let i in this.doctor_advices){
3761 3761
             if(this.doctor_advices[i].parent_id >0){
3762 3762
               this.doctor_advices.splice(i,1)
3763 3763
             }
3764 3764
           }
3765 3765
         }
3766
-        
3766
+
3767 3767
 
3768 3768
         this.totollength = this.doctor_advices.length + this.monitors.length;
3769 3769
         console.log("this.totollength",this.totollength)
@@ -3779,11 +3779,11 @@ export default {
3779 3779
               doctor_advices_2.push(element);
3780 3780
             }
3781 3781
           }
3782
-          
3782
+
3783 3783
           this.doctor_advices = doctor_advices_1;
3784 3784
           this.doctor_advices_2 = doctor_advices_2;
3785 3785
         }
3786
-        
3786
+
3787 3787
       } else {
3788 3788
         this.loading = false;
3789 3789
         this.$message.error("请求数据失败");

+ 10 - 6
src/xt_pages/dialysis/template/DialysisPrintOrderSop.vue Visa fil

@@ -39,7 +39,7 @@
39 39
                     <label-box :isChecked="predialysis.symptom_before_dialysis_other==''?true :false" showValue="无特殊"></label-box>&nbsp;
40 40
                     <label-box :isChecked="predialysis.symptom_before_dialysis_other!=''?true :false" showValue="出现:"></label-box>
41 41
                   <!-- </span> -->
42
-                  
42
+
43 43
                   <!-- <span>{{predialysis.symptom_before_dialysis}}</span> -->
44 44
                   <span>{{predialysis.symptom_before_dialysis_other}}</span>
45 45
                 </div>
@@ -166,6 +166,7 @@
166 166
                             predialysis.blood_access_part_opera_name!='临时静脉导管' &&
167 167
                             predialysis.blood_access_part_opera_name!=''?true :false" showValue="其它">
168 168
                 </label-box>
169
+
169 170
               </div>&nbsp;&nbsp;
170 171
               <div style="display: inline-block;line-height: 30px;">
171 172
                 穿刺者:
@@ -503,7 +504,7 @@ export default {
503 504
         (this.prescription.mode_id == 2 || this.prescription.mode_id == 5 || this.prescription.mode_id == 12)){
504 505
           const obj3 = "置换量"
505 506
           checkDate.push(obj3)
506
-      } if(this.afterdialysis.actual_treatment_hour == '' && 
507
+      } if(this.afterdialysis.actual_treatment_hour == '' &&
507 508
           this.afterdialysis.actual_treatment_minute == ''
508 509
       ){
509 510
         const obj4 = "治疗时间"
@@ -1270,10 +1271,13 @@ export default {
1270 1271
     },
1271 1272
     getcheckData(val){
1272 1273
       if(val.length >0){
1273
-        const a = val.join(',')
1274
-        console.log('a',a);
1275
-        this.$message.error(a +" 未填");
1276
-        return a
1274
+        let message = `记录单未填数据:<br/>&nbsp;${val.join("<br/>&nbsp;")}`;
1275
+        this.$alert(message, '提示', {
1276
+          confirmButtonText: '确定',
1277
+          type: 'warning',
1278
+          dangerouslyUseHTMLString: true,
1279
+          
1280
+        });
1277 1281
       }else{
1278 1282
         this.$message.success('核对完成')
1279 1283
       }

+ 11 - 10
src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue Visa fil

@@ -186,7 +186,7 @@
186 186
                             : ""
187 187
                         }}
188 188
                       </div>
189
-                      
189
+                      /
190 190
                       <div class="under_line" style="width: 50px; text-align: center">
191 191
                         {{
192 192
                           predialysis.diastolic_blood_pressure
@@ -584,7 +584,7 @@
584 584
                       </tr>
585 585
                       <tr v-for="(monitor, monindex) in monitors" :key="monindex" style="">
586 586
                         <td>{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
587
-                        <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + " ": ""}}
587
+                        <td>{{monitor.systolic_blood_pressure? monitor.systolic_blood_pressure + "/": ""}}
588 588
                           {{monitor.diastolic_blood_pressure? monitor.diastolic_blood_pressure: ""}}</td>
589 589
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
590 590
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
@@ -889,7 +889,7 @@
889 889
                           </span>
890 890
                            <span v-else></span>
891 891
                       </div>
892
-                      
892
+                      /
893 893
                       <div
894 894
                         class="under_line"
895 895
                         style="width: 50px; text-align: center"
@@ -959,10 +959,9 @@
959 959
                       导管:
960 960
                       <div class="under_line"
961 961
                         style="width: 75%; text-align: center;white-space: normal;"
962
-                      >
963
-                        {{
964
-                          afterdialysis.catheter ? afterdialysis.catheter : ""
965
-                        }}
962
+                      > 
963
+
964
+                          {{ afterdialysis.catheter ? afterdialysis.catheter : ""}}
966 965
                       </div>
967 966
                     </div>
968 967
                     <div class="inline_block" style="flex: 2">
@@ -1034,11 +1033,13 @@
1034 1033
                       <div class="under_line"
1035 1034
                         style="width: 70px; text-align: center"
1036 1035
                       >
1037
-                        {{
1038
-                          afterdialysis.dialysis_intakes
1036
+                        <span>
1037
+                          {{ afterdialysis.dialysis_intakes
1039 1038
                             ? afterdialysis.dialysis_intakes
1040 1039
                             : ""
1041
-                        }}
1040
+                          }}
1041
+                        </span>
1042
+                        
1042 1043
                       </div>
1043 1044
 
1044 1045
                       {{ getUnit(afterdialysis.dialysis_intakes_unit) }}

+ 12 - 21
src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue Visa fil

@@ -809,7 +809,7 @@ export default {
809 809
         const obj0 = '血液净化方式'
810 810
         checkDate.push(obj0)
811 811
       }
812
-      if(this.prescription.dialyzer_perfusion_apparatus ==''){
812
+      if(this.prescription.dialysis_dialyszers =='' && this.prescription.dialysis_irrigation == ''){
813 813
         const obj = '血液净化器类型'
814 814
         checkDate.push(obj)
815 815
       } if(this.prescription.dialysate_formulation_name ==''){
@@ -821,10 +821,10 @@ export default {
821 821
       } if(this.predialysis.blood_access_part_opera_name ==''){
822 822
         const obj3 = '血管通路'
823 823
         checkDate.push(obj3)
824
-      } if(this.predialysis.catheter == ''){
824
+      } if(this.predialysis.catheter == '' && this.predialysis.internal_fistula ==''){
825 825
         const obj4 = '透前导管'
826 826
         checkDate.push(obj4)
827
-      } if(this.predialysis.internal_fistula ==''){
827
+      } if(this.predialysis.internal_fistula =='' && this.predialysis.catheter == ''){
828 828
         const obj5 = '透前内瘘'
829 829
         checkDate.push(obj5)
830 830
       } if(this.prescription.anticoagulant == 0){
@@ -913,15 +913,10 @@ export default {
913 913
       ){
914 914
         const obj31 = '透后血压'
915 915
         checkDate.push(obj31)
916
-      } if(this.afterdialysis.symptom_after_dialysis == ""){
917
-        const obj32 = '透后症状'
918
-        checkDate.push(obj32)
919
-      } if(this.afterdialysis.actual_displacement == 0){
916
+      } 
917
+      if(this.afterdialysis.actual_displacement == 0){
920 918
         const obj33 = '实际置换量'
921 919
         checkDate.push(obj33)
922
-      } if(this.afterdialysis.is_eat == 0){
923
-        const obj34 = '透析期间进食'
924
-        checkDate.push(obj34)
925 920
       } if(this.predialysis.is_eat == 1 && this.predialysis.dialysis_during == 0){
926 921
         const obj35 = '透析进食'
927 922
         checkDate.push(obj35)
@@ -943,9 +938,6 @@ export default {
943 938
       } if(this.summary.dialysis_summary == ""){
944 939
         const obj41 = '透析小结'
945 940
         checkDate.push(obj41)
946
-      } if(this.summary.special_record == ""){
947
-        const obj42 = '病情记录'
948
-        checkDate.push(obj42)
949 941
       } if(this.tableAdvice.length > 0){
950 942
         this.tableAdvice.map((item) =>{
951 943
           if(item.id > 0 && (item.created_time || item.start_time)){
@@ -1731,15 +1723,14 @@ export default {
1731 1723
     },
1732 1724
     getcheckData(val){
1733 1725
       if(val.length >0){
1734
-        let message = `记录单未填数据:<br/><br/>&nbsp;&nbsp;${val.join("<br/><br/>&nbsp;&nbsp;")}`;
1735
-        this.$message({
1726
+        let message = `记录单未填数据:<br/>&nbsp;${val.join("<br/>&nbsp;")}`;
1727
+        this.$alert(message, '提示', {
1728
+          confirmButtonText: '确定',
1729
+          type: 'warning',
1736 1730
           dangerouslyUseHTMLString: true,
1737
-          message:message,
1738
-          duration:0,
1739
-          showClose:true,
1740
-          type:'error'
1741
-        })
1742
-        return message
1731
+          
1732
+        });
1733
+        // return message
1743 1734
       }else{
1744 1735
         this.$message.success('核对完成')
1745 1736
       }

+ 13 - 0
src/xt_pages/eleFaPiao/settleDetail.vue Visa fil

@@ -124,6 +124,19 @@
124 124
           </template>
125 125
         </el-table-column>
126 126
 
127
+
128
+        <el-table-column
129
+          align="center"
130
+          width="100"
131
+          prop="name"
132
+          label="医疗费总额"
133
+        >
134
+          <template slot-scope="scope">
135
+            {{scope.row.medfee_sumamt}}
136
+          </template>
137
+        </el-table-column>
138
+
139
+
127 140
         <el-table-column
128 141
           align="center"
129 142
           width="100"