新分支

src/api/drug/drug.js

   })
 }
 
+export function deleteSelfWarehouse(id,params){
+ 
+  return request({
+    url:"/api/drug/deleteselfwarehouse?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
 export function toCheckSelfWarehousingInfo(params){
  
   return request({
     method:"get",
     params:params,
   })
+}
+
+export function getAllSelfDrugWarehouseOut(params){
+  
+  return request({
+    url:"/api/drug/getallselfdrugwarehouseout",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function deleteSelfWarehouseOutList(id,params){
+
+  return request({
+    url:"/api/drug/deleteselfwarehouseoutlist?id="+id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function getSelfDrugWarehouseOutDetailByPatientId(params){
+
 }

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue

 
             var delghTwo = 0
             if (this.records[recordIndex].advices && this.records[recordIndex].advices.length < 14) {
-              delghTwo = 14 - this.records[recordIndex].advices.length
+              delghTwo =  this.records[recordIndex].advices.length
             } else {
               delghTwo = 0
             }

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

         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo(patient.id)">{{ patient.name }}</el-button>
            
-            <span style="position: absolute;left: 20%;top: 3%">
+            <span style="position: absolute;left: 20%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702">
               透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
             </span>
 
+            <span style="position: absolute;left: 20%;top: 3%" v-if="this.$store.getters.xt_user.template_info.org_id ==0||this.$store.getters.xt_user.template_info.org_id==10702">
+              透前体重：{{predialysis&&(predialysis.weight_before-predialysis.additional_weight).toFixed(2)?(predialysis.weight_before-predialysis.additional_weight).toFixed(2):"" }} kg
+            </span>
+
           
            
             <span style="position: absolute;left: 30%;top: 3%">

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

             v-if="isShow('脉搏1')"
           >
             <template slot-scope="scope">
-              {{ scope.row.pulse_frequency_one ? scope.row.pulse_frequency_one : "/" }}
+              {{ scope.row.monitor_pulse_frequency_one ? scope.row.monitor_pulse_frequency_one : "/" }}
             </template>
           </el-table-column>
 
           <el-col :span="8" v-if="isShow('脉搏1')">
             <el-form-item label="脉搏(次/分)：" :prop="isName('脉搏')"
               :rules="isCheckmust('脉搏')">
-              <el-input v-model="form.pulse_frequency_one"></el-input>
+              <el-input v-model="form.monitor_pulse_frequency_one"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="isShow('呼吸频率')">

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

                 class="under_line"
                 style="width: 70px; text-align: center"
               >
-                {{ predialysis.weight_before != '' && predialysis.additional_weight !='' ? (predialysis.weight_before - predialysis.additional_weight).toFixed(1) : ""}}
+              <span v-if="predialysis!=null && predialysis.weight_before >0">
+                    {{ (predialysis.weight_before - predialysis.additional_weight).toFixed(1)}}
+              </span>
+                <!-- {{ predialysis.weight_before > 0? (predialysis.weight_before - predialysis.additional_weight).toFixed(1) : ""}} -->
               </div>
               kg
             </div>

src/xt_pages/stock/selfPreparedMedicine/editWarehouseOut.vue

           >
 
           <el-button
-          size="small"
-          type="primary"
-          v-if="is_check == 1 && parseInt(this.$route.query.is_sys) == 0"
-          @click="toReturnCheck"
-          class="filter-item"
-          >反 审 核</el-button
-        >
+            size="small"
+            type="primary"
+           v-if="is_check == 1 && parseInt(this.$route.query.is_sys) == 0"
+            @click="toReturnCheck()"
+            class="filter-item"
+            >反审核</el-button>
        
         </div>
       </div>
         showReturnCheck:false,
         patientList:[],
         patient_id:"",
-        numberList:[]
+        numberList:[],
+        is_check:0,
+        is_sys:0,
       };
     },
     methods: {
         getSelfDrugWarehouseOutById(id).then(response=>{
           if(response.data.state ==1){
               var outInfo = response.data.data.outInfo
+              if(outInfo.is_check == 2){
+               this.showCheck = true
+               this.showReturnCheck = false
+             }
+             if(outInfo.is_check == 1){
+                this.showCheck = false
+                this.showReturnCheck = true
+             }
               this.manufacturerList = response.data.data.manufacturerList
               this.dealerList = response.data.data.dealerList
               this.drugTypeList = response.data.data.drugTypeList
     created() {
       var id =  this.$route.query.id
       var is_sys = this.$route.query.is_sys
+      this.is_sys = is_sys
       var is_check = this.$route.query.is_check
-      console.log("id",id)
-      console.log("is_sys",is_sys)
-      console.log("is_check",is_check)
+      this.is_check = is_check
+     
       this.drugTypeList = getDictionaryDataConfig("system", "drug_type");
       this.getallPatientList() 
       this.getSelfDrugWarehouseOutById(id)

src/xt_pages/stock/selfPreparedMedicine/patientDrugQuery.vue

+<template>
+    <div class="main-contain">
+        <div class="app-container" style="padding-left:0px;margin:0px;"  v-loading="loading"
+        element-loading-text="拼命加载中">
+         <el-container>
+               <div style="width:27%">
+                <el-row style="white-space:nowrap;display:flex;line-height: 31px;">
+                   <span style="font-size:14px;color:#606266"> 时间:</span>
+                    <el-date-picker
+                      size="small"
+                      v-model="start_time"
+                      prefix-icon="el-icon-date"
+                      :editable="false"
+                      type="date"
+                      placeholder="选择日期时间"
+                      align="right"
+                      format="yyyy-MM-dd"
+                      value-format="yyyy-MM-dd"
+                      @change="startTimeChange"
+                      :clearable="false"
+                    ></el-date-picker> 
+                      <span>-</span> 
+                      <el-date-picker
+                        size="small"
+                        v-model="end_time"
+                        prefix-icon="el-icon-date"
+                        :editable="false"
+                        type="date"
+                        placeholder="选择日期时间"
+                        align="right"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        @change="endTimeChange"
+                    ></el-date-picker>
+                </el-row>
+                <el-row></el-row>
+                 <el-row>
+                   <el-col :span="24" style="display:flex">
+                      <el-input style="margin-top:10px;margin-bottom:10px" placeholder="请输入患者姓名" v-model="keyword"></el-input>&nbsp;
+                      <el-button style="height: 35px;margin-top: 10px;margin-bottom: 10px;" type="primary" @click="onSearch" icon="el-icon-search">搜索</el-button>
+                   </el-col>
+                  </el-row>
+
+                  <el-row>
+                    
+                      <el-table
+                          ref="singleTable"
+                          :data="patientList"
+                          highlight-current-row
+                           border
+                          @current-change="handleCurrentChange"
+                           height="440"
+                           :row-style="{ color: '#303133' }"
+                          :header-cell-style="{
+                            backgroundColor: 'rgb(245, 247, 250)',
+                            color: '#606266'
+                          }"
+                        >
+                     <el-table-column
+                       prop="date"
+                       label="序号"
+                      align="center"
+                      >
+                      <template slot-scope="scope">
+                        {{scope.$index + 1}}
+                      </template>
+                    </el-table-column>
+                     <el-table-column
+                       prop="name"
+                      label="姓名"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.name}}
+                      </template>
+                     </el-table-column>
+
+                     </el-table>
+                  </el-row>
+               </div>
+
+                 <el-main>
+                  <div class="main newMain">
+                      
+                        
+                  <el-tabs>
+
+                   <el-tab-pane label="患者使用列表">
+                     <div style="float:right;margin-bottom:10px">
+                      <el-button type="primary" @click="toPrint">打印</el-button>
+                      <el-button type="primary" @click="exportList">导出</el-button>
+                      </div>
+                     <el-table
+                          :data="tableList"
+                          highlight-current-row
+                           border
+                           height="440"
+                           :row-style="{ color: '#303133' }"
+                          :header-cell-style="{
+                            backgroundColor: 'rgb(245, 247, 250)',
+                            color: '#606266'
+                          }"
+                        >
+                     <el-table-column
+                       prop="date"
+                       label="名称"
+                      align="center"
+                      >
+                      <template slot-scope="scope">
+                        {{scope.row.drug_name}}
+                      </template>
+                    </el-table-column>
+                     <el-table-column
+                       prop="name"
+                      label="生产厂家"
+                      align="center">
+                      <template slot-scope="scope">
+                        {{scope.row.manufacturer}}
+                      </template>
+                     </el-table-column>
+                      <el-table-column
+                       prop="name"
+                      label="规格&单位"
+                      align="center">
+                      <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
+                       prop="name"
+                      label="数量"
+                      align="center">
+                      <template slot-scope="scope">
+                         {{getCount(scope.row.child,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}
+                      </template>
+                     </el-table-column>
+
+                     </el-table>
+                      <el-pagination
+                        @size-change="handleSizeChange"
+                        @current-change="handleCurrentChangeOne"
+                        :page-sizes="[10, 50, 100,200,500,1000]"
+                        :page-size="10"
+                        background
+                        align="right"
+                        style="margin-top:20px;"
+                        layout="total, sizes, prev, pager, next, jumper"
+                        :total="total"
+                        >
+                      </el-pagination>
+                    </el-tab-pane>
+                   </el-tabs>
+                </div>
+             </el-main>
+          </el-container>
+        </el-container>
+      </el-container>
+      </div>
+    </div>
+
+</template>
+<script>
+import { getGoodPatientList,getSelfDrugWarehouseOutDetailByPatientId } from "@/api/drug/drug"
+export default {
+  data(){
+    return{
+      zoneList:[],
+      zone_id:0,
+      tableData:[],
+      DeviceTypeType:[],
+      device_type:"",
+      forms:{},
+      start_time:"",
+      end_time:"",
+      patientList:[],
+      tableList:[],
+      keyword:"",
+      manufacturerList:[],
+      patient_id:0,
+      patient:{},
+      limit:10,
+      page:1,
+      total:0,
+      loading:false,
+    }
+  },
+  methods:{
+  
+    handleSizeChange(val) {
+      this.limit = val;
+      this.getDrugWarehouseOutDetailByPatientId()
+    },
+    handleCurrentChangeOne(val) {
+      this.page = val;
+      
+      this.getDrugWarehouseOutDetailByPatientId()
+    },
+    startTimeChange(){
+      this.handleCurrentChange(this.patient)
+    },
+    endTimeChange(){
+      this.handleCurrentChange(this.patient)
+    },
+    getlist(){
+        this.loading = true
+        var params = {
+          keyword:this.keyword,
+        }
+      getGoodPatientList(params).then(response=>{
+        if(response.data.state == 1){
+          this.loading = false
+          var list = response.data.data.list
+          this.patientList=[]
+          this.patientList = list
+          this.$refs.singleTable.setCurrentRow(this.patientList[0]);
+          this.handleCurrentChange(this.patientList[0])
+        }
+      })
+    },
+   onSearch(){
+     this.getlist()
+   },
+   handleCurrentChange(val){
+       this.patient = val
+       var params = {
+         patient_id:val.id,
+         start_time:this.start_time,
+         end_time:this.end_time,
+         limit:this.limit,
+         page:this.page,
+       }
+     getSelfDrugWarehouseOutDetailByPatientId(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("list233223232323",list)
+          var outlist = response.data.data.outlist
+          this.manufacturerList = response.data.data.manufacturerList
+          if(list!=null && list.length > 0){
+            for(let i=0;i<list.length;i++){
+              if(list[i].count_unit == list[i].drug.max_unit){
+                 list[i].count = list[i].count * list[i].drug.min_number
+              }
+            }
+          }
+          let dataInfo = {}
+          list.forEach((item, index) => {
+            let { drug_id } = item
+            if (!dataInfo[drug_id]) {
+              dataInfo[drug_id] = {
+                drug_id,
+                child: [],
+                dose:item.drug.dose,
+                dose_unit:item.drug.dose_unit,
+                min_number:item.drug.min_number,
+                min_unit:item.drug.min_unit,
+                max_unit:item.drug.max_unit,
+                drug_name:item.drug.drug_name,
+                manufacturer:this.getManufacturName(item.manufacturer),
+              }
+            }
+          })
+          let arr = Object.values(dataInfo)
+          arr.forEach((item,index)=>{
+            for(let i=0;i<outlist.length;i++){
+               if(item.drug_id == outlist[i].drug_id){
+                 item.child.push(outlist[i])
+               }
+            }
+          })
+        
+        
+          this.tableList = arr
+          this.total = response.data.data.total
+        }
+     })
+   },
+   getDrugWarehouseOutDetailByPatientId(){
+      var params = {
+         patient_id:this.patient.id,
+         start_time:this.start_time,
+         end_time:this.end_time,
+         limit:this.limit,
+         page:this.page,
+       }
+      console.log("hh23232323232323",params)
+     getDrugWarehouseOutDetailByPatientId(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+         console.log("list233223232323",list)
+          var outlist = response.data.data.outlist
+          this.manufacturerList = response.data.data.manufacturerList
+          if(list!=null && list.length > 0){
+            for(let i=0;i<list.length;i++){
+              if(list[i].count_unit == list[i].drug.max_unit){
+                 list[i].count = list[i].count * list[i].drug.min_number
+              }
+            }
+          }
+          let dataInfo = {}
+          list.forEach((item, index) => {
+            let { drug_id } = item
+            if (!dataInfo[drug_id]) {
+              dataInfo[drug_id] = {
+                drug_id,
+                child: [],
+                dose:item.drug.dose,
+                dose_unit:item.drug.dose_unit,
+                min_number:item.drug.min_number,
+                min_unit:item.drug.min_unit,
+                max_unit:item.drug.max_unit,
+                drug_name:item.drug.drug_name,
+                manufacturer:this.getManufacturName(item.manufacturer),
+              }
+            }
+          })
+          let arr = Object.values(dataInfo)
+          arr.forEach((item,index)=>{
+            for(let i=0;i<outlist.length;i++){
+               if(item.drug_id == outlist[i].drug_id){
+                 item.child.push(outlist[i])
+               }
+            }
+          })
+         
+         
+          this.tableList = arr
+        }
+     })
+   },
+   getManufacturName(id){
+     var manufacturer_name = ""
+     for(let i=0;i<this.manufacturerList.length;i++){
+        if(id == this.manufacturerList[i].id){
+          manufacturer_name = this.manufacturerList[i].manufacturer_name
+        } 
+     }
+     return manufacturer_name
+   },
+   open(){
+    console.log("haaaaaaaaaaaaaaaaaaaaaaa")
+    this.getlist()
+   },
+   getCount(val,min_number,max_unit,min_unit){
+    var total = 0
+    var min_str = ""
+    var max_str = ""
+    if(val!=null && val.length>0){
+      for(let i=0;i<val.length;i++){
+        total +=val[i].count
+      }
+    }
+    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;  
+   },
+   toPrint(){
+    var patient_name = ""
+    for(let i=0;i<this.patientList.length;i++){
+       if(this.patient.id == this.patientList[i].id){
+        patient_name = this.patientList[i].name
+       }
+    }
+    this.$router.push({path:"/drugs/patient/print?start_time="+this.start_time+"&end_time="+this.end_time+"&page="+this.page+"&limit="+this.limit+"&keyword="+this.keyword+"&patient_id="+this.patient.id+"&patient_name="+patient_name})
+   },
+   exportList(){
+      for(let i=0;i<this.tableList.length;i++){
+        this.tableList[i].index = i+1
+        this.tableList[i].count_name = this.getCount(this.tableList[i].child,this.tableList[i].min_number,this.tableList[i].max_unit,this.tableList[i].min_unit)
+        this.tableList[i].query_date = this.start_time + "~" + this.end_time
+        this.tableList[i].specification_name = this.tableList[i].dose +this.tableList[i].dose_unit + "*"+this.tableList[i].min_number+this.tableList[i].min_unit+"/"+this.tableList[i].max_unit
+        this.tableList[i].patient_name = ""
+        if(this.tableList[i].index == 1){
+          this.tableList[i].patient_name = this.getPatientName(this.patient.id)
+        }
+      
+      }
+      import('@/vendor/Export2Excel').then(excel => {
+       
+        const tHeader = ['序号','患者姓名','查询日期','药品名称','生产厂家','规格&单位','数量']
+        const filterVal = ['index','patient_name','query_date','drug_name', 'manufacturer','specification_name','count_name']
+
+        const data = this.formatJson(filterVal,this.tableList)
+
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '患者药品使用查询表'
+        })
+       })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+       },
+       getPatientName(id){
+         var patient_name = ""
+        for(let i=0;i<this.patientList.length;i++){
+          if(id == this.patientList[i].id){
+            patient_name = this.patientList[i].name
+          }
+        }
+        return patient_name
+       }
+  },
+  created(){
+    var nowDate = new Date();
+    var nowYear = nowDate.getFullYear();
+    var nowMonth = nowDate.getMonth() + 1;
+    var nowDay = nowDate.getDate();
+    this.end_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+    nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
+    nowMonth = nowDate.getMonth() + 1;
+    nowDay = nowDate.getDate();
+    this.start_time =
+      nowYear +
+      "-" +
+      (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      "-" +
+      (nowDay < 10 ? "0" + nowDay : nowDay);
+   
+  },
+  
+}
+</script>
+
+
+   
+<style lang="scss" scoped>
+    .zone{
+      //  margin-left: 30px;
+      //  text-align: left;
+       width: 70px;
+       display: inline-block;
+       color:#606266;
+    }
+    .disinfect{
+      position: relative;
+      .newButton{
+        // position: absolute;
+        // right: 2%;
+        // top:4px;
+        // z-index: 9;
+        margin-bottom: 10px;
+    margin-left: 90%;
+      }
+    }
+    .disinfectOne{
+      position: relative;
+      .newButtonOne{
+        position: absolute;
+         right: 0;
+         top: -10;
+         z-index: 18;
+      }
+    }
+    .but{
+      width: 200px;
+      height: 50px;
+      // border: solid 1px red;
+      margin-left: 77%;
+    }
+    .clearn{
+      width: 460px;
+      height: 50px;
+      // border:solid 1px red;
+      margin-left:650px;
+    }
+
+  .zClass{
+    width: 200px;
+    height: 200px;
+    // border:solid 1px red;
+    margin-left: 450px;
+    margin-top: 200px;
+  }
+  .warn{
+    color: red;
+    font-size: 14px;
+    width: 100%;
+    display: inline-block;
+    margin-left: 96px;
+  }
+
+  .userbutton{
+       margin-bottom: 10px;
+    margin-left: 82%
+  }
+    /deep/ .el-tabs__content{
+    margin-top: 10px;
+  }
+
+</style>
+<style lang="scss">
+   .a{
+     margin-bottom: 10px;
+      margin-top: 6px;
+
+   }
+
+   .b{
+    .el-button{
+      margin-left: 90%;
+      margin-bottom: 10px;
+    }
+   }
+
+   .stoppage{
+     .el-form-item__label{
+       width:190px;
+     }
+   }
+   .st{
+     .el-form-item__label{
+       width:-10px;
+     }
+   }
+   .main{
+     position: relative;
+     .newButtonOne{
+       position:absolute;
+       right: 0;
+       z-index: 2;
+     }
+   }
+
+    .elbutton{
+      // border: solid 1px red;
+      height: 50px;
+      width: 400px;
+      margin-left: 650px;
+    }
+  // .el-form-item__label {
+  //   width: 130px;
+  //   font-size: 14px;
+  // }
+  .el-form-item__error {
+    margin-left: 130px;
+  }
+
+ .el-upload-list__item-name {
+    color: #606266;
+    display: block;
+    margin-right: 40px;
+    overflow: hidden;
+    padding-left: 4px;
+    text-overflow: ellipsis;
+    transition: color .3s;
+    white-space: nowrap;
+}
+.el-main{
+  padding-top: 0px;
+}
+.newMain{
+  .el-form-item__label{
+    width: 104px;
+  }
+}
+.newDisinfectOne{
+  .el-input--prefix .el-input__inner{
+    padding-left: 15px
+  }
+}
+.stoppage{
+  .el-form-item__label{
+    width: 18%;
+  }
+}
+.newItem{
+  .el-form-item__label{
+    width: 130px;
+  }
+}
+.formItem{
+  .el-form-item__label{
+    width: 104px;
+    line-height: 30px;
+  }
+}
+.newname{
+  .el-form-item__label{
+    width: 60px;
+  }
+}
+::-webkit-scrollbar{
+  height: 20px;
+}
+</style>

src/xt_pages/stock/selfPreparedMedicine/selfDrugFlow.vue

           <el-table-column prop="drug_name" label="数量&单位" align="center">
              <template slot-scope="scope">
                 <span v-if="scope.row.consumable_type != 2 &&  scope.row.consumable_type != 3 && scope.row.consumable_type != 5 && scope.row.consumable_type != 7">{{scope.row.count}}{{scope.row.max_unit}}</span>
-                <span v-if="(scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 5 || scope.row.consumable_type == 7) && parseInt(scope.row.count/scope.row.BaseDrugLib.min_number) >0">{{parseInt(scope.row.count/scope.row.BaseDrugLib.min_number)}}{{scope.row.BaseDrugLib.max_unit}}</span>
-                <span v-if="(scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 5 || scope.row.consumable_type == 7) && scope.row.count%scope.row.BaseDrugLib.min_number >0">{{scope.row.count%scope.row.BaseDrugLib.min_number}}{{scope.row.BaseDrugLib.min_unit}}</span>
+                <span v-if="(scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 5 || scope.row.consumable_type == 7) && parseInt(scope.row.count/scope.row.drug.min_number) >0">{{parseInt(scope.row.count/scope.row.drug.min_number)}}{{scope.row.drug.max_unit}}</span>
+                <span v-if="(scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 5 || scope.row.consumable_type == 7) && scope.row.count%scope.row.drug.min_number >0">{{scope.row.count%scope.row.drug.min_number}}{{scope.row.drug.min_unit}}</span>
              </template>
           </el-table-column>
   

src/xt_pages/stock/selfPreparedMedicine/selfDrugQuery.vue

                 <new-drug-query></new-drug-query>
               </el-tab-pane>
             
-              <el-tab-pane label="患者查询" name="sencode">
+              <el-tab-pane label="患者查询" name="second">
                   <patient-drug-query ref="mychildtwo"></patient-drug-query>
               </el-tab-pane>
           </el-tabs>

src/xt_pages/stock/selfPreparedMedicine/warehouseInfo.vue

           @change="changeAllSelected"
           >全选</el-checkbox
         >
-        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
+        <!-- <el-button size="small" icon="el-icon-delete" @click="batchDelete"
           >删除</el-button
-        >
+        > -->
         <el-button size="small" type="primary" @click="drugPrint()"
           >打印</el-button
         >
       <div v-if="isShow">
 
         <el-table
-        :data="tableList"
+        :data="tableDataList"
         :class="signAndWeighBoxPatients"
         style="width: 100%"
         border
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266',
         }"
-        @current-change="handleCurrentChangeOne"
       >
         <el-table-column align="center" type="selection" width="55">
         </el-table-column>
 
-        <el-table-column label="入库时间" align="center">
-          <template slot-scope="scope">
-             {{ getTime(scope.row.record_date)}}
-          </template>
-        </el-table-column>
 
         <el-table-column label="药品名称" align="center">
           <template slot-scope="scope">
-             {{ scope.row.drug.drug_name }}
+             {{ scope.row.drug_name }}
           </template>
         </el-table-column>
 
         <el-table-column label="药品类型" align="center">
           <template slot-scope="scope">
-             {{ GetDrugTypeName(scope.row.drug.drug_type) }}
+            {{scope.row.drug_type}}
           </template>
         </el-table-column>
 
         <el-table-column label="规格" align="center">
           <template slot-scope="scope">
-            {{ scope.row.drug.dose }} {{  scope.row.drug.dose_unit }} * {{ scope.row.drug.min_number}} {{ scope.row.drug.min_unit}} / {{ scope.row.max_unit }}
+            {{scope.row.name}}
           </template>
         </el-table-column>
 
           </template>
         </el-table-column>
 
-      
-
         <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
-           
-            {{ getManufacturer(scope.row.manufacturer) }}
+           {{scope.row.manufacturer}}
           </template>
         </el-table-column>
 
         <el-table-column label="生产日期" align="center">
           <template slot-scope="scope">
-             {{ getTime(scope.row.product_date) }}
+           {{scope.row.product_date}}
           </template>
         </el-table-column>
 
         <el-table-column label="有效日期" align="center">
           <template slot-scope="scope">
-            {{ getTime(scope.row.expiry_date) }}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="审核状态" align="center">
-          <template slot-scope="scope">
-             <span v-if="scope.row.is_check ==1">已审核</span>
-             <span v-if="scope.row.is_check ==2">未审核</span>
+          {{scope.row.expiry_date}}
           </template>
         </el-table-column>
 
+  
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
              {{ scope.row.remark }}
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" align="center" width="240">
-          <template slot-scope="scope">
-            <el-tooltip
-              class="item"
-              effect="dark"
-              content="编辑"
-              placement="top"
-            >
-              <el-button
-                size="small"
-                type="primary"
-                icon="el-icon-edit-outline"
-                @click="handleEdit(scope.$index, scope.row)"
-              >
-              </el-button>
-            </el-tooltip>
-            <el-tooltip
-              class="item"
-              effect="dark"
-              content="删除"
-              placement="top"
-            >
-              <el-button
-                size="small"
-                type="danger"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.$index, scope.row)"
-              >
-              </el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
+      
         </el-table>
       </div>
     
 } from "@/api/drug/drug_stock";
 import { getDictionaryDataConfig } from "@/utils/data";
 import BreadCrumb from "../../components/bread-crumb";
-import { getallPatientList,getAllSelfDrugWarehouseInfoList,deleteSelfWarehouseInfo,getAllSelfDrugWarehouse} from "@/api/drug/drug"
+import { getallPatientList,getAllSelfDrugWarehouseInfoList,deleteSelfWarehouse,getAllSelfDrugWarehouse,getSelfDrugWarehouseInfoById} from "@/api/drug/drug"
 export default {
   name: "drugStockInOrder",
   components: { BreadCrumb },
       drugTypeList:[],
       isShow:false,
       doctorList:[],
+      tableDataList:[]
     };
   },
 
       
     },
     search(){
-
-    },
-    handleSearch(id) {
-      this.WarehouseInfo.warehouseInfoDate = [];
-      this.dialogVisible = true;
+      this.getAllSelfDrugWarehouse();
     },
     handleDelete: function (index, row) {
         if(row.is_check ==1){
           return false
         }
         if(row.is_sys ==1){
-          this.$message.error("该药瓶自动入库,不能删除!")
+          this.$message.error("该药品自动入库,不能删除!")
           return false
         }
         this.$confirm('确定删除吗？', '提示', {
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          deleteSelfWarehouseInfo(row.id).then(response => {
+          deleteSelfWarehouse(row.id).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               return false
         .catch(() => {});
     },
     handleCurrentChangeOne(val) {
-     
+         getSelfDrugWarehouseInfoById(val.id).then(response=>{
+          if(response.data.state ==1){
+            var info = response.data.data.info
+
+            var warehouseInfo =  response.data.data.warehouseInfo
+
+            this.isShow = true
+             if(info.is_check == 2){
+               this.showCheck = true
+               this.showReturnCheck = false
+             }
+             if(info.is_check == 1){
+                this.showCheck = false
+                this.showReturnCheck = true
+             }
+             this.patient_id = info.patient_id
+
+             this.warehousing_time  =this.getTimeOne(warehouseInfo.operation_time)
+             this.manufacturerList = response.data.data.manufacturerList
+             this.dealerList = response.data.data.dealerList
+             this.drugTypeList = response.data.data.drugTypeList
+             var warehouseInfo  =  response.data.data.warehouseInfo
+             this.warehousing_id  = warehouseInfo.id
+             const tempObj = {};
+             
+             tempObj["id"] = info.id;
+             tempObj["drug_id"] = info.drug_id;
+             tempObj["drug_name"] = info.drug.drug_name;
+             tempObj["max_unit"] = info.max_unit;
+             tempObj["min_unit"] = info.min_unit,
+             tempObj["product_date"] = this.getTimeOne(info.product_date);
+             tempObj["expiry_date"] = this.getTimeOne(info.expiry_date);
+             tempObj["warehousing_count"] = info.warehousing_count.toString();
+             tempObj["remark"] = info.remark;
+             tempObj["dealer"] =this.getDealer(info.dealer) 
+             tempObj["manufacturer"] = this.getManufacturer(info.manufacturer);
+             tempObj["batch_number"] = info.batch_number;
+             tempObj["drug_type"] =this.GetDrugTypeName(info.drug.drug_type) 
+             tempObj["number"] = info.number;
+             tempObj["count_unit"] = info.max_unit;
+           
+             tempObj["name"] = info.drug.dose + info.drug.dose_unit + "*" + info.drug.min_number+info.drug.min_unit +"/"+info.drug.max_unit
+             this.tableDataList = []
+             this.tableDataList.push(tempObj);
+          }
+
+       })
     },
     getTime(val) {
       if (val < 0) {
         return uParseTime(val, "{y}-{m}-{d}");
       }
     },
+    getTimeOne(val) {
+      if(val < 0){
+        return ""
+      }
+      if(val == ""){
+      return ""
+      }else {
+      return uParseTime(val, '{y}-{m}-{d}')
+      }
+     },
     getDrugType(id) {
       var name = "";
       for (let i = 0; i < this.drugTypeList.length; i++) {
     
     getManufacturer(id) {
       var name = "";
-      console.log("manufacturerList-=------",this.manufacturerList)
       for (let i = 0; i < this.manufacturerList.length; i++) {
 
         if (id == this.manufacturerList[i].id) {
       },
       GetDrugTypeName(drug_type){
         var name = ""
+        console.log("drugTypeList---------------",this.drugTypeList)
         for(let i=0;i<this.drugTypeList.length;i++){
           if(drug_type == this.drugTypeList[i].value){
              name = this.drugTypeList[i].name

src/xt_pages/stock/selfPreparedMedicine/warehouseOut.vue

           style="width: 200px"
           v-model.trim="searchKey"
           class="filter-item"
-          placeholder="单据编码/制单人/药品名称"
+          placeholder="单据编码"
         />
         <el-button
           size="small"
           @change="changeAllSelected"
           >全选</el-checkbox
         >
-        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
+        <!-- <el-button size="small" icon="el-icon-delete" @click="batchDelete"
           >删除</el-button
-        >
+        > -->
         <el-button size="small" type="primary" @click="drugPrint()"
           >打印</el-button
         >
           </el-select>
         </div>
       </div>
+      
 
       <el-table
         :data="tableList"
         <el-table-column align="center" type="selection" width="55">
         </el-table-column>
 
-        <el-table-column label="出库时间" align="center">
+        <el-table-column label="单据日期" align="center">
           <template slot-scope="scope">
-             {{ getTime(scope.row.sys_record_time)}}
+             {{ getTime(scope.row.warehouse_out_time)}}
           </template>
         </el-table-column>
 
-        <el-table-column label="药品名称" align="center">
+        <el-table-column label="单据编号" align="center">
           <template slot-scope="scope">
-             {{ scope.row.drug.drug_name }}
+           {{scope.row.warehouse_out_order_number}}
           </template>
         </el-table-column>
 
-        <el-table-column label="药品类型" align="center">
+        <el-table-column label="患者名称" align="center">
           <template slot-scope="scope">
-             {{ GetDrugTypeName(scope.row.drug.drug_type) }}
+             {{getPatientName(scope.row.patient_id)}}
           </template>
         </el-table-column>
 
-        <el-table-column label="规格" align="center">
+        <el-table-column label="制单人" align="center">
           <template slot-scope="scope">
-            {{ scope.row.drug.dose }} {{  scope.row.drug.dose_unit }} * {{ scope.row.drug.min_number}} {{ scope.row.drug.min_unit}} / {{ scope.row.max_unit }}
+            {{getAdminUserName(scope.row.creater)}}
           </template>
         </el-table-column>
 
-        <el-table-column label="批号" align="center">
+        <el-table-column label="出库方式" align="center">
           <template slot-scope="scope">
-             {{ scope.row.batch_number }}
+            <span v-if="scope.row.is_sys ==1">自动出库</span>
+            <span v-if="scope.row.is_sys ==0">手动出库</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="出库数量" align="center">
+        <el-table-column label="审核状态" align="center">
           <template slot-scope="scope">
-             {{ scope.row.count }} {{ scope.row.max_unit }}
+             <span v-if="scope.row.is_check ==1">已审核</span>
+             <span v-if="scope.row.is_check ==2">未审核</span>
           </template>
         </el-table-column>
-
-      
-
-        <el-table-column label="生产厂家" align="center">
-          <template slot-scope="scope">
-            {{ getManufacturer(scope.row.manufacturer) }}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="生产日期" align="center">
-          <template slot-scope="scope">
-             {{ getTime(scope.row.product_date) }}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="有效日期" align="center">
-          <template slot-scope="scope">
-            {{ getTime(scope.row.expiry_date) }}
-          </template>
-        </el-table-column>
-
-        <el-table-column label="备注" align="center">
-          <template slot-scope="scope">
-             {{ scope.row.remark }}
-          </template>
-        </el-table-column>
-
         <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
             <el-tooltip
           </template>
         </el-table-column>
       </el-table>
-
+   
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :total="total"
       >
       </el-pagination>
+       
+       <div v-show="isShow">
+        <el-table
+        :data="recordDataList"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%"
+        border
+        highlight-current-row
+        v-loading="Warehouse.loading"
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+      >
+        <el-table-column align="center" type="selection" width="55">
+        </el-table-column>
+
+    
+        <el-table-column label="药品名称" align="center">
+          <template slot-scope="scope">
+             {{ scope.row.drug_name }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="药品类型" align="center">
+          <template slot-scope="scope">
+             {{scope.row.drug_type }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="规格" align="center">
+          <template slot-scope="scope">
+             {{scope.row.name}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="批号" align="center">
+          <template slot-scope="scope">
+             {{ scope.row.batch_number }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="出库数量" align="center">
+          <template slot-scope="scope">
+             {{ scope.row.count }} {{ scope.row.max_unit }}
+          </template>
+        </el-table-column>
+
+      
+
+        <el-table-column label="生产厂家" align="center">
+          <template slot-scope="scope">
+            {{scope.row.manufacturer}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="生产日期" align="center">
+          <template slot-scope="scope">
+           {{scope.row.product_date}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="有效日期" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.expiry_date }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="备注" align="center">
+          <template slot-scope="scope">
+             {{ scope.row.remark }}
+          </template>
+        </el-table-column>
+
     
+      </el-table>
+       </div>
     </div>
 
  
 import { getAllDrugList } from "@/api/data";
 import { getDictionaryDataConfig } from "@/utils/data";
 import BreadCrumb from "../../components/bread-crumb";
-  import { getallPatientList,getAllSelfDrugWarehouseOutList,deleteSelfWarehouseOut} from "@/api/drug/drug"
+  import { getallPatientList,getAllSelfDrugWarehouseOutList,deleteSelfWarehouseOutList,getAllSelfDrugWarehouseOut,getSelfDrugWarehouseOutById} from "@/api/drug/drug"
 export default {
   name: "drugStockInOrder",
   components: { BreadCrumb },
       (nowDay < 10 ? "0" + nowDay : nowDay);
 
     this.getallPatientList() 
-
-    this.getAllSelfDrugWarehouseOutList()
+    this.getAllSelfDrugWarehouseOut()
+    
   },
   data() {
     return {
       manufacturerList:[],
       dealerList:[],
       drugTypeList:[],
+      isShow:false,
+      doctorList:[],
+      recordDataList:[],
+      loading:false,
     };
   },
 
   methods: {
-    
-    getAllSelfDrugWarehouseOutList(){
-        var params = {
+    getAllSelfDrugWarehouseOut(){
+      var params = {
           keyword:this.searchKey,
           patient_id:this.patient_id,
           start_time:this.start_time,
           end_time:this.end_time,
+          check_type:this.check_type,
+          limit:this.limit,
+          page:this.page,
+        }
+      getAllSelfDrugWarehouseOut(params).then(response=>{
+        if(response.data.state ==1){
+          var list= response.data.data.list
+          this.tableList = list
+          var doctorList = response.data.data.doctorList
+          this.doctorList = doctorList
+          this.total = response.data.data.total
         }
-        getAllSelfDrugWarehouseOutList(params).then(response=>{
-          if(response.data.state ==1){
-            var outInfo  =  response.data.data.outInfo
-            console.log("infolist22222222222222",outInfo)
-            this.tableList = outInfo
-            this.manufacturerList = response.data.data.manufacturerList
-            this.dealerList = response.data.data.dealerList
-            this.drugTypeList = response.data.data.drugTypeList
 
-          }
       })
     },
+   
     tableRowClassName({ row, rowIndex }) {
       // 把每一行的索引放进row
       row.index = rowIndex;
     },
     handleSizeChange(val) {
       this.limit = val;
-      this.GetWarehouse();
+      this.getAllSelfDrugWarehouseOut();
     },
     handleCurrentChange(val) {
       this.page = val;
-      this.GetWarehouse();
+      this.getAllSelfDrugWarehouseOut();
     },
     startTimeChange(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
       } else {
         this.startTime = this.getTimestamp(val);
         this.start_time = val;
-        this.GetWarehouse();
+        this.getAllSelfDrugWarehouseOut();
       }
     },
     endTimeChange(val) {
         this.end_time = "";
       } else {
         this.end_time = val;
-        this.GetWarehouse();
+        this.getAllSelfDrugWarehouseOut();
       }
     },
     getTimestamp(time) {
       
     },
     search(){
-
-    },
-    handleSearch(id) {
-      this.WarehouseInfo.warehouseInfoDate = [];
-      this.GetOrderDetail(id);
-      this.dialogVisible = true;
-    },
-    GetOrderDetail(order_id) {
-      const params = {
-        id: order_id,
-      };
-
-      this.WarehouseInfo.warehouseInfoDate = [];
-      getDrugWarehouseInfoList(params).then((response) => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          var obj = {total_count:0,is_total:1}
-          for (let i = 0; i < response.data.data.info.length; i++) {
-            response.data.data.info[i].is_total = 0
-            this.showOne = true;
-            this.WarehouseInfo.warehouseInfoDate.push(
-              response.data.data.info[i]
-            );
-            obj.total_count += (response.data.data.info[i].warehousing_count *response.data.data.info[i].price)
-          }
-          this.WarehouseInfo.warehouseInfoDate.push(obj)
-        
-          this.WarehouseInfo.warehouse = response.data.data.warehousing;
-          this.getAllDrugList();
-        }
-      });
+      this.getAllSelfDrugWarehouseOut();
     },
     handleDelete: function (index, row) {
 
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
-          deleteSelfWarehouseOut(row.id).then(response => {
+          deleteSelfWarehouseOutList(row.id).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               return false
         .catch(() => {});
     },
     handleCurrentChangeOne(val) {
-      this.GetOrderDetail(val.id);
+      this.getSelfDrugWarehouseOutById(val.id)
     },
     getTime(val) {
       if (val < 0) {
       return storehouse_name;
     },
     changeStoreHouse() {
-      this.GetWarehouse();
+      this.getAllSelfDrugWarehouseOut();
     },
     changeCheckType() {
-      this.GetWarehouse();
+      this.getAllSelfDrugWarehouseOut();
     },
 
     getallPatientList(){
           }
         }
         return dealer_name
+      },
+      getPatientName(id){
+         var name = ""
+         for(let i=0;i<this.patientList.length;i++){
+            if(id == this.patientList[i].id){
+               name = this.patientList[i].name
+            }
+         }
+         return name
+      },
+      getAdminUserName(admin_user_id){
+         var user_name = ""
+         for(let i=0;i<this.doctorList.length;i++){
+            if(admin_user_id == this.doctorList[i].admin_user_id){
+              user_name = this.doctorList[i].user_name
+            }
+         }
+         return user_name
+      },
+      getSelfDrugWarehouseOutById(id){
+        getSelfDrugWarehouseOutById(id).then(response=>{
+          if(response.data.state ==1){
+              var outInfo = response.data.data.outInfo
+              this.isShow = true
+              if(outInfo.is_check == 2){
+               this.showCheck = true
+               this.showReturnCheck = false
+             }
+             if(outInfo.is_check == 1){
+                this.showCheck = false
+                this.showReturnCheck = true
+             }
+              this.manufacturerList = response.data.data.manufacturerList
+              this.dealerList = response.data.data.dealerList
+              this.drugTypeList = response.data.data.drugTypeList
+              console.log("out_info",outInfo)
+              const tempObj = {};
+              this.patient_id = outInfo.patient_id
+              this.warehouse_out_time = this.getTimeOne(outInfo.sys_record_time);
+              this.warehouse_out_id  = outInfo.warehouse_out_id
+              tempObj["id"] = outInfo.id;
+              tempObj["drug_id"] = outInfo.drug_id;
+              tempObj["max_unit"] = outInfo.count_unit;
+              tempObj["min_unit"] = outInfo.min_unit, 
+              tempObj["return_count"] = "";
+              tempObj["price"] = "";
+              tempObj["remark"] = outInfo.remark;
+              tempObj["manufacturer"] = this.getManufacturer(outInfo.manufacturer)
+              tempObj["batch_number"] = outInfo.batch_number;
+              tempObj["drug_type"] = this.GetDrugTypeName(outInfo.drug.drug_type) 
+              tempObj["dose"] = "";
+              tempObj["dose_unit"] = "";
+              tempObj["min_number"] = "";
+              tempObj["dealer"] = this.getDealer(outInfo.dealer) 
+              tempObj["number"] = "";
+              tempObj["warehouse_info_id"] = outInfo.warehouse_info_id;
+              tempObj["count"] = (outInfo.count).toString();
+              tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name;
+              tempObj["retail_price"] = 0;
+              tempObj["last_price"] = "";
+              tempObj["stock_count"] = "";
+              tempObj["total_count"] = 0;
+              tempObj["max_unit_fisrt"] = 0;
+              tempObj["min_unit_fisrt"] = 0;
+              tempObj["total_price"] = 0;
+              tempObj["patient_id"] = outInfo.patient_id
+              tempObj["product_date"] = this.getTimeOne(outInfo.product_date);
+              tempObj["expiry_date"]=this.getTimeOne(outInfo.expiry_date)
+              tempObj["class_type"] = ""
+              tempObj["drug_name"] = outInfo.drug.drug_name
+              tempObj["name"] = outInfo.drug.dose + outInfo.drug.dose_unit + "*" + outInfo.drug.min_number+outInfo.drug.min_unit +"/"+outInfo.drug.max_unit
+              this.recordDataList = []
+              this.recordDataList.push(tempObj);
+          }
+        })
+      },
+
+      getTimeOne(val) {
+      if(val < 0){
+        return ""
+      }
+      if(val == ""){
+      return ""
+      }else {
+      return uParseTime(val, '{y}-{m}-{d}')
       }
+     },
+
     
    
   },