Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/outpatientCharges/components/prescriptionTable.vue

@@ -31,7 +31,7 @@
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
             <el-input v-model="scope.row.prescribing_number" style="width:60%" readonly placeholder=""></el-input>
-            <div>{{scope.row.min_unit}}</div>
+            <div>{{scope.row.prescribing_number_unit}}</div>
           </div>
         </template>
       </el-table-column>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -237,6 +237,7 @@
           { path: false, name: '门诊收费' },
           { path: false, name: '门诊收费管理' }
         ],
+        current_index:0,
         cal_one:'',
         cal_two:'',
         cal_three:'',
@@ -464,6 +465,11 @@
           this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
         } else if (index == 4) {
 
+          if(this.hisPatientInfo.id == 0){
+            this.$message({ message: '该患者尚未挂号,请先挂号', type: 'error' })
+            return
+          }
+
           let params = {
             'id': this.patientInfo.id,
             'record_time': this.record_date
@@ -473,17 +479,17 @@
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               this.loadingtwo = false
-
               return false
-
             } else {
+              this.state = '已收费'
+              this.$message({ message: '收费成功', type: 'success' })
               this.loadingtwo = false
-
+              this.cal_one  =  this.cal_one-1
+              this.cal_two = this.cal_two + 1
+              this.patientTableData.splice(this.current_index,1)
             }
           })
 
-          this.state = '已收费'
-          this.$message({ message: '收费成功', type: 'success' })
         } else if (index == 5) {
           let params = {
             'order_id': this.order.id,
@@ -493,16 +499,14 @@
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               this.loadingtwo = false
-
               return false
-
             } else {
+              this.$message({ message: '退费成功', type: 'success' })
               this.loadingtwo = false
 
             }
           })
 
-          this.$message({ message: '退费成功', type: 'success' })
         } else if (index == 6) {
 
           if (this.patientInfo.id == 0) {
@@ -522,6 +526,8 @@
               return false
 
             } else {
+              this.$message({ message: '挂号成功', type: 'success' })
+
               this.loadingone = false
               var his_info = response.data.data.his_info
               this.hisPatientInfo = his_info
@@ -631,6 +637,7 @@
             this.cal_two = two_count
             this.cal_three = three_count
 
+            this.current_index = 0
             this.$refs.tab.setCurrentRow(this.patientTableData[0])
             this.getPatientInformation(this.patientTableData[0].patients.id,"")
 
@@ -646,6 +653,14 @@
         console.log('val', val)
         this.getPatientInformation(val.patients.id, val.info.batch_number)
         this.patient_id = val.patients.id
+
+        for (let i =0; i < this.patientTableData.length; i++){
+          if(this.patientTableData[i].patients.id == val.patients.id){
+            this.current_index = i
+          }
+
+        }
+
       },
 
       //获取患者的基本信息

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -104,7 +104,7 @@
             </el-option>
           </el-select>
           <span>当前处方总价：</span>
-          <span style="color:red;"></span>元
+          <span style="color:red;">{{curTotal}}</span>元
           <span style="margin-left:10px;">总价：</span>
           <span style="color:red;">{{ getTotal() }}</span>元
           <span>{{order_status}}</span>
@@ -343,7 +343,8 @@
 
         ],
         department:[],
-        sick:[]
+        sick:[],
+        curTotal:0,
       }
     },
     methods: {
@@ -362,6 +363,32 @@
         }
 
 
+      },getTotalOne() {
+        var total = 0
+        if (this.curPrescriptions.type == 1) {
+          if (this.curPrescriptions.advices != null) {
+            for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
+              console.log(this.curPrescriptions.advices[a].retail_price)
+              console.log(this.curPrescriptions.advices[a].prescribing_number)
+
+              total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
+            }
+          }
+          return total
+
+        } else {
+          var total = 0
+          if (this.curPrescriptions.project != null) {
+            for (let b = 0; b < this.curPrescriptions.project.length; b++) {
+              console.log(this.curPrescriptions.project[b].price)
+              console.log(this.curPrescriptions.project[b].total)
+              total = total + this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total
+            }
+          }
+          return total
+
+        }
+
       },
       getTotal() {
         var total = 0
@@ -477,6 +504,9 @@
           }
 
         }
+
+        this.total = 0
+        this.total = this.getTotalOne()
       },
       clearData() {
         this.curPrescriptions = []
@@ -526,6 +556,8 @@
           this.order_status = '已退费'
         }
 
+        this.total = 0
+        this.total = this.getTotalOne()
         // console.log(this.$refs)
         // this.$nextTick(() => {
         //   this.$refs.prescription_tables.setNewData(this.prescriptions[0])
@@ -855,7 +887,7 @@
                   remark: '',
                   prescribing_number: temp[b].prescribing_number,
                   single_dose_unit: temp[b].min_unit,
-                  prescribing_number_unit: temp[b].min_unit,
+                  prescribing_number_unit: temp[b].max_unit,
                   min_unit: temp[b].min_unit,
                   medical_insurance_number: temp[b].medical_insurance_number
 

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -43,7 +43,7 @@
         <template slot-scope="scope">
           <div style="display:flex;align-items:center;">
             <el-input v-model="scope.row.prescribing_number" style="width:60%" placeholder=""></el-input>
-            <div> {{scope.row.min_unit}}</div>
+            <div> {{scope.row.prescribing_number_unit}}</div>
           </div>
         </template>
       </el-table-column>