HIS 系统提交

src/xt_pages/data/printTemplate.vue

@@ -8,18 +8,19 @@
         <el-tab-pane label="电子病历模板" name="1">
           <record-print></record-print>
         </el-tab-pane>
-        <el-tab-pane label="处方模板" name="2">
+        <el-tab-pane label="电子处方模板" name="2">
           <prescription-print></prescription-print>
         </el-tab-pane>
-        <el-tab-pane label="处方治疗模板" name="3">
+        <el-tab-pane label="处方治疗单模板" name="3">
           <treat-print></treat-print>
         </el-tab-pane>
-        <el-tab-pane label="透析记录模板" name="4">
-          <dialysis-print></dialysis-print>
-        </el-tab-pane>
-        <el-tab-pane label="门诊收费明细模板" name="5">
+         <el-tab-pane label="门诊收费明细模板" name="5">
           <charge-print></charge-print>
         </el-tab-pane>
+        <el-tab-pane label="透析记录单模板" name="4">
+          <dialysis-print></dialysis-print>
+        </el-tab-pane>
+       
       </el-tabs>
     </div>
   </div>

src/xt_pages/outpatientRegistration/index.vue

@@ -24,9 +24,17 @@
                         </div>
                     </el-form-item>
                     <el-form-item label="患者姓名："  prop="name" :validate-event="is_Name">
-                        <el-input  v-model="form.name"></el-input>
+                        <!-- <el-input  v-model="form.name"></el-input> -->
+                       <el-select v-model="form.name" placeholder="请选择">
+                            <el-option
+                            v-for="item in patient"
+                            :key="item.patient_id"
+                            :label="item.name"
+                            :value="item.name">
+                            </el-option>
+                        </el-select>
                     </el-form-item>
-                    <el-form-item label="性别：">
+                    <el-form-item label="性别：" prop="sex" :validate-event="is_Name">
                         <el-select v-model="form.sex" placeholder="请选择">
                             <el-option
                             v-for="item in sex"
@@ -56,10 +64,10 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="出生日期：">
+                    <el-form-item label="出生日期：" prop="birthday" :validate-event="is_Name">
                         <el-date-picker v-model="form.birthday" type="date" @change="getBirthday" placeholder="选择日期"></el-date-picker>
                     </el-form-item>
-                    <el-form-item label="年龄：">
+                    <el-form-item label="年龄：" prop="age" :validate-event="is_Name">
                         <el-input v-model="form.age"></el-input>
                     </el-form-item>
                     <el-form-item label="证件号码：" prop="idCard"  :validate-event="is_Name">
@@ -245,16 +253,20 @@ export default {
             },
             rules: {
               name:[{ required:true,message:"患者姓名不能为空",trigger: 'blur'}],
+              sex:[{ 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' }],
+              age:[{ required:true,message:"患者年龄不能为空",trigger: 'blur'}],
+              birthday:[{required:true,message:"患者出生日期不能为空",trigger:'blur'}]
            },
            doctorList:[],
            departmentList:[],
            check:0,
            show:false,
-           is_Name:false
+           is_Name:false,
+           patient:[],
         }
     },
     computed:{
@@ -364,10 +376,10 @@ export default {
              this.is_Name = true
              return
            }
-          if(this.form.idCard == ""){
-             this.$message.error("证件号码不能为空")
-             this.is_Name = true
-             return
+          
+
+           if(this.form.sex == ""){
+             this.$message.error("患者性别不能为空")
            }
 
           if(this.form.register == ""){
@@ -387,6 +399,22 @@ export default {
              this.is_Name = true
              return
            }
+         if(this.form.age == ""){
+            this.$message.error("患者年龄不能为空")
+            this.is_Name = true
+            return
+         }
+         if(this.form.birthday == ""){
+            this.$message.error("出生日期不能为空")
+            this.is_Name = true
+            return
+         }
+
+         if(this.form.idCard == ""){
+             this.$message.error("证件号码不能为空")
+             this.is_Name = true
+             return
+          }
           this.$refs[formName].validate((valid)=>{
              if(valid){
                   if(this.form.costChecked == true){
@@ -418,6 +446,7 @@ export default {
                     total:this.total
                 }
                 console.log("params",params)
+                return
                 saveHisPatient(params).then(response=>{
                    if(response.data.state == 1){
                      var patient =  response.data.data.patient
@@ -449,7 +478,8 @@ export default {
           getTodaySchedulePatient().then(response=>{
              if(response.data.state == 1){
                var patient =  response.data.data.patient
-            //    console.log("今日排班",patient)
+               console.log("今日排班",patient)
+               this.patient = patient
              }
           }) 
        }

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -54,7 +54,7 @@
                 <el-table-column align="center" type="index" label="序号" width="60">
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="时间" width="100">
-                    <template slot-scope="scope">{{getTime(scope.row.record_date,"{y}-{m}-{d}")}}</template>
+                    <template slot-scope="scope">{{getTime(scope.row.ctime,"{y}-{m}-{d} {h}:{i}:{s}")}}</template>
                 </el-table-column>
                 <el-table-column align="center" prop="dialysis_no" label="姓名" width="80">
                     <template slot-scope="scope">{{scope.row.name }}</template>