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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1884,6 +1884,15 @@
           // this.$router.push('/outpatientCharges/treatPrint?record_date=' + this.record_date + '&patient_id=' + this.patient_id + '&prescription_id=' + this.prescription_id)
         } else if (index == 4) {
 
+
+          var ids = []
+          for (let i = 0; i < prescriptions.length; i++) {
+            ids.push(prescriptions[i].id)
+          }
+          var ids_str = ids.join(',')
+          this.temp_ids = ids_str
+
+
           this.currentOrder = order
           this.current_med_type = med_type
           if (this.patientInfo.id == 0) {
@@ -2005,11 +2014,20 @@
             return
           }
 
+          var ids = []
+          for (let i = 0; i < prescriptions.length; i++) {
+            ids.push(prescriptions[i].id)
+          }
+          var ids_str = ids.join(',')
+          this.temp_ids = ids_str
+
+
           var that = this
           let form = {}
           form['id'] = this.patientInfo.id
           form['his_patient_id'] = this.hisPatientInfo.id
           form['record_time'] = this.record_date
+          form['ids'] = this.temp_ids
 
           form['p_type'] = med_type
           form['diagnosis'] = this.form.diagnosis.join(',')
@@ -2052,8 +2070,7 @@
               cancelButtonText: '取 消',
               type: 'warning'
             }).then(() => {
-              axios.get('http://127.0' +
-                '.0.1:9532/api/presettle/get', {
+              axios.get('http://127.0.0.1:9532/api/presettle/get', {
                 params: form,
                 headers: {
                   'Permission': 5