Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/his/his.js

@@ -150,6 +150,16 @@ export function getConfig() {
 
 
 
+export function Refund() {
+  return request({
+    url: "/api/refund/post",
+    method: "post",
+  });
+}
+
+
+
+
 
 
 

src/api/project/project.js

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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -90,7 +90,7 @@
                     <span>当前处方总费用：<span style="color:red;">{{ total}}元</span></span>
                     <span v-if="this.curPrescriptions.order_status  == 1">待结算</span>
                     <span v-if="this.curPrescriptions.order_status  == 2">已结算</span>
-                    <span v-if="this.curPrescriptions.order_status  == 2">已退费</span>
+                    <span v-if="this.curPrescriptions.order_status  == 3">已退费</span>
 
                   </div>
                 </div>
@@ -211,7 +211,7 @@
   import prescriptionTable from './components/prescriptionTable'
   import additionalCharges from './components/additionalCharges'
   import { getPatientInformation, getPatientList } from '@/api/project/project'
-  import { getPatientInfo, getSchedulePatientList, register, upload } from '@/api/his/his'
+  import { getPatientInfo, getSchedulePatientList, register, upload,Refund } from '@/api/his/his'
 
   const moment = require('moment')
   export default {
@@ -341,7 +341,8 @@
                 name: '处方' + index,
                 advices: tempAdvice,
                 project: tempProject,
-                type: response.data.data.prescription[i].type
+                type: response.data.data.prescription[i].type,
+                order_status: response.data.data.prescription[i].order_status
               }
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]
@@ -463,6 +464,26 @@
           this.state = '已收费'
           this.$message({ message: '收费成功', type: 'success' })
         } else if (index == 5) {
+          let params = {
+            'id': this.patientInfo.id,
+            'record_time': this.record_date
+          }
+          Refund(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              this.loadingtwo = false
+
+              return false
+
+            } else {
+              this.loadingtwo = false
+
+            }
+          })
+
+
+
+
           this.$message({ message: '退费成功', type: 'success' })
         } else if (index == 6) {
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -102,6 +102,8 @@
           </el-select>
           <span>总计：</span>
           <span style="color:red;">{{ getTotal() }}</span>元
+          <span >{{order_status}}</span>
+
         </div>
       </div>
       <div class='centerRight'>
@@ -114,7 +116,7 @@
             <el-tabs class="rightTabs" v-model="activeName">
               <el-tab-pane label="药品列表" name="1">
                 <div style="margin-bottom:5px;display:flex;">
-                  <el-input style="width:50%;" v-model="input" placeholder=""></el-input>
+                  <el-input style="width:50%;"  @keyup.enter.native='searchAction' v-model.trim="search_keyword" placeholder=""></el-input>
                   <el-select style="margin-left:5px;width:50%;" v-model="value" placeholder="" @change="changeKind">
                     <el-option
                       label="全部"
@@ -148,7 +150,7 @@
               </el-tab-pane>
               <el-tab-pane label="医嘱模板" name="2">
                 <div style="margin-bottom:5px;">
-                  <el-input style="width:50%;" v-model="input" placeholder=""></el-input>
+                  <!--<el-input style="width:50%;" v-model="input" placeholder=""></el-input>-->
                   <el-select style="float: right;width: 49%;" v-model="value" placeholder="">
                       <el-option
                       v-for="item in options"
@@ -264,6 +266,7 @@
       hisPatientInfo: Object,
       prescriptions: Array,
       record_date: String,
+      search_keyword:"",
 
       other_sick: {
         type: Array,
@@ -323,6 +326,7 @@
         doctors: [],
         departMent: [],
         curStatus: 0,
+        order_status:"",
         register_types: [
           { id: 1, name: '医保' },
           { id: 2, name: '自费' }
@@ -331,6 +335,10 @@
       }
     },
     methods: {
+      searchAction(){
+        console.log(this.search_keyword)
+
+      },
       getTotal() {
         var total = 0
         for (let i = 0; i < this.prescriptions.length; i++) {
@@ -477,6 +485,20 @@
         this.departmentValue = info.departments
         this.register_type = info.register_type
 
+        if(info.prescription_status == 1 || info.prescription_status == 2){
+          this.order_status  = "未收费"
+
+        }
+
+        if(info.prescription_status == 3){
+          this.order_status  = "已结算"
+        }
+
+
+        if(info.prescription_status == 4){
+          this.order_status  = "已退费"
+        }
+
 
         // console.log(this.$refs)
         // this.$nextTick(() => {
@@ -489,6 +511,10 @@
         }
       },
       open(index) {
+        if(this.curPrescriptions.order_status >= 2){
+          this.$message.error('当前处方处于结算或者退费状态,无法保存')
+          return
+        }
         if (this.doctorValue.length <= 0) {
           this.$message.error('医生不能为空')
           return
@@ -535,7 +561,6 @@
           }
           createHisPrescription(data, params).then(response => {
             if (response.data.state == 1) {
-              // this.prescriptions = []
               this.$message.success('保存成功')
             }
           })
@@ -549,6 +574,10 @@
 
       },
       addTab(targetName) {
+        if(this.curPrescriptions.order_status >= 2){
+          this.$message.error('该处方已经结算或者退费，无法继续添加处方')
+          return
+        }
         ++this.tabIndex
         let newTabName = '处方' + this.tabIndex
         this.prescriptions.push({
@@ -563,6 +592,10 @@
         this.curStatus = 0
       },
       removeTab(targetName) {
+        if(this.curPrescriptions.order_status >= 2){
+          this.$message.error('该处方已经结算或者退费，无法删除')
+          return
+        }
 
         this.$confirm('处方删除后不可恢复，是否确认删除', '删除', {
           confirmButtonText: '确 定',
@@ -723,7 +756,7 @@
       },
       comfirm() {
         if(this.curPrescriptions.order_status >= 2){
-          this.$message.error('该处方已经结算或者退费，无法继续添加')
+          this.$message.error('该处方已经结算或者退费，无法继续添加药品或者项目')
           this.teamList = []
           this.curDrugs = []
           this.$refs.tables.clearSelection()

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -170,6 +170,7 @@
       patientInfo: Object,
       hisPatientInfo: Object,
       record_date:String,
+      detalid:Number,
     },
     components: {
       medicalRecord,
@@ -179,19 +180,19 @@
       return {
         id:0,
         delivery_way:"",
-        case_history:{
-          sick_type:'',
-          symptom:"",
-          sick_date:"",
-          is_infect:"",
-          chief_conplaint:"",
-          history_of_present_illness:"",
-          past_history:"",
-          diagnostic:"",
-          personal_history:"",
-          family_history:"",
+        // case_history:{
+        //   sick_type:'',
+        //   symptom:"",
+        //   sick_date:"",
+        //   is_infect:"",
+        //   chief_conplaint:"",
+        //   history_of_present_illness:"",
+        //   past_history:"",
+        //   diagnostic:"",
+        //   personal_history:"",
+        //   family_history:"",
 
-        },
+        // },
         formValue:{
           temperature:"",
           blood_sugar:"",
@@ -271,11 +272,10 @@
        
 
       },
-      getMsgFormSon(data){
-       this.getTemplateDetail(data)
-     },
+    
 
       getTemplateDetail(id){
+          console.log("22222")
           getTemplateDetail(id).then(response=>{
               if(response.data.state == 1){  
                 var templatedetail =  response.data.data.templateDetail
@@ -294,9 +294,13 @@
     },
     created(){
        this.wayOptions = getDataConfig("patient", "reimbursement_ways");
-
-       console.log("2222",this.wayOptions)
-     
+       console.log("232322323",this)
+       
+    },
+    watch:{
+      detalid:function(val){
+        this.getTemplateDetail(val)
+      }
     }
   }
 </script>

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -27,75 +27,78 @@
       </el-tab-pane>
       <el-tab-pane label="病历详情" name="second">
         <div class="detailMain">
-          <span style="width:240px;">处方号：344431222222222</span>
-          <span style="width:200px;">医生：医生</span>
-          <span style="width:200px;">科室：儿科</span>
-          <span style="width:200px;">创建时间：2020-10-10 01:12:20</span>
+          <span style="width:240px;">处方号：{{order.prescription_number}}</span>
+          <span style="width:200px;">医生：{{order.doctor}}</span>
+          <span style="width:200px;">科室：{{order.departments}}</span>
+          <span style="width:200px;">创建时间： {{getTimes(order.ctime,"{y}-{m}-{d} {h}:{i}")}}</span>
         </div>
         <div class="commonCell">
           <p>基本信息</p>
           <div class="detailMain">
-            <span style="width:240px;">疾病名称：无</span>
-            <span style="width:200px;">症状：医生</span>
-            <span style="width:200px;">发病日期：2020-10-10 01:12:20</span>
-            <span style="width:200px;">是否传染：否</span>
+            <span style="width:240px;">疾病名称：{{case_history.diagnostic}}</span>
+            <span style="width:200px;">症状：{{case_history.diagnostic}}</span>
+            <span style="width:200px;">发病日期：{{getTimes(case_history.sick_date,"{y}-{m}-{d}")}}</span>
+            <span style="width:200px;" v-if="case_history.is_infect== 1">是否传染：是</span>
+          <span style="width:200px;" v-if="case_history.is_infect != 1">是否传染：否</span>
+
           </div>
         </div>
         <div class="commonCell">
           <p>体格信息</p>
           <div class="detailMain">
-            <span style="width:140px;">体温：℃</span>
-            <span style="width:140px;">呼吸：0 次/分</span>
-            <span style="width:140px;">脉搏：0 次/分</span>
-            <span style="width:200px;">血压：0。00~0.00 mmHg</span>
+            <span style="width:140px;">体温：{{case_history.temperature}}℃</span>
+            <span style="width:140px;">呼吸：{{case_history.breathing}} 次/分</span>
+
+            <span style="width:140px;">脉搏：{{case_history.pulse}} 次/分</span>
+            <span style="width:200px;">血压：{{case_history.sbp}}~{{case_history.dbp}} mmHg</span>
           </div>
         </div>
         <div class="commonCell">
           <p></p>
           <div class="detailMain">
-            <span style="width:140px;">血糖：0 mmol/L</span>
-            <span style="width:140px;">血脂：0 mmol/L</span>
-            <span style="width:140px;">身高：0 cm</span>
-            <span style="width:200px;">体重：0 kg</span>
+            <span style="width:140px;">血糖：{{case_history.blood_sugar}} mmol/L</span>
+            <span style="width:140px;">血脂：{{case_history.blood_fat}} mmol/L</span>
+            <span style="width:140px;">身高：{{case_history.height}} cm</span>
+            <span style="width:200px;">体重： kg</span>
           </div>
         </div>
         <div class="commonCell">
           <p>主诉</p>
-          <div>无</div>
+          <div>{{case_history.chief_conplaint}}</div>
         </div>
         <div class="commonCell">
           <p>现病史</p>
-          <div>无</div>
+          <div>{{case_history.history_of_present_illness}}</div>
         </div>
         <div class="commonCell">
           <p>门诊诊断</p>
-          <div>无</div>
+          <div>{{case_history.diagnostic}}</div>
         </div>
         <div class="commonCell">
           <p>门诊医嘱</p>
-          <div>无</div>
+          <div>{{case_history.doctor_advice}}</div>
         </div>
         <div class="commonCell">
           <p>过敏史</p>
-          <div>无</div>
+          <div>{{order.sick_history}}</div>
         </div>
         <div class="commonCell">
           <p>既往史</p>
-          <div>无</div>
+          <div>{{case_history.past_history}}</div>
         </div>
         <div class="commonCell">
           <p>个人史</p>
-          <div>无</div>
+          <div>{{case_history.personal_history}}</div>
         </div>
         <div class="commonCell">
           <p>家族史</p>
-          <div>无</div>
+          <div>{{case_history.family_history}}</div>
         </div>
       </el-tab-pane>
     </el-tabs>
     <div slot="footer" class="dialog-footer">
       <el-button @click="hide">取 消</el-button>
-      <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</el-button>
+      <!--<el-button type="primary" :loading="submitLoading" @click="hide">确定</el-button>-->
     </div>
   </el-dialog>
 </template>
@@ -105,6 +108,7 @@
 <script>
   import { getHisPrescriptionInfo } from '@/api/his/his'
   import NewPrescriptionTable from './newPrescriptionTable'
+  import { uParseTime } from '@/utils/tools'
 
   export default {
     components: { NewPrescriptionTable },
@@ -134,10 +138,15 @@
         state: '未收费',
         radio: 1,
         radioStatus: 1,
-        search_input: ''
+        search_input: '',
+        case_history:{},
+        order:{},
       }
     },
     methods: {
+      getTimes(time,temp) {
+        return uParseTime(time, temp);
+      },
       tabclickEvent(val) {
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == val.name) {
@@ -188,6 +197,10 @@
           } else {
             this.patientInfo = response.data.data.order.patient
             this.hisPatientInfo = response.data.data.order.his_patient
+            this.case_history = response.data.data.order.case_history
+            this.order = response.data.data.order
+
+
             this.prescriptions = []
             for (let i = 0; i < response.data.data.prescription.length; i++) {
               var prescription = response.data.data.prescription[i]

src/xt_pages/outpatientDoctorStation/components/medicalRecord.vue

@@ -160,24 +160,27 @@ export default {
             this.$refs.recordTemplateDetail.show(id)
         },
         totemplateDetailTwo(id){
+        console.log("id0---",id)
          this.$emit('func',id)
          this.visible = false
         },
         //获取历史数据历史模板
         getlist(){
+            console.log("触发了吗")
             const params = {
                keyword:this.search_input,
                start_time:this.start_time,
                end_time:this.end_time
             }
+           console.log("params-----",params)
           getHistoryTemplate(params).then(response=>{
             if(response.data.state == 1){
               var template =  response.data.data.template
               console.log("templagte",template)
               this.tempalateData = template
-              var history =  response.data.data.history
-              console.log("history",history)
-              this.tableData = history
+            //   var history =  response.data.data.history
+            //   console.log("history",history)
+            //   this.tableData = history
             }
           })
         },
@@ -192,6 +195,7 @@ export default {
         }
     },
     created(){
+       console.log("99999999999999999")
        this.getlist()
     }
 }

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -193,7 +193,10 @@
         })
 
       },deleteDrug:function(index, row){
-
+       if(this.curPrescriptions.order_status >= 2){
+         this.$message.error('该处方已经结算或者退费，无法删除')
+         return
+       }
        this.$confirm("药品删除后不可恢复，是否确认删除", "删除", {
          confirmButtonText: "确 定",
          cancelButtonText: "取 消",
@@ -266,6 +269,10 @@
          return name
       },
       deleteProject(row){
+        if(this.curPrescriptions.order_status >= 2){
+          this.$message.error('该处方已经结算或者退费，无法删除')
+          return
+        }
         this.$confirm("项目删除后不可恢复，是否确认删除", "删除", {
           confirmButtonText: "确 定",
           cancelButtonText: "取 消",

src/xt_pages/outpatientDoctorStation/components/recordTemplateDetail.vue

@@ -145,7 +145,7 @@ export default {
                 var template =  response.data.data.templateDetail
                 this.$message.success("保存成功")
                 this.visible = false
-                this.$parents.getlist()
+                // this.$parents.getlist()
              }
           }) 
         }

src/xt_pages/outpatientDoctorStation/components/saveRecordTemplate.vue

@@ -12,7 +12,7 @@
                 <el-radio v-model="mode_type" label="2">公共模板</el-radio>
             </el-form-item> -->
             <el-form-item label="模板名称: " prop="name" style="width:100%;">
-                <el-input v-model="form.template_name" placeholder=""></el-input>
+                <el-input v-model="template_name" placeholder=""></el-input>
             </el-form-item>
             <el-form-item label="模板说明:" prop="name" style="width:100%;">
                 <el-input
@@ -100,7 +100,7 @@ export default {
              family_history:this.family_history,
              diagnostic:this.diagnostic,
             }
-            console.log("params",params)
+         console.log("params",params)
           SaveHisPatientCaseHistoryTemplate(params).then(response=>{
               if(response.data.state == 1){
                  this.$message.success("保存成功")
@@ -112,6 +112,7 @@ export default {
     created(){
       this.start_time = moment().format("YYYY-MM-DD HH:mm:ss")
       this.user_name = this.$store.getters.xt_user.user.user_name
+      
     }
 }
 </script>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -64,9 +64,10 @@
                            :hisPatientInfo="hisPatientInfo"
                            v-show="titleType == '处方'" style="flex:1;"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
-                     :hisPatientInfo="hisPatientInfo" v-show="titleType == '病历'"></desk-record>
-        <medicalRecord ref='medicalRecord'  @func="getMsgFormSon"></medicalRecord>
-       <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
+                     :hisPatientInfo="hisPatientInfo"   v-show="titleType == '病历'" :detalid="detalid" ref="child"></desk-record>
+
+         <medicalRecord ref='medicalRecord' @func="getMsgFormSon" ></medicalRecord>
+         <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
       </div>
 
     </div>
@@ -82,7 +83,6 @@
   import medicalRecord from './components/medicalRecord'
   import saveRecordTemplate from './components/saveRecordTemplate'
   import { uParseTime } from '@/utils/tools'
-
   export default {
     components: {
       BreadCrumb,
@@ -113,6 +113,7 @@
         ],
         titleType: '处方',
         patientTableData: [{}],
+        patientTableDataTwo:[{}],
         patientInfo: {},
         hisPatientInfo: {},
         case_history: {},
@@ -120,7 +121,8 @@
         diagnoses: [],
         other_sick: [],
         info:{},
-
+        templatedetail:{},
+        detalid:0,
       }
     },
     methods: {
@@ -133,6 +135,21 @@
 
       },
       searchAction() {
+        if(this.search_input.length == 0){
+          this.patientTableData = this.patientTableDataTwo
+        }else{
+          let arr = []
+          for (let i = 0; i < this.patientTableData.length; i++){
+            if(this.patientTableData[i].patients.name.indexOf(this.search_input) != -1 ){
+              arr = arr.concat(this.patientTableData[i])
+            }
+          }
+          if(arr.length > 0){
+            this.patientTableData = arr
+          }
+
+        }
+
 
       },
       change(val) {
@@ -150,6 +167,8 @@
             return false
           } else {
             this.patientTableData = response.data.data.list
+            this.patientTableDataTwo = response.data.data.list
+
             console.log('222', this.patientTableData)
             // this.$refs.tab.setCurrentRow(this.patientTableData[0])
             let cal_one = 0
@@ -182,7 +201,6 @@
           } else {
 
             this.prescriptions = []
-            // this.$refs.prescriptions.clearData()
             this.patientInfo = response.data.data.xt_info
             this.hisPatientInfo = response.data.data.his_info
             this.case_history = response.data.data.case_history
@@ -276,7 +294,7 @@
                   name: '处方' + index,
                   advices: tempAdvice,
                   project: tempProject,
-                  orderStatus:prescription.order_status
+                  order_status:prescription.order_status
                 }
                 this.prescriptions.push(obj)
               }
@@ -384,6 +402,22 @@
       //   this.hisPatientInfo = val.hisPatientInfo
       //   console.log("333333",this.hisPatientInfo)
       // }
+
+      getMsgFormSon(id){
+        console.log("id----------",id)
+        this.detalid = id
+      },
+      //  getTemplateDetail(id){
+      //     getTemplateDetail(id).then(response=>{
+      //         if(response.data.state == 1){
+      //           var templatedetail =  response.data.data.templateDetail
+      //           console.log("templatedetail",templatedetail)
+      //           templatedetail =
+
+
+      //         }
+      //     })
+      //   },
     },
     created() {
       var nowDate = new Date()

src/xt_pages/outpatientRegistration/index.vue

@@ -23,8 +23,8 @@
                             <el-button style="margin-left:10px;" type="primary" @click="reading">读卡</el-button>
                         </div>
                     </el-form-item>
-                    <el-form-item label="患者姓名：">
-                        <el-input v-model="form.name"></el-input>
+                    <el-form-item label="患者姓名："  prop="name" :validate-event="is_Name">
+                        <el-input  v-model="form.name"></el-input>
                     </el-form-item>
                     <el-form-item label="性别：">
                         <el-select v-model="form.sex" placeholder="请选择">
@@ -62,7 +62,7 @@
                     <el-form-item label="年龄：">
                         <el-input v-model="form.age"></el-input>
                     </el-form-item>
-                    <el-form-item label="证件号码：" required prop="idCard">
+                    <el-form-item label="证件号码：" prop="idCard"  :validate-event="is_Name">
                         <el-input v-model="form.idCard"></el-input>
                     </el-form-item>
    
@@ -71,7 +71,7 @@
             <div class="nameTitle">患者挂号信息:</div>
             <div class="formMain">
                 <el-form class="basicForm" :model="form" :rules="rules" ref="form" label-width="100px">
-                    <el-form-item label="挂号类型："  prop="register">
+                    <el-form-item label="挂号类型："  prop="register"  :validate-event="is_Name">
                         <el-select v-model="form.register"  placeholder="请选择">
                             <el-option
                             v-for="item in register"
@@ -81,7 +81,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="医生："  prop="doctor" >
+                    <el-form-item label="医生："  prop="doctor" :validate-event="is_Name" >
                         <el-select v-model="form.doctor" placeholder="请选择">
                             <el-option
                             v-for="item in doctorList"
@@ -91,7 +91,7 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="科室："  prop="department">
+                    <el-form-item label="科室："  prop="department" :validate-event="is_Name">
                         <el-select v-model="form.department"  placeholder="请选择">
                             <el-option
                             v-for="item in departmentList"
@@ -243,8 +243,8 @@ export default {
                 psn_name:"杨美英",
                 age:60.7
             },
-
             rules: {
+              name:[{ required:true,message:"患者姓名不能为空",trigger: 'blur'}],
               idCard: [{ required: true, message: '证件号码不能为空', trigger: 'blur'  }],
               register: [{ required: true, message: '请选择挂号类型' , trigger: 'blur' }],
               doctor: [{ required: true, message: '请选择医生' , trigger: 'blur' }],
@@ -253,7 +253,8 @@ export default {
            doctorList:[],
            departmentList:[],
            check:0,
-           show:false
+           show:false,
+           is_Name:false
         }
     },
     computed:{
@@ -358,8 +359,33 @@ export default {
            })   
         },
         saveHisPatient(formName){   
-           if(this.form.idCard == ""){
+           if(this.form.name == ""){
+             this.$message.error("患者姓名不能为空")
+             this.is_Name = true
+             return
+           }
+          if(this.form.idCard == ""){
              this.$message.error("证件号码不能为空")
+             this.is_Name = true
+             return
+           }
+
+          if(this.form.register == ""){
+             this.$message.error("挂号类型不能为空")
+             this.is_Name = true
+             return
+           }
+
+         if(this.form.doctor == ""){
+             this.$message.error("医生不能为空")
+             this.is_Name = true
+             return
+           }
+
+         if(this.form.department == ""){
+             this.$message.error("科室不能为空")
+             this.is_Name = true
+             return
            }
           this.$refs[formName].validate((valid)=>{
              if(valid){
@@ -405,7 +431,7 @@ export default {
                      this.form.medicalCare = "",
                      this.form.birthday ="",
                      this.form.age ="",
-                    //  this.form.idCard = "",
+                     this.form.idCard = "",
                      this.form.register = "",
                      this.form.doctor = "",
                      this.form.department = "",

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -5,7 +5,21 @@
         </div>
         <div class="app-container">
             <div class="cell clearfix">
-                <el-input style="width: 180px;" v-model.trim="search_input" class="filter-item"/>
+                <!-- <el-input style="width: 180px;" v-model.trim="search_input" class="filter-item"/> -->
+                <el-autocomplete
+                  style="margin:16px 5px"
+                  popper-class="my-autocomplete"
+                  v-model.trim="search_input"
+                  :fetch-suggestions="querySearchAsync"
+                  :trigger-on-focus="false"
+                  placeholder="病人名字或者透析号"
+                  @select="handleSelect"
+                >
+                  <i class="el-icon-search el-input__icon" slot="suffix"> </i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.name }}</div>
+                  </template>
+                </el-autocomplete>
                 <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="searchAction">搜索</el-button>
                 <!-- <el-date-picker
                 v-model="value1"
@@ -113,7 +127,7 @@
 <script>
 const moment = require('moment')
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { getHisPatientHistory,changePatient } from "@/api/project/project"
+import { getHisPatientHistory,changePatient,getHisPatient } from "@/api/project/project"
 import { uParseTime } from "@/utils/tools";
 export default {
     components:{
@@ -167,6 +181,7 @@ export default {
                 id: 7,
                 name: "生育保险"
             }],
+            tablePatient:[]
         }
     },
     created(){
@@ -180,7 +195,7 @@ export default {
             
         // })
         // this.tableData = arr
-     
+       //获取所有挂号号的患者
        this.getlist()
     },
     methods:{
@@ -301,7 +316,34 @@ export default {
           });
         })
         .catch(() => {});
+        },
+
+     querySearchAsync(keyword, cb) {
+        let key = ''
+        if (keyword != undefined) {
+          key = keyword
+        }
+        let searchArray = []
+       
+        var params = {
+           keyword:key
         }
+        console.log("params",params)
+        getHisPatient(params).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.patient
+            console.log("searcharrya",searchArray)
+            cb(searchArray)
+          }
+        })
+        return searchArray
+      },
+
+      handleSelect(val){   
+          this.search_input = val.name
+          this.getlist()
+        },
+
     }
 }
 </script>

src/xt_pages/stock/selfPreparedMedicine/index.vue

@@ -350,6 +350,7 @@ export default {
             key = keyword
           }
           let searchArray = []
+          console.log("key",key)
           PostSearch(key).then(response => {
             if (response.data.state == 1) {
               searchArray = response.data.data.patient