数据

src/api/drug/drug_stock.js

     params: params
   })
 }
+
+export function getDrugWarehouseInfoPrint(params) {
+  return request({
+    url: '/api/drug/getdrugwarehouseinfoprint',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugOutOrderPrint(params) {
+  return request({
+    url: '/api/drug/getdrugoutorderprint',
+    method: 'get',
+    params: params
+  })
+}

src/api/patient.js

     params: params
   })
 }
+
+export function getInspectionMajorItem(params) {
+  return request({
+    url: '/api/patient/getinspectionmajoritem',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getInspectionDetail(params) {
+  return request({
+    url: '/api/patient/getinspectiondetail',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function getInspectionItemList(params) {
+  return request({
+    url: '/api/patient/getinspectionitemlist',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/stock/cancelStockOrderAdd.vue

             } else {
              var msg =  response.data.data.msg
              if (msg == 1){
-                this.$message.error("该耗材无出库记录")
+                this.$message.error("无出库记录")
                 return
              }
              if(msg == 2){

src/xt_pages/stock/detail/print.vue

                 {{index+1}}
               </td>
               <td style="line-height: 50px">
-                <span>{{item.GoodInfo.good_name}}</span>
+                <!-- <span>{{item.GoodInfo.good_name}}</span> -->
+                {{item.good_name}}
               </td>
               <td style="line-height: 50px">
-                <span>{{item.GoodInfo.specification_name}}</span>
+                <!-- <span>{{item.GoodInfo.specification_name}}</span> -->
+                {{item.specification_name}}
               </td>
              
               <td style="line-height: 50px">
                 <span v-if="type == 4"> {{ item.count }}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{item.GoodInfo.packing_unit}}</span>
+                <!-- <span>{{item.GoodInfo.packing_unit}}</span> -->
+                {{item.packing_unit}}
               </td>
               <td style="line-height:50px">
                 <span v-if="type == 1"> {{ item.price }}</span>
-                <span v-if="type == 2"> {{ item.price }}</span>
+                <span v-if="type == 2"> {{ item.packing_price }}</span>
                  <span v-if="type == 4"> {{ item.price }}</span>
               </td>
               <td style="line-height:50px">
                 <span v-if="type == 1">{{(item.warehousing_count * item.price).toFixed(2)}}</span>
-                <span v-if="type == 2">{{(item.count * item.price).toFixed(2)}}</span>
+                <span v-if="type == 2">{{(item.count * item.packing_price).toFixed(2)}}</span>
                 <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
               </td>
               <td style="line-height: 50px">
       getGoodDetailPrintList(this.queryParams).then(response=>{
          if(response.data.state == 1){
            var list = response.data.data.list
-           console.log("list",list)
+           console.log("新的",list)
+           this.stockDatas = list
            
          }
       })
         if(response.data.state == 1){
           var total =   response.data.data.total
           var list = response.data.data.list
-          console.log("list2323223",list)
           this.stockDatas = list
         }
       })
      getWareOutTotal(){
        var total = 0
        for(let i=0;i<this.stockDatas.length;i++){
-         total+= this.stockDatas[i].count * this.stockDatas[i].price
+         total+= this.stockDatas[i].count * this.stockDatas[i].packing_price
        }
        return total
      }
       this.goodUnit = this.$store.getters.good_unit
 
       // this.getDialysisRecord()
-      // this.getGoodDetailPrintList()
-      this.getStockDetail()
+      this.getGoodDetailPrintList()
+      // this.getStockDetail()
     }
 
   }

src/xt_pages/stock/detail/stockInDetail.vue

   GetAllConfig,
   getStockDetail,
   getPrintStockGood,
-  
+  getGoodDetailPrintList
 } from "@/api/stock";
 
 export default {
     // this.getPrintStockGood()
     this.org_id = this.$store.getters.xt_user.template_info.org_id
     console.log("机构ID",this.org_id)
+    this.getGoodDetailPrintList()
   },
   data() {
     return {
         const res = new Map();
         return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1));
       },
-      
-      // exportList(){
-      //   var obj = {index:"合计",total:0}
-      //   obj.total = this.calTotalPrice()
-     
-      //   for(let i=0;i<this.tableList.length;i++){
-      //     this.tableList[i].index = i+1
-      //     this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
-      //     this.tableList[i].count = this.calCount(this.tableList[i])
-      //     this.tableList[i].total = this.calTotal(this.tableList[i])
-      //     this.tableList[i].price = this.tableList[i].query_warehousing_info[0].price
-      //     this.tableList[i].remark = this.tableList[i].query_warehousing_info[0].remark
-      //     this.tableList[i].packing_unit = this.tableList[i].packing_unit
-      //   }
-      //   console.log("总共条数555",this.tableList)
-         
-      //   if(this.org_id == 10024){
-      //     var arr = this.uniqueOne(this.tableList)
-      //     this.tableList = arr
-      //     this.tableList.push(obj)
-      //     console.log("去重后条数",this.tableList)
-        
-      //     import('@/vendor/Export2Excel').then(excel => {
-      //     const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-      //     const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total','remark']
-          
-      //     const data = this.formatJson(filterVal, this.tableList)
-
-      //     console.log("data222222222",data)
-      //       excel.export_json_to_excel({
-      //         header: tHeader,
-      //         data,
-      //         filename: '耗材入库明细'
-      //       })
-      //         this.downloadLoading = false
-      //       })
-      //   }
-      //   if(this.org_id !=10024){
-      //      var arr = this.unique(this.tableList)
-      //       this.tableList = arr
-      //       this.tableList.push(obj)
-      //       console.log("去重后条数",this.tableList)
-          
-      //       import('@/vendor/Export2Excel').then(excel => {
-      //       const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-      //       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total','remark']
-            
-      //       const data = this.formatJson(filterVal, this.tableList)
-      //       console.log("data222222222",data)
-      //         excel.export_json_to_excel({
-      //           header: tHeader,
-      //           data,
-      //           filename: '耗材入库明细'
-      //         })
-      //           this.downloadLoading = false
-      //         })
-      //   }
-     
-      //   },
+    
       exportList(){
-        // var obj = {index:"合计",total:0}
-        // obj.total = this.calTotalPrice()
+  
         console.log("hhhh",this.tableList)
        
         for(let i=0;i<this.tableList.length;i++){
-          this.tableList[i].good_name = this.tableList[i].GoodInfo.good_name
-          this.tableList[i].specification_name = this.tableList[i].GoodInfo.specification_name
-          this.tableList[i].packing_unit = this.tableList[i].GoodInfo.packing_unit
           this.tableList[i].index = i+1  
-          this.tableList[i].total_price = (this.tableList[i].warehousing_count * this.tableList[i].price).toFixed(2) 
+          this.tableList[i].total_price = (this.tableList[i].warehousing_count * this.tableList[i].packing_price).toFixed(2) 
         }
         console.log("总共条数555",this.tableList)   
         import('@/vendor/Export2Excel').then(excel => {
         const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','进货价','总价','备注']
         const filterVal = ['index','good_name', 'specification_name', 'packing_unit','warehousing_count','price','total_price','remark']
-        
+        console.log("hhhhhhhh",this.tableList)
+       
         const data = this.formatJson(filterVal, this.tableList)
         console.log("data222222222",data)
           excel.export_json_to_excel({
        }
       return name
      },
+     getGoodDetailPrintList(){
+        const params = {
+          start_time:this.start_time,
+          end_time:this.end_time,
+          type:1,
+        }
+      getGoodDetailPrintList(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("入库详情单",list)
+          this.tableList = list
+        }
+      })
+     }
   }
 };
 </script>

src/xt_pages/stock/detail/stockOutDetail.vue

 <script>
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
-import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood,getGoodInfoList } from "@/api/stock";
+import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood,getGoodInfoList,getGoodDetailPrintList } from "@/api/stock";
 
 export default {
   name: "stockOutDetail",
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
     // this.getPrintStockGood()
-    this.getList()
+    // this.getList()
     var org_id = this.$store.getters.xt_user.org.id
     this.orgId = org_id
     console.log("机构信息",org_id)
+    this.getGoodDetailPrintList()
+    
   },
   data() {
     return {
       ],
       manufacturer_id: "",
       dealer_id: "",
-      order_type: "",
+      order_type:"",
 
       searchKey: "",
       type: 2,
         })
       },
 
-    //  exportList(){
-      
-    //   for(let i=0;i<this.tableList.length;i++){
-    //      for(let j=0;j<this.goodInfoData.length;j++){
-    //         if(this.tableList[i].id === this.goodInfoData[j].id){
-    //            this.tableList[i].buy_price = this.goodInfoData[j].buy_price
-    //         }
-    //      }
-    //   }
-    //   console.log('合并后',this.tableList)
-      
-    //   var obj = {index:"合计",total:0}
-    //    obj.total = this.getTotalPrice()
-    //    for(let i=0;i<this.tableList.length;i++){
-    //     this.tableList[i].index = i+1
-    //     this.tableList[i].min_unit = this.getUnit(this.tableList[i].good_unit)
-    //     this.tableList[i].count = this.getStockCount(this.tableList[i].id)
-    //     this.tableList[i].total = (this.getStockCount(this.tableList[i].id) * this.tableList[i].buy_price).toFixed(2)
-    //     this.tableList[i].remark = this.tableList[i].query_warehouseout_info[0].remark
-    //     this.tableList[i].packing_unit = this.tableList[i].packing_unit
-    //    }
-    //    var arr = this.unique(this.tableList)
-     
-    //    this.tableList = arr
-    //    this.tableList.push(obj)
-    //    import('@/vendor/Export2Excel').then(excel => {
-    //    const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-    //    const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','buy_price','total','remark']
-
-    //    const data = this.formatJson(filterVal, this.tableList)
-    //    console.log("data",data)
-       
-    //     excel.export_json_to_excel({
-    //        header: tHeader,
-    //        data,
-    //        filename: '耗材出库明细'
-    //      })
-    //       this.downloadLoading = false
-    //     })
-    //    },
     exportList(){
        for(let i=0;i<this.tableData.length;i++){
         this.tableData[i].index = i+1
-        this.tableData[i].good_name = this.tableData[i].GoodInfo.good_name
-        this.tableData[i].specification_name = this.tableData[i].GoodInfo.specification_name
-        this.tableData[i].packing_unit = this.tableData[i].GoodInfo.packing_unit
-        this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price).toFixed(2)
+        this.tableData[i].good_name = this.tableData[i].good_name
+        this.tableData[i].specification_name = this.tableData[i].specification_name
+        this.tableData[i].packing_unit = this.tableData[i].packing_unit
+        this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].packing_price).toFixed(2)
        }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
-       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','price','total_price','remark']
+       const filterVal = ['index','good_name', 'specification_name', 'packing_unit','count','packing_price','total_price','remark']
 
        const data = this.formatJson(filterVal, this.tableData)
        console.log("data",data)
        return total_price
      },
    
-     
+     getGoodDetailPrintList(){
+        const params = {
+          start_time:this.start_time,
+          end_time:this.end_time,
+          type:2,
+        }
+      getGoodDetailPrintList(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("出库单详单",list)
+          this.tableData = list
+        }
+      })
+     } 
   }
 };
 </script>

src/xt_pages/stock/drugs/components/drugCancelDetail.vue

       getDrugCancelDetail(params).then(response=>{
          if(response.data.state == 1){
            var order =  response.data.data.order
-           console.log("退库详细222222222222222222",order)
+          //  console.log("退库详细222222222222222222",order)
            this.tableData = order
            this.tableList = order
            var total = response.data.data.total

src/xt_pages/stock/drugs/components/drugInOrder.vue

 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers } from "@/api/doctor";
 import { GetAllConfig } from "@/api/stock";
-import { getDrugIndetail} from "@/api/drug/drug_stock"
+import { getDrugIndetail,getDrugWarehouseInfoPrint} from "@/api/drug/drug_stock"
 export default {
   name: "stockInDetail",
 
     this.fetchAllAdminUsers()
     //获取入库单数据
     this.getlist()
+    this.getDrugWarehouseInfoPrint() 
+
   },
   data() {
     return {
       limit: 10,
       manufacturer_id: "",
       dealer_id: "",
-      order_type: "",
+      order_type: 1,
       checked: false,
       total: 0,
       pageTotal: 0,
       selectedTableData: [],
       dealer: [],
       tableList:[],
+      tabelePrintList:[],
     };
   },
   methods: {
     changeType: function(val) {
+     
       this.order_type = val;
      
     },
         }
       })
     },
+    getDrugWarehouseInfoPrint(){
+      var params = {
+        start_time:this.start_time,
+        end_time:this.end_time,
+        order_type:this.order_type,
+      }
+      console.log("params2222",params)
+     getDrugWarehouseInfoPrint(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("入库单详情",list)
+            this.tabelePrintList = list
+          }   
+      })
+    },
     PrintAction(){
+      console.log("打印",this.order_type)
       this.$router.push("/stock/drugprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     select(){
       return name
     },
      exportList(){
-        for(let i=0;i<this.tableList.length;i++){
-          this.tableList[i].index = i+1
-          this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*" + this.tableList[i].min_number +this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
+        for(let i=0;i<this.tabelePrintList.length;i++){
+          this.tabelePrintList[i].index = i+1
+          this.tabelePrintList[i].drug_name = this.tabelePrintList[i].XtBaseDrug.drug_name
+
+          this.tabelePrintList[i].unit = this.tabelePrintList[i].XtBaseDrug.dose + this.tabelePrintList[i].XtBaseDrug.dose_unit + "*" + this.tabelePrintList[i].XtBaseDrug.min_number +this.tabelePrintList[i].XtBaseDrug.min_unit +"/"+this.tabelePrintList[i].XtBaseDrug.max_unit
         }
         
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
        const filterVal = ['index','drug_name', 'unit', 'min_unit','warehousing_count','price','total_price','remark']
-       console.log("表格22222222",this.tableList)
+       console.log("表格22222222",this.tabelePrintList)
        let obj = {'index':'合计','total_price':0}
-       for(let i=0;i<this.tableList.length;i++){
-         obj.total_price += this.tableList[i].price * this.tableList[i].warehousing_count
+       for(let i=0;i<this.tabelePrintList.length;i++){
+         obj.total_price += this.tabelePrintList[i].price * this.tabelePrintList[i].warehousing_count
        }
-       for(let j=0;j<this.tableList.length;j++){
-         this.tableList[j].total_price = this.tableList[j].total_price.toFixed(2)
+       for(let j=0;j<this.tabelePrintList.length;j++){
+         this.tabelePrintList[j].total_price = this.tabelePrintList[j].total_price.toFixed(2)
        }
        obj.total_price = obj.total_price.toFixed(2)
-       this.tableList.push(obj)
-       const data = this.formatJson(filterVal, this.tableList)
+       this.tabelePrintList.push(obj)
+       const data = this.formatJson(filterVal, this.tabelePrintList)
        console.log("data",data)
        
         excel.export_json_to_excel({

src/xt_pages/stock/drugs/components/drugOutDetail.vue

 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers } from "@/api/doctor";
 import {GetAllConfig } from "@/api/stock";
-import {getDrugOutDetail } from "@/api/drug/drug_stock"
+import {getDrugOutDetail,getDrugOutOrderPrint } from "@/api/drug/drug_stock"
  import {getBaseDrugLibList} from '@/api/data'
 export default {
   name: "stockOutDetail",
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
+    this.getDrugOutOrderPrint()
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.getlist()
     this.getBaseDrugLibList()
+ 
   },
   data() {
     return {
       ],
       manufacturer_id: "",
       dealer_id: "",
-      order_type: "",
+      order_type:"",
 
       searchKey: "",
       type: 2,
       dealer: [],
       tableData:[],
       tableList:[],
-      drugList:[]
+      drugList:[],
+      tablePrint:[]
     };
   },
   methods: {
       }
     },
     PrintAction: function() {
-       this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
+       this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
     },
     getlist(){
       var params = {
 
      exportList(){
 
-        for(let i=0;i<this.tableList.length;i++){
-          for(let j=0;j<this.drugList.length;j++){
-             if(this.tableList[i].drug_id == this.drugList[j].id){
-               this.tableList[i].last_price = this.drugList[j].last_price
+        for(let i=0;i<this.tablePrint.length;i++){
+          // for(let j=0;j<this.drugList.length;j++){
+          //    if(this.tableList[i].drug_id == this.drugList[j].id){
+          //      this.tableList[i].last_price = this.drugList[j].last_price
                
-             }
-          }
-          this.tableList[i].index = i+1
+          //    }
+          // }
+          this.tablePrint[i].index = i+1
+          
         }
-        for(let i=0;i<this.tableList.length;i++){
-           this.tableList[i].total_price = this.tableList[i].last_price * this.tableList[i].count
-           this.tableList[i].unit = this.tableList[i].dose + this.tableList[i].dose_unit + "*" + this.tableList[i].min_number +this.tableList[i].min_unit +"/"+this.tableList[i].max_unit
+        for(let i=0;i<this.tablePrint.length;i++){
+           this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
+          //  this.tablePrint[i].total_price = this.tablePrint[i].last_price * this.tablePrint[i].count
+           this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
+           this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
         }
-       console.log("列表数据333333333",this.tableList)
-      
+       console.log("列表数据333333333",this.tablePrint)
+     
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
-       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','last_price','total_price','remark']
-       let obj = {'index':'合计','total_price':0}
-       for(let i=0;i<this.tableList.length;i++){
-         obj.total_price += (this.tableList[i].last_price * this.tableList[i].count)
-       }
-       for(let j=0;j<this.tableList.length;j++){
-          this.tableList[j].total_price = this.tableList[j].total_price.toFixed(2)
-       }
-       obj.total_price = obj.total_price.toFixed(2)
-       this.tableList.push(obj)
-       const data = this.formatJson(filterVal, this.tableList)
+       const filterVal = ['index','drug_name', 'unit', 'min_unit','count','min_price','total_price','remark']
+      //  let obj = {'index':'合计','total_price':0}
+      //  for(let i=0;i<this.tablePrint.length;i++){
+      //    obj.total_price += (this.tablePrint[i].min_price * this.tablePrint[i].count)
+      //  }
+      //  for(let j=0;j<this.tablePrint.length;j++){
+      //     this.tablePrint[j].total_price = this.tablePrint[j].total_price.toFixed(2)
+      //  }
+      //  obj.total_price = obj.total_price.toFixed(2)
+      //  this.tablePrint.push(obj)
+       const data = this.formatJson(filterVal, this.tablePrint)
        console.log("data",data)
        
        excel.export_json_to_excel({
           }
         })
       },
+    getDrugOutOrderPrint(){
+       var params = {
+         start_time:this.start_time,
+         end_time:this.end_time,
+         order_type:2,
+      }  
+      console.log("poara232323223233223",params)
+     getDrugOutOrderPrint(params).then(response=>{
+        if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("药品出库详情",list)
+            let objInfo = {}
+            list.forEach((item,index)=>{
+              let { drug_id } = item
+              if(!objInfo[drug_id]){
+                objInfo[drug_id] = {
+                  drug_id,
+                  child:[],
+                  drug_name:item.XtBaseDrug.drug_name,
+                  drug_spec:item.XtBaseDrug.drug_spec,
+                  min_unit:item.XtBaseDrug.min_unit,
+                  count:0,
+                  price:item.XtBaseDrug.retail_price,
+                  remark:item.XtBaseDrug.remark,
+                  total_price:"",
+                  dose:item.XtBaseDrug.dose,
+                  dose_unit:item.XtBaseDrug.dose_unit,
+                  min_number:item.XtBaseDrug.min_number,
+                  max_unit:item.XtBaseDrug.max_unit,
+                  min_price:item.XtBaseDrug.min_price,
+                }
+              }
+            })
+            let newArr = Object.values(objInfo);
+            for(let i=0;i<newArr.length;i++){
+              for(let j=0;j<list.length;j++){
+                if(newArr[i].drug_id == list[j].drug_id){
+                   newArr[i].child.push(list[j])
+                }
+              }
+            }
+           this.tablePrint = newArr
+           console.log(" this.tablePrint",this.tablePrint)  
+        }
+     })
+    },
+   getCount(arr,max_unit,min_unit,min_number){
+        var total = 0
+        var str = ""
+        var min_str = ""
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].count_unit == max_unit){
+            arr[i].count = arr[i].count * arr[i].min_number
+          }
+        }
+        for(let i=0;i<arr.length;i++){
+          total+= arr[i].count
+        }
+
+       if(total<min_number){
+           str = ""
+           min_str = total + min_unit
+        }
+        if(total >= min_number){
+          if(parseInt(total/min_number)!=0){
+            str = parseInt(total/min_number)+ max_unit
+          }
+          if((total%min_number)!=0){
+            min_str =  total%min_number + min_unit
+          }
+        }
+        return str + min_str
+      },
+      getTotalPrice(arr,max_unit,min_number,min_price){
+        var total = 0
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].count_unit == max_unit){
+            arr[i].count = arr[i].count * min_number
+          }else{
+            arr[i].count = arr[i].count
+          }
+        }  
+        for(let j=0;j<arr.length;j++){
+          total +=arr[j].count
+        }
+        console.log("total23232",total)
+        return (total*min_price).toFixed(2)
+      }
   }
 };
 </script>

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

               </td>
             
               <td style="line-height: 50px">
-                  {{item.count}}
+                  <!-- {{item.count}} -->
+                  {{getCount(item.child,item.max_unit,item.min_unit,item.min_number)}}
               </td>
               <td style="line-height:50px">
-                  <!-- {{item.price}} -->
-                  {{getPrice(item.drug_id)}}
+                  {{item.price}}
+                  <!-- {{getPrice(item.drug_id)}} -->
               </td>
               <td style="line-height:50px">
-                  {{(item.count * getPrice(item.drug_id)).toFixed(2)}}
+                  <!-- {{(item.count * getPrice(item.drug_id)).toFixed(2)}} -->
+                  <!-- {{item.count*item.price}} -->
+                <span ></span>   {{getTotalPrice(item.child,item.max_unit,item.min_number,item.min_price)}}
               </td>
               <td style="line-height: 50px">
                  {{item.remark}}
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
-  import { getDrugOutDetail} from "@/api/drug/drug_stock"
+  import { getDrugOutDetail,getDrugOutOrderPrint} from "@/api/drug/drug_stock"
   export default {
     name: 'dialysisPrintOrder',
     components: {
                  dose:item.dose,
                  dose_unit:item.dose_unit,
                  min_number:item.min_number,
-                 max_unit:item.max_unit
+                 max_unit:item.max_unit,
+                
                }
              }
           })
           }
         }
         return price
+      },
+      getDrugOutOrderPrint(){
+         var params = {
+          start_time:this.start_time,
+          end_time:this.end_time,
+          order_type:parseInt(this.order_type),
+        }
+        console.log("params22222",params)
+        getDrugOutOrderPrint(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("药品出库详情",list)
+            let objInfo = {}
+            list.forEach((item,index)=>{
+              let { drug_id } = item
+              if(!objInfo[drug_id]){
+                objInfo[drug_id] = {
+                  drug_id,
+                  child:[],
+                  drug_name:item.XtBaseDrug.drug_name,
+                  drug_spec:item.XtBaseDrug.drug_spec,
+                  min_unit:item.XtBaseDrug.min_unit,
+                  count:0,
+                  price:item.XtBaseDrug.retail_price,
+                  remark:item.XtBaseDrug.remark,
+                  total_price:"",
+                  dose:item.XtBaseDrug.dose,
+                  dose_unit:item.XtBaseDrug.dose_unit,
+                  min_number:item.XtBaseDrug.min_number,
+                  max_unit:item.XtBaseDrug.max_unit,
+                  min_price:item.XtBaseDrug.min_price,
+                }
+              }
+            })
+            let newArr = Object.values(objInfo);
+            for(let i=0;i<newArr.length;i++){
+              for(let j=0;j<list.length;j++){
+                if(newArr[i].drug_id == list[j].drug_id){
+                   newArr[i].child.push(list[j])
+                }
+              }
+            }
+            console.log("list2334444",newArr)
+            this.cancelStockDate = newArr
+          }
+        })
+      },
+      getCount(arr,max_unit,min_unit,min_number){
+        var total = 0
+        var str = ""
+        var min_str = ""
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].count_unit == max_unit){
+            arr[i].count = arr[i].count * arr[i].min_number
+          }
+        }
+        for(let i=0;i<arr.length;i++){
+          total+= arr[i].count
+        }
+
+       if(total<min_number){
+           str = ""
+           min_str = total + min_unit
+        }
+        if(total >= min_number){
+          if(parseInt(total/min_number)!=0){
+            str = parseInt(total/min_number)+ max_unit
+          }
+          if((total%min_number)!=0){
+            min_str =  total%min_number + min_unit
+          }
+        }
+        return str + min_str
+      },
+      getTotalPrice(arr,max_unit,min_number,min_price){
+        var total = 0
+        for(let i=0;i<arr.length;i++){
+          if(arr[i].count_unit == max_unit){
+            arr[i].count = arr[i].count * min_number
+          }else{
+            arr[i].count = arr[i].count
+          }
+        }  
+        for(let j=0;j<arr.length;j++){
+          total +=arr[j].count
+        }
+        console.log("total23232",total)
+        return (total*min_price).toFixed(2)
       }
     },
     created() {
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
-      this.getlist()
-      this.getBaseDrugLibList()
+      // this.getlist()
+      // this.getBaseDrugLibList()
+      this.getDrugOutOrderPrint()
     }
 
   }

src/xt_pages/stock/drugs/drugPrint.vue

                 {{index+1}}
               </td>
               <td style="line-height: 50px">
-                <span>{{item.drug_name}}</span>
+                <span>{{item.XtBaseDrug.drug_name}}</span>
               </td>
               <td style="line-height: 50px">
                 <!-- <span>{{item.drug_spec}}</span> -->
-                <span>{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
+                <span>{{item.XtBaseDrug.dose}}{{item.XtBaseDrug.dose_unit}}*{{item.XtBaseDrug.min_number}}{{item.XtBaseDrug.min_unit}}/{{item.XtBaseDrug.max_unit}}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{item.min_unit}}</span>
+                <span>{{item.XtBaseDrug.min_unit}}</span>
               </td>
             
               <td style="line-height: 50px">
   import { jsGetAge, uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
-  import { getDrugIndetail} from "@/api/drug/drug_stock"
+  import { getDrugIndetail,getDrugWarehouseInfoPrint} from "@/api/drug/drug_stock"
   export default {
     name: 'dialysisPrintOrder',
     components: {
            total += this.cancelStockDate[i].price*this.cancelStockDate[i].warehousing_count
         }
         return total
+      },
+      getDrugWarehouseInfoPrint(){
+         var params = {
+          start_time:this.start_time,
+          end_time:this.end_time,
+          order_type:this.order_type,
+         }
+         console.log("params2222",params)
+        getDrugWarehouseInfoPrint(params).then(response=>{
+           if(response.data.state == 1){
+             var list = response.data.data.list
+             console.log("入库单详情",list)
+             this.cancelStockDate  = list
+           }   
+        })
+
+        
       }
     },
     created() {
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
-      this.getlist()
+      // this.getlist()
+     
 
+      this.getDrugWarehouseInfoPrint()
       
 
     }

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

               'stockIn': this.recordInfo.recordData
             }
             console.log("params2222222",params)
-             
+            
             postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)

src/xt_pages/stock/drugs/drugStockOutOrder.vue

               <span>使用人</span>
             </template>
             <template slot-scope="scope">
-              <!-- <span v-if="scope.row.is_total == 0">{{scope.row.user.name}}</span>
-              <span  v-if="scope.row.is_total == 1"></span> -->
               {{scope.row.user.name}}
             </template>
           </el-table-column>
             </template>
             <template slot-scope="scope">
               <span >{{scope.row.count}}{{scope.row.count_unit}}</span>
-              <!-- <span  v-if="scope.row.is_total == 1">{{scope.row.total}}</span> -->
             </template>
           </el-table-column>
 
           this.tableShow = true
           this.tableList = []
           var list =  response.data.data.list
-          console.log("list2323232",list)
           var outList = response.data.data.outList
           for(let i=0;i<outList.length;i++){
-            console.log("55555",outList[i].count_unit)
-            console.log("666",outList[i].max_unit)
           if(outList[i].count_unit == outList[i].max_unit){
               outList[i].count =outList[i].count * outList[i].min_number
             }
           }
           this.outList = outList
-         console.log("出库数据44444",outList)
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
          this.drugFlowList = drugFlowList
-         console.log("23232323232323",drugFlowList)
          for(let i=0;i<list.length;i++){
            if(list[i].batch_number == "0" || list[i].batch_number == 0){
               list[i].batch_number = ""
         return str + min_str
       },
       getTotalCount(drug_id,min_number,max_unit,min_unit){
-        console.log("hhhhhhhhh",this.outList)
          var str = ""
          var min_str = ""
          var arr = []
          return str + min_str
       },
       getTotalCountOne(id,min_number,max_unit,min_unit){
-        console.log("列表",this.drugFlowList)
         var arr = []
         for(let i=0;i<this.drugFlowList.length;i++){
           if(id == this.drugFlowList[i].drug_id){
              arr.push(this.drugFlowList[i])
           }
         }
-      
         var total = 0
         for(let i=0;i<arr.length;i++){
           if(arr[i].count_unit == max_unit){
           }
           total += arr[i].count
         }
-      console.log("arr00000000000",arr)
         var str = ""
         var min_str = ""
         if(total >= min_number){
           str = ""
           min_str = total + min_unit
         }
-       
         return str + min_str 
-
       },
     //   getTotalCountOne(id,min_number,max_unit,min_unit){
        
          return  total_price
       },
       getDrugBatchNumber(drugid,count){
+        console.log("drug_id2323",drug_id)
+        console.log("count",count)
+        console.log("hhhhhhhhhhh",this.batchNumberList)
         var arr = []
         for(let i=0;i<this.batchNumberList.length;i++){
           if(drugid == this.batchNumberList[i].drug_id && count == this.batchNumberList[i].count){

src/xt_pages/user/components/PatientSidebar.vue

               name: '1-2',
               label: '病程管理'
             },
-            // {
-            //   name: '1-9',
-            //   label: '阶段小结'
-            // },
+            {
+              name: '1-9',
+              label: '阶段小结'
+            },
             {
               name: '1-3',
               label: '检验检查'
       }else if (name == '1-8'){
         this.$router.push({path:'/patients/patients/'+this.id+'/inspectionInfectious'})
       }else if (name == '1-9'){
-        this.$router.push({path:'/patients/patients/'+2448+'/templateSummary'})
+        this.$router.push({path:'/patients/patients/'+this.id+'/templateSummary'})
       }
     },
     changePatient(value) {

src/xt_pages/user/templateSummary.vue

                   color: '#606266'
                 }"
                 :row-style="{ color: '#303133' }" ref="record_table" :data="records"
-                        border highlight-current-row @current-change="didChangeCurrentRecord"
+                        border highlight-current-row @current-change="changeCurrentRecordOne"
                         @selection-change="didSelectionChange"
                         :row-class-name="tableRow"
                         @row-click="onRowClick"
               >
                 <el-table-column type="selection" width="40" align="center"></el-table-column>
-                <el-table-column label="阶段小结名称" align="center">
-                  <template slot-scope="scope">
-                    <!-- {{ scope.row.title}} -->
-                  </template>
-                </el-table-column>
-                <el-table-column label="记录时间" align="center">
-                  <template slot-scope="scope">
-                    <!-- {{ recordTime(scope.row.record_time) }} -->
-                  </template>
-                </el-table-column>
-                <el-table-column label="记录医生" align="center">
+                <el-table-column label="检查项目" align="center">
                   <template slot-scope="scope">
-                    <!-- {{ doctorName(scope.row.recorder) }} -->
+                   
                   </template>
                 </el-table-column>
               </el-table>
             <el-col :span="14">
               <div class="record_content_panel">
                 <div style="background-color:rgb(245, 247, 250)" class="title">病程内容</div>
-                <div class="content">
-                  <span v-if="current_select_record" v-html="current_select_record.content">{{current_select_record.content }}</span>
-                  <span v-else></span>
-                </div>
+                  <el-table :header-cell-style="{
+                     backgroundColor: 'rgb(245, 247, 250)',
+                     color: '#606266'
+                   }"
+                   :row-style="{ color: '#303133' }" ref="record_table" :data="records"
+                        border highlight-current-row @current-change="didChangeCurrentRecord"
+                        @selection-change="didSelectionChange"
+                        :row-class-name="tableRow"
+                        @row-click="onRowClick"
+                 >
+                  <el-table-column type="selection" width="40" align="center"></el-table-column>
+                  <el-table-column label="检查项目" align="center">
+                    <template slot-scope="scope">
+                    
+                    </template>
+                  </el-table-column>
+                </el-table>
               </div>
             </el-col>
           </el-row>
                      </el-radio-group>
                     </el-form-item> 
                   </el-col>
+                  
                   <el-col :span="8" v-if="form.radio == 1">
                     <el-form-item>
                       <el-date-picker
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
-                     <el-select v-model="form.template_inspection_id" placeholder="请选择">
-                        <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                        </el-option>
-                     </el-select>
-                     <el-input tyep="text" v-model="form.template_inspection_content"></el-input>
+                    <el-button type="primary" @click="toInspection">选择检验检查</el-button>
+                     <el-input tyep="text" v-model="form.template_inspection_content" style="height:100px"></el-input>
                   </el-row>
                   <el-row>
                     <el-col :span="8">
                   </el-row>
               </el-form>
             </div>
-
-
-          
             <div style="text-align: right; padding-right: 0px; padding-top: 10px; padding-bottom: 10px;">
               <el-button @click="show_dialog = false">取消</el-button>
               <el-button type="primary" @click="createAction">保存
         </div>
       </el-dialog>
 
-
+       <el-dialog
+        title="提示"
+        :visible.sync="dialogVisibleInspection"
+        width="80%"
+        >
+        <span>
+          <el-form>
+            <el-row>
+              <el-form-item>
+                <span>选择检验检查时间:</span>
+                <div>
+                  <el-form-item
+                   label="年份:"
+                   prop="startYear"
+                   style="width:100%;"
+                 >
+                 <el-date-picker 
+                    v-model="startYear" 
+                    class="timePicker" 
+                    type="month" 
+                    placeholder=""
+                    format="yyyy-MM" 
+                    value-format="yyyy-MM">
+	               </el-date-picker>
+                 </el-form-item>
+                 <!-- <el-form-item  label="月份:"
+                   prop="startYear"
+                   style="width:100%;">     
+                  <el-date-picker
+                    v-model="startMonth"
+                    type="month"
+                    format="MM"
+                    value-format="MM"
+                    placeholder="请选择">
+                  </el-date-picker>  
+                 </el-form-item> -->
+                </div>
+              </el-form-item>
+            </el-row>
+            <el-row>
+               <span>选择检验检查项目:</span>
+                 <div class="record">
+                  <el-row :gutter="15">
+                    <el-col :span="10">
+                      <el-table :header-cell-style="{
+                          backgroundColor: 'rgb(245, 247, 250)',
+                          color: '#606266'
+                        }"
+                        :row-style="{ color: '#303133' }" :data="tableList"
+                                border highlight-current-row @current-change="changeCurrentRecord"
+                                @selection-change="selectionChangeOne"
+                                :row-class-name="tableRow"
+                                @row-click="onRowClick"
+                                ref="singleTable"
+                      >
+                        <el-table-column type="selection" width="40" align="center"></el-table-column>
+                        <el-table-column label="检验项目" align="center">
+                          <template slot-scope="scope">
+                            {{scope.row.project_name}}
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                    </el-col>
+                    <el-col :span="14">
+                      <div class="record_content_panel">
+                        <el-table :header-cell-style="{
+                          backgroundColor: 'rgb(245, 247, 250)',
+                          color: '#606266'
+                        }"
+                        :row-style="{ color: '#303133' }" ref="record_table" :data="tableData"
+                                border highlight-current-row @current-change="didChangeCurrentRecord"
+                                @selection-change="selectionChange"
+                                :row-class-name="tableRow"
+                                @row-click="onRowClick"
+                                
+                      >
+                        <el-table-column label="检验项目" align="center">
+                          <template slot-scope="scope">
+                            {{scope.row.item_name}}
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="结果" align="center">
+                          <template slot-scope="scope">
+                           <span v-if="parseInt(scope.row.inspect_value) < parseInt(scope.row.range_min)">
+                             {{scope.row.inspect_value}}↓
+                          </span> 
+                           <span v-if="parseInt(scope.row.inspect_value) > parseInt(scope.row.range_max)">
+                             {{scope.row.inspect_value}}↑
+                          </span> 
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="参考值" align="center">
+                          <template slot-scope="scope">
+                           {{scope.row.range_min}} ~  {{scope.row.range_max}}
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="单位" align="center">
+                          <template slot-scope="scope">
+                            {{scope.row.unit}}
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      </div>
+                    </el-col>
+                  </el-row>
+                </div>
+            </el-row>
+          </el-form>
+
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisibleInspection = false">取 消</el-button>
+          <el-button type="primary" @click="toContent">确 定</el-button>
+        </span>
+      </el-dialog>
   
     </div>
   </div>
   import PatientSidebar from './components/PatientSidebar'
   import Editor from '@/components/Editor'
 
-  import { getInitDataList } from '@/api/patient'
+  import { getInitDataList,getInspectionMajorItem,getInspectionDetail,getInspectionItemList } from '@/api/patient'
   import { parseTime } from '@/utils'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { uParseTime } from '@/utils/tools'
           {id:4,name:"第四季度"},
         ],
         options:[],
+        dialogVisibleInspection:false,
+        InspectionMajor:[],
+        other_start_time:"",
+        startYear:new Date(),
+        startMonth:(new Date().getMonth+1).toString(),
+        tableList:[],
+        tableData:[],
+        inspectDataList:[],
+        projectList:[],
       }
     },
     created() {
-    //   this.patient_id = parseInt(this.$route.query.id)
-    //   if (isNaN(this.patient_id) || this.patient_id <= 0) {
-    //     this.$notify.error({
-    //       title: '错误',
-    //       message: '无效的id'
-    //     })
-    //     this.$router.push('/patients/patients')
-    //     return
-    //   }
+      this.patient_id = parseInt(this.$route.query.id)
+      console.log("hhhhhh",this.patient_id)
+      if (isNaN(this.patient_id) || this.patient_id <= 0) {
+        this.$notify.error({
+          title: '错误',
+          message: '无效的id'
+        })
+        this.$router.push('/patients/patients')
+        return
+      }
       var now = new Date()
       this.date = [now.getTime() - (7 * 24 * 60 * 60 * 1000), now.getTime()]
 
         (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
         '-' +
         (nowDay < 10 ? '0' + nowDay : nowDay)
+      this.other_start_time = nowYear +'-' +(nowMonth < 10 ? '0' + nowMonth : nowMonth) +'-' + (nowDay < 10 ? '0' + nowDay : nowDay)
       this.getlist()
+      this.getInspectionMajor()
+
     },
     methods: {
       getTime(val) {
       },
       didChangeCurrentRecord(){
 
+      },
+      changeCurrentRecord(val){
+      
+        this.getInspectionDetai(val)
+      },
+      selectionChangeOne(val){
+        console.log("val23232323",val)
+       
+        this.getInspectionItemList(val)
       },
       startTimeChange(){
 
       },
       print(){
 
+      },
+      tableRow(){
+
       },
       getQuarter(year,quarter){
         var start_time = ""
 
         // }
 
+      },
+      didSelectionChange(){
+
+      },
+      changeCurrentRecordOne(){
+
+      },
+      changeCurrentRecordOne(){
+
       },
       getlist(){
         var params={
         }
         console.log("param222222",params)
         console.log(moment(moment(2020 + '-01-01').toDate()).quarter(2).format("YYYY-MM-DD"))
-      getInitDataList(params).then(response=>{
+        getInitDataList(params).then(response=>{
+
+       })
+      },
+      toInspection(){
+        this.dialogVisibleInspection = true
+      },
+
+      //获取大项数据来源
+      getInspectionMajor(){
+          var params = {
+            other_start_time:this.getTime(this.startYear),
+            // patient_id:this.$route.query.id,
+             patient_id:2448,
+          }
+        console.log("params",params)
+        getInspectionMajorItem(params).then(response=>{
+          if(response.data.state == 1){
+            var list = response.data.data.list
+            console.log("list23232323",list)
+            this.tableList = list
+            // this.$refs.singleTable.setCurrentRow(list[0])
+          }
+        })
+      },
+      //获取小项的值
+      getInspectionDetai(val){
+        var params = {
+          project_id:val.project_id,
+          patient_id:val.patient_id,
+          inspect_date:val.inspect_date,
+        }
+        console.log("param2233233223",params)
+       getInspectionDetail(params).then(response=>{
+          if(response.data.state ==1){
+            var list = response.data.data.list
+            console.log("详情222",list)
+            this.tableData = list
+          }
+       })
+      },
+      selectionChange(val){
+        console.log("val233223",val)
+        selectionChange().then(response=>{
 
-      })
+        })
+      },
+      getInspectionItemList(val){
+       
+       for(let i=0;i<val.length;i++){
+        this.projectList.push(val[i].project_id)
+        this.inspectDataList.push(val[i].inspect_date)
+      }
+    
+      },
+      toContent(){
+      
+         var str = this.inspectDataList.join(",")
+         var inspe_date = this.projectList.join(",")
+         var params = {
+           ids:str,
+           inspect_date:inspe_date,
+           patient_id:2448,
+         }
+         console.log("params",params)
+        getInspectionItemList(params).then(response=>{
+           if(response.data.state == 1){
+             var list = response.data.data.list
+             console.log("list23223322332",list)
+             var str = ""
+             for(let i=0;i<list.length;i++){
+               str += (list[i].item_name + ":" + list[i].inspect_value)
+             }
+            this.form.template_inspection_content = str
+            this.dialogVisibleInspection = true
+           }
+        })  
       }
     }
   }

src/xt_pages/workforce/template.vue

 
 
         })
+      },
+      beforeUpload(){
+
       },
       handleSuccess({ results, header }) {
-       
+         consle.log("result32eeeeeeee",results)
         let headers = []
         for (let key in results[0]) {
           headers.push(key)