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

src/api/his/his.js

@@ -131,6 +131,37 @@ export function getHisPrescriptionList() {
 }
 
 
+export function getHisPrescriptionInfo(params) {
+  return request({
+    url: "/api/hisprescription/info",
+    method: "get",
+    params:params,
+  });
+}
+
+
+
+export function getConfig() {
+  return request({
+    url: "/api/medicalinsurance/config",
+    method: "get",
+  });
+}
+
+
+
+export function Refund() {
+  return request({
+    url: "/api/refund/post",
+    method: "post",
+  });
+}
+
+
+
+
+
+
 
 
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -42,15 +42,15 @@
           <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">打印处置单</el-button>
           <el-button size="small" @click="open(2)" type="primary">打印治疗单</el-button>
           <el-button size="small" @click="open(3)" type="primary">打印</el-button>
-          <el-button v-loading="loadingone" v-if="hisPatientInfo == null || hisPatientInfo.id == 0 " size="small"
+          <el-button v-loading="loadingone"  size="small"
                      @click="open(6)"
                      type="primary">挂号
           </el-button>
-          <el-button v-loading="loadingtwo" v-if="hisPatientInfo != null && hisPatientInfo.id > 0 " size="small"
+          <el-button v-loading="loadingtwo" v-if="this.info.prescription_status == 1" size="small"
                      @click="open(4)"
                      type="primary">收费
           </el-button>
-          <el-button size="small" @click="open(5)" type="primary">退费</el-button>
+          <el-button size="small" @click="open(5)" type="primary" v-if="this.info && this.info.prescription_status == 3">退费</el-button>
         </div>
 
         <div class="mainCenter">
@@ -87,8 +87,11 @@
 
                   </div>
                   <div class="costBox">
-                    <span>当前处方总费用：<span style="color:red;">{{ getTotal() }}元</span></span>
-                    <span>{{ state }}</span>
+                    <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  == 3">已退费</span>
+
                   </div>
                 </div>
                 <div class="centerRight">
@@ -114,6 +117,8 @@
                   <ul class="basicUl">
                     <li style="width:50%;">医生：{{ info.doctor }}</li>
                     <li style="width:50%;">科室：{{ info.departments }}</li>
+                    <li style="width:50%;">总费用：{{ getTotal() }}</li>
+
                     <li style="width:100%;">判断结果：{{info.diagnosis}}</li>
                     <li style="width:100%;">是否有传染病：</li>
                     <li style="width:100%;">血压：</li>
@@ -206,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 {
@@ -336,18 +341,16 @@
                 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]
-
+              this.total = 0
+              this.total = this.getTotalOne()
             }
           }
         })
-
-        console.log(val)
-        console.log(patientInfo.id)
-
       },
       handleClick() {
 
@@ -363,6 +366,14 @@
             this.curPrescriptions = temp
           }
         }
+        console.log(this.curPrescriptions)
+
+        this.total = 0
+        this.total = this.getTotalOne()
+        console.log(this.total)
+
+
+
       }, deepClone(source) {
         if (!source && typeof source !== 'object') {
           throw new Error('error arguments', 'shallowClone')
@@ -376,6 +387,34 @@
           }
         })
         return targetObj
+      },getTotalOne(){
+        var total = 0
+          if(this.curPrescriptions.type == 1) {
+            if (this.curPrescriptions.advices != null) {
+              for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
+                console.log(this.curPrescriptions.advices[a].retail_price)
+                console.log(this.curPrescriptions.advices[a].prescribing_number)
+
+                total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
+              }
+            }
+            return total
+
+          }else{
+            var total = 0
+            if (this.curPrescriptions.project != null) {
+              for (let b = 0; b < this.curPrescriptions.project.length; b++) {
+                console.log(this.curPrescriptions.project[b].price )
+                console.log(this.curPrescriptions.project[b].total )
+                total = total + this.curPrescriptions.project[b].price * this.curPrescriptions.project[b].total
+              }
+            }
+            return total
+
+          }
+
+
+
       },
       getTotal() {
         var total = 0
@@ -425,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) {
 
@@ -453,9 +512,6 @@
         }
       },
 
-      // addCharges(){
-      //     this.$refs.additionalCharges.show()
-      // },
       choosePatient() {
         console.log(id)
         this.radioStatus = id
@@ -561,10 +617,15 @@
                 name: '处方' + index,
                 advices: tempAdvice,
                 project: tempProject,
+                order_status:response.data.data.prescription[i].order_status,
                 type: response.data.data.prescription[i].type
               }
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]
+              this.total = 0
+              this.total = this.getTotalOne()
+              console.log(this.total)
+
 
             }
           }

src/xt_pages/outpatientCharges/summary.vue

@@ -67,6 +67,8 @@
             <div v-if="scope.row.order_status == 1">待结算</div>
             <div v-if="scope.row.order_status == 2">已结算</div>
             <div v-if="scope.row.order_status == 3">结算失败</div>
+            <div v-if="scope.row.order_status == 4">已退费</div>
+
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="操作">

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -115,7 +115,8 @@ export default {
           this.curPrescriptions = temp
         }
       }
-    }, deepClone(source) {
+    },
+    deepClone(source) {
       if (!source && typeof source !== 'object') {
         throw new Error('error arguments', 'shallowClone')
       }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -19,12 +19,12 @@
             <el-input v-model="patientInfo.id_card_no" placeholder="" readonly></el-input>
           </el-form-item>
           <!--<el-form-item label="挂号类型: " prop="name">-->
-            <!--<el-input v-model="hisPatientInfo.register_type" placeholder="" readonly></el-input>-->
+          <!--<el-input v-model="hisPatientInfo.register_type" placeholder="" readonly></el-input>-->
           <!--</el-form-item>-->
           <el-form-item label="挂号类型: " prop="name">
             <el-select style="margin-right:5px;" v-model="register_type" placeholder="">
               <el-option
-                v-for="(item,index) in getDictionaryDataConfig('system','register_type')"
+                v-for="(item,index) in this.register_types"
                 :key="index"
                 :label="item.name"
                 :value="item.name">
@@ -88,7 +88,7 @@
               v-for="(item,index) in doctors"
               :key="index"
               :label="item.user_name"
-              :value="item.user_name">
+              :value="item.admin_user_id">
             </el-option>
           </el-select>
           <span>科室：</span>
@@ -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"
@@ -235,7 +237,8 @@
         </template>
       </div>
     </div>
-    <additionalCharges ref='additionalCharges' :hisPatientInfo="hisPatientInfo" :patientInfo="patientInfo"></additionalCharges>
+    <additionalCharges ref='additionalCharges' :hisPatientInfo="hisPatientInfo"
+                       :patientInfo="patientInfo"></additionalCharges>
     <select-template ref='selectTemplate'></select-template>
     <save-template ref='saveTemplate'></save-template>
   </div>
@@ -248,8 +251,7 @@
     delHisPrescription,
     getInitData,
     getPatientInfo,
-    getSchedulePatientList,
-
+    getSchedulePatientList
   } from '@/api/his/his'
   import { getDictionaryDataConfig } from '@/utils/data'
   import prescriptionTable from './prescriptionTable'
@@ -257,13 +259,14 @@
   import saveTemplate from './saveTemplate'
   import additionalCharges from './additionalCharges'
   import { addProjectTeam, getAllProjectTeam, getHisProject, getPojectListById } from '@/api/project/project'
- 
+
   export default {
     props: {
       patientInfo: Object,
       hisPatientInfo: Object,
       prescriptions: Array,
       record_date: String,
+      search_keyword:"",
 
       other_sick: {
         type: Array,
@@ -282,7 +285,7 @@
     },
     data() {
       return {
-        register_type:"",
+        register_type: '',
         value: '',
         form: {
           name: ''
@@ -322,10 +325,20 @@
         teamList: [],
         doctors: [],
         departMent: [],
-        curStatus: 0
+        curStatus: 0,
+        order_status:"",
+        register_types: [
+          { id: 1, name: '医保' },
+          { id: 2, name: '自费' }
+
+        ]
       }
     },
     methods: {
+      searchAction(){
+        console.log(this.search_keyword)
+
+      },
       getTotal() {
         var total = 0
         for (let i = 0; i < this.prescriptions.length; i++) {
@@ -371,11 +384,11 @@
       changeKind(val) {
         this.drugs = []
 
-        if(val == 0){
+        if (val == 0) {
           this.drugs = this.allDrugs
-        }else{
-          for (let i = 0; i < this.allDrugs.length; i++){
-            if (this.allDrugs[i].drug_type == val){
+        } else {
+          for (let i = 0; i < this.allDrugs.length; i++) {
+            if (this.allDrugs[i].drug_type == val) {
               this.drugs.push(this.allDrugs[i])
             }
           }
@@ -396,7 +409,6 @@
             this.advices_template = response.data.data.advices_template
             this.doctors = response.data.data.doctors
 
-
           }
         })
 
@@ -432,7 +444,6 @@
             if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
               this.customTabIndex = this.rightTab
               this.curStatus = 0
-
             }
 
           }
@@ -440,41 +451,53 @@
         }
       },
       clearData() {
-        console.log("111111")
         this.curPrescriptions = []
         this.curStatus = 0
         this.curDrugs = []
         this.preDrugs = []
         this.teamList = []
 
-
       },
-      setData(data,info) {
+      setData(data, info) {
         this.curStatus = 0
         this.prescriptions = data
         this.curPrescriptions = this.prescriptions[0]
-        if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0 ){
+        if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.curStatus = 1
-          this.customTabIndex= 1
+          this.customTabIndex = 1
           this.rightTab = 1
           this.showOne = true
           this.showTwo = false
 
         }
 
-        if(this.curPrescriptions.project.length > 0 && this.curPrescriptions.advices.length == 0 ){
+        if (this.curPrescriptions.project.length > 0 && this.curPrescriptions.advices.length == 0) {
           this.curStatus = 2
-          this.customTabIndex= 2
+          this.customTabIndex = 2
           this.rightTab = 2
           this.showOne = false
           this.showTwo = true
         }
 
-
         this.state1 = info.diagnosis
         this.state2 = info.sick_history
-        this.doctorValue = info.doctor
+        this.doctorValue = info.doctor_id
         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)
@@ -488,13 +511,17 @@
         }
       },
       open(index) {
-        if(this.doctorValue.length <= 0){
-          this.$message.error("医生不能为空")
+        if(this.curPrescriptions.order_status >= 2){
+          this.$message.error('当前处方处于结算或者退费状态,无法保存')
+          return
+        }
+        if (this.doctorValue.length <= 0) {
+          this.$message.error('医生不能为空')
           return
         }
 
-        if(this.departmentValue.length <= 0){
-          this.$message.error("科室不能为空")
+        if (this.departmentValue.length <= 0) {
+          this.$message.error('科室不能为空')
           return
         }
 
@@ -504,9 +531,10 @@
             diagnose: this.state1,
             sick_history: this.state2,
             doctor: this.doctorValue,
-               department: this.departmentValue,
+            department: this.departmentValue,
             record_date: this.record_date,
-            his_patient_id: this.hisPatientInfo.id
+            his_patient_id: this.hisPatientInfo.id,
+            reg_type: this.register_type
           }
 
           for (let i = 0; i < this.prescriptions.length; i++) {
@@ -533,7 +561,6 @@
           }
           createHisPrescription(data, params).then(response => {
             if (response.data.state == 1) {
-              // this.prescriptions = []
               this.$message.success('保存成功')
             }
           })
@@ -547,6 +574,10 @@
 
       },
       addTab(targetName) {
+        if(this.curPrescriptions.order_status >= 2){
+          this.$message.error('该处方已经结算或者退费，无法继续添加处方')
+          return
+        }
         ++this.tabIndex
         let newTabName = '处方' + this.tabIndex
         this.prescriptions.push({
@@ -561,10 +592,15 @@
         this.curStatus = 0
       },
       removeTab(targetName) {
-        this.$confirm("处方删除后不可恢复，是否确认删除", "删除", {
-          confirmButtonText: "确 定",
-          cancelButtonText: "取 消",
-          type: "warning"
+        if(this.curPrescriptions.order_status >= 2){
+          this.$message.error('该处方已经结算或者退费，无法删除')
+          return
+        }
+
+        this.$confirm('处方删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
         }).then(() => {
           let id = 0
           for (let i = 0; i < this.prescriptions.length; i++) {
@@ -593,10 +629,10 @@
             for (let i = 0; i < this.prescriptions.length; i++) {
               if (activeName == this.prescriptions[i].name) {
                 this.curPrescriptions = this.prescriptions[i]
-                if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
+                if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
                   this.curStatus = 1
                 }
-                if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0){
+                if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
                   this.curStatus = 2
                 }
               }
@@ -605,8 +641,7 @@
               this.curPrescriptions = []
               this.curStatus = 0
             }
-          }
-          else {
+          } else {
             let params = {
               'id': id
             }
@@ -632,10 +667,10 @@
                 for (let i = 0; i < this.prescriptions.length; i++) {
                   if (activeName == this.prescriptions[i].name) {
                     this.curPrescriptions = this.prescriptions[i]
-                    if(this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0){
+                    if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
                       this.curStatus = 1
                     }
-                    if(this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0){
+                    if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
                       this.curStatus = 2
                     }
                   }
@@ -651,29 +686,27 @@
           }
 
         })
-          .catch(() => {});
-
-
+          .catch(() => {
+          })
 
       },
       clickTab(index) {
-        if (index == 1){
+        if (index == 1) {
           if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
-            this.$message.error("当前处方为项目，无法切换为药品，需要新开处方")
+            this.$message.error('当前处方为项目，无法切换为药品，需要新开处方')
             return
           }
-        }else{
+        } else {
           if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
-            this.$message.error("当前处方为药品，无法切换为项目，需要新开处方")
+            this.$message.error('当前处方为药品，无法切换为项目，需要新开处方')
             return
           }
 
-
         }
 
         if (index == 1) {
 
-            this.teamList = []
+          this.teamList = []
           this.$refs.tables.clearSelection()
 
           this.showOne = true
@@ -699,21 +732,20 @@
         //用来区分处方属于项目还是药品
         if (this.curPrescriptions.advices.length > 0 && this.curPrescriptions.project.length == 0) {
           this.customTabIndex = 1
-          this.curStatus =1
+          this.curStatus = 1
 
         }
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length > 0) {
           this.customTabIndex = 2
-          this.curStatus =2
+          this.curStatus = 2
         }
         if (this.curPrescriptions.advices.length == 0 && this.curPrescriptions.project.length == 0) {
           // this.customTabIndex = this.rightTab
           this.customTabIndex = index
-          this.curStatus =0
+          this.curStatus = 0
 
         }
 
-
       }, changeAllGoodInfoTableData: function(selection) {
         this.curDrugs = selection
       }, addCharges() {
@@ -723,24 +755,32 @@
         this.curDrugs = selection
       },
       comfirm() {
+        if(this.curPrescriptions.order_status >= 2){
+          this.$message.error('该处方已经结算或者退费，无法继续添加药品或者项目')
+          this.teamList = []
+          this.curDrugs = []
+          this.$refs.tables.clearSelection()
+          this.$refs.multipleTable.clearSelection()
+          return
+        }
 
-        if (this.curStatus == 1  && this.rightTab == 2) {
+        if (this.curStatus == 1 && this.rightTab == 2) {
           this.$message.error('改处方是药品，无法添加项目')
           this.teamList = []
           this.$refs.tables.clearSelection()
           return
         }
 
-        if (this.curStatus ==2 && this.rightTab == 1) {
+        if (this.curStatus == 2 && this.rightTab == 1) {
           this.$message.error('改处方是项目，无法添加药品')
           this.curDrugs = []
           this.$refs.multipleTable.clearSelection()
           return
         }
 
-        for (let i = 0; i < this.teamList.length; i++){
-          for (let a = 0; a < this.curPrescriptions.project.length; a++){
-            if(this.teamList[i].id == this.curPrescriptions.project[a].project_id){
+        for (let i = 0; i < this.teamList.length; i++) {
+          for (let a = 0; a < this.curPrescriptions.project.length; a++) {
+            if (this.teamList[i].id == this.curPrescriptions.project[a].project_id) {
               this.$message.error('改处方存在相同的项目，无法添加相同的项目')
               return
 
@@ -751,10 +791,9 @@
         console.log(this.curDrugs)
         console.log(this.curPrescriptions.advices)
 
-
-        for (let i = 0; i < this.curDrugs.length; i++){
-          for (let a = 0; a < this.curPrescriptions.advices.length; a++){
-            if(this.curDrugs[i].id == this.curPrescriptions.advices[i].id){
+        for (let i = 0; i < this.curDrugs.length; i++) {
+          for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
+            if (this.curDrugs[i].id == this.curPrescriptions.advices[i].id) {
               this.$message.error('改处方存在相同的药品，无法添加相同的药品')
               return
 
@@ -762,9 +801,6 @@
           }
         }
 
-
-
-
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == this.editableTabsValue) {
             var temp = this.deepClone(this.curDrugs)
@@ -775,7 +811,7 @@
               for (let b = 0; b < temp.length; b++) {
                 let obj = {
                   advice_id: 0,
-                  id:  temp[b].id,
+                  id: temp[b].id,
                   drug_name: temp[b].drug_name,
                   single_dose: temp[b].single_dose,
                   delivery_way: temp[b].delivery_way,
@@ -786,7 +822,7 @@
                   single_dose_unit: temp[b].min_unit,
                   prescribing_number_unit: temp[b].min_unit,
                   min_unit: temp[b].min_unit,
-                  medical_insurance_number:temp[b].medical_insurance_number,
+                  medical_insurance_number: temp[b].medical_insurance_number
 
                 }
                 this.prescriptions[i].advices.push(obj)
@@ -805,10 +841,10 @@
                   delivery_way: temp2[b].delivery_way,
                   execution_frequency: temp2[b].execution_frequency,
                   number_days: temp2[b].number_days,
-                  total:temp2[b].total,
-                  price:temp2[b].price,
-                  remark:"",
-                  medical_code:temp2[b].medical_code,
+                  total: temp2[b].total,
+                  price: temp2[b].price,
+                  remark: '',
+                  medical_code: temp2[b].medical_code
                 }
                 console.log(obj)
                 this.prescriptions[i].project.push(obj)

src/xt_pages/outpatientDoctorStation/components/inquiriesDetail.vue

@@ -1,191 +1,298 @@
 <template>
-    <el-dialog
-        title="详情"
-        width="1000px"
-        :visible.sync="visible"
-        :before-close="_close"
-        class="detailDialog"
-    >
-        <el-tabs v-model="activeName">
-            <el-tab-pane label="处方详情" name="first">
-                <el-table :data="tableData" border height="350" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-                    <el-table-column align="center" prop="name" label="类型">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="医嘱名称">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="组">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="每次量">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="单位">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="用法">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="频率">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="天数">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="总量">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="单位">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                    <el-table-column align="center" prop="name" label="限制说明">
-                        <template slot-scope="scope">{{ scope.row.date }}</template>
-                    </el-table-column>
-                </el-table> 
-            </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>
-                </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>
-                    </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>
-                    </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>
-                    </div>
-                </div>
-                <div class="commonCell">
-                    <p>主诉</p>
-                    <div>无</div>
-                </div>
-                <div class="commonCell">
-                    <p>现病史</p>
-                    <div>无</div>
-                </div>
-                <div class="commonCell">
-                    <p>门诊诊断</p>
-                    <div>无</div>
-                </div>
-                <div class="commonCell">
-                    <p>门诊医嘱</p>
-                    <div>无</div>
-                </div>
-                <div class="commonCell">
-                    <p>过敏史</p>
-                    <div>无</div>
-                </div>
-                <div class="commonCell">
-                    <p>既往史</p>
-                    <div>无</div>
-                </div>
-                <div class="commonCell">
-                    <p>个人史</p>
-                    <div>无</div>
-                </div>
-                <div class="commonCell">
-                    <p>家族史</p>
-                    <div>无</div>
-                </div>
-            </el-tab-pane>
+  <el-dialog
+    title="详情"
+    width="1000px"
+    :visible.sync="visible"
+    :before-close="_close"
+    class="detailDialog"
+  >
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="处方详情" name="first">
+        <el-tabs class="preTabs" v-model="editableTabsValue" type="card" @tab-click="tabclickEvent">
+          <el-tab-pane
+            v-for="(item, index) in prescriptions"
+            :key="index"
+            :label="item.name"
+            :name="item.name"
+          >
+          </el-tab-pane>
+
+          <div class="RP">
+            Rp
+          </div>
+          <new-prescription-table ref="prescription_tables"
+                                  :prescription="curPrescriptions"></new-prescription-table>
         </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-tab-pane>
+      <el-tab-pane label="病历详情" name="second">
+        <div class="detailMain">
+          <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;">疾病名称：{{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;">体温：{{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;">血糖：{{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>{{case_history.chief_conplaint}}</div>
+        </div>
+        <div class="commonCell">
+          <p>现病史</p>
+          <div>{{case_history.history_of_present_illness}}</div>
+        </div>
+        <div class="commonCell">
+          <p>门诊诊断</p>
+          <div>{{case_history.diagnostic}}</div>
+        </div>
+        <div class="commonCell">
+          <p>门诊医嘱</p>
+          <div>{{case_history.doctor_advice}}</div>
         </div>
-    </el-dialog>         
+        <div class="commonCell">
+          <p>过敏史</p>
+          <div>{{order.sick_history}}</div>
+        </div>
+        <div class="commonCell">
+          <p>既往史</p>
+          <div>{{case_history.past_history}}</div>
+        </div>
+        <div class="commonCell">
+          <p>个人史</p>
+          <div>{{case_history.personal_history}}</div>
+        </div>
+        <div class="commonCell">
+          <p>家族史</p>
+          <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="hide">确定</el-button>-->
+    </div>
+  </el-dialog>
 </template>
 
+
+
 <script>
-export default {
-    data(){
-        return{
-            visible:false,
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-            }],
-            activeName:'first'
-        }
+  import { getHisPrescriptionInfo } from '@/api/his/his'
+  import NewPrescriptionTable from './newPrescriptionTable'
+  import { uParseTime } from '@/utils/tools'
+
+  export default {
+    components: { NewPrescriptionTable },
+    data() {
+      return {
+        visible: false,
+        activeName: 'first',
+        curPrescriptions: {},
+        prescriptions: [],
+        record_date: '',
+        editableTabsValue: '1',
+        loadingone: false,
+        editableTabs: [{
+          title: '处方1',
+          name: '1'
+        }],
+        tabIndex: 1,
+        hisPatientInfo: {},
+        loadingtwo: false,
+        patientTableData: [{
+          name: '杨美英',
+          mdtrt_id: '1709946'
+        }],
+        patientInfo: { id: 0 },
+        doctor: {},
+        total: 0,
+        state: '未收费',
+        radio: 1,
+        radioStatus: 1,
+        search_input: '',
+        case_history:{},
+        order:{},
+      }
     },
-    methods:{
-        _close: function(done) {
-            // this.clear()
-            done()
-        },
-        clear: function() {
-            this.form.id = 0;
-            this.form.name = "";
-            this.form.intro = "";
-        },
-        show() {
-            // this.clear()
-            this.visible = true
-        },
-        hide() {
-            // this.clear()
-            this.visible = false
-        },
-    }
-}
-</script>
+    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) {
+            this.curPrescriptions = {}
+            var temp = this.deepClone(this.prescriptions[i])
+            this.curPrescriptions = temp
+          }
+        }
+      },
+      deepClone(source) {
+        if (!source && typeof source !== 'object') {
+          throw new Error('error arguments', 'shallowClone')
+        }
+        const targetObj = source.constructor === Array ? [] : {}
+        Object.keys(source).forEach((keys) => {
+          if (source[keys] && typeof source[keys] === 'object') {
+            targetObj[keys] = this.deepClone(source[keys])
+          } else {
+            targetObj[keys] = source[keys]
+          }
+        })
+        return targetObj
+      },
 
-<style lang="scss">
-.detailDialog{
-    .el-dialog__body{
-        padding: 0 20px 30px;
-    }
-    .detailMain{
-        // padding:5px;
-        span{
-            display: inline-block;
+      moreState(tab, event) {
+        if (tab == 'more') {
+          return false
         }
-    }
-    .commonCell{
-        display: flex;
-        line-height: 40px;
-        >p{
-            font-weight: bold;
-            color:#000;
-            width: 80px;
+      },
+
+      _close: function(done) {
+        // this.clear()
+        done()
+      },
+      clear: function() {
+        this.form.id = 0
+        this.form.name = ''
+        this.form.intro = ''
+      },
+      show(id) {
+        let params={
+          id:id,
         }
+        getHisPrescriptionInfo(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } 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]
+              let tempAdvice = []
+              let tempProject = []
+              for (let b = 0; b < prescription.advices.length; b++) {
+                let obj = {
+                  advice_id: prescription.advices[b].id,
+                  drug_name: prescription.advices[b].advice_name,
+                  single_dose: prescription.advices[b].single_dose,
+                  delivery_way: prescription.advices[b].delivery_way,
+                  execution_frequency: prescription.advices[b].execution_frequency,
+                  retail_price: prescription.advices[b].price.toString(),
+                  remark: prescription.advices[b].remark,
+                  prescribing_number: prescription.advices[b].prescribing_number.toString(),
+                  single_dose_unit: prescription.advices[b].single_dose_unit,
+                  prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+                  min_unit: prescription.advices[b].single_dose_unit,
+                  medical_insurance_number: prescription.advices[b].med_list_codg
+
+                }
+                tempAdvice.push(obj)
+              }
+
+              for (let b = 0; b < prescription.project.length; b++) {
+                let obj = {
+                  id: prescription.project[b].id,
+                  project_id: prescription.project[b].project.id,
+                  project_name: prescription.project[b].project.project_name,
+                  statistical_classification: prescription.project[b].statistical_classification,
+                  single_dose: prescription.project[b].single_dose,
+                  delivery_way: prescription.project[b].delivery_way,
+                  execution_frequency: prescription.project[b].execution_frequency,
+                  number_days: prescription.project[b].day,
+                  total: prescription.project[b].count.toString(),
+                  price: prescription.project[b].price,
+                  remark: prescription.project[b].remark,
+                  medical_code: prescription.project[b].project.medical_code
+                }
+                tempProject.push(obj)
+              }
+              let index = i + 1
+              let obj = {
+                id: prescription.id,
+                name: '处方' + index,
+                advices: tempAdvice,
+                project: tempProject,
+                type: response.data.data.prescription[i].type
+              }
+              this.prescriptions.push(obj)
+              this.curPrescriptions = this.prescriptions[0]
+            }
+          }
+        })
+        // this.clear()
+        this.visible = true
+
+
+
+      },
+      hide() {
+        // this.clear()
+        this.visible = false
+      }
     }
-}
+  }
+</script>
+
+<style lang="scss">
+  .detailDialog {
+
+  .el-dialog__body {
+    padding: 0 20px 30px;
+  }
+
+  .detailMain {
+  span {
+    display: inline-block;
+  }
+
+  }
+  .commonCell {
+    display: flex;
+    line-height: 40px;
+
+  > p {
+    font-weight: bold;
+    color: #000;
+    width: 80px;
+  }
+
+  }
+  }
 </style>
 

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,8 +269,10 @@
          return name
       },
       deleteProject(row,i){
-       
-        console.log("row",row)
+        if(this.curPrescriptions.order_status >= 2){
+          this.$message.error('该处方已经结算或者退费，无法删除')
+          return
+        }
         this.$confirm("项目删除后不可恢复，是否确认删除", "删除", {
           confirmButtonText: "确 定",
           cancelButtonText: "取 消",

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -45,10 +45,10 @@
             <el-radio-button label="病历"></el-radio-button>
           </el-radio-group>
           <div class="mainCell fixedCell" style="float:right" v-if="titleType == '处方'">
-            <el-button size="small" @click="open(1)" type="primary" style="margin-left:10px;">保存</el-button>
-            <el-button size="small" @click="open(2)" type="primary">打印</el-button>
-            <el-button size="small" @click="open(4)" type="primary">选择模板</el-button>
-            <el-button size="small" @click="open(5)" type="primary">存模板</el-button>
+            <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-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-if="titleType == '病历'">
             <el-button size="small" @click="opentwo(1)" type="primary" style="margin-left:10px;">保存</el-button>
@@ -62,10 +62,10 @@
         <desk-prescription  :diagnoses="diagnoses" :other_sick="other_sick" :record_date="record_date"
                            ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                            :hisPatientInfo="hisPatientInfo"
-                           v-if="titleType == '处方'" style="flex:1;"></desk-prescription>
+                           v-show="titleType == '处方'" style="flex:1;"></desk-prescription>
         <desk-record :record_date="record_date" :case_history="case_history" :patientInfo="patientInfo"
-                     :hisPatientInfo="hisPatientInfo"   v-if="titleType == '病历'" :detalid="detalid" ref="child"></desk-record>
-                    
+                     :hisPatientInfo="hisPatientInfo"   v-show="titleType == '病历'" :detalid="detalid" ref="child"></desk-record>
+
          <medicalRecord ref='medicalRecord' @func="getMsgFormSon" ></medicalRecord>
          <saveRecordTemplate ref='saveRecordTemplate'></saveRecordTemplate>
       </div>
@@ -113,6 +113,7 @@
         ],
         titleType: '处方',
         patientTableData: [{}],
+        patientTableDataTwo:[{}],
         patientInfo: {},
         hisPatientInfo: {},
         case_history: {},
@@ -134,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) {
@@ -151,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
@@ -181,8 +199,8 @@
             this.$message.error(response.data.msg)
             return false
           } 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
@@ -275,7 +293,8 @@
                   id: prescription.id,
                   name: '处方' + index,
                   advices: tempAdvice,
-                  project: tempProject
+                  project: tempProject,
+                  order_status:prescription.order_status
                 }
                 this.prescriptions.push(obj)
               }
@@ -284,10 +303,12 @@
                 id:0,
                 name: '处方' + 1,
                 advices: [],
-                project: []
+                project: [],
+                orderStatus:0,
               }
               this.prescriptions.push(obj)
             }
+            console.log(this.prescriptions)
 
             this.$refs.prescriptions.setData(this.prescriptions,this.info)
           }
@@ -303,9 +324,20 @@
         //     psn_name:"杨美英",
         //     age:60.7
         // }
+      },open(index) {
+        if (index == 1) {
+          this.$refs.prescriptions.open(1)
+        } else if (index == 2) {
+          this.$refs.prescriptions.open(2)
+        } else if (index == 3) {
+          this.$refs.prescriptions.open(3)
+        } else if (index == 4) {
+          this.$refs.prescriptions.open(4)
+        }
       },
+
       opentwo(index) {
-        console.log("index===",index)
+        console.log("index",index)
         if (index == 1) {
           if(this.patientInfo.id == undefined){
             this.$message.error("请先选择病人")
@@ -377,16 +409,16 @@
       },
       //  getTemplateDetail(id){
       //     getTemplateDetail(id).then(response=>{
-      //         if(response.data.state == 1){  
+      //         if(response.data.state == 1){
       //           var templatedetail =  response.data.data.templateDetail
       //           console.log("templatedetail",templatedetail)
-      //           templatedetail = 
-             
-               
+      //           templatedetail =
+
+
       //         }
       //     })
       //   },
-    }, 
+    },
     created() {
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -15,35 +15,40 @@
       </div>
       <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }"
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-        <el-table-column align="center" width="60" label="序号">
-          <template slot-scope="scope">
-            1
-          </template>
+        <el-table-column align="center" label="序号" width="60" type="index">
+          <!--<template slot-scope="scope">{{ scope.$index +1 }}</template>-->
         </el-table-column>
         <el-table-column align="center" prop="name" label="姓名" width="100">
-          <template slot-scope="scope">{{ scope.row.date }}</template>
+          <template slot-scope="scope">{{ scope.row.patient.name }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="处方日期" width="110">
-          <template slot-scope="scope">{{ scope.row.date }}</template>
-        </el-table-column>
-        <el-table-column align="center" prop="name" label="患者类型">
-          <template slot-scope="scope">{{ scope.row.date }}</template>
+          <template slot-scope="scope"> {{getTimes(scope.row.record_date)}}</template>
+
         </el-table-column>
+        <!--<el-table-column align="center" prop="name" label="患者类型">-->
+          <!--<template slot-scope="scope">{{}}</template>-->
+        <!--</el-table-column>-->
         <el-table-column align="center" prop="name" label="处方号">
-          <template slot-scope="scope">{{ scope.row.date }}</template>
+          <template slot-scope="scope">{{scope.row.prescription_number}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="开立医生">
-          <template slot-scope="scope">{{ scope.row.date }}</template>
+          <template slot-scope="scope">{{scope.row.doctor}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="诊断">
-          <template slot-scope="scope">{{ scope.row.date }}</template>
+          <template slot-scope="scope">{{ scope.row.diagnosis }}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="状态">
-          <template slot-scope="scope">{{ scope.row.date }}</template>
+          <template slot-scope="scope">
+            <div v-if=" scope.row.prescription_status == 1">新建</div>
+            <div v-if=" scope.row.prescription_status == 2">待结算</div>
+            <div v-if=" scope.row.prescription_status == 3">已结算</div>
+            <div v-if=" scope.row.prescription_status == 4">已退费</div>
+
+          </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="操作" width="100">
           <template slot-scope="scope">
-            <el-button size="mini" type="primary" @click="handerDelete">详情</el-button>
+            <el-button size="mini" type="primary" @click="handerShowDetail(scope.row)">详情</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -56,6 +61,7 @@
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
+
       >
       </el-pagination>
       <inquiries-detail ref="inquiriesDetail"></inquiries-detail>
@@ -67,6 +73,7 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import inquiriesDetail from './components/inquiriesDetail'
   import { getHisPrescriptionList } from '@/api/his/his'
+  import { uParseTime } from '@/utils/tools'
 
   export default {
     components: {
@@ -99,14 +106,19 @@
       }
     },
     methods: {
-      handerDelete() {
-        this.$refs.inquiriesDetail.show()
+      getTimes(time) {
+        return uParseTime(time, "{y}-{m}-{d}");
+      },
+      handerShowDetail(row) {
+        console.log(row)
+        this.$refs.inquiriesDetail.show(row.id)
       }, getHisPrescriptionList() {
         getHisPrescriptionList().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
           } else {
+            this.tableData = response.data.data.order
 
           }
         })

src/xt_pages/upload/fast/FastCountry.vue

@@ -1,28 +1,28 @@
 <template>
   <div class="patient-container">
-    <!-- <fast-patients-sidebar
+     <fast-patients-sidebar
       :id="patientID"
       v-on:patient="patientInfoClick()"
       v-on:inspection="inspectionClick()"
-    ></fast-patients-sidebar> -->
+    ></fast-patients-sidebar>
     <!-- <fast-upload-detail v-if="isShow == 1"  :id="patientID"  :is-edit='true' :class='panelClass'></fast-upload-detail> -->
     <el-container>
-      <div style="width:170px">
-        <el-form :inline="true" :model="listQuery">
-          <el-form-item label style="margin-bottom:0;">
-            <el-input v-model.trim="searchVal" placeholder="姓名/透析号" style="width:70%"></el-input>
-            <el-button type="primary" style="padding: 10px 6px;" @click="onSearch">搜索</el-button>
-          </el-form-item>
-        </el-form>
-        <div style="width:170px">
-          <div class="tableTitle">患者列表</div>
-          <el-table :data="tableData" border style="width: 100%;" height="500">
-            <el-table-column prop="date" label="日期" width="80"></el-table-column>
-            <el-table-column prop="name" label="姓名" width="90"></el-table-column>
-          </el-table>
-        </div>
-      </div>
-      
+      <!--<div style="width:170px">-->
+        <!--<el-form :inline="true" :model="listQuery">-->
+          <!--<el-form-item label style="margin-bottom:0;">-->
+            <!--<el-input v-model.trim="searchVal" placeholder="姓名/透析号" style="width:70%"></el-input>-->
+            <!--<el-button type="primary" style="padding: 10px 6px;" @click="onSearch">搜索</el-button>-->
+          <!--</el-form-item>-->
+        <!--</el-form>-->
+        <!--<div style="width:170px">-->
+          <!--<div class="tableTitle">患者列表</div>-->
+          <!--<el-table :data="tableData" border style="width: 100%;" height="500">-->
+            <!--<el-table-column prop="date" label="日期" width="80"></el-table-column>-->
+            <!--<el-table-column prop="name" label="姓名" width="90"></el-table-column>-->
+          <!--</el-table>-->
+        <!--</div>-->
+      <!--</div>-->
+
       <div style="margin-left:20px;flex:1;" >
         <div class="cell clearfix">
           <div class="time">

src/xt_pages/upload/fast/FastPatientsSidebar.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- <div> -->
   <div class="patient-menu">
-    <!-- <el-autocomplete
+    <el-autocomplete
       style="margin:16px 5px"
       popper-class="my-autocomplete"
       v-model.trim="value"
@@ -38,10 +38,10 @@
       :default-expanded-keys="[defaultActive]"
       @node-click="handleNodeClick"
     >
-    </el-tree> -->
+    </el-tree>
     <!-- </div> -->
 
-    
+
   </div>
 </template>
 <script>
@@ -83,7 +83,7 @@ export default {
           ]
         }
       ],
-      
+
     };
   },
   methods: {

src/xt_pages/upload/fast_upload.vue

@@ -6,9 +6,9 @@
     <div class="app-container">
       <div class="service-box">
         <el-tabs v-model="activeName">
-          <!-- <el-tab-pane label="国家质控平台" name="first">
+      <el-tab-pane label="国家质控平台" name="first">
            <fast-country></fast-country>
-          </el-tab-pane> -->
+          </el-tab-pane>
           <el-tab-pane label="省级质控平台" name="first">
             <fast-province></fast-province>
           </el-tab-pane>