XMLWAN 4 лет назад
Родитель
Сommit
a39610bba1

+ 17 - 5
src/xt_pages/data/components/consumables.vue Просмотреть файл

@@ -872,11 +872,17 @@
872 872
             var that = this
873 873
             axios.get('http://127.0.0.1:9532/sz/api/goods/get',{ params: params }).then(function(response) {
874 874
             if (response.data.state == 0) {
875
-                  that.$message.error(response.data.msg)
875
+                  that.$message.error(response.data.data.msg)
876 876
                   return false
877 877
                 } else {
878
-                  that.$message({ message: '备案成功', type: 'success' })
878
+                 if(response.data.data.msg == ""){
879
+                  that.$message.success("备案成功!")
879 880
                   that.getList()
881
+               }
882
+               if(response.data.data.msg!=""){
883
+                  that.$message.error(response.data.data.msg)
884
+                  that.getList()
885
+                }
880 886
                 }
881 887
               }).catch(function(error) {
882 888
             })
@@ -893,11 +899,17 @@
893 899
           }
894 900
          axios.get('http://127.0.0.1:9532/sz/api/revocation/get',{params:params}).then(function(response) {
895 901
           if (response.data.state == 0) {
896
-               that.$message.error(response.data.msg)
902
+               that.$message.error(response.data.data.msg)
897 903
                return false
898 904
             } else {
899
-              that.$message({ message: '操作成功', type: 'success' })
900
-              that.getList()
905
+              if(response.data.data.msg == ""){
906
+                  that.$message.success("备案成功!")
907
+                  that.getList()
908
+               }
909
+               if(response.data.data.msg!=""){
910
+                  that.$message.error(response.data.data.msg)
911
+                  that.getList()
912
+               }
901 913
              }
902 914
            }).catch(function(error) {
903 915
         })

+ 33 - 24
src/xt_pages/data/components/drugs.vue Просмотреть файл

@@ -66,7 +66,7 @@
66 66
           align="center"
67 67
           type="selection"
68 68
           width="55"
69
-       ></el-table-column>        
69
+       ></el-table-column>
70 70
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
71 71
 
72 72
       <el-table-column prop="date" label="药品名称" align="center" width="100">
@@ -207,7 +207,7 @@
207 207
         is_record:"",
208 208
         is_inject: '',
209 209
         list: [],
210
-    
210
+
211 211
         isCreated: 1,
212 212
         manufacturers: [],
213 213
         title: '',
@@ -327,7 +327,7 @@
327 327
             label: '未备案'
328 328
           }],
329 329
         value: '',
330
-       
330
+
331 331
         dealer:[],
332 332
         selectDrug:[],
333 333
       }
@@ -401,7 +401,7 @@
401 401
         } else if (val.id == 0) {
402 402
           //新增
403 403
           console.log("vale222222",val)
404
-         
404
+
405 405
           createBaseDrugLib(val).then(response => {
406 406
             if (response.data.state == 0) {
407 407
               this.$message.error(response.data.msg)
@@ -426,11 +426,11 @@
426 426
           } else {
427 427
               var obj = {id:0,manufacturer_name:"全部"}
428 428
               this.manufacturers.push(obj)
429
-          
429
+
430 430
             for (let i = 0; i < response.data.data.manufacturer.length; i++) {
431 431
               this.manufacturers.push(response.data.data.manufacturer[i])
432 432
             }
433
-          
433
+
434 434
           }
435 435
         })
436 436
       },
@@ -531,10 +531,10 @@
531 531
               }
532 532
 
533 533
               this.formValue.record_date = this.getTime(this.formValue.record_date)
534
-               
534
+
535 535
               if(this.formValue.drug_category == 0){
536 536
                   this.formValue.drug_category = ""
537
-              } 
537
+              }
538 538
               if(this.formValue.drug_control == 0){
539 539
                   this.formValue.drug_control = ""
540 540
               }
@@ -561,7 +561,7 @@
561 561
               }
562 562
               if(this.formValue.is_mark == 0){
563 563
                  this.formValue.is_mark = ""
564
-              }  
564
+              }
565 565
               if(this.formValue.prescription_mark == 0){
566 566
                   this.formValue.prescription_mark = ""
567 567
               }
@@ -652,11 +652,18 @@
652 652
           }
653 653
          axios.get('http://127.0.0.1:9532/sz/api/revocation/get',{params:params}).then(function(response) {
654 654
           if (response.data.state == 0) {
655
-               that.$message.error(response.data.msg)
655
+               that.$message.error(response.data.data.msg)
656 656
                return false
657 657
             } else {
658
-              that.$message({ message: '操作成功', type: 'success' })
659
-              that.getList()
658
+              if(response.data.data.msg == ""){
659
+                  that.$message.success("备案成功!")
660
+                  that.getList()
661
+               }
662
+               if(response.data.data.msg!=""){
663
+                  that.$message.error(response.data.data.msg)
664
+                  that.getList()
665
+               }
666
+              
660 667
              }
661 668
            }).catch(function(error) {
662 669
         })
@@ -668,7 +675,7 @@
668 675
           return false;
669 676
         } else {
670 677
           this.dealer = response.data.data.dealer;
671
-         
678
+  
672 679
         }
673 680
        });
674 681
       },
@@ -708,32 +715,34 @@
708 715
           ids.push(this.selectDrug[index].id);
709 716
           idMap[this.selectDrug[index].id] = this.selectDrug[index].id;
710 717
         }
711
-      
718
+
712 719
         var idss = ids.join(',')
713 720
         let params = {
714 721
           ids:idss,
715 722
           admin_user_id:this.$store.getters.xt_user.user.id
716 723
         }
717
-       
724
+
718 725
         var that = this
719 726
         axios.get('http://127.0.0.1:9532/sz/api/drug/get',{ params: params }).then(function(response) {
720 727
          if (response.data.state == 0) {
721
-               that.$message.error(response.data.msg)
728
+              
729
+               that.$message.error(response.data.data.msg)
722 730
                return false
723 731
             } else {
724
-              if(response.data.msg != ""){
725
-                that.$message.success(response.data.msg)
726
-              }
727
-              if(response.data.msg == ""){
728
-               that.$message.success("备案成功")
729
-              }
730
-              that.getList()
732
+               if(response.data.data.msg == ""){
733
+                  that.$message.success("备案成功!")
734
+                  that.getList()
735
+               }
736
+               if(response.data.data.msg!=""){
737
+                  that.$message.error(response.data.data.msg)
738
+                   that.getList()
739
+               }
731 740
              }
732 741
            }).catch(function(error) {
733 742
         })
734 743
        });
735 744
      },
736
-    }, 
745
+    },
737 746
     created() {
738 747
       this.getList()
739 748
       this.getAllManufacturer()

+ 7 - 1
src/xt_pages/data/components/editInspection.vue Просмотреть файл

@@ -30,7 +30,7 @@
30 30
                         </el-option>
31 31
                   </el-select>
32 32
                 </el-form-item>
33
-                <el-form-item label="组套类型 : " prop="name" style="width:50%">
33
+                <el-form-item label="组套类型 : " prop="team_type" style="width:50%">
34 34
                     <el-select v-model="form.team_type" style="width:100%;" placeholder="请选择">
35 35
                         <el-option
36 36
                         v-for="item in options"
@@ -211,7 +211,13 @@ export default {
211 211
                  this.form.pinyin = projectTeamDetail.pinyin
212 212
                  this.form.wubi  = projectTeamDetail.wubi
213 213
                  this.form.tube_color = projectTeamDetail.tube_color
214
+                 if(projectTeamDetail.tube_color == 0){
215
+                    this.form.tube_color = ""
216
+                 }
214 217
                  this.form.team_type = projectTeamDetail.team_type
218
+                 if(projectTeamDetail.team_type == 0){
219
+                    this.form.team_type = ""
220
+                 }     
215 221
                  this.form.remark = projectTeamDetail.remark
216 222
                  this.form.item_id = projectTeamDetail.item_id
217 223
                 //  console.log("project",projectTeamDetail)

+ 18 - 6
src/xt_pages/data/components/project.vue Просмотреть файл

@@ -278,11 +278,17 @@ export default {
278 278
          
279 279
          axios.get('http://127.0.0.1:9532/sz/api/revocation/get',{params:params}).then(function(response) {
280 280
           if (response.data.state == 0) {
281
-               that.$message.error(response.data.msg)
281
+               that.$message.error(response.data.data.msg)
282 282
                return false
283 283
             } else {
284
-              that.$message({ message: '操作成功', type: 'success' })
285
-              that.getlist()
284
+              if(response.data.data.msg == ""){
285
+                  that.$message.success("备案成功!")
286
+                  that.getlist()
287
+               }
288
+               if(response.data.data.msg!=""){
289
+                  that.$message.error(response.data.data.msg)
290
+                  that.getlist()
291
+               }
286 292
              }
287 293
            }).catch(function(error) {
288 294
         })
@@ -325,11 +331,17 @@ export default {
325 331
         var that = this
326 332
         axios.get('http://127.0.0.1:9532/sz/api/treatment/get',{ params: params }).then(function(response) {
327 333
          if (response.data.state == 0) {
328
-               that.$message.error(response.data.msg)
334
+               that.$message.error(response.data.data.msg)
329 335
                return false
330 336
             } else {
331
-              that.$message({ message: '备案成功', type: 'success' })
332
-              that.getList()
337
+              if(response.data.data.msg == ""){
338
+                  that.$message.success("备案成功!")
339
+                  that.getlist()
340
+               }
341
+               if(response.data.data.msg!=""){
342
+                  that.$message.error(response.data.data.msg)
343
+                  that.getlist()
344
+               }
333 345
              }
334 346
            }).catch(function(error) {
335 347
         })

+ 8 - 3
src/xt_pages/outpatientDoctorStation/components/deskRecord.vue Просмотреть файл

@@ -314,6 +314,9 @@
314 314
         diagnoses:[],
315 315
         sick:[],
316 316
         allergic_history:"",
317
+        form:{
318
+          id:0,
319
+        }
317 320
       }
318 321
     },
319 322
     methods: {
@@ -365,7 +368,8 @@
365 368
             "remark":this.case_history.remark,
366 369
             "sick":this.case_history.sick,
367 370
             "diagnose":this.case_history.diagnose,
368
-            "allergic_history":this.allergic_history
371
+            "allergic_history":this.allergic_history,
372
+            "id":this.form.id,
369 373
           }
370 374
           console.log("prams222",params)
371 375
           createCaseHistory(params).then(response => {
@@ -402,7 +406,7 @@
402 406
                 this.case_history.remark = templatedetail.remark
403 407
                 this.case_history.sick = templatedetail.sick
404 408
                 this.case_history.diagnose = templatedetail.diagnose
405
-                // this.allergic_history = templatedetail.allergic_history
409
+                
406 410
               }
407 411
           })
408 412
         },
@@ -569,7 +573,8 @@
569 573
         if(this.case_history.diagnose == 0){
570 574
            this.case_history.diagnose = ""
571 575
         }
572
-        // this.allergic_history = this.case_history.allergic_history
576
+        this.form.id = this.case_history.id
577
+        this.allergic_history = this.case_history.allergic_history
573 578
         
574 579
       }
575 580
     }

+ 3 - 5
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Просмотреть файл

@@ -743,6 +743,7 @@
743 743
             this.patientInfo = response.data.data.xt_info
744 744
             this.hisPatientInfo = response.data.data.his_info
745 745
             this.case_history = response.data.data.case_history
746
+            console.log("病历222222",this.case_history)
746 747
             this.info = response.data.data.info
747 748
             this.doctors = response.data.data.doctors
748 749
             this.department = response.data.data.department
@@ -970,8 +971,7 @@
970 971
                 this.patientInfo = response.data.data.xt_info
971 972
                 this.hisPatientInfo = response.data.data.his_info
972 973
                 this.case_history = response.data.data.case_history
973
-                // var case_history = response.data.data.case_history
974
-                // console.log("礼拜2222222222",this.case_history)
974
+                console.log("数据列表是多少",this.case_history)
975 975
                 var month_prescriptions = response.data.data.month_prescriptions
976 976
                 this.setMonthPrescription(month_prescriptions)
977 977
                 this.doctors = response.data.data.doctors
@@ -1144,9 +1144,7 @@
1144 1144
               this.patientInfo = response.data.data.xt_info
1145 1145
               this.hisPatientInfo = response.data.data.his_info
1146 1146
               this.case_history = response.data.data.case_history
1147
-              // var case_history = response.data.data.case_history
1148
-              // console.log("礼拜2223332222222",this.case_history)
1149
-              // this.case_history = case_history
1147
+              console.log("数据是22222多少",this.case_history)
1150 1148
               this.info = response.data.data.info
1151 1149
               this.doctors = response.data.data.doctors
1152 1150
               this.department = response.data.data.department

+ 16 - 3
src/xt_pages/outpatientDoctorStation/template/printOne.vue Просмотреть файл

@@ -17,7 +17,7 @@
17 17
               <div style="margin-bottom: 10px;">医保卡号:{{item.hisPatient.number?item.hisPatient.number:""}}</div>
18 18
               <div style="margin-bottom: 10px;">电话:{{item.patient.phone}}</div>
19 19
               <div>地址:{{item.patient.home_address}}</div>
20
-              <div style="display:flex;width:50%;">临床诊断:{{item.patient.diagnose}}</div>
20
+              <div style="display:flex;width:50%;">临床诊断:{{getDiagnosis(item.info.diagnosis)}}</div>
21 21
           </div>
22 22
           <div class="prescriptionBox">
23 23
               <div class="Rp">Rp:</div>
@@ -85,7 +85,8 @@ export default {
85 85
         department:[],
86 86
         prescriptions:[],
87 87
         projectList:[],
88
-        orgname:""
88
+        orgname:"",
89
+        diagnoses:[],
89 90
       }
90 91
     },
91 92
    methods:{
@@ -132,6 +133,7 @@ export default {
132 133
             console.log("adviceprint9999",advicePrint)
133 134
             this.advicePrint = advicePrint
134 135
             this.prescriptions = advicePrint
136
+            console.log("处方222222",this.prescriptions)
135 137
             var hisPatient = response.data.data.hisPatient
136 138
             console.log("hisPatient",hisPatient)
137 139
             this.hisPatient = hisPatient
@@ -157,7 +159,8 @@ export default {
157 159
        getInitData().then(response=>{
158 160
           if(response.data.state == 1){
159 161
             this.department = response.data.data.department
160
-           
162
+            this.diagnoses = response.data.data.diagnose
163
+            console.log("争端",this.diagnoses)
161 164
           }
162 165
        })
163 166
      },
@@ -222,6 +225,16 @@ export default {
222 225
         return project_name
223 226
      },
224 227
 
228
+     getDiagnosis(id){
229
+        var name = ""
230
+        for(let i=0;i<this.diagnoses.length;i++){
231
+          if(id == this.diagnoses[i].id){
232
+             name = this.diagnoses[i].class_name
233
+          }
234
+        }
235
+        return name
236
+     }
237
+
225 238
    },
226 239
    created(){
227 240
       this.getAllDoctorList()

+ 23 - 2
src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue Просмотреть файл

@@ -33,7 +33,7 @@
33 33
             <div style="margin-bottom: 10px;width:25%">参保类型:{{hisPatient.social_type?hisPatient.social_type:''}}</div>
34 34
             <div style="margin-bottom: 10px;width:50%;">联系电话:{{item.patient.phone}}</div>
35 35
             <div style="width:50%;">地址:{{item.patient.unit_address}}</div>
36
-            <div style="width:100%;">诊断:{{item.patient.diagnose}}</div>
36
+            <div style="width:100%;">诊断:{{getDiagnosis(item.info.diagnosis)}}</div>
37 37
         </div>
38 38
 
39 39
         <div class="prescriptionBox">
@@ -221,6 +221,7 @@
221 221
 <script>
222 222
 import { jsGetAge, uParseTime } from '@/utils/tools'
223 223
 import {getAllDoctorList,getPrescriptionPrint} from "@/api/project/project"
224
+import {getInitData} from "@/api/his/his"
224 225
 export default {
225 226
     props:{
226 227
       patient_id:Number,
@@ -247,7 +248,8 @@ export default {
247 248
           {value: 6,label:'职工'},
248 249
           {value: 7,label:'合同'}
249 250
          ],
250
-         hisPatient:{}
251
+         hisPatient:{},
252
+         diagnoses:[]
251 253
       }
252 254
     },
253 255
    methods:{
@@ -371,12 +373,31 @@ export default {
371 373
 
372 374
         return total + addtotal
373 375
       },
376
+     getInitData(){
377
+       getInitData().then(response=>{
378
+          if(response.data.state == 1){
379
+            this.diagnoses = response.data.data.diagnose
380
+            console.log("争端",this.diagnoses)
381
+          }
382
+       })
383
+     },
384
+     getDiagnosis(id){
385
+        var name = ""
386
+        for(let i=0;i<this.diagnoses.length;i++){
387
+          if(id == this.diagnoses[i].id){
388
+             name = this.diagnoses[i].class_name
389
+          }
390
+        }
391
+        return name
392
+     }
374 393
    },
375 394
    created(){
395
+      this.getInitData()
376 396
       this.getAllDoctorList()
377 397
       this.getPrescriptionPrint()
378 398
       var xtuser = this.$store.getters.xt_user
379 399
       this.orgname = xtuser.org.org_name
400
+
380 401
    },
381 402
    watch:{
382 403
      patient_id:function(val){

+ 5 - 3
src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue Просмотреть файл

@@ -299,6 +299,7 @@
299 299
 
300 300
       },
301 301
       changeProject(val) {
302
+        console.log("Val222222",val)
302 303
         this.query.page = 1
303 304
         let item_inspection_reference = []
304 305
         for (let i = 0; i < this.all_inspection_reference.length; i++) {
@@ -307,6 +308,7 @@
307 308
           }
308 309
         }
309 310
         this.item_columns = item_inspection_reference
311
+        
310 312
         var projectInfo = this.getPojectInfo(this.item_columns[0].project_id, this.item_columns[0].id)
311 313
         console.log("projectInfo",projectInfo)
312 314
         this.query.project_id = projectInfo.project_id
@@ -338,7 +340,7 @@
338 340
               let project = []
339 341
               let item = []
340 342
               this.all_inspection_reference = resp.data.references
341
-               console.log("====",this.all_inspection_reference)
343
+               console.log("====hhh",this.all_inspection_reference)
342 344
               for (let i = 0; i < this.all_inspection_reference.length; i++) {
343 345
                 project.push(this.all_inspection_reference[i])
344 346
               }
@@ -356,7 +358,7 @@
356 358
                   item.push(this.all_inspection_reference[i])
357 359
                 }
358 360
               }
359
-             console.log("item",item)
361
+             console.log("item9999888888",item)
360 362
               this.item_columns = item
361 363
               this.item_name = item[0].item_name
362 364
 
@@ -475,7 +477,7 @@
475 477
         GetInspectionIndexTable(params)
476 478
           .then(rs => {
477 479
             var resp = rs.data
478
-            console.log("resp",resp)
480
+            console.log("resp22222",resp)
479 481
             if (resp.state == 1) {
480 482
               this.tableData = []
481 483
               for (let i = 0; i < resp.data.data.length; i++) {

+ 22 - 9
src/xt_pages/role/admin.vue Просмотреть файл

@@ -396,7 +396,7 @@ export default {
396 396
           ids.push(this.selectDrug[index].user_id);
397 397
           idMap[this.selectDrug[index].user_id] = this.selectDrug[index].user_id;
398 398
         }
399
-        console.log('ids222222222',ids)
399
+        
400 400
         var idss = ids.join(',')
401 401
         let params = {
402 402
           ids:idss,
@@ -406,11 +406,18 @@ export default {
406 406
         var that = this
407 407
         axios.get('http://127.0.0.1:9532/sz/api/doctor/get',{ params: params }).then(function(response) {
408 408
          if (response.data.state == 0) {
409
-               that.$message.error(response.data.msg)
409
+               that.$message.error(response.data.data.msg)
410 410
                return false
411 411
             } else {
412
-              that.$message({ message: '操作成功', type: 'success' })
413
-              that.adminMainView()
412
+              that.$message.error(response.data.data.msg)
413
+              if(response.data.data.msg == ""){
414
+                  that.$message.success("登记成功!")
415
+                  that.adminMainView()
416
+               }
417
+               if(response.data.data.msg!=""){
418
+                  that.$message.error(response.data.data.msg)
419
+                  that.adminMainView()
420
+               }
414 421
              }
415 422
            }).catch(function(error) {
416 423
         })
@@ -423,15 +430,21 @@ export default {
423 430
            "is_mark":is_mark,
424 431
            "admin_user_id":this.$store.getters.xt_user.user.id
425 432
         }
426
-        console.log("params222222222",params)
433
+        
427 434
          axios.get('http://127.0.0.1:9532/sz/api/medical/get',{params:params}).then(function(response) {
428 435
           if (response.data.state == 0) {
429
-               that.$message.error(response.data.msg)
436
+               that.$message.error(response.data.data.msg)
430 437
                return false
431 438
             } else {
432
-              // that.$message({ message: '操作成功', type: 'success' })
433
-              this.$message.error(response.data.msg)
434
-              that.adminMainView()
439
+             
440
+              if(response.data.data.msg == ""){
441
+                  that.$message.success("登记成功!")
442
+                  that.adminMainView()
443
+               }
444
+               if(response.data.data.msg!=""){
445
+                  that.$message.error(response.data.data.msg)
446
+                  that.adminMainView()
447
+               }
435 448
              }
436 449
            }).catch(function(error) {
437 450
         })

+ 1 - 1
src/xt_pages/user/patients.vue Просмотреть файл

@@ -638,7 +638,7 @@
638 638
         ],
639 639
         lapsetoRules: {
640 640
           lapseto_type: [{ required: true, message: '请选择治疗状态' }],
641
-          lapseto_time: [{ required: true, message: '请选择转归时间' }]
641
+          lapseto_time: [{ required: true, message: '请选择时间' }]
642 642
         },
643 643
         currentIndex: -1,
644 644
         LapsetoDialogVisible: false,