Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

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,6 +28,10 @@
 <script>
  import { saveCharges } from "@/api/project/project"
 export default {
+   props: {
+      hisPatientInfo: Object,
+      patientInfo:Object,
+    },
     data(){
         return{
             visible:false,
@@ -66,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)
@@ -79,6 +84,11 @@ export default {
              }
           })      
         }
+    },
+    watch:{
+       hisPatientInfo:function(val){
+         console.log("患者ID",this)  
+       }
     }
 }
 </script>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -196,7 +196,7 @@
         </template>
       </div>
     </div>
-    <additionalCharges ref='additionalCharges'></additionalCharges>
+    <additionalCharges ref='additionalCharges' :hisPatientInfo="hisPatientInfo" :patientInfo="patientInfo"></additionalCharges>
     <select-template ref='selectTemplate'></select-template>
     <save-template ref='saveTemplate'></save-template>
   </div>
@@ -336,15 +336,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
               }
 
@@ -416,7 +416,8 @@
         this.prescriptions.push({
           name: newTabName,
           advices: [],
-          projects: []
+          project:[],
+          projects:[]
 
         })
         this.editableTabsValue = newTabName
@@ -462,15 +463,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
         }

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -117,7 +117,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>
@@ -192,6 +192,7 @@
           }
         }
       },
+    
       setNewData:function(data){
 
         // this.prescription.advices = data.advices
@@ -209,10 +210,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>
@@ -45,6 +45,8 @@
             <el-radio-button label="病历"></el-radio-button>
           </el-radio-group>
         </div>
+        <!--<desk-prescription ref="prescriptions"   :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"-->
+                   <!--v-if="titleType == '处方'" style="flex:1;"></desk-prescription>-->
         <desk-prescription :record_date="record_date" ref="prescriptions"  :prescriptions="prescriptions" :patientInfo="patientInfo" :hisPatientInfo="hisPatientInfo"
                            v-if="titleType == '处方'" style="flex:1;"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
@@ -117,7 +119,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,10 +216,11 @@
         //     age:60.7
         // }
       },
-      changePatient(val){
-        console.log("患者val",val)
-        this.patient_id = val.id
-      }
+      // changePatient(val){
+      //   console.log("患者val",val)
+      //   this.hisPatientInfo = val.hisPatientInfo
+      //   console.log("333333",this.hisPatientInfo)
+      // }
     }, created() {
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -38,45 +38,50 @@
             </div>
             <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
                 <el-table-column align="center" type="index" label="序号" width="60">
+                    <template slot-scope="scope">
+                        {{scope.$index+1}}
+                    </template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="时间" width="100">
-                    <template slot-scope="scope">{{ scope.row.create_time }}</template>
+                    <template slot-scope="scope">{{ scope.row.record_date }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="dialysis_no" label="姓名" width="80">
                     <template slot-scope="scope">{{scope.row.name }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="科室" width="80">
-                    <template slot-scope="scope">{{ scope.row.department }}</template>
+                    <template slot-scope="scope">{{ scope.row.departments }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="挂号类型" width="90">
                     <template slot-scope="scope">
-                        <span v-if="scope.row.register == 1">普通</span>
-                        <span v-if="scope.row.register == 2">主治</span>
-                        <span v-if="scope.row.register == 3">主任</span>
-                        <span v-if="scope.row.register == 4">免收诊金</span>
-                        <span v-if="scope.row.register == 5">专家</span>
+                        <span v-if="scope.row.register_type == 1">普通</span>
+                        <span v-if="scope.row.register_type == 2">主治</span>
+                        <span v-if="scope.row.register_type == 3">主任</span>
+                        <span v-if="scope.row.register_type == 4">免收诊金</span>
+                        <span v-if="scope.row.register_type == 5">专家</span>
                     </template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="就诊号" width="80">
-                    <template slot-scope="scope"></template>
+                    <template slot-scope="scope">
+                        {{scope.row.number}}
+                    </template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="证件号">
-                    <template slot-scope="scope">{{ scope.row.idCard }}</template>
+                    <template slot-scope="scope">{{ scope.row.id_card_no }}</template>
                 </el-table-column>
                 <el-table-column align="center" label="患者保险类型" width="80">
-                    <!-- <template slot-scope="scope">{{ scope.row.name }}</template> -->
+                    <template slot-scope="scope">{{ scope.row.id_type }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="医生" width="80">
-                    <template slot-scope="scope">{{ scope.row.doctor }}</template>
+                    <template slot-scope="scope">{{ scope.row.admin_user_id }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="挂号费" width="70">
-                    <template slot-scope="scope">{{ scope.row.registrationFee }}</template>
+                    <template slot-scope="scope">{{ scope.row.register_cost }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="诊疗费" width="70">
-                    <template slot-scope="scope">{{ scope.row.medicalExpenses }}</template>
+                    <template slot-scope="scope">{{ scope.row.treatment_cost }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="工本费" width="70">
-                    <template slot-scope="scope">{{ scope.row.cost }}</template>
+                    <template slot-scope="scope">{{ scope.row.cost_of_production }}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作人" width="70">
                     <template slot-scope="scope">{{ $store.getters.xt_user.org.org_name }}</template>
@@ -187,7 +192,7 @@ export default {
 
         },
         getlist(){
-            var params = {
+          var params = {
                keyword:this.search_input,
                start_time:this.start_time,
                end_time:this.end_time,
@@ -200,8 +205,12 @@ export default {
              if(response.data.state == 1){
                 var history = response.data.data.history
                 console.log("history",history)
+                this.tableData = history
                 var total =  response.data.data.total
                 console.log("total",total)
+                var department =  response.data.data.department
+                console.log("department",department)
+               
              }
           })