数据

src/api/drug/drug_stock.js

     params: params
   })
 }
+
+export function getDrugCountList(params) {
+  return request({
+    url: '/api/drug/getdrugcountlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getSinleOrderDetail(params) {
+  return request({
+    url: '/api/drug/getsingleorderdetail',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/selfPreparedMedicine.js

     },
 
     {
-        path: '/stock/selfPreparedMedicineIndex',
-        component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
-        name: 'selfPreparedMedicineIndex',
-        meta: { title: 'selfPreparedMedicineIndex', noCache: true }
+      path: '/stock/selfPreparedMedicineIndex',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/index'),
+      name: 'selfPreparedMedicineIndex',
+      meta: { title: 'selfPreparedMedicineIndex', noCache: true }
     },
     {
-        path: '/stock/selfPreparedMedicineQuery',
-        component: () => import('@/xt_pages/stock/selfPreparedMedicine/query'),
-        name: 'selfPreparedMedicineQuery',
-        meta: { title: 'selfPreparedMedicineQuery', noCache: true }
+      path: '/stock/selfPreparedMedicineQuery',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/query'),
+      name: 'selfPreparedMedicineQuery',
+      meta: { title: 'selfPreparedMedicineQuery', noCache: true }
     },
     {
-        path: '/stock/selfPreparedMedicineQueryPrint',
-        component: () => import('@/xt_pages/stock/selfPreparedMedicine/queryPrint'),
-        name: 'selfPreparedMedicineQueryPrint',
-        hidden: true,
-        is_menu: false,
-        meta: { title: 'selfPreparedMedicineQueryPrint', noCache: true }
+      path: '/stock/selfPreparedMedicineQueryPrint',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/queryPrint'),
+      name: 'selfPreparedMedicineQueryPrint',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'selfPreparedMedicineQueryPrint', noCache: true }
     },
     {
-        path: '/stock/selfPreparedMedicineInfo',
-        component: () => import('@/xt_pages/stock/selfPreparedMedicine/info'),
-        name: 'selfPreparedMedicineInfo',
-        meta: { title: 'selfPreparedMedicineInfo', noCache: true }
+      path: '/stock/selfPreparedMedicineInfo',
+      component: () => import('@/xt_pages/stock/selfPreparedMedicine/info'),
+      name: 'selfPreparedMedicineInfo',
+      meta: { title: 'selfPreparedMedicineInfo', noCache: true }
     },
     {
       path: '/stock/stockprint',
       hidden: true,
       is_menu: false,
       meta: { title: 'stockprint', noCache: true }
-     },
-     {
-       path:"/stock/selfstockprint",
-       component:()=>import('@/xt_pages/stock/selfStockPrint'),
-       name:'selfStockQuery',
-       hidden:true,
-       is_menu:false,
-       meta:{title:'selfStockPrint',noCache:true}
-     },
+    },
+    {
+      path: '/stock/selfstockprint',
+      component: () => import('@/xt_pages/stock/selfStockPrint'),
+      name: 'selfStockQuery',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'selfStockPrint', noCache: true }
+    },
 
-     {
+    {
       path: '/stock/stockprint',
       component: () => import('@/xt_pages/stock/stockPrint'),
       name: 'stockqueryprint',
       hidden: true,
       is_menu: false,
       meta: { title: 'stockprint', noCache: true }
-     },
+    },
 
-     {
+    {
       path: '/stock/in/detail/print',
       component: () => import('@/xt_pages/stock/stockInOrderDetailPrint'),
       name: 'stockInDetailPrint',
       hidden: true,
       is_menu: false,
-      meta: { title: 'stockInDetailPrint',noCache: true }
+      meta: { title: 'stockInDetailPrint', noCache: true }
     },
     {
-      path: '/stock/out/detail',
+      path: '/stock/out/detail/print',
       component: () => import('@/xt_pages/stock/stockOutOrderDetailPrint'),
       name: 'stockOutDetailPrint',
       hidden: true,
       is_menu: false,
-      meta: { title: 'stockOutDetailPrint',noCache: true }
-    },
+      meta: { title: 'stockOutDetailPrint', noCache: true }
+    }
   ]
 }

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

 
                         </el-button>
 
-                        <!--<el-button-->
-                                <!--size="small" @click="sz_open(8)" type="primary"-->
-                        <!--&gt;预结算-->
-                        <!--</el-button>-->
+                        <el-button
+                                size="small" @click="sz_open(8)" type="primary"
+                        >预结算
+                        </el-button>
 
-                        <!--<el-button-->
-                                <!--v-if="this.order.order_status == 1"-->
-                                <!--size="small" @click="sz_open(7)" type="primary"-->
-                        <!--&gt;撤销明细-->
-                        <!--</el-button>-->
+                        <el-button
+                                v-if="this.order.order_status == 1"
+                                size="small" @click="sz_open(7)" type="primary"
+                        >撤销明细
+                        </el-button>
 
                         <el-button
                                 v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1"

src/xt_pages/stock/drugs/drugStockFlow.vue

         </el-table-column>
         <el-table-column prop="drug_type" label="出入库方式" width="180">
            <template slot-scope="scope">
-             <span v-if="scope.row.drug_way == 4">入库</span>
-             <span v-if="scope.row.drug_way == 2">出库</span>
+             <span v-if="scope.row.drug_way == 4">手动入库</span>
+             <span v-if="scope.row.drug_way == 2">手动出库</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出/入库单据编码">
              <span v-if="scope.row.drug_way == 2">{{scope.row.warehousing_order}}</span>
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="库存剩余量">
+         <el-table-column prop="drug_name" label="剩余库存量">
            <template slot-scope="scope">
-             <span v-if="scope.row.drug_way == 4"> {{scope.row.stock_max_numbe}}{{scope.row.max_unit}}{{scope.row.stock_min_number}}{{scope.row.min_unit}}</span>
-             <span v-if="scope.row.drug_way == 2">{{scope.row.count}}</span>
+             <!-- <span v-if="scope.row.drug_way == 4"> {{scope.row.stock_max_numbe}}{{scope.row.max_unit}}{{scope.row.stock_min_number}}{{scope.row.min_unit}}</span>
+             <span v-if="scope.row.drug_way == 2">{{scope.row.count}}</span> -->
+              {{getInCount(scope.row.drug_id) - getOutCount(scope.row.drug_id) - getAutoCount(scope.row.drug_id)}}
+             <span></span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="进/出货单价">
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getDrugStockFlow,getOutDrugStockFlow } from '@/api/drug/drug_stock'
+  import { getDrugStockFlow,getOutDrugStockFlow,getDrugCountList } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
   export default {
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
       this.getlist()
       this.getOutList()
+      this.getDrugCountList()
     },
     components: {
       SettingDialog,
           {id:0,name:"全部"},
           {id:1,name:"手动出库"},
           {id:2,name:"自动出库"},
-          {id:3,name:"入库"},
+          {id:3,name:"手动入库"},
 
         ],
         outList:[],
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
       }
     },
     methods:{
                   outList[i].drug_way = 2
                   this.tableList.push(outList[i])
                }
-              // for(let i=0;i<this.tableList.length;i++){
-              //   this.tableList[i].index = i+1
-              // }
               console.log("列表数据",this.tableList)
             }
          })
        },
        handleSizeChange(val) {
         this.limit = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
         
     startTimeChange: function(val) {
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+        this.getlist();
       }
     },
     endTimeChange: function(val) {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+        this.getlist();
       }
      },
-     changeDrug(){},
      getManufacturer(id){
        var name = ""
        for(let i=0;i<this.manufacturerList.length;i++){
         return uParseTime(val, '{y}-{m}-{d}')
       }
      },
+    getDrugCountList(){
+         var params = {
+          keyword: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+         }
+      getDrugCountList(params).then(response=>{
+          if(response.data.state == 1){
+            var countlist =  response.data.data.countList
+            console.log("入库数据",countlist)
+            this.countList = countlist
+            var outcountlist = response.data.data.outCountList
+            console.log("出库数据",outcountlist)
+            this.outCountList = this.outCountList
+            var aucountlist = response.data.data.auCountList
+            console.log("自动数据",aucountlist)
+            this.autoCountList = aucountlist
+          }
+        })
+      },
+      getInCount(id){
+        var count = ""
+        for(let i=0;i<this.countList.length;i++){
+           if(id == this.countList[i].drug_id){
+             count = this.countList[i].count
+           }
+        }
+        return count
+      },
+
+      getOutCount(id){
+        var count = ""
+        for(let i=0;i<this.outCountList.length;i++){
+           if(id == this.outCountList[i].drug_id){
+               count = this.outCountList[i].count
+           }
+        }
+        return count
+      },
+      getAutoCount(id){
+        var count= ""
+        for(let i=0;i<this.autoCountList.length;i++){
+          if(id == this.autoCountList[i].drug_id){
+            count = this.autoCountList[i].count
+          }
+        }
+        return count
+      },
+      getTimestamp(time) { // 把时间日期转成时间戳
+        return (new Date(time)).getTime() / 1000
+      },
+      changeDrug(val){
+        
+        var arr = []
+        if(val == 3){
+          for(let i=0;i<this.tableList.length;i++){
+            if(this.tableList[i].drug_way == 4){
+
+              arr.push(this.tableList[i])
+            }
+          }
+          this.tableList = arr
+        }
+        if(val == 1){
+          for(let i=0;i<this.tableList.length;i++){
+            if(this.tableList[i].drug_way == 2){
+              arr.push(this.tableList[i])
+            }
+          }
+          this.tableList = arr
+        }
+      }
     }
   }
 </script>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

               <span>药品类型</span>
             </template>
              <template slot-scope="scope">
-               <el-select v-model="scope.row.drug_type" filterable placeholder="请输入药品类型">
+               <el-select v-model="scope.row.drug_type" filterable placeholder="请选择药品类型">
                 <el-option
                   v-for="(option, index) in drugTypeList"
                   :key="index"

src/xt_pages/stock/drugs/drugStockOutOrder.vue

 
         <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">
-              {{getDrugType(scope.row.drug.drug_type)}}
+              {{getDrugType(scope.row.drug_type)}}
           </template>
         </el-table-column>
          <el-table-column label="规格&单位" align="center">
           <template slot-scope="scope">
-             {{scope.row.drug.dose}}&nbsp;{{scope.row.drug.dose_unit}}*{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
+             {{scope.row.dose}}&nbsp;{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
           </template>
         </el-table-column>
        
 
        <el-table-column label="生产厂家" align="center">
           <template slot-scope="scope">
-             {{getManufacturerName(scope.row.drug.manufacturer)}}
+             {{getManufacturerName(scope.row.manufacturer)}}
           </template>
         </el-table-column>
 
   getDrugWarehouseOutList,
   getDrugWarehouseOutInfo,
   getDrugWarehouseOutUser,
-  getDrugAutoMaticList
+  getDrugAutoMaticList,
+  getSinleOrderDetail
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 import { getInitializtion } from '@/api/stock'
     //   this.dialogVisible = true
     // },
     handleSearch(val){
+       console.log("val2222222222",val)
        this.getInitializtion()
-       this.GetOrderDetail(val.id)
+       this.getSinleOrderDetail(val.id)
        this.list = []
        this.getDrugAutoMaticList(val.id,val.time,val.warehouse_out_order_number)
+
     },
     GetOrderDetail(order_id) {
         const params = {
        }
      }
      return name
+   },
+   getSinleOrderDetail(id){
+       var params = {
+         id:id,
+       }
+     getSinleOrderDetail(params).then(response=>{
+        if(response.data.state == 1){
+          this.tableShow = true
+          this.tableList = []
+          var list =  response.data.data.list
+          console.log("list",list)
+          this.tableList = list
+        }
+     })
    }
   }
 };

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="150">
+          <!-- <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope" >
                   <span>批号</span>
               </template>
                     ></el-input>
                   </el-form-item>
               </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
               ></el-date-picker>
             </template>
           </el-table-column>
-        
+<!--         
         <el-table-column align="center" width="150" label="批准文号">
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
                 ></el-input>
               </el-form-item>
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
           <el-table-column label="备注" width="120" align="center">
             <template slot-scope="scope">
       tempObj["retail_price"] = "";
       tempObj["remark"] = "";
       tempObj["min_unit"] = "";
+      tempObj['dose'] = ""
+      tempObj['dose_unit'] = ""
+      tempObj["min_number"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
             stockOut: this.recordInfo.recordData
           };
           console.log("params222222",params)
-      
+          
           postDrugWarehouseOut(
             params,
             this.warehouse_out_time,
             this.recordInfo.recordData[i].max_unit = val.max_unit
             this.recordInfo.recordData[i].min_number = val.min_number
             this.recordInfo.recordData[i].min_unit = val.min_unit
-            this.recordInfo.recordData[i].packing_unit = val.packing_unit
+         
             this.recordInfo.recordData[i].number = val.number
             this.recordInfo.recordData[i].last_price = val.last_price
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
       (nowDay < 10 ? "0" + nowDay : nowDay);
     const tempObj = {};
     tempObj["drug_id"] = 0;
-    tempObj['dosage'] = ''
     tempObj['max_unit'] = ''
-    tempObj['unval'] = ''
     tempObj['min_unit'] = '',
-    tempObj['packing_unit'] = '',
     tempObj["return_count"] = 0;
     tempObj["price"] = "";
     tempObj["remark"] = "";
-    tempObj["min_unit"] = "";
     tempObj['manufacturer'] = ''
     tempObj['batch_number'] = ''
     tempObj['drug_type'] = ''
+    tempObj['dose'] = ""
+    tempObj['dose_unit'] = ""
+    tempObj["min_number"] = ""
+    
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

                   max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
 
-          <el-table-column align="center" width="200">
+          <el-table-column align="center" width="150px">
             <template slot="header" slot-scope="scope">
               <span>药品名称<span style="color: red">*</span></span>
             </template>
               </el-form-item>
             </template>
           </el-table-column>
-         <el-table-column align="center" width="150">
+         <!-- <el-table-column align="center" width="150">
             <template slot="header" slot-scope="scope" >
                   <span>批号</span>
               </template>
                     ></el-input>
                   </el-form-item>
               </template>
-          </el-table-column>
+          </el-table-column> -->
            <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>出库数量<span style="color: red">*</span></span>
               ></el-date-picker>
             </template>
           </el-table-column>
-           <el-table-column align="center" width="150" label="批准文号">
+           <!-- <el-table-column align="center" width="150" label="批准文号">
             <template slot-scope="scope">
               <el-form-item style="padding-top: 20px">
                 <el-input
                 ></el-input>
               </el-form-item>
             </template>
-          </el-table-column>
+          </el-table-column> -->
 
           <el-table-column label="备注" width="120" align="center">
             <template slot-scope="scope">
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" min-width="20">
+          <el-table-column label="操作" align="center" width="150" fixed="right">
             <template slot-scope="scope">
               <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
             const params = {
               'stockOut': this.recordInfo.recordData
             }
+            console.log("params----",params)
             editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)

src/xt_pages/stock/drugs/query.vue

             style="width: 200px;"
             class="filter-item"
             v-model.trim="keywords"
-            placeholder="商品名称/规格名称"
+            placeholder="药品名称"
           />
           <el-button
             size="small"
              {{getManufacturerList(scope.row.manufacturer)}}
            </template>
         </el-table-column>
+        <el-table-column prop="drug_name" label="入库数量" align="center">
+           <template slot-scope="scope">
+              {{getInCount(scope.row.drug_id)}}
+           </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="出库数量" align="center">
+           <template slot-scope="scope">
+             {{getOutCount(scope.row.drug_id)}}
+           </template>
+        </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
-            <span v-if="scope.row.stock_max_number!=''">
-              {{scope.row.stock_max_number}}{{scope.row.max_unit}}
-              <span v-if="scope.row.stock_min_number!=''">
-                {{scope.row.stock_min_number}}{{scope.row.min_unit}}
-              </span>
-            </span> 
+            {{getInCount(scope.row.drug_id) - getOutCount(scope.row.drug_id) - getAutoCount(scope.row.drug_id)}}
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作" align="center">
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getAllDrugStockQueryList,getDrugStockList } from '@/api/drug/drug_stock'
+  import { getAllDrugStockQueryList,getDrugStockList,getDrugCountList } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
   export default {
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
   
       this.getlist()
+      this.getDrugCountList()
     },
     components: {
       SettingDialog,
         ],
         drugTypeList:[],
         tableList:[],
-        manufacturerList:[]
+        manufacturerList:[],
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
+        keyword:"",
       }
     },
     methods: {
       showCancelStockDetailDialog: function() {
       },
       search: function() {
-        // this.GetAllDrugStockQueryList()
         this.getlist()
       }, 
       setting: function() {
       },
       handleBatch(id){
         this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id='+id})
+      },
+      getDrugCountList(){
+         var params = {
+          keyword: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+         }
+        getDrugCountList(params).then(response=>{
+          if(response.data.state == 1){
+            var countlist =  response.data.data.countList
+            console.log("入库数据",countlist)
+            this.countList = countlist
+            var outcountlist = response.data.data.outCountList
+            console.log("出库数据",outcountlist)
+            this.outCountList = this.outCountList
+            var aucountlist = response.data.data.auCountList
+            console.log("自动数据",aucountlist)
+            this.autoCountList = aucountlist
+          }
+        })
+      },
+      getInCount(id){
+        var count = ""
+        for(let i=0;i<this.countList.length;i++){
+           if(id == this.countList[i].drug_id){
+             count = this.countList[i].count
+           }
+        }
+        return count
+      },
+
+      getOutCount(id){
+        var count = ""
+        for(let i=0;i<this.outCountList.length;i++){
+           if(id == this.outCountList[i].drug_id){
+               count = this.outCountList[i].count
+           }
+        }
+        return count
+      },
+      getAutoCount(id){
+        var count= ""
+        for(let i=0;i<this.autoCountList.length;i++){
+          if(id == this.autoCountList[i].drug_id){
+            count = this.autoCountList[i].count
+          }
+        }
+        return count
       }
     }
   }

src/xt_pages/stock/stockOutOrder.vue

           @change="changeAllSelected"
           >全选</el-checkbox
         >
-        <el-button size="small" icon="el-icon-delete" @click="batchDelete"
-          >删除</el-button
-        >
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+        <el-button size="small" type="primary" @click="toPrint">打印</el-button>
       </div>
 
       <el-table
       userList:[],
       editdialogVisibleTwo:false,
       editdialogVisibleThree:false,
+      order_id:0,
+      warehouse_out_time:"",
     };
   },
   methods: {
       }
     },
     select(selection) {
+      console.log("selection",selection)
+      this.order_id = selection[0].id
+      this.warehouse_out_time = selection[0].warehouse_out_time
       this.selectedTableData = selection;
     },
     batchDelete() {
             }
          })
       },
-    
+      toPrint(){
+        if(this.order_id == 0){
+          this.$message.error("请选择出库单")
+        }else{
+            this.$router.push({path:"/stock/out/detail/print?id="+this.order_id+"&warehouse_out_time="+this.warehouse_out_time})
+        }
+      
+      }
   }
 };
 </script>