Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/his/his.js

 }
 
 
+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",
+  });
+}
+
+
+
+
+
 
 
 

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

           <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"
-                     @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="loadingone" v-if="hisPatientInfo == null || hisPatientInfo.id == 0 " size="small"-->
+                     <!--@click="open(6)"-->
+                     <!--type="primary">挂号-->
+          <!--</el-button>-->
+          <el-button v-loading="loadingtwo" v-if="(curPrescriptions.advices.length >0 || curPrescriptions.project.length >0) && (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.prescription_status == 3">退费</el-button>
         </div>
 
         <div class="mainCenter">
 
                   </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  == 2">已退费</span>
+
                   </div>
                 </div>
                 <div class="centerRight">
                   <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>
               }
               this.prescriptions.push(obj)
               this.curPrescriptions = this.prescriptions[0]
+              this.total = 0
+              this.total = this.getTotalOne()
+              console.log(this.total)
 
             }
           }
             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')
           }
         })
         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
                 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/summaryDetail.vue

           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

             <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">
         </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>
     delHisPrescription,
     getInitData,
     getPatientInfo,
-    getSchedulePatientList,
-
+    getSchedulePatientList
   } from '@/api/his/his'
   import { getDictionaryDataConfig } from '@/utils/data'
   import prescriptionTable from './prescriptionTable'
     },
     data() {
       return {
-        register_type:"",
+        register_type: '',
         value: '',
         form: {
           name: ''
         teamList: [],
         doctors: [],
         departMent: [],
-        curStatus: 0
+        curStatus: 0,
+        register_types: [
+          { id: 1, name: '医保' },
+          { id: 2, name: '自费' }
+
+        ]
       }
     },
     methods: {
       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])
             }
           }
             this.advices_template = response.data.data.advices_template
             this.doctors = response.data.data.doctors
 
-
           }
         })
 
         }
       },
       clearData() {
-        console.log("111111")
+        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.departmentValue = info.departments
+        this.register_type = info.register_type
 
 
         // console.log(this.$refs)
         }
       },
       open(index) {
-        if(this.doctorValue.length <= 0){
-          this.$message.error("医生不能为空")
+        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
         }
 
             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++) {
         this.curStatus = 0
       },
       removeTab(targetName) {
-        this.$confirm("处方删除后不可恢复，是否确认删除", "删除", {
-          confirmButtonText: "确 定",
-          cancelButtonText: "取 消",
-          type: "warning"
+        this.$confirm('处方删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
         }).then(() => {
           let id = 0
           for (let i = 0; i < this.prescriptions.length; i++) {
             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
                 }
               }
               this.curPrescriptions = []
               this.curStatus = 0
             }
-          }
-          else {
+          } else {
             let params = {
               'id': id
             }
                 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
                     }
                   }
           }
 
         })
-          .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
         //用来区分处方属于项目还是药品
         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() {
       },
       comfirm() {
 
-        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
 
         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
 
           }
         }
 
-
-
-
         for (let i = 0; i < this.prescriptions.length; i++) {
           if (this.prescriptions[i].name == this.editableTabsValue) {
             var temp = this.deepClone(this.curDrugs)
               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,
                   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)
                   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

 <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;">处方号：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>
-    </el-dialog>         
+        <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-tabs>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="hide">取 消</el-button>
+      <el-button type="primary" :loading="submitLoading" @click="submitAction()">保 存</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'
+
+  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: ''
+      }
     },
-    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: {
+      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.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/pastInquiries.vue

       </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>
         style="margin-top:20px;float: right"
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
+
       >
       </el-pagination>
       <inquiries-detail ref="inquiriesDetail"></inquiries-detail>
   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: {
       }
     },
     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
 
           }
         })