see999 преди 3 години
родител
ревизия
181a52289f

+ 1 - 1
src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue Целия файл

2549
       this.getSelfMedicalList()
2549
       this.getSelfMedicalList()
2550
     },mounted(){
2550
     },mounted(){
2551
       console.log("~~~~~")
2551
       console.log("~~~~~")
2552
-      console.log(this.his_is_open)
2552
+      console.log(this.doctor_advices)
2553
       console.log("~~~~~")
2553
       console.log("~~~~~")
2554
 
2554
 
2555
 
2555
 

+ 1 - 1
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Целия файл

1546
       getAfterWeight(record) {
1546
       getAfterWeight(record) {
1547
         if (record.id > 0) {
1547
         if (record.id > 0) {
1548
           if (record.weight_after > 0) {
1548
           if (record.weight_after > 0) {
1549
-            return record.weight_after - this.predialysis.additional_weight
1549
+            return parseFloat(record.weight_after - this.predialysis.additional_weight).toFixed(1)
1550
           } else {
1550
           } else {
1551
             return ''
1551
             return ''
1552
           }
1552
           }

+ 7 - 6
src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue Целия файл

1
 <template>
1
 <template>
2
-  <div id="dialysis-print-box-1" style="width:920px">
2
+  <div id="dialysis-print-box-1" style="width:940px">
3
     <div
3
     <div
4
       id="dialysis-print-box-1-1"
4
       id="dialysis-print-box-1-1"
5
       class="dialysis-print-order print-template-two print_page_main_content"
5
       class="dialysis-print-order print-template-two print_page_main_content"
39
           </div>
39
           </div>
40
         </div>
40
         </div>
41
         <div class="inline_block">
41
         <div class="inline_block">
42
-          门诊:
43
-          <div class="under_line" style="width: 30px;text-align: center;">
44
-            <check-box :checked="receiverTreatmentAccess.condition == 2 ? true : false"></check-box>
42
+          <div class="under_line" style="width: 50px;text-align: center;">
43
+            <!-- <check-box :checked="receiverTreatmentAccess.condition == 2 ? true : false"></check-box> -->
44
+            <span v-if="receiverTreatmentAccess.condition == 2">门诊</span>
45
+            <span v-if="receiverTreatmentAccess.condition == 1">住院</span>
45
           </div>
46
           </div>
46
         </div>
47
         </div>
47
         <div class="inline_block">
48
         <div class="inline_block">
583
                 <table class="inside_table">
584
                 <table class="inside_table">
584
                   <tbody>
585
                   <tbody>
585
                     <tr>
586
                     <tr>
586
-                      <td colspan="9" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 0px 8px;line-height: 30px;">
587
+                      <td colspan="11" style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 0px 8px;line-height: 30px;">
587
                         监测记录
588
                         监测记录
588
                       </td>
589
                       </td>
589
                     </tr>
590
                     </tr>
633
                       </td>
634
                       </td>
634
                     </tr>
635
                     </tr>
635
                     <tr>
636
                     <tr>
636
-                      <td colspan="10" style="line-height:25px;text-align:left;">
637
+                      <td colspan="11" style="line-height:25px;text-align:left;">
637
                         医师记录:{{ summary.special_record ? summary.special_record : '' }}
638
                         医师记录:{{ summary.special_record ? summary.special_record : '' }}
638
                       </td>
639
                       </td>
639
                     </tr>
640
                     </tr>

+ 2 - 1
src/xt_pages/outpatientCharges/summary.vue Целия файл

205
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
205
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
206
   import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
206
   import { getDoctorList, getExportConsumeDetailList, getHisOrderList, Refund } from '@/api/his/his'
207
   import { uParseTime } from '@/utils/tools'
207
   import { uParseTime } from '@/utils/tools'
208
-  import NewStatementPrint from './newStatementPrint'
208
+  // import NewStatementPrint from './newStatementPrint'
209
+  import NewStatementPrint from './statementPrint.vue'
209
   import listPrint from './listPrint'
210
   import listPrint from './listPrint'
210
   import allListPrint from './allListPrint'
211
   import allListPrint from './allListPrint'
211
   import NewStatementPrintTwo from './newStatementPrintTwo'
212
   import NewStatementPrintTwo from './newStatementPrintTwo'

+ 30 - 1
src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue Целия файл

1474
       }, changeAllGoodInfoTableDataTwo(row) {
1474
       }, changeAllGoodInfoTableDataTwo(row) {
1475
         this.teamList = row
1475
         this.teamList = row
1476
       },
1476
       },
1477
-      selectChange(row) {
1477
+      selectChange(selection, row) {
1478
+        console.log('row',row)
1479
+        if(row.total <= 0){
1480
+          if(row.type == 3){
1481
+            if (selection) {
1482
+              selection.forEach(row => {
1483
+                if(row.total <= 0){
1484
+                  this.$refs.tables.toggleRowSelection(row);
1485
+                }
1486
+              });
1487
+            } else {
1488
+              this.$refs.tables.clearSelection();
1489
+            }
1490
+            this.$message.error(row.project_name + '库存不足')
1491
+            return
1492
+          }
1493
+        }
1478
         this.teamList = row
1494
         this.teamList = row
1479
       }, getPrescriptionTemplateInfo() {
1495
       }, getPrescriptionTemplateInfo() {
1480
         let params = {
1496
         let params = {
1640
                 price: good_info[i].retail_price,
1656
                 price: good_info[i].retail_price,
1641
                 medical_code: good_info[i].medical_insurance_number,
1657
                 medical_code: good_info[i].medical_insurance_number,
1642
                 unit: this.getGoodUnit(good_info[i].good_unit),
1658
                 unit: this.getGoodUnit(good_info[i].good_unit),
1659
+                total: good_info[i].total,
1643
                 type: 3
1660
                 type: 3
1644
               }
1661
               }
1645
               this.tabProject.push(obj)
1662
               this.tabProject.push(obj)
1715
         getPojectListById(params).then(response => {
1732
         getPojectListById(params).then(response => {
1716
           if (response.data.state == 1) {
1733
           if (response.data.state == 1) {
1717
             this.teamList = []
1734
             this.teamList = []
1735
+            let num = 0
1718
             var project = response.data.data.project
1736
             var project = response.data.data.project
1719
             for (let i = 0; i < project.length; i++) {
1737
             for (let i = 0; i < project.length; i++) {
1720
               if (project[i].type == 2) {
1738
               if (project[i].type == 2) {
1740
 
1758
 
1741
                 this.teamList.push(obj)
1759
                 this.teamList.push(obj)
1742
               } else if (project[i].type == 3) {
1760
               } else if (project[i].type == 3) {
1761
+                if(project[i].good_info.total <= 0){
1762
+                  num++
1763
+                  this.$refs.tabProjectTeam.toggleRowSelection(row);
1764
+                  setTimeout(() => {
1765
+                    this.$message.error(project[i].good_info.good_name + '库存不足')
1766
+                  },100)
1767
+                }
1768
+                if(num > 0){
1769
+                  this.$refs.tabProjectTeam.clearSelection();
1770
+                }
1771
+
1743
                 let obj = {
1772
                 let obj = {
1744
                   id: project[i].project_id,
1773
                   id: project[i].project_id,
1745
                   project_name: project[i].good_info.good_name,
1774
                   project_name: project[i].good_info.good_name,