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/registerDialog9504.vue

 
 
             <el-form-item label="医疗类别：">
-                <el-select v-model="form.medical_care" placeholder="请选择" style="width:100%;">
+                <el-select v-model="form.medical_care" prop="medical_care" placeholder="请选择" style="width:100%;">
                     <el-option
                             v-for="(item,index) in medical_care"
                             :key="index"
               if (that.form.id_card_type == 1) {
                 that.form.id = patient.id
                 that.form.name = patient.name
-                that.form.sex = patient.gender
+                that.form.sex = patient.gender.toString()
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone

src/xt_pages/outpatientRegistration/index.vue

         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>
         </div>
-        <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 0" class="app-container">
+        <div v-if="this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 0"
+             class="app-container">
             <div class="nameTitle">患者基本信息:</div>
             <div class="formMain">
                 <el-form class="basicForm" :model="form" :rules="rules2" ref="form" label-width="100px">
                     <el-form-item class="specialFormItem" label="医保卡号：">
                         <div style="display:flex;">
                             <el-input v-model="form.medicalInsuranceCard"></el-input>
-                            <el-button style="margin-left:10px;" type="primary" @click="readingSZ" v-loading="read_loading">读卡</el-button>
+                            <el-button style="margin-left:10px;" type="primary" @click="readingSZ"
+                                       v-loading="read_loading">读卡
+                            </el-button>
                         </div>
                     </el-form-item>
 
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
                 <el-form class="basicForm" :model="form" :rules="rules2" ref="form" label-width="100px">
-                    <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name" >
+                    <el-form-item label="挂号类型：" prop="register" :validate-event="is_Name">
                         <el-select v-model="form.register" placeholder="请选择" @change="changeReg">
                             <el-option
                                     v-for="item in his_registers"
                         </el-select>
                     </el-form-item>
 
-                    <el-form-item label="医疗类别：" :validate-event="is_Name"  prop="medicalCare" >
+                    <el-form-item label="医疗类别：" :validate-event="is_Name" prop="medicalCare">
                         <el-select v-model="form.medicalCare" placeholder="请选择">
                             <el-option
                                     v-for="(item,index) in medical_care"
     },
     data() {
       return {
-        read_loading:false,
+        read_loading: false,
         registers: [
           { value: 11, label: '普通门诊' },
           { value: 12, label: '门诊挂号' },
           birthday: [{ required: true, message: '患者出生日期不能为空', trigger: 'blur' }],
           certificates: [{ required: true, message: '证件类型不能为空', trigger: 'change' }],
           id_card_type: [{ required: true, message: '读卡类型不能为空', trigger: 'change' }],
-          medicalCare: [{ required: true, message: '医疗类别不能为空', trigger: 'change' }],
-
+          medicalCare: [{ required: true, message: '医疗类别不能为空', trigger: 'change' }]
 
         },
         rules: {
       }
     },
     methods: {
-      changeReg(){
+      changeReg() {
         console.log(this.form.register)
-        if(this.form.register != 4){
+        if (this.form.register != 4) {
           this.form.registrationFee = 10
-        }else{
+        } else {
           this.form.registrationFee = 0
 
         }
       }, readingSZ() {
         var that = this
         if (this.form.id_card_type.length == 0 || this.form.id_card_type == 0) {
-          this.$message.error("请先选择读卡类型")
+          this.$message.error('请先选择读卡类型')
           return
         }
         this.read_loading = true
         let params = {
-          'id_card_type': this.form.id_card_type,
+          'id_card_type': this.form.id_card_type
 
         }
         axios.get('http://127.0.0.1:9532/sz/api/readcard', {
           params: params
         })
-          .then(function (response) {
+          .then(function(response) {
             if (response.data.state == 0) {
               that.read_loading = false
 
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
-                that.form.id_card = patient.id_card_no
+                that.form.idCard = patient.id_card_no
                 that.form.medicalInsuranceCard = response.data.data.health_card_no
               } else if (that.form.id_card_type == 2) {
                 this.form.id = patient.id
                 that.form.age = patient.age
                 that.form.birthday = uParseTime(patient.birthday, '{y}-{m}-{d}')
                 that.form.phone = patient.phone
-                that.form.id_card = patient.id_card_no
+                that.form.idCard = patient.id_card_no
               }
-              that.$message({message: '读卡成功', type: 'success'})
+              that.$message({ message: '读卡成功', type: 'success' })
 
             }
           })
-          .catch(function (error) {
+          .catch(function(error) {
 
-          });
+          })
 
       },
 
             this.departmentList = department
           }
         })
-      },saveHisPatient9504(formName){
+      }, saveHisPatient9504(formName) {
         if (this.form.name == '') {
           this.$message.error('患者姓名不能为空')
           this.is_Name = true
               diagnosis: this.form.diagnosis,
               sick_type: this.form.sick_type
             }
-            params['record_time'] = this.record_date,
-              params['admin_user_id'] = this.$store.getters.xt_user.user.id
+            params['record_time'] = this.record_date
+            params['admin_user_id'] = this.$store.getters.xt_user.user.id
             this.loadingone = true
 
             if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 0) {
                     that.$refs.register.hide()
                     return false
                   } else {
-                    if (response.data.data.failed_code == -10){
+                    if (response.data.data.failed_code == -10) {
                       that.$message.error(response.data.data.msg)
-                    }else{
+                    } else {
                       that.$refs.register.hide()
                       that.getPatientList()
                       that.$message({ message: '挂号成功', type: 'success' })
           }
         })
 
-
-
-
       },
       saveHisPatient(formName) {
         if (this.form.name == '') {
                     that.$refs.register.hide()
                     return false
                   } else {
-                    if (response.data.data.failed_code == -10){
+                    if (response.data.data.failed_code == -10) {
                       that.$message.error(response.data.data.msg)
-                    }else{
+                    } else {
                       that.$refs.register.hide()
                       that.getPatientList()
                       that.$message({ message: '挂号成功', type: 'success' })