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

src/xt_pages/outpatientRegistration/index.vue

@@ -1126,11 +1126,9 @@
                     })
                   } else {
                     that.$message({ message: '挂号成功', type: 'success' })
-                    that.form.settlementValue = ''
-                    that.form.medicalInsuranceCard = ''
+
                     that.form.name = ''
                     that.form.sex = ''
-                    that.form.certificates = ''
                     that.form.medicalCare = ''
                     that.form.birthday = ''
                     that.form.age = ''
@@ -1147,6 +1145,11 @@
                     that.form.social_type = ''
                     that.loadingone = false
 
+                    that.form.settlementValue = ''
+                    that.form.medicalInsuranceCard = ''
+
+                    that.form.certificates = 2
+                    that.form.id_card_type = 1
                     that.form.p_type = 14
                     that.form.sick_type = that.sick[0].id
                     that.form.diagnosis = that.diagnoses[0].id

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -720,7 +720,7 @@
         return ''
       }, toReturnSZPatient(val) {
         if(val.balance_accounts_type == 2){
-          this.$confirm('是否退费', '退费', {
+          this.$confirm('是否退号', '退号 ', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
             type: 'warning'
@@ -753,7 +753,7 @@
           }).then(() => {
             axios.get('http://127.0.0.1:9532/sz/api/refundnumber/get', {
               params: {
-                order_id: 0,
+                his_patient_id: val.id,
                 record_time: this.getTime(val.record_date, '{y}-{m}-{d}'),
                 admin_user_id: this.$store.getters.xt_user.user.id,
                 patient_id: val.patient_id