XMLWAN před 4 roky
rodič
revize
9ef07c3c36

+ 1 - 1
src/xt_pages/outpatientDoctorStation/components/additionalCharges.vue Zobrazit soubor

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

+ 53 - 37
src/xt_pages/outpatientRegistration/index.vue Zobrazit soubor

@@ -6,7 +6,7 @@
6 6
         <div class="app-container">
7 7
             <div class="nameTitle">患者基本信息:</div>
8 8
             <div class="formMain">
9
-                <el-form class="basicForm"  :rules="rules" ref="form" :model="form" label-width="100px">
9
+                <el-form class="basicForm" :model="form" :rules="rules" ref="form"  label-width="100px">
10 10
                     <el-form-item label="结算类型:">
11 11
                         <el-select v-model="form.settlementValue" placeholder="请选择">
12 12
                             <el-option
@@ -62,13 +62,17 @@
62 62
                     </el-form-item>
63 63
                     <el-form-item label="证件号码:" required prop="idCard">
64 64
                         <el-input v-model="form.idCard"></el-input>
65
+                        <!-- <div class="el-form-item__error" v-show="show">
66
+                          请填写证件号码
67
+                        </div> -->
65 68
                     </el-form-item>
69
+   
66 70
                 </el-form>
67 71
             </div>
68 72
             <div class="nameTitle">患者挂号信息:</div>
69 73
             <div class="formMain">
70
-                <el-form class="basicForm" ref="form" :model="form" :rules="rules" label-width="100px">
71
-                    <el-form-item label="挂号类型:" required prop="register">
74
+                <el-form class="basicForm" :model="form" :rules="rules" label-width="100px">
75
+                    <el-form-item label="挂号类型:"  prop="register">
72 76
                         <el-select v-model="form.register"  placeholder="请选择">
73 77
                             <el-option
74 78
                             v-for="item in register"
@@ -78,7 +82,7 @@
78 82
                             </el-option>
79 83
                         </el-select>
80 84
                     </el-form-item>
81
-                    <el-form-item label="医生:" required prop="doctor" >
85
+                    <el-form-item label="医生:"  prop="doctor" >
82 86
                         <el-select v-model="form.doctor" placeholder="请选择">
83 87
                             <el-option
84 88
                             v-for="item in doctorList"
@@ -88,7 +92,7 @@
88 92
                             </el-option>
89 93
                         </el-select>
90 94
                     </el-form-item>
91
-                    <el-form-item label="科室:" required prop="department">
95
+                    <el-form-item label="科室:"  prop="department">
92 96
                         <el-select v-model="form.department"  placeholder="请选择">
93 97
                             <el-option
94 98
                             v-for="item in departmentList"
@@ -242,14 +246,15 @@ export default {
242 246
             },
243 247
 
244 248
             rules: {
245
-              idCard: [{ required: true, message: '请填写证件号码', trigger: 'blur'  }],
249
+              idCard: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
246 250
               register: [{ required: true, message: '请选择挂号类型' , trigger: 'blur' }],
247 251
               doctor: [{ required: true, message: '请选择医生' , trigger: 'blur' }],
248 252
               department: [{ required: true, message: '请填写科室', trigger: 'blur' }],
249 253
            },
250 254
            doctorList:[],
251 255
            departmentList:[],
252
-           check:0
256
+           check:0,
257
+           show:false
253 258
         }
254 259
     },
255 260
     computed:{
@@ -353,37 +358,38 @@ export default {
353 358
              }
354 359
            })   
355 360
         },
356
-        saveHisPatient(formName){
357
-           
358
-            if(this.form.costChecked == true){
359
-               this.check = 1
360
-            }
361
-            if(this.form.costChecked == false){
362
-               this.check = 2
363
-            } 
364
-            var params = {
365
-              settlementValue:this.form.settlementValue,
366
-              medicalInsuranceCard:this.form.medicalInsuranceCard,
367
-              name:this.form.name,
368
-              sex:this.form.sex,
369
-              certificates:this.form.certificates, 
370
-              medicalCare:this.form.medicalCare,
371
-              birthDay:moment(new Date(this.form.birthday)).format('YYYY-MM-DD'),
372
-              age:parseInt(this.form.age),
373
-              idCard:this.form.idCard,
374
-              register:this.form.register,
375
-              doctor:this.form.doctor,
376
-              department:this.form.department,
377
-              costChecked:this.check,
378
-              registrationFee:this.form.registrationFee,
379
-              medicalExpenses:this.form.medicalExpenses,
380
-              cost:this.form.cost,
381
-              total:this.total
382
-            }
383
-            console.log("params",params)
384
- 
361
+        saveHisPatient(formName){   
385 362
           this.$refs[formName].validate((valid)=>{
386 363
              if(valid){
364
+                  if(this.form.costChecked == true){
365
+                this.check = 1
366
+                }
367
+                if(this.form.costChecked == false){
368
+                this.check = 2
369
+                } 
370
+                if(this.form.idCard == ""){
371
+                   this.show = true
372
+                }
373
+                var params = {
374
+                    settlementValue:this.form.settlementValue,
375
+                    medicalInsuranceCard:this.form.medicalInsuranceCard,
376
+                    name:this.form.name,
377
+                    sex:this.form.sex,
378
+                    certificates:this.form.certificates, 
379
+                    medicalCare:this.form.medicalCare,
380
+                    birthDay:moment(new Date(this.form.birthday)).format('YYYY-MM-DD'),
381
+                    age:parseInt(this.form.age),
382
+                    idCard:this.form.idCard,
383
+                    register:this.form.register,
384
+                    doctor:this.form.doctor,
385
+                    department:this.form.department,
386
+                    costChecked:this.check,
387
+                    registrationFee:this.form.registrationFee,
388
+                    medicalExpenses:this.form.medicalExpenses,
389
+                    cost:this.form.cost,
390
+                    total:this.total
391
+                }
392
+                console.log("params",params)
387 393
                 saveHisPatient(params).then(response=>{
388 394
                    if(response.data.state == 1){
389 395
                      var patient =  response.data.data.patient
@@ -410,7 +416,8 @@ export default {
410 416
                 })
411 417
              } 
412 418
           })
413
-        }
419
+        },
420
+      
414 421
     },
415 422
     created(){
416 423
       //获取当前机构有人员信息
@@ -450,4 +457,13 @@ export default {
450 457
         width: 180px;
451 458
     }
452 459
 }
460
+    .el-form-item__error{
461
+        color: #F56C6C;
462
+        font-size: 12px;
463
+        line-height: 1;
464
+        padding-top: 4px;
465
+        position: absolute;
466
+        top: 100%;
467
+        left: 0;
468
+    }
453 469
 </style>