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

src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue

@@ -74,7 +74,7 @@ export default {
              patient_id:this.patientInfo.id,
              medicineData:this.chargeTable
            }
-           console.log("params",params)
+        //    console.log("params",params)
           saveCharges(params).then(response=>{
              if(response.data.state == 1){
                var additionalCharge =  response.data.data.additionalCharge

src/xt_pages/outpatientRegistration/index.vue

@@ -6,7 +6,7 @@
         <div class="app-container">
             <div class="nameTitle">患者基本信息:</div>
             <div class="formMain">
-                <el-form class="basicForm"  :rules="rules" ref="form" :model="form" label-width="100px">
+                <el-form class="basicForm" :model="form" :rules="rules" ref="form"  label-width="100px">
                     <el-form-item label="结算类型：">
                         <el-select v-model="form.settlementValue" placeholder="请选择">
                             <el-option
@@ -64,13 +64,17 @@
                     </el-form-item>
                     <el-form-item label="证件号码：" required prop="idCard">
                         <el-input v-model="form.idCard"></el-input>
+                        <!-- <div class="el-form-item__error" v-show="show">
+                          请填写证件号码
+                        </div> -->
                     </el-form-item>
+   
                 </el-form>
             </div>
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
-                <el-form class="basicForm" ref="form" :model="form" :rules="rules" label-width="100px">
-                    <el-form-item label="挂号类型：" required prop="register">
+                <el-form class="basicForm" :model="form" :rules="rules" label-width="100px">
+                    <el-form-item label="挂号类型："  prop="register">
                         <el-select v-model="form.register"  placeholder="请选择">
                             <el-option
                             v-for="item in register"
@@ -80,7 +84,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="医生：" required prop="doctor" >
+                    <el-form-item label="医生："  prop="doctor" >
                         <el-select v-model="form.doctor" placeholder="请选择">
                             <el-option
                             v-for="item in doctorList"
@@ -90,7 +94,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="科室：" required prop="department">
+                    <el-form-item label="科室："  prop="department">
                         <el-select v-model="form.department"  placeholder="请选择">
                             <el-option
                             v-for="item in departmentList"
@@ -244,14 +248,15 @@ export default {
             },
 
             rules: {
-              idCard: [{ required: true, message: '请填写证件号码', trigger: 'blur'  }],
+              idCard: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
               register: [{ required: true, message: '请选择挂号类型' , trigger: 'blur' }],
               doctor: [{ required: true, message: '请选择医生' , trigger: 'blur' }],
               department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
            },
            doctorList:[],
            departmentList:[],
-           check:0
+           check:0,
+           show:false
         }
     },
     computed:{
@@ -355,37 +360,38 @@ export default {
              }
            })   
         },
-        saveHisPatient(formName){
-           
-            if(this.form.costChecked == true){
-               this.check = 1
-            }
-            if(this.form.costChecked == false){
-               this.check = 2
-            } 
-            var params = {
-              settlementValue:this.form.settlementValue,
-              medicalInsuranceCard:this.form.medicalInsuranceCard,
-              name:this.form.name,
-              sex:this.form.sex,
-              certificates:this.form.certificates, 
-              medicalCare:this.form.medicalCare,
-              birthDay:moment(new Date(this.form.birthday)).format('YYYY-MM-DD'),
-              age:parseInt(this.form.age),
-              idCard:this.form.idCard,
-              register:this.form.register,
-              doctor:this.form.doctor,
-              department:this.form.department,
-              costChecked:this.check,
-              registrationFee:this.form.registrationFee,
-              medicalExpenses:this.form.medicalExpenses,
-              cost:this.form.cost,
-              total:this.total
-            }
-            console.log("params",params)
- 
+        saveHisPatient(formName){   
           this.$refs[formName].validate((valid)=>{
              if(valid){
+                  if(this.form.costChecked == true){
+                this.check = 1
+                }
+                if(this.form.costChecked == false){
+                this.check = 2
+                } 
+                if(this.form.idCard == ""){
+                   this.show = true
+                }
+                var params = {
+                    settlementValue:this.form.settlementValue,
+                    medicalInsuranceCard:this.form.medicalInsuranceCard,
+                    name:this.form.name,
+                    sex:this.form.sex,
+                    certificates:this.form.certificates, 
+                    medicalCare:this.form.medicalCare,
+                    birthDay:moment(new Date(this.form.birthday)).format('YYYY-MM-DD'),
+                    age:parseInt(this.form.age),
+                    idCard:this.form.idCard,
+                    register:this.form.register,
+                    doctor:this.form.doctor,
+                    department:this.form.department,
+                    costChecked:this.check,
+                    registrationFee:this.form.registrationFee,
+                    medicalExpenses:this.form.medicalExpenses,
+                    cost:this.form.cost,
+                    total:this.total
+                }
+                console.log("params",params)
                 saveHisPatient(params).then(response=>{
                    if(response.data.state == 1){
                      var patient =  response.data.data.patient
@@ -412,7 +418,8 @@ export default {
                 })
              } 
           })
-        }
+        },
+      
     },
     created(){
       //获取当前机构有人员信息
@@ -452,4 +459,13 @@ export default {
         width: 100%;
     }
 }
+    .el-form-item__error{
+        color: #F56C6C;
+        font-size: 12px;
+        line-height: 1;
+        padding-top: 4px;
+        position: absolute;
+        top: 100%;
+        left: 0;
+    }
 </style>