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

index.html

@@ -8,7 +8,7 @@
       name="viewport"
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
     />
-    <title>血透管理-酷医云</title>
+    <title>酷医云-透析管理平台</title>
     <!-- <link
       rel="stylesheet"
       href="//at.alicdn.com/t/font_1480998_l66fq6mc0y.css"

src/api/project/project.js

@@ -425,4 +425,13 @@ export function changePatient(id,params){
       method:"get",
       params:params
     })
+  }
+
+  export function getTodaySchedulePatient(params){
+     
+    return request({
+      url:"/api/hispatient/gettodayschedulepatient",
+      method:"get",
+      params:params
+    })
   }

src/router/modules/outpatientDoctorStation.js

@@ -55,20 +55,12 @@ export default {
         meta: { title: 'outpatientDoctorStationRecordPrint', noCache: true }
     },
     {
-      path:'/outpatientDoctorStation/print',
-      component:() => import('@/xt_pages/outpatientDoctorStation/print'),
-      hidden:true,
+      path: '/outpatientDoctorStation/treatPrint',
+      component: () => import('@/xt_pages/outpatientDoctorStation/treatPrint'),
+      hidden: true,
       is_menu: false,
-      name: 'outpatientDoctorStationRecordPrintOne',
-      meta: { title: 'outpatientDoctorStationRecordPrintOne', noCache: true }
-    },
-    {
-      path:"/outpatientCharges/treatPrint",
-      component:()=>import('@/xt_pages/outpatientCharges/treatPrint'),
-      hidden:true,
-      is_menu:false,
-      name:'outpatientChargesTreatePrint',
-      meta:{title:'outpatientChargesTreatePrint',noCache:true}
-    }
+      name: 'outpatientDoctorStationTreatPrint',
+      meta: { title: 'outpatientDoctorStationTreatPrint', noCache: true }
+  },
   ]
 }

src/xt_pages/data/basicConfig.vue

@@ -4,7 +4,6 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
     <div class="app-container">
-        <p style="font-size:18px">开关配置</p>
         <!--<div class="configBox">-->
             <!--<p>收费发药</p>-->
             <!--<p style="font-size:14px;margin-top:5px;">开启收费发药分离后，处方发药的工作需要到收费发药页面完成</p>-->
@@ -12,13 +11,20 @@
                 <!--<el-switch v-model="value"></el-switch>-->
             <!--</p>-->
         <!--</div>-->
-      <div class="configBox">
-      <p>血透His互通</p>
-      <p style="font-size:14px;margin-top:5px;">血透His互通</p>
-      <p style="margin-top:20px;">血透His互通
-      <el-switch v-model="is_open_xt_his" @change="changeFuncOne"></el-switch>
-      </p>
-      </div>
+        <div class="configBox">
+            <p style="font-size:18px;font-weight:bold">门诊打印</p>
+            <p style="font-size:14px;margin-top:5px;color:#333;">开启直接打印后，门诊病历、处方、治疗单、处置单、收费清单等打印时跳过打印预览，直接连接打印机打印。</p>
+            <p style="margin-top:20px;">直接打印：
+                <el-switch v-model="value"></el-switch>
+            </p>
+        </div>
+        <div class="configBox">
+          <p style="font-size:18px;font-weight:bold">医嘱同步</p>
+          <p style="font-size:14px;margin-top:5px;color:#333;">开启门诊处方同步到透析医嘱后，同一个患者，门诊医生站开的药品类处方自动同步到透析管理临时医嘱中，同时在透析管理中，给患者开长期医嘱和临时医嘱的功能失效，医生只能在门诊医生站开处方，只有同时使用门诊管理和透析管理的机构方可开启。</p>
+          <p style="margin-top:20px;">门诊处方同步到透析医嘱：
+          <el-switch v-model="is_open_xt_his" @change="changeFuncOne"></el-switch>
+          </p>
+        </div>
         <!--<div class="configBox">-->
             <!--<p>药品，耗材出库</p>-->
             <!--<p style="font-size:14px;margin-top:5px;">开启药品，耗材出库自动扣减则医生开完医嘱或处方可直接出库，不开启则由发药动作或出库按钮手动出库</p>-->
@@ -49,13 +55,7 @@
                 <!--<el-switch v-model="value"></el-switch>-->
             <!--</p>-->
         <!--</div>-->
-        <div class="configBox">
-            <p>打印预览设置</p>
-            <p style="font-size:14px;margin-top:5px;">开启直接打印后，处方单，售药单，收费发票等打印时跳过预览</p>
-            <p style="margin-top:20px;">直接打印：
-                <el-switch v-model="value"></el-switch>
-            </p>
-        </div>
+        
     </div>
   </div>
 </template>
@@ -141,7 +141,9 @@ export default {
 
 <style lang="scss" scoped>
 .configBox{
-    margin-top:20px;
+    padding-bottom:20px;
+    margin-top:10px;
+    border-bottom: 1px solid #000;
 }
 </style>
 

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

@@ -86,7 +86,7 @@
         </div>
         <div class="costBox">
           <span>医生：</span>
-          <el-select style="margin-right:5px;" v-model="doctorValue" placeholder="" @change="changeDoctor">
+          <el-select style="margin-right:5px;width:140px;" v-model="doctorValue" placeholder="" @change="changeDoctor">
             <el-option
               v-for="(item,index) in doctors"
               :key="index"
@@ -95,7 +95,7 @@
             </el-option>
           </el-select>
           <span>科室：</span>
-          <el-select style="margin-right:5px;" v-model="departmentValue" placeholder="">
+          <el-select style="margin-right:5px;width:140px;" v-model="departmentValue" placeholder="">
             <el-option
               v-for="(item,index) in department"
               :key="index"
@@ -103,7 +103,9 @@
               :value="item.id">
             </el-option>
           </el-select>
-          <span>总价：</span>
+          <span>当前处方总价：</span>
+          <span style="color:red;"></span>元
+          <span style="margin-left:10px;">总价：</span>
           <span style="color:red;">{{ getTotal() }}</span>元
           <span>{{order_status}}</span>
 

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -44,13 +44,20 @@
             <el-radio-button label="电子处方"></el-radio-button>
             <el-radio-button label="电子病历"></el-radio-button>
           </el-radio-group>
-          <div class="mainCell fixedCell" style="float:right" v-show="titleType == '电子处方'">
+          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子处方'">
             <el-button size="small" ref="button_one"   @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
-            <el-button size="small" ref="button_two"   @click="open(2)" type="primary">打印</el-button>
+            <el-popover
+              placement="bottom"
+              width="200"
+              trigger="click">
+              <el-button size="small" ref="button_two"   @click="open(2)" type="primary">处方单</el-button>
+              <el-button size="small" ref="button_six"   @click="open(6)" type="primary">治疗单</el-button>
+              <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
+            </el-popover>
             <el-button size="small" ref="button_three" @click="open(4)" type="primary">选择模板</el-button>
             <el-button size="small" ref="button_four"  @click="open(5)" type="primary">存模板</el-button>
           </div>
-          <div class="mainCell fixedCell" style="float:right" v-show="titleType == '电子病历'">
+          <div class="mainCell fixedCell" style="float:right" v-if="titleType == '电子病历'">
             <el-button size="small" @click="opentwo(1)" type="primary" style="margin-left:10px;">保存</el-button>
             <el-button size="small" @click="opentwo(2)" type="primary">打印</el-button>
             <el-button size="small" @click="opentwo(3)" type="primary">病历调用</el-button>
@@ -144,7 +151,7 @@
               arr = arr.concat(this.patientTableData[i])
             }
           }
-          this.patientTableData = arr
+            this.patientTableData = arr
 
         }
 
@@ -321,7 +328,11 @@
           this.$refs.prescriptions.open(3)
         } else if (index == 4) {
           this.$refs.prescriptions.open(4)
+        }else if(index == 6){
+          this.$router.push("/outpatientDoctorStation/treatPrint?record="+this.record_date)
+          
         }
+        
       },
 
       opentwo(index) {

src/xt_pages/outpatientDoctorStation/print.vue

@@ -67,6 +67,28 @@ export default {
     };
   },
   methods:{
+    printThisPage() {
+      var ptime = Math.round(new Date().getTime() / 1000);
+      this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
+
+      const style =
+        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain p{width: 50%;line-height: 1px;}.prescriptionBox{padding:0 10px;height:750px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
+      printJS({
+        printable: "prescription-print",
+        type: "html",
+        style: style,
+        scanStyles: false
+      });
+
+      // if (this.org_template_info.template_id == 1) {
+      //   printJS({
+      //     printable: "dialysis-print-box",
+      //     type: "html",
+      //     style: style,
+      //     scanStyles: false
+      //   });
+      // }
+    },
     getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){

src/xt_pages/outpatientDoctorStation/printtwo.vue

@@ -67,6 +67,28 @@ export default {
     };
   },
   methods:{
+    printThisPage() {
+      var ptime = Math.round(new Date().getTime() / 1000);
+      this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
+
+      const style =
+        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain p{width: 50%;line-height: 1px;}.prescriptionBox{padding:0 10px;height:750px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
+      printJS({
+        printable: "prescription-print",
+        type: "html",
+        style: style,
+        scanStyles: false
+      });
+
+      // if (this.org_template_info.template_id == 1) {
+      //   printJS({
+      //     printable: "dialysis-print-box",
+      //     type: "html",
+      //     style: style,
+      //     scanStyles: false
+      //   });
+      // }
+    },
     getAllDoctorList(){
       getAllDoctorList().then(response=>{
         if(response.data.state == 1){

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -0,0 +1,343 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+       <template>
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
+    </div>
+    <div class="app-container" style="min-height:0;">
+        <el-container class="newContainer">
+            <div style="width:270px;margin-right:20px;">
+                <div class="cell clearfix" style="margin-bottom:10px;">
+                    <el-input size="small"  v-model.trim="search_input" class="filter-item"/>
+                    <el-button size="small" class="filter-item" type="primary" @click="searchAction">搜索</el-button>
+                </div>
+                <el-table ref="tab"   @current-change="changePatient" highlight-current-row :data="patientTableData" 
+                 height="480" border style="width: 100%">
+                    <el-table-column prop="date"  label="患者">   
+                      <template slot-scope="scope">{{scope.row.patients?scope.row.patients.name:''}}</template> 
+                    </el-table-column>
+                    <el-table-column prop="name" label="就诊号">
+                        <template slot-scope="scope">{{ scope.row.his_patient ?scope.row.his_patient.number:''}}</template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            
+            <div class='dialysisPage' style="flex: 1;height: calc(100vh - 178px);overflow-x:auto;::-webkit-scrollbar:height:15px">
+              <printOne v-bind:childResponse="childResponse" :advicePrint="advicePrint" :patient="patient" :hisPatient="hisPatient"></printOne>
+            </div>
+        </el-container>
+    </div>
+  </div>
+</template>
+
+<script>
+
+
+import { parseTime } from "@/utils";
+import { getDialysisRecord } from "@/api/dialysis";
+import { getDataConfig } from "@/utils/data";
+import { jsGetAge, uParseTime } from "@/utils/tools";
+
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import print from "print-js";
+import printOne from "./treatTemplate/printOne"
+import { getAllDoctorList,getAllHisPatientList,getPrescriptionPrint } from "@/api/project/project"
+export default {
+  name: "dialysisPrintOrder",
+  components: {
+    BreadCrumb,
+    printOne
+  },
+  data() {
+    return {
+       record_date:"",
+       patientTableData:[],
+       advicePrint:[],
+       hisPatient:{},
+       patient:{}
+    };
+  },
+  methods:{
+    printThisPage() {
+      var ptime = Math.round(new Date().getTime() / 1000);
+      this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
+
+      const style =
+        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;border-bottom: 2px solid #000;margin-top:10px;line-height: 1px; padding:0 10px;}.infoTitle p{width: 300px;}.infoMain{display: flex;flex-wrap: wrap;border-bottom: 2px solid #000;padding:0 10px;}.infoMain p{width: 50%;line-height: 1px;}.prescriptionBox{padding:0 10px;height:600px;}.Rp{font-size: 22px;font-weight: bold;line-height:1px;}.drugsBox{padding-left: 40px;margin-bottom: 10px;margin-bottom: 10px;}.drugsBox p{line-height: 1px;padding-bottom:10px !important;} .drugsOne{line-height: 1px;margin-bottom:10px !important;} .drugsOne span{margin-right: 20px;} .doctorBox{display: flex; justify-content: space-between; padding:0 10px; line-height: 1px; border-bottom: 2px solid #000;} .actionBar{display: flex; justify-content: space-between; line-height: 1px; padding:0 10px;} .actionBar p{width:150px;}}';
+      printJS({
+        printable: "prescription-print",
+        type: "html",
+        style: style,
+        scanStyles: false
+      });
+
+      // if (this.org_template_info.template_id == 1) {
+      //   printJS({
+      //     printable: "dialysis-print-box",
+      //     type: "html",
+      //     style: style,
+      //     scanStyles: false
+      //   });
+      // }
+    },
+    getAllDoctorList(){
+      getAllDoctorList().then(response=>{
+        if(response.data.state == 1){
+               var doctor =  response.data.data.doctor
+               
+               this.doctorList = doctor
+             }
+         })   
+     },
+    getAllHisPatientList(){
+         const params = {
+           record_date:this.record_date
+         }
+      getAllHisPatientList(params).then(response=>{
+         if(response.data.state == 1){
+            this.patientTableData = response.data.data.list
+            this.patientTableDataTwo = response.data.data.list
+
+            console.log('222', this.patientTableData)
+            let cal_one = 0
+            let cal_two = 0
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              if (response.data.data.list[i].prescription == null || response.data.data.list[i].prescription.length == 0) {
+                cal_one = cal_one + 1
+              }
+              if (response.data.data.list[i].prescription != null && response.data.data.list[i].prescription.length > 0) {
+                cal_two = cal_two + 1
+              }
+            }
+            this.$refs.tab.setCurrentRow(this.patientTableData[0])
+            console.log(this.patientTableData[0])
+            this.choosePatient(this.patientTableData[0])
+            this.cal_one = cal_one
+            this.cal_two = cal_two   
+         }
+      })
+    },
+
+    changePatient(row){
+      console.log("row",row)
+        var params = {
+          patient_id:row.patient_id,
+          record_date:this.record_date,
+        }
+      getPrescriptionPrint(params).then(response=>{
+          if(response.data.state == 1){
+            var advicePrint =  response.data.data.advicePrint
+            console.log("adviceprint",advicePrint)
+            this.advicePrint = advicePrint
+            // var hisPatient =  response.data.data.hisPatient
+            // console.log("hispatient",hisPatient)
+            // this.hisPatient = hisPatient
+            var patient =  response.data.data.patient
+            console.log("patient",patient)
+            this.patient = patient
+            var doctorPorject = response.data.data.doctorPorject
+            console.log("doctorporject",doctorPorject)
+          }
+      })
+    }
+    
+  },
+
+  created() {
+    this.getAllDoctorList()
+    var record_date = this.$route.query.record
+    this.record_date = record_date
+    console.log("record_date",record_date)
+    this.getAllHisPatientList(record_date)
+  },
+
+};
+</script>
+
+<style>
+.dialysis-print-order {
+  width: 960px;
+  margin: 0 auto;
+}
+
+.dialysis-print-order .order-yy-name {
+  margin: auto;
+  text-align: center;
+  font-size: 20px;
+  letter-spacing: 5px;
+}
+
+.dialysis-print-order .order-title {
+  margin: auto;
+  font-weight: 600;
+  text-align: center;
+  font-size: 22px;
+  padding: 10px;
+}
+
+.dialysis-print-order .table-box {
+  width: 100%;
+  line-height: 23px;
+  font-size: 14px;
+}
+
+.dialysis-print-order .print-table {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  line-height: 40px;
+  font-size: 14px;
+  border-color: #000;
+}
+
+.dialysis-print-order .print-table-no {
+  width: 100%;
+  text-align: center;
+  border-collapse: collapse;
+  font-size: 14px;
+}
+
+.dialysis-print-order .under-line {
+  border-bottom: 1px solid #999;
+  width: 95%;
+  text-align: center;
+  margin-left: 2px;
+}
+
+.dialysis-print-order .title-box {
+  text-align: center;
+  font-size: 16px;
+}
+
+.dialysis-print-order .radio-lebel-box {
+  font-weight: 400;
+  cursor: pointer;
+}
+
+.dialysis-print-order .radio-no {
+  opacity: 0;
+  outline: none;
+  position: absolute;
+  margin: 0;
+  width: 0;
+  height: 0;
+  z-index: -1;
+}
+
+.dialysis-print-order .radio-inner {
+  white-space: nowrap;
+  cursor: pointer;
+  outline: none;
+  display: inline-block;
+  line-height: 1;
+  position: relative;
+  vertical-align: middle;
+}
+
+.dialysis-print-order .radio-fang {
+  display: inline-block;
+  position: relative;
+  border: 1px solid #000;
+  box-sizing: border-box;
+  width: 14px;
+  height: 14px;
+  background-color: #fff;
+  z-index: 1;
+  transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),
+    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);
+}
+
+.dialysis-print-order .is-checked-radio::after {
+  content: "√";
+  font-size: 15px;
+}
+
+.dialysis-print-order .print-table-no tr td {
+  padding: 8px 5px;
+  line-height: 25px;
+}
+
+.dialysis-print-order .print-table tr td {
+  padding: 1px 1px;
+  /*line-height: 25px;*/
+}
+
+.es-img {
+  height: 30px;
+}
+
+.advice-name {
+  text-align: left;
+}
+
+.advice-children {
+  display: flex;
+}
+
+.title-box-pro {
+  border: 0 #fff;
+  line-height: 25px;
+  height: 25px;
+  text-align: left;
+  padding-left: 10px !important;
+}
+.title-box-pro-tr {
+  border: 0 #fff;
+}
+.text-align-left {
+  text-align: left !important;
+  padding-left: 10px !important;
+  font-size: 14px !important;
+  line-height: 25px;
+}
+.print-table-tr-new td {
+  line-height: 20px !important;
+}
+.border-top-solid {
+  border: solid 1px #000;
+}
+.print-template-two tr {
+  line-height: 30px;
+}
+
+.table-box1 {
+  border: 1px solid #000;
+  width: 100%;
+  line-height: 30px;
+  font-size: 14px;
+  border-collapse: collapse;
+}
+.table-box1 tr {
+  border-bottom: 1px solid #000;
+}
+</style>
+
+<style lang="scss">
+
+.newContainer{
+  .dialysisPage::-webkit-scrollbar {
+    height: 15px;
+  }
+  
+  .el-date-editor{
+    .el-input__inner{
+      padding-right:0px;
+    }
+  }
+  .el-table td, .el-table th{
+    text-align: center;
+  }
+}
+.newContainer::-webkit-scrollbar{
+  height: 15px !important;
+}
+</style>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -0,0 +1,205 @@
+<template>
+    <div id='prescription-print' class="prescription-print">
+        <div style="display:flex;justify-content: space-between;font-weight:bold;">
+            <p style="width:300px;display:flex;justify-content: space-between;font-weight:bold;">
+                <span>费别</span>
+                <span>自费</span>
+                <span>公费</span>
+                <span>保险</span>
+                <span>其他</span>
+            </p>
+            <p>就诊日期：2020-11-01 09:22:12</p>
+        </div>
+        <div class="printTitle">血液透析中心</div>
+        <div class="printTitle">处方、治疗单</div>
+        <div class="infoTitle">
+            <p>门诊编号：34567876532345678</p>
+            <p>电脑号：</p>
+        </div>
+        <div class="infoMain">
+            <p style="margin-bottom: 10px;width:25%">姓名：阿萨德</p>
+            <p style="margin-bottom: 10px;width:25%">性别：男</p>
+            <p style="margin-bottom: 10px;width:25%">年龄：12</p>
+            <p style="margin-bottom: 10px;width:25%">参保类型：</p>
+            <p style="margin-bottom: 10px;width:50%;">联系电话</p>
+            <p style="width:50%;">地址：</p>
+            <p style="width:50%;">诊断：</p>
+        </div>
+        <div class="prescriptionBox">
+            <table style="width:100%;text-align:center;line-height:25px;">
+                <tr>
+                    <td>序号</td>
+                    <td>项目名称</td>
+                    <td>数量</td>
+                    <td>单位</td>
+                    <td>单价</td>
+                    <td>部位</td>
+                    <td>备注</td>
+                    <td>天数</td>
+                </tr>
+                <tr v-for='item in 4'>
+                    <td>1</td>
+                    <td>啊势均力敌框架爱实力坑爹就爱上了肯德基</td>
+                    <td>1</td>
+                    <td>1</td>
+                    <td>1</td>
+                    <td>1</td>
+                    <td>1</td>
+                    <td>1</td>
+                </tr>
+            </table>
+        </div>
+        <div class="infoTitle">
+            <p>开单医生：就看见</p>
+            <p>签章：2020-11-01 09:22:12</p>
+        </div>
+        <div class="actionBar">
+            <p>执行医生：</p>
+            <p>费用：</p>
+        </div>
+        <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">
+            <tr>
+                <td style="width:16%;">治疗时间</td>
+                <td style="width:16%;"></td>
+                <td style="width:16%;"></td>
+                <td style="width:16%;"></td>
+                <td style="width:16%;"></td>
+                <td style="width:16%;"></td>
+            </tr>
+            <tr>
+                <td style="width:16%;">医生签字</td>
+                <td style="width:16%;"></td>
+                <td style="width:16%;"></td>
+                <td style="width:16%;"></td>
+                <td style="width:16%;"></td>
+                <td style="width:16%;"></td>
+            </tr>
+            <tr>
+                <td style="width:16px;">患者签字</td>
+                <td style="width:16px;"></td>
+                <td style="width:16px;"></td>
+                <td style="width:16px;"></td>
+                <td style="width:16px;"></td>
+                <td style="width:16px;"></td>
+            </tr>
+        </table>
+    </div>
+</template>
+<script>
+import { jsGetAge, uParseTime } from '@/utils/tools'
+  import {getAllDoctorList} from "@/api/project/project"
+export default {
+    props:{
+      patient:Object,
+      advicePrint:Array,
+      hisPatient:Object,
+    }, 
+    data(){
+      return{
+        doctorList:[]
+      }
+    },
+   methods:{
+     printThisPage() {
+      var ptime = Math.round(new Date().getTime() / 1000);
+      this.print_time = uParseTime(ptime, "{y}-{m}-{d} {h}:{i}");
+
+      const style =
+        '@media print {.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoTitle{display: flex;margin-top:10px;line-height: 1px;padding:0 10px;}.infoTitle p{width: 200px;}.otherInfo{display: flex;margin-top:10px;padding:0 10px;}.otherInfo span{display:inline-block;}.recordTitle{display: flex;margin-top:10px;line-height: 24px;padding:0 10px;border-bottom: 2px solid #000;}.recordTitle p{width: 200px;}}';
+      printJS({
+        printable: "prescription-print",
+        type: "html",
+        style: style,
+        scanStyles: false
+      });
+    },
+     getAllDoctorList(){
+      getAllDoctorList().then(response=>{
+        if(response.data.state == 1){
+               var doctor =  response.data.data.doctor
+               
+               this.doctorList = doctor
+             }
+         })   
+     },
+
+      getDoctor(id){
+        var name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+          if(id == this.doctorList[i].admin_user_id){
+              name = this.doctorList[i].user_name
+          }
+        }
+        return name
+      },
+      getTime(value, temp) {
+        if (value != undefined) {
+            return uParseTime(value, temp)
+        }
+        return ''
+     },
+   },
+   created(){
+    //   this.getAllDoctorList()
+   }
+}
+</script>
+
+
+<style lang="scss" scoped>
+.printTitle{
+    font-size: 22px;
+    text-align: center;
+    font-weight: bold;
+}
+.infoTitle{
+    display: flex;
+    border-bottom: 2px solid #000;
+    margin-top:10px;
+    line-height: 24px;
+    padding:0 10px;
+}
+.infoTitle p{
+    width: 300px;
+}
+.infoMain{
+    display: flex;
+    flex-wrap: wrap;
+    border-bottom: 2px solid #000;
+    padding:0 10px;
+}
+.infoMain p{
+    width: 50%;
+    line-height: 24px;
+}
+.prescriptionBox{
+    padding:0 10px;
+    height:600px;
+}
+.Rp{
+    font-size: 22px;
+    font-weight: bold;
+}
+.drugsBox{
+    padding-left: 40px;
+    margin-bottom: 10px;
+}
+.drugsBox p{
+    line-height: 30px;
+}
+.drugsOne{
+    line-height: 24px;
+}
+.drugsOne span{
+    margin-right: 20px;
+}
+.actionBar{
+    display: flex;
+    justify-content: space-between; 
+    line-height: 24px;
+    padding:0 10px;
+}
+.actionBar p{
+    width:150px;
+}
+</style>

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>