Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1887,6 +1887,7 @@
 
           if (index == 1) {
             let params = {
+              p_type:1,
               patient_id: this.patientInfo.id,
               diagnose: this.diagnose,
               sick_type: this.state1,
@@ -1971,7 +1972,8 @@
                 department: this.departmentValue,
                 record_date: this.end_time,
                 his_patient_id: this.hisPatientInfo.id,
-                reg_type: this.register_type
+                reg_type: this.register_type,
+                p_type: 1,
               };
 
               var month_prescriptions = this.deepClone(this.month_prescriptions);

src/xt_pages/hospitalStation/outpatientChargesManagement.vue

@@ -91,7 +91,8 @@
                         </el-button>
 
                       <el-button
-                        v-if="(this.hisPatientInfo.id > 0 && this.order.order_status == 1) || (this.hisPatientInfo.id > 0 && this.order.order_status == 2) "
+                        v-if="(this.hisPatientInfo.id > 0 && this.hisPatientInfo.in_hospital_status == 1 && this.hisPatientInfo.out_hospital_status == 0)"
+
                         size="small" @click="open(9)" type="primary"
                       >撤销明细
                       </el-button>
@@ -1031,7 +1032,7 @@
 
         let params = {
           'record_date': this.record_date
-        };
+         };
         GetHisHospitalChargePatientList(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1887,6 +1887,7 @@
 
           if (index == 1) {
             let params = {
+              p_type:2,
               patient_id: this.patientInfo.id,
               diagnose: this.diagnose,
               sick_type: this.state1,
@@ -1971,7 +1972,8 @@
                 department: this.departmentValue,
                 record_date: this.end_time,
                 his_patient_id: this.hisPatientInfo.id,
-                reg_type: this.register_type
+                reg_type: this.register_type,
+                p_type: 2,
               };
 
               var month_prescriptions = this.deepClone(this.month_prescriptions);