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

src/api/his/advice.js

@@ -7,3 +7,11 @@ export function getTodayAdviceList(params) {
     params: params
   })
 }
+
+export function getPharmacyBaseDrug(params) {
+  return request({
+    url: '/api/advice/getpharmacybasedrug',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -210,7 +210,7 @@
       <!--   @row-click="cellMouseEnter" -->
       <!--&lt;!&ndash;:header-cell-style="{ backgroundColor: 'rgb(64, 158, 255)', color: 'white'}"&ndash;&gt;@current-change="selectRow"-->
       <el-table
-        v-if="his_is_open !=1"
+        v-if="his_is_open !=1 && is_advice_open!=1"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
         :data="doctor_advices"
         border
@@ -303,6 +303,10 @@
       </el-table>
 
 
+
+
+
+
       <el-table
         v-if="his_is_open  == 1 || is_advice_open == 1"
         :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
@@ -404,87 +408,6 @@
 
       </el-table>
 
-      <!-- 医嘱列表 end -->
-
-      <!-- 新医嘱列表 -->
-      <!-- <div class="orderTable">
-        <table class="table">
-          <tr @click="cancelAdviceSelect" class="tableTh">
-            <th width="8%">开嘱医生</th>
-            <th width="12%">开始时间</th>
-            <th width="52%">医嘱内容</th>
-            <th width="12%">执行时间</th>
-            <th width="8%">执行护士</th>
-            <th v-if="template_id != 6" width="8%">核对人员</th>
-          </tr>
-          <template v-for="(group, group_index) in advice_groups">
-            <tr
-              v-for="(advice, advice_index) in group.advices"
-              :key="advice.id"
-              :class="{ 'row-class-active': current_group_index == group_index && current_advice_index < 0 }"
-            >
-              <td
-                v-if="advice_index == 0"
-                :rowspan="group.advices.length"
-                @click="selectGroupAdviceAction(group_index, -1, null,group)"
-              >
-                <span v-if="advice.parent_id==0">{{getXuserName(advice.advice_doctor)}}</span>
-                <span v-else></span>
-              </td>
-
-              <td
-                v-if="advice_index == 0"
-                :rowspan="group.advices.length"
-                @click="selectGroupAdviceAction(group_index, -1, null,group)"
-              >
-                <span>{{uParseTime(advice.start_time, '{m}-{d} {h}:{i}')}}</span>
-              </td>
-
-              <td
-                :class="{ 'advice_content': advice.parent_id == 0, 'subadvice_content': advice.parent_id > 0, 'td-active':current_group_index == group_index  && advice.is_selected == 1 }"
-                @click="selectAdviceAction(group_index, advice_index, advice)"
-              >
-                <div class="txt">
-                  <span>{{advice.advice_name }}</span>
-                  <span
-                    v-if="advice.advice_desc"
-                  >({{ advice.advice_desc }}{{advice.drug_spec_unit}})</span>
-                  <span
-                    v-if="advice.prescribing_number"
-                  >&nbsp;&nbsp;{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
-                  <span
-                    v-if="advice.single_dose && template_id == 6"
-                  >{{advice.single_dose}}{{advice.single_dose_unit}}</span>
-                  <span
-                    v-if="advice.single_dose && template_id != 6"
-                  >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
-
-                  <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
-                  <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
-                  <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{advice.remark}})</span>
-                </div>
-              </td>
-
-              <td
-                :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
-                @click="selectAdviceAction(group_index,advice_index, advice)"
-              >{{uParseTime(advice.execution_time, '{m}-{d} {h}:{i}')}}</td>
-
-              <td
-                :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
-                @click="selectAdviceAction(group_index,advice_index, advice)"
-              >{{getXuserName(advice.execution_staff)}}</td>
-              <td
-                v-if="template_id != 6"
-                :class="{'td-active':current_group_index == group_index  && advice.is_selected == 1}"
-                @click="selectAdviceAction(group_index,advice_index, advice)"
-              >{{getXuserName(advice.checker)}}</td>
-            </tr>
-          </template>
-        </table>
-      </div>-->
-      <!-- 新医嘱列表 -->
-
 
       <!-- 新增医嘱(子药)表单 || 新增子药表单 -->
       <!-- 医嘱表单 -->
@@ -1413,8 +1336,7 @@
               this.currentRow = null
               this.setCurrent()
               this.hideForm()
-              console.log("子药23223332323332",this.form.parent_id)
-              console.log("232322332323232",this.form.parent_id)
+            
 
               if (this.form.parent_id > 0) {
                 var spliceIndex = -1
@@ -1427,7 +1349,7 @@
                     break
                   }
                 }
-                console.log("spliceIndex233232323232",spliceIndex)
+               
                 if (spliceIndex > -1) {
                   spliceIndex += 1
                   if (spliceIndex === this.doctor_advices.length) {
@@ -1440,7 +1362,7 @@
                     }
                   }
 
-                  console.log("doctore_advic4233232323232",this.doctor_advices)
+                 
                 }
               } else {
                 this.doctor_advices.unshift(response.data.data.advice)
@@ -2056,6 +1978,8 @@
       }
       ,
       show(his_is_open,is_advice_open) {
+        console.log("his_is_open233232323232323322323",his_is_open)
+        console.log("is_advice_open233232323232323322323",is_advice_open)
         this.his_is_open = his_is_open
         this.is_advice_open = is_advice_open
         this.isVisibility = true
@@ -2366,14 +2290,6 @@
                  this.doctor_advices.push(his_advices[i])
               }
             }
-
-            this.$notify({
-              title: '成功',
-              message: '新增医嘱成功',
-              type: 'success',
-              duration: 2000
-            })
-
             this.currentIndex = -1
             this.currentRow = null
             this.setCurrent()

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -19,9 +19,9 @@
           "
           :paramsObj="invoiceParams"
         ></printOne>
-        <printTwo v-if="org_id == 10215 ||  org_id == 0" :paramsObj="invoiceParams"></printTwo>
+        <printTwo v-if="org_id == 10215 " :paramsObj="invoiceParams"></printTwo>
         <printThree
-          v-if="org_id == 10265 || org_id == 4 || org_id == 9675"
+          v-if="org_id == 10265 || org_id == 4 || org_id == 9675 ||  org_id == 0"
           :paramsObj="invoiceParams"
         ></printThree>
       </div>

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -191,7 +191,7 @@
         </div> -->
         <div style="position: absolute;top:370px;left:40px">
             <!-- 预交款合计 -->
-            预交款合计:0.00
+            预交款合计:{{pre_pay_money}}
         </div>
         <div style="position: absolute;top:370px;left:250px">
             <!-- 补交款 -->
@@ -244,6 +244,7 @@ export default {
           out_hosptial_time:'',
           number:'',
           insutype:'',
+          pre_pay_money:"",
         }
     },
     mounted(){
@@ -302,7 +303,7 @@ export default {
               this.id_card_no = this.list.his_hospital_record.id_card_no
               this.number = this.list.his_hospital_record.number
               this.psn_no = this.list.his_hospital_record.psn_no
-
+              this.pre_pay_money = this.list.pre_pay_money
 
               this.balance_accounts_type = this.list.his_hospital_record.balance_accounts_type
               this.gend= this.list.his_hospital_record.gend

src/xt_pages/hospitalStation/settlementTemplate/hospitalSettlePrint.vue

@@ -557,7 +557,7 @@
                 <td>&nbsp;{{info.bed_cost_total?info.bed_cost_total:''}}</td>
                 <td>&nbsp;{{getJiaTotal('床位费')}}</td>
                 <td>&nbsp;{{getYiTotal('床位费')}}</td>
-                <td>&nbsp;{{info.bed_cost_self_total?info.bed_cost_self_total:''}}</td>
+                <td>&nbsp;{{getBingTotal('床位费')}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
@@ -573,7 +573,7 @@
                 <td>&nbsp;{{info.check_cost_total?info.check_cost_total:''}}</td>
                 <td>&nbsp;{{getJiaTotal('检查费')}}</td>
                 <td>&nbsp;{{getYiTotal('检查费')}}</td>
-                <td>&nbsp;{{info.check_cost_self_total?info.check_cost_self_total:""}}</td>
+                <td>&nbsp;{{getBingTotal('检查费')}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
@@ -581,7 +581,7 @@
                 <td>&nbsp;{{info.laboratory_cost_total?info.laboratory_cost_total:''}}</td>
                 <td>&nbsp;{{getJiaTotal('化验费')}}</td>
                 <td>&nbsp;{{getYiTotal('化验费')}}</td>
-                <td>&nbsp;{{info.laboratory_cost_self_total?info.laboratory_cost_self_total:''}}</td>
+                <td>&nbsp;{{getBingTotal('化验费')}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
@@ -589,7 +589,7 @@
                 <td>&nbsp;{{info.treat_cost_total?info.treat_cost_total:''}}</td>
                 <td>&nbsp;{{getJiaTotal('治疗费')}}</td>
                 <td>&nbsp;{{getYiTotal('治疗费')}}</td>
-                <td>&nbsp;{{info.treat_cost_self_total?info.treat_cost_self_total:''}}</td>
+                <td>&nbsp;{{getBingTotal('治疗费')}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
@@ -597,7 +597,7 @@
                 <td>&nbsp;{{info.operation_cost_total?info.operation_cost_total:''}}</td>
                 <td>&nbsp;{{getJiaTotal('手术费')}}</td>
                 <td>&nbsp;{{getYiTotal('手术费')}}</td>
-                <td>&nbsp;{{info.operation_cost_self_total?info.operation_cost_self_total:""}}</td>
+                <td>&nbsp;{{getBingTotal('手术费')}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
@@ -613,7 +613,7 @@
                 <td>&nbsp;{{info.material_cost_total?info.material_cost_total:""}}</td>
                 <td>&nbsp;{{getJiaTotal('材料费')}}</td>
                 <td>&nbsp;{{getYiTotal('材料费')}}</td>
-                <td>&nbsp;{{info.material_cost_self_total?info.material_cost_self_total:""}}</td>
+                <td>&nbsp;{{getBingTotal('材料费')}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
@@ -621,7 +621,7 @@
                 <td>&nbsp;{{info.western_medicine_cost_total?info.western_medicine_cost_total:""}}</td>
                 <td>&nbsp;{{getJiaTotal('西药费')}}</td>
                 <td>&nbsp;{{getYiTotal('西药费')}}</td>
-                <td>&nbsp;{{info.western_medicine_cost_self_total?info.western_medicine_cost_self_total:""}}</td>
+                <td>&nbsp;{{getBingTotal('西药费')}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
@@ -637,7 +637,7 @@
                 <td>&nbsp;{{info.chinese_traditional_medicine_cost_total?info.chinese_traditional_medicine_cost_total:""}}</td>
                 <td>&nbsp;{{getJiaTotal('中成药费')}}</td>
                 <td>&nbsp;{{getYiTotal('中成药费')}}</td>
-                <td>&nbsp;{{info.chinese_traditional_medicine_cost_self_total?info.chinese_traditional_medicine_cost_self_total:""}}</td>
+                <td>&nbsp;{{getBingTotal('中成药费')}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
@@ -661,7 +661,7 @@
                 <td>&nbsp;{{info.other_cost_total?info.other_cost_total:""}}</td>
                 <td>&nbsp;{{getJiaTotal('其他费')}}</td>
                 <td>&nbsp;{{getYiTotal('其他费')}}</td>
-                <td>&nbsp;{{info.other_cost_self_total?info.other_cost_self_total:""}}</td>
+                <td>&nbsp;{{getBingTotal('其他费')}}</td>
                 <td>&nbsp;</td>
               </tr>
               <tr>
@@ -892,6 +892,18 @@ export default {
         return ""
       }
       return total
+    },getBingTotal(name){
+      let total = 0.00
+      for(let i = 0; i  < this.list.length; i++){
+        if(name == this.list[i].med_chrgitm_name){
+          total = this.list[i].bingTotal
+
+        }
+      }
+      if (total == 0){
+        return ""
+      }
+      return total
     },
     getNaty(naty){
       switch (naty){

src/xt_pages/hospitalStation/statementPrint.vue

@@ -501,7 +501,7 @@ export default {
                 that.info['his'] = response.data.data.his_hospital
 
                 console.log("22222222")
-
+                that.list = []
                 //获取所有项目类型进行去重
                 let med_chrgitm_types = []
                 for (let i = 0; i < response.data.data.order_infos.length; i++) {

src/xt_pages/outpatientCharges/listPrint.vue

@@ -136,7 +136,7 @@
                 obj.bingTotal = this.getBingTotal(tempDetails)
                 obj.otherTotal = this.getOtherTotal(tempDetails)
 
-                obj.details = this.setNewData(tempDetails)
+                obj.details = this.set10265NewData(tempDetails)
                 this.list.push(obj)
               }
               console.log(this.list)
@@ -251,7 +251,8 @@
           total = Number(total) + Number(parseFloat(items[i].cnt) * parseFloat(items[i].pric))
         }
         return total.toFixed(2)
-      },setNewData(details) {
+      },
+      setNewData(details) {
         let drug_ids = []
         let project_ids = []
 
@@ -259,13 +260,15 @@
           if (details[i].advice && details[i].advice.id > 0 && details[i].advice.prescription && details[i].advice.prescription.type == 1) { //药品
             let obj = {
               id: details[i].advice.drug_id,
-              price: details[i].advice.price
+              price: details[i].advice.price,
+              lv: details[i].chrgitm_lv,
             }
             drug_ids.push(obj)
           } else if (details[i].project && details[i].project.id > 0 && details[i].project.prescription && details[i].project.prescription.type == 2) { //项目
             let obj = {
               id: details[i].project.project_id,
-              price: details[i].project.price
+              price: details[i].project.price,
+              lv: details[i].chrgitm_lv,
 
             }
             project_ids.push(obj)
@@ -283,17 +286,17 @@
         let new_project_ids = this.unique(project_ids)
         let list = []
 
-        // console.log('ids')
-        // console.log(new_drug_ids)
-        // console.log(new_project_ids)
-        // console.log('ids')
+        console.log('ids')
+        console.log(new_drug_ids)
+        console.log(new_project_ids)
+        console.log('ids')
 
         if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
           for (let i = 0; i < new_drug_ids.length; i++) {
             let obj = {}
             let count = 0
             for (let a = 0; a < details.length; a++) {
-              if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price) {
+              if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price ) {
                 obj['name'] = details[a].advice.advice_name
                 // obj['spec'] = details[a].advice.drug.drug_spec
                 obj['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
@@ -344,6 +347,102 @@
         return list
 
       },
+      set10265NewData(details) {
+        let drug_ids = []
+        let project_ids = []
+
+        for (let i = 0; i < details.length; i++) {
+          if (details[i].advice && details[i].advice.id > 0 && details[i].advice.prescription && details[i].advice.prescription.type == 1) { //药品
+            let obj = {
+              id: details[i].advice.drug_id,
+              price: details[i].advice.price,
+              lv: details[i].chrgitm_lv,
+            }
+            drug_ids.push(obj)
+          } else if (details[i].project && details[i].project.id > 0 && details[i].project.prescription && details[i].project.prescription.type == 2) { //项目
+            let obj = {
+              id: details[i].project.project_id,
+              price: details[i].project.price,
+              lv: details[i].chrgitm_lv,
+
+            }
+            project_ids.push(obj)
+
+          }
+
+        }
+        //
+        // console.log('old ids')
+        // console.log(drug_ids)
+        // console.log(project_ids)
+        // console.log('old ids')
+
+        let new_drug_ids = this.unique10265(drug_ids)
+        let new_project_ids = this.unique10265(project_ids)
+        let list = []
+
+        console.log('ids')
+        console.log(new_drug_ids)
+        console.log(new_project_ids)
+        console.log('ids')
+
+        if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
+          for (let i = 0; i < new_drug_ids.length; i++) {
+            let obj = {}
+            let count = 0
+            for (let a = 0; a < details.length; a++) {
+              if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price && new_drug_ids[i].lv == details[a].chrgitm_lv) {
+                obj['name'] = details[a].advice.advice_name
+                // obj['spec'] = details[a].advice.drug.drug_spec
+                obj['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
+                obj['unit'] = details[a].advice.drug.max_unit
+                obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
+                obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
+                obj['price'] = parseFloat(details[a].pric)
+                obj['is_total'] = 2
+                count = count + details[a].cnt
+              }
+            }
+            obj['count'] = count
+            list.push(obj)
+          }
+        }
+
+        if (new_drug_ids.length == 0 && new_project_ids.length > 0) {
+          for (let i = 0; i < new_project_ids.length; i++) {
+            let obj = {}
+            let count = 0
+            for (let a = 0; a < details.length; a++) {
+              if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price && new_project_ids[i].lv == details[a].chrgitm_lv) {
+                if( details[a].project.type == 2){
+                  obj['name'] = details[a].project.project.project_name
+                  obj['spec'] = ''
+                  obj['unit'] = details[a].project.project.unit
+
+
+                }else if(details[a].project.type == 3){
+                  obj['name'] = details[a].project.good_info.good_name
+                  obj['spec'] = ''
+                  obj['unit'] = details[a].project.good_info.packing_unit
+
+                }
+                obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
+                obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
+                obj['price'] = parseFloat(details[a].pric)
+                obj['is_total'] = 2
+
+                count = count + details[a].cnt
+              }
+            }
+            obj['count'] = count
+            list.push(obj)
+          }
+        }
+
+        return list
+
+      },
+
       getType(med_chrgitm_type) {
         switch (med_chrgitm_type) {
           case '01':
@@ -415,11 +514,12 @@
 
             break
           case "03":
-            return '自费'
+            return '丙类'
             break
 
         }
-      }, unique(array) {
+      },
+      unique(array) {
         // res用来存储结果
         var res = []
         for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
@@ -435,6 +535,23 @@
         }
         return res
       },
+      unique10265(array) {
+        // res用来存储结果
+        var res = []
+        for (var i = 0, arrayLen = array.length; i < arrayLen; i++) {
+          for (var j = 0, resLen = res.length; j < resLen; j++) {
+            if (array[i].id === res[j].id && array[i].price === res[j].price && array[i].lv === res[j].lv) {
+              break
+            }
+          }
+          // 如果array[i]是唯一的，那么执行完循环，j等于resLen
+          if (j === resLen) {
+            res.push(array[i])
+          }
+        }
+        return res
+      },
+
       printThisPage() {
         if(this.org_id != 10106){
           if(this.org_id == 10215){

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -766,10 +766,9 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
-       
+       console.log("val232332322323323232323",val)
         var arr = []
        
-       
         for(let i=0;i<this.recordInfo.recordData.length;i++){
            arr.push(this.recordInfo.recordData[i].good_id)
         }
@@ -798,6 +797,7 @@ export default {
             this.recordInfo.recordData[i].remark = val.remark
             this.recordInfo.recordData[i].buy_price = val.buy_price
             this.recordInfo.recordData[i].stock_count = total_count
+            this.recordInfo.recordData[i].license_number = val.number
             if(val.packing_price == 0){
               this.recordInfo.recordData[i].price =""
             }else{

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -782,7 +782,7 @@
             this.recordInfo.recordData[i].name = val.specification_name  +"/"+val.packing_unit
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
-            this.recordInfo.recordData[i].license_number = ""
+            this.recordInfo.recordData[i].license_number = val.number
             this.recordInfo.recordData[i].warehouse_info_id = 0
             this.recordInfo.recordData[i].buy_price = val.buy_price
             this.recordInfo.recordData[i].stock_count = total_count

src/xt_pages/stock/test.vue

@@ -30,10 +30,10 @@
             @change="startTimeChange"
           ></el-date-picker>
 
-        <el-input @keyup.enter.native='searchAction' v-model="keywords"
+        <!-- <el-input @keyup.enter.native='searchAction' v-model="keywords"
                   class="filter-item"/>
         <el-button  class="filter-item" type="primary" icon="el-icon-search"
-                   @click="searchAction">搜索</el-button>
+                   @click="searchAction">搜索</el-button> -->
           </div>
 
           <el-table
@@ -52,16 +52,55 @@
             ref="singleTable"
             @current-change="handleCurrentChange"
           >
-            <el-table-column align="center" prop="name" label="姓名" wdith="89">
-              <template slot-scope="scope"></template>
+            <el-table-column align="center" prop="name" label="名称" wdith="89">
+              <template slot-scope="scope">
+                {{scope.row.drug_name}}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="规格" wdith="89">
+              <template slot-scope="scope">
+                {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
+              </template>
+            </el-table-column>
+            <el-table-column align="center" prop="name" label="库存" wdith="89">
+              <template slot-scope="scope">
+                {{getWarehoseInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
+              </template>
             </el-table-column>
           </el-table>
         </div>
       </div>
       <div class="mainRight">
         <el-tabs v-model="titleType">
-          <el-tab-pane label="明细" name="明细"></el-tab-pane>
-          <el-tab-pane label="汇总" name="汇总"></el-tab-pane>
+          <el-tab-pane label="明细" name="明细">
+           
+           <el-table
+            :data="tableData"
+            border
+            style="width: 100%">
+            <el-table-column prop="date" label="序号" width="180">
+              <template slot-scope="scope">
+
+              </template>
+            </el-table-column>
+            <el-table-column  prop="name" label="单据编码" width="180">
+            </el-table-column>
+            <el-table-column prop="address" label="患者姓名">
+            </el-table-column>
+            <el-table-column prop="address" label="单次用量">
+            </el-table-column>
+             <el-table-column prop="address" label="用法">
+            </el-table-column>
+             <el-table-column prop="address" label="频率">
+            </el-table-column>
+             <el-table-column prop="address" label="天数">
+            </el-table-column>
+            <el-table-column prop="address" label="总量">
+            </el-table-column>
+          </el-table>
+
+          </el-tab-pane>
+         
         </el-tabs>
       </div>
     </div>
@@ -69,9 +108,9 @@
 </template>
 
 <script>
-import { getTodayAdviceList } from "@/api/his/advice";
+import { getTodayAdviceList,getPharmacyBaseDrug } from "@/api/his/advice";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-
+const moment = require('moment')
 export default {
   components: {
     BreadCrumb,
@@ -88,7 +127,8 @@ export default {
       titleType: "明细",
       patient_id: 0,
       keywords: "",
-      start_time:new Date(),
+      start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+      tableData:[],
     };
   },
 
@@ -131,8 +171,8 @@ export default {
       this.getPatientList();
     },
     handleCurrentChange(row) {
-      this.patient_id = row.id;
-     
+    
+      this.getPharmacyBaseDrug(row.id)
     },
     getlist(){
       var params = {
@@ -140,8 +180,58 @@ export default {
         keywords:this.keywords,
       }  
       getTodayAdviceList(params).then(response=>{
-
+         if(response.data.state == 1){
+           var list =  response.data.data.list
+           this.$refs.singleTable.setCurrentRow(list[0])
+           this.patientTableData = list
+         }
       }) 
+    }, 
+     getWarehoseInfo(arr, max_unit, min_unit, min_number) {
+      var total = 0;
+      var max_str = "";
+      var min_str = "";
+      if (arr.length > 0) {
+        for (let i = 0; i < arr.length; i++) {
+          total += parseInt(arr[i].stock_max_number+ arr[i].stock_min_number);
+        }
+      }
+      if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
+      }
+      return max_str + min_str;
+    },
+    startTimeChange(){
+
+    },
+    getPharmacyBaseDrug(drug_id){
+      var params = {
+        start_time:this.start_time,
+        drug_id:drug_id,
+      }
+      console.log("param23232323322332",params)
+      getPharmacyBaseDrug(params).then(response=>{
+        if(response.data.state == 1){
+           var advicelist = response.data.data.advicelist
+           console.log("advicelist23323232323323",advicelist)
+           var hisAdviceList = response.data.data.hisAdviceList
+           console.log("hisadvicelist23233232233",hisAdviceList)
+           var patient = response.data.data.patient
+           console.log("patient23322323232332",patient)
+        }
+      })
     }
   },
   created() {