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/components/registerDialog.vue

@@ -470,23 +470,23 @@
               var patient = response.data.data.patient
 
               if (that.form.id_card_type == 1) {
-                this.form.id = patient.id
+                that.form.id = patient.id
                 that.form.name = patient.name
-                that.form.sex = patient.gender
+                that.form.gender = patient.gender
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
-                that.form.idCard = patient.id_card_no
-                that.form.medicalInsuranceCard = response.data.data.number
+                that.form.id_card = patient.id_card_no
+                that.form.medical_insurance_card = response.data.data.number
 
               } else if (that.form.id_card_type == 2) {
-                this.form.id = patient.id
+                that.form.id = patient.id
                 that.form.name = patient.name
-                that.form.sex = patient.gender
+                that.form.gender = patient.gender
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
-                that.form.idCard = patient.id_card_no
+                that.form.id_card = patient.id_card_no
               }
               that.$message({ message: '读卡成功', type: 'success' })
             }
@@ -494,7 +494,6 @@
           .catch(function(error) {
 
           })
-
       },
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
@@ -526,6 +525,7 @@
         this.form.id_card_type = 2
         this.form.certificates = 1
 
+
         if (departments.length > 0) {
           this.form.department = departments[0].id
         }