HIS 系统提交

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -234,9 +234,6 @@ export default {
                if(response.data.state == 1){
                  var hisPatient = response.data.data.hisPatient
                  console.log("his",hisPatient)
-                 for(let i=0;i<hisPatient.length;i++){
-                    hisPatient[i].id_card_no = hisPatient[i].id_number
-                 }
                  var scheduleList = response.data.data.scheduleList
                  hisPatient.push(...scheduleList)
                  console.log("arrr",hisPatient)

src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue

@@ -28,8 +28,9 @@
 <script>
  import { saveCharges } from "@/api/project/project"
 export default {
-    props:{
-     paitent_id:Number,   
+   props: {
+      hisPatientInfo: Object,
+      patientInfo:Object,
     },
     data(){
         return{
@@ -69,7 +70,8 @@ export default {
         },
         submitAction(){
           var params = {
-             patient_id:this.patient_id,
+             his_patient_id:this.hisPatientInfo.id,
+             patient_id:this.patientInfo.id,
              medicineData:this.chargeTable
            }
            console.log("params",params)
@@ -84,8 +86,8 @@ export default {
         }
     },
     watch:{
-       paitent_id:function(val){
-         console.log("患者ID=====",val)  
+       hisPatientInfo:function(val){
+         console.log("患者ID",this)  
        }
     }
 }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -200,7 +200,7 @@
         </template>
       </div>
     </div>
-    <additionalCharges ref='additionalCharges' :paitent_id="paitent_id"></additionalCharges>
+    <additionalCharges ref='additionalCharges' :hisPatientInfo="hisPatientInfo" :patientInfo="patientInfo"></additionalCharges>
     <select-template ref='selectTemplate'></select-template>
     <save-template ref='saveTemplate'></save-template>
   </div>
@@ -221,7 +221,7 @@
     props: {
       patientInfo: Object,
       hisPatientInfo: Object,
-      prescriptions: Array,
+      prescriptions: Array
     },
     components: {
       selectTemplate,
@@ -309,15 +309,15 @@
               this.curPrescriptions = this.prescriptions[i]
 
               //用来区分处方属于项目还是药品
-              if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.projects.length == 0){
+              if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
                 this.customTabIndex = 1
               }
-              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length > 0){
+              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0){
                
                 this.customTabIndex = 2
               }
 
-              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length == 0){
+              if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0){
                 this.customTabIndex = this.rightTab
               }
 
@@ -357,8 +357,9 @@
         this.prescriptions.push({
           name: newTabName,
           advices: [],
-          projects: []
-
+          project:[],
+          projects:[]
+         
         })
         this.editableTabsValue = newTabName
         this.curPrescriptions = this.prescriptions[this.prescriptions.length-1]
@@ -403,15 +404,15 @@
 
 
         //用来区分处方属于项目还是药品
-        if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.projects.length == 0){
+        if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
         
           this.customTabIndex = 1
         }
-        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length > 0){
+        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0){
          
           this.customTabIndex = 2
         }
-        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.projects.length == 0){
+        if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0){
           // this.customTabIndex = this.rightTab
           this.customTabIndex = index
         }
@@ -511,12 +512,8 @@
       this.getlist()
       //获取所以项目组套
       this.getAllProjectTeam()
-    },
-    watch:{
-      hisPatientInfo:function(val){
-        console.log("333333333",this.hisPatientInfo)
-        deep:true
-      }
+
+   
     }
   }
 </script>

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -120,7 +120,7 @@
       </el-table-column>
       <el-table-column align="center" width="40" prop="name" label="操作">
         <template slot-scope="scope">
-          <i class="el-icon-delete"></i>
+          <i class="el-icon-delete" @click="deleteProject(scope.row)"></i>
         </template>
       </el-table-column>
     </el-table>
@@ -196,6 +196,7 @@
           }
         }
       },
+    
       setNewData:function(data){
 
         // this.prescription.advices = data.advices
@@ -213,10 +214,24 @@
              }
           }
          return name
-      }
+      },
+      deleteProject(row){
+       
+        for (let i = 0; i < this.prescription.project.length; i++){
+          if(this.prescription.project[i].id == row.id){
+              this.prescription.project.splice(i, 1)
+          }
+        }
+      },
     },mounted(){
       this.getInitData()
     },
+    watch:{
+      prescription:function(){
+        console.log("8888888",this)
+        console.log("9999999",this.prescription)
+      }
+    }
   }
 </script>
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -28,7 +28,7 @@
                     :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                      highlight-current-row
                     ref="tab"
-                    @current-change="changePatient">
+                   >
             <el-table-column align="center" prop="name" label="患者姓名">
               <template slot-scope="scope">{{ scope.row.patients.name }}</template>
             </el-table-column>
@@ -117,7 +117,7 @@
             return false
           } else {
             this.patientTableData = response.data.data.list
-            this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            // this.$refs.tab.setCurrentRow(this.patientTableData[0])
             let cal_one = 0
             let cal_two = 0
             for (let i = 0; i < response.data.data.list.length; i++) {
@@ -214,11 +214,11 @@
         //     age:60.7
         // }
       },
-      changePatient(val){
-        console.log("患者val",val)
-        this.hisPatientInfo = val.his_patient
-        console.log("333333",this.hisPatientInfo)
-      }
+      // changePatient(val){
+      //   console.log("患者val",val)
+      //   this.hisPatientInfo = val.hisPatientInfo
+      //   console.log("333333",this.hisPatientInfo)
+      // }
     }, created() {
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()