数据

src/api/stock.js

@@ -657,3 +657,11 @@ export function getSingleOutOrderDetail(params) {
     params: params
   })
 }
+
+export function getExportStockList(params) {
+  return request({
+    url: '/api/stock/getexportstocklist',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/data/components/addDrugs.vue

@@ -800,6 +800,7 @@
         this.form.max_unit = ""
         this.form.min_price = ""
         this.form.prescribing_number_unit = ""
+        this.dosageShow = false
         this.visible = false
       },
       getValue: function() {

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -5,9 +5,10 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-       药品名称:
-       库存:
-       厂家:
+       药品名称:<span>{{this.$route.query.drug_name}}</span>&nbsp;
+       库存:&nbsp;
+       规格:<span>{{this.$route.query.unit}}</span>&nbsp;
+       厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -60,7 +61,7 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="有效期" align="center">
            <template slot-scope="scope">
-              {{getTime(scope.row.expiry_date)}}
+              {{getTime(scope.row.expiry_date,"{y}-{m}-{d}")}}
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="批号" align="center">
@@ -166,6 +167,7 @@
               this.tableList = detail
               var total = response.data.data.total
               console.log("total",total)
+              this.total = total
            }
         })
       },

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -5,9 +5,11 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-       药品名称:<span v-if="list.length>0">{{list[0].drug_name}}</span>
-       库存:
-       厂家:<span v-if="list.length>0">{{getManufacturer(list[0].manufacturer)}}</span>
+       药品名称:<span>{{this.$route.query.drug_name}}</span>&nbsp;
+       库存:&nbsp;
+       规格:<span>{{this.$route.query.unit}}</span>&nbsp;
+       厂家:<span>{{this.$route.query.manufacturer}}</span>&nbsp;
+
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>

src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue

@@ -19,7 +19,7 @@
             <tr>
               <td width="80">药品名称</td>
               <td style="line-height:18px;" width="80">注册证号/批准文号/备案凭证号</td>
-              <td style="line-height:18px;" width="80">规格<br>型号</td>
+              <td style="line-height:18px;" width="100">规格<br>型号</td>
               <td style="line-height:18px;" width="80">生产<br>厂商</td>
               <td style="line-height:18px;" width="80">单位</td>
               <td style="line-height:18px;" width="80">进货价</td>
@@ -38,12 +38,12 @@
               </td>
               <td style="line-height: 18px">{{ item.remark }}</td>
               <td style="line-height: 18px">
-                 <span v-if="item.drug_id != 0">{{item.drug?item.drug.drug_spec:''}}</span>
+                 <span v-if="item.drug_id != 0">{{item.drug.dose}}{{item.drug.dose_unit}}*{{item.drug.min_number}}{{item.drug.min_unit}}/{{item.drug.max_unit}}</span>
               </td>
               <!-- <td style="line-height: 18px">{{ getManufacturer(item.manufacturer) }}</td> -->
               <td style="line-height: 18px">{{ getManufacturer(item.drug.id) }}</td>
               <td style="line-height: 18px">
-                <span>{{getUnit(item.drug_id)}}</span>
+                <span>{{item.drug.max_unit}}</span>
               </td>
               <td style="line-height:18px">
                   {{item.price}}

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -33,20 +33,20 @@
                 <span v-if="item.drug_id != 0">{{item.drug.drug_name}}</span>
               </td>
               <td style="line-height: 50px">
-                  <span v-if="item.drug_id != 0">{{item.drug?item.drug.drug_spec:''}}</span>
+                  <span v-if="item.drug_id != 0">{{item.drug.dose}}{{item.drug.dose_unit}}*{{item.drug.min_number}}{{item.drug.min_unit}}/{{item.drug.max_unit}}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{getUnit(item.drug_id)}}</span>
+                <span>{{item.drug.max_unit}}</span>
               </td>
 
               <td style="line-height: 50px">
                   {{item.count}}
               </td>
               <td style="line-height:50px">
-                  {{item.price}}
+                  {{item.drug.last_price}}
               </td>
              <td  style="line-height:50px">
-                {{(item.count * item.price).toFixed(2)}}
+                {{(item.count * item.drug.last_price).toFixed(2)}}
              </td>
              <td>{{getNumber(item.drug_id)}}</td>
              <td>{{getProductDate(item.drug_id)}}</td>

src/xt_pages/stock/drugs/query.vue

@@ -32,9 +32,9 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-         <el-select v-model="drug_category" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+         <el-select v-model="drug_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
             <el-option
-              v-for="(item,index) in drugCategory"
+              v-for="(item,index) in drugTypeList"
               :key="index"
               :label="item.name"
               :value="item.id">
@@ -113,31 +113,34 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-              {{getInCount(scope.row.drug_id)}}
+             {{getInCount(scope.row.drug_id)}}
+              <!-- {{getInCount(scope.row.drug_id)}}{{scope.row.max_unit}} -->
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
              {{getOutCount(scope.row.drug_id) + getAutoCount(scope.row.drug_id)}}
+             <!-- {{getCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}} -->
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
             {{getInCount(scope.row.drug_id) - getOutCount(scope.row.drug_id) - getAutoCount(scope.row.drug_id)}}
+            <!-- {{getCountTwo(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}} -->
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="操作" align="center">
+        <el-table-column prop="drug_name" label="操作" align="center" width="200px">
           <template slot-scope="scope">
             <el-button
               size="small"
               type="primary"
-              @click="handleDetail(scope.row.drug_id)"
+              @click="handleDetail(scope.row)"
             >库存流水
             </el-button>
             <el-button
               size="small"
               type="primary"
-              @click="handleBatch(scope.row.drug_id)"
+              @click="handleBatch(scope.row)"
             >批次
             </el-button>
           </template>
@@ -171,13 +174,14 @@
   import { getAllDrugStockQueryList,getDrugStockList,getDrugCountList } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
+import { min } from 'moment'
   export default {
     name: 'stockIn',
     created() {
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
-      this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
-  
+      var drugTypeList = getDictionaryDataConfig('system','drug_type') 
+      this.drugTypeList.push(...drugTypeList)
       this.getlist()
       this.getDrugCountList()
     },
@@ -212,13 +216,18 @@
         drugCategory:[
           {id:0,name:"全部"}
         ],
-        drugTypeList:[],
+        drugTypeList:[
+          {id:0,name:"全部"}
+        ],
         tableList:[],
         manufacturerList:[],
         countList:[],
         outCountList:[],
         autoCountList:[],
         keyword:"",
+        drug_type:0,
+        minCount:[],
+        drugOutList:[]
       }
     },
     methods: {
@@ -438,8 +447,7 @@
         return (new Date(time)).getTime() / 1000
       },
       changeDrug(){
-     
-      this.getlist()
+        this.getlist()
       },
       printOrder(){
         this.$router.push({
@@ -454,11 +462,11 @@
           page: this.page,
           limit: this.limit,
           keyword: this.keywords,
-          drug_category:this.drug_category,
+          drug_type:this.drug_type,
           start_time:this.start_time,
           end_time:this.end_time,
         }
-         
+        console.log("parasm222222",params)
         getDrugStockList(params).then(response=>{
           if(response.data.state == 1){
              var list = response.data.data.list
@@ -493,11 +501,25 @@
         }
         return name
       },
-      handleDetail(id){
-        this.$router.push({path:'/drugstock/in/drugstockflow?drug_id='+id})
+      handleDetail(val){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+         if(val.manufacturer == this.manufacturerList[i].id){
+           manufacturer_name = this.manufacturerList[i].manufacturer_name
+         }
+        }
+        var unit =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
+        this.$router.push({path:'/drugstock/in/drugstockflow?drug_id='+val.drug_id+"&drug_name="+val.drug_name+"&manufacturer="+manufacturer_name+"&unit="+unit})
       },
-      handleBatch(id){
-        this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id='+id})
+      handleBatch(val){
+        var manufacturer_name = ""
+        for(let i=0;i<this.manufacturerList.length;i++){
+         if(val.manufacturer == this.manufacturerList[i].id){
+           manufacturer_name = this.manufacturerList[i].manufacturer_name
+         }
+        }
+        var unit =  val.dose + val.dose_unit +"*"+val.min_number+val.min_unit+"/"+val.max_unit
+        this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id='+val.drug_id+"&drug_name="+val.drug_name+"&manufacturer="+manufacturer_name+"&unit="+unit})
       },
       getDrugCountList(){
          var params = {
@@ -516,6 +538,24 @@
             var aucountlist = response.data.data.auCountList
             console.log("自动数据",aucountlist)
             this.autoCountList = aucountlist
+            var minCount = response.data.data.minCount
+            console.log("minCount",minCount)
+            this.minCount = minCount
+            var info = response.data.data.info
+            for(let i=0;i<info.length;i++){
+              if(info[i].count_unit == info[i].max_unit){
+                 info[i].count = info[i].count * info[i].min_number
+              }
+            }
+            console.log("info2222222",info)
+            this.drugOutList = info
+            var arr = []
+            for(let i=0;i<this.drugOutList.length;i++){
+              if(this.drugOutList[i].drug_id == 1197){
+                arr.push(this.drugOutList[i])
+              }
+            }
+            console.log("arrr",arr)
           }
         })
       },
@@ -546,7 +586,60 @@
           }
         }
         return count
-      }
+      },
+      getMinCount(id){
+        var count=""
+        for(let i=0;i<this.minCount.length;i++){
+          if(id == this.minCount[i].drug_id){
+            count = this.minCount[i].count
+          }
+        }
+        return count
+      },
+      getCount(drug_id,min_number,max_unit,min_unit){
+        var count= 0
+        var str = ""
+        var min_str = ""
+        for(let i=0;i<this.drugOutList.length;i++){
+          if(drug_id == this.drugOutList[i].drug_id){
+             count += parseInt(this.drugOutList[i].count)
+          }
+        }
+        if(parseInt(count/min_number)!=0){
+          str = parseInt(count/min_number)+ max_unit
+        }
+        if((count%min_number)!=0){
+          min_str =  count%min_number + min_unit
+        }
+        return str + min_str
+      },
+
+      getCountOne(drug_id){
+        var count= 0
+        for(let i=0;i<this.drugOutList.length;i++){
+          if(drug_id == this.drugOutList[i].drug_id){
+             count += parseInt(this.drugOutList[i].count)
+          }
+        }
+        return count
+      },
+     getCountTwo(drug_id,min_number,max_unit,min_unit){
+       var total_count = 0
+       var out_count = 0
+       var count = 0
+       var str = ""
+       var str_min = ""
+       total_count = this.getInCount(drug_id) * min_number
+       out_count = this.getCountOne(drug_id)
+       count = total_count-out_count
+       if(parseInt(count/min_number)!=0){
+         str = parseInt(count/min_number) + max_unit
+       }
+       if((count%min_number)!=0){
+         str_min = count%min_number + min_unit
+       }
+       return str+str_min
+     }
     }
   }
 </script>

src/xt_pages/stock/stockFlow.vue

@@ -80,7 +80,7 @@
              {{getTime(scope.row.ctime)}}
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="入库数量"  align="center">
+         <el-table-column prop="drug_name" label="出入库数量"  align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.stock_way == 4 && scope.row.warehousing_count!=0"> {{scope.row.warehousing_count}}</span>
              <span v-if="(scope.row.stock_way == 2 || scope.row.stock_way == 3) && scope.row.count!=0">{{scope.row.count}}</span>

src/xt_pages/stock/stockInOrder.vue

@@ -75,17 +75,17 @@
 
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
 
-        <!-- <el-button size="small" type="primary" @click="exportList">导出</el-button> -->
+        <el-button size="small" type="primary" @click="toExport">导出</el-button>
       </div>
 
       <el-table
+        ref="multipleTable"
         :data="Warehouse.warehouseDate"
         :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="{
@@ -233,12 +233,12 @@
         </el-table-column>
         <el-table-column label="生产日期" align="center">
           <template slot-scope="scope">
-            {{ getTime(scope.row.product_date)}}
+            {{ getTime(scope.row.product_date,"{y}-{m}-{d}")}}
           </template>
         </el-table-column>
         <el-table-column label="有效期" align="center">
           <template slot-scope="scope">
-            {{ getTime(scope.row.expiry_date)}}
+            {{ getTime(scope.row.expiry_date,"{y}-{m}-{d}")}}
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center">
@@ -630,7 +630,8 @@ import {
   getWarehouseList,
   DeleteWarehouseInfoItem,
   GetAllGoodInfoByID,
-  EditWarehouse
+  EditWarehouse,
+  getExportStockList
 } from "@/api/stock";
 
 import { GetAllDrugInfoByID,postDrugWarehouse} from "@/api/drug/drug_stock";
@@ -666,7 +667,7 @@ export default {
     this.fetchAllAdminUsers();
     this.GetAllGoodType()
     this.GetAllGoodInfo()
-    // this.getlist()
+
     
   },
   data() {
@@ -764,6 +765,7 @@ export default {
       tableList:[],
       isVisibility:false,
       order_id:0,
+      exportList:[]
     };
     
   
@@ -1019,9 +1021,9 @@ export default {
         } else {
           this.manufacturer = response.data.data.manufacturer;
           this.dealer = response.data.data.dealer;
-          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
-          this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
-         
+          // this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
+          // this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+          this.getlist()
         }
       });
     },
@@ -1084,11 +1086,11 @@ export default {
         })
         .catch(() => {});
     },
-    changeAllSelected: function(val) {
-      if (val) {
+    changeAllSelected: function() {
+      console.log("22222",this.checked)
+      this.$refs.multipleTable.clearSelection();
+      if (this.checked) {
         this.$refs.multipleTable.toggleAllSelection();
-      } else {
-        this.$refs.multipleTable.clearSelection();
       }
     },
     select(selection) {
@@ -1452,15 +1454,59 @@ export default {
         start_time:this.start_time,
         end_time:this.end_time,
       }
-      getExportStockList().then(response=>{
+      getExportStockList(params).then(response=>{
+        if(response.data.state == 1){
+           var list = response.data.data.list
+           console.log("l类型",this.manufacturer)
+           for(let i=0;i<this.goodType.length;i++){
+             for(let j=0;j<list.length;j++){
+               if(this.goodType[i].id == list[j].good_type_id){
+                 list[j].good_type_name = this.goodType[i].type_name
+               }
+             }
+           }
+          for(let i=0;i<list.length;i++){
+            list[i].unit = list[i].specification_name + list[i].packing_unit
+            list[i].total_price = (list[i].total_count * list[i].price).toFixed(2)
+            list[i].expiry_date = this.getTime(list[i].expiry_date,"{y}-{m}-{d}")
+            list[i].product_date = this.getTime(list[i].product_date,"{y}-{m}-{d}")
+            for(let j=0;j<this.manufacturer.length;j++){
+               if(list[i].manufacturer == this.manufacturer[j].id){
+                  list[i].manufacturer = this.manufacturer[j].manufacturer_name
+               }
+            }
 
+           for(let z=0;z<this.dealer.length;z++){
+               if(list[i].dealer = this.dealer[z].id){
+                 list[i].dealer = this.dealer[z].dealer_name
+               }
+            }
+          }
+         
+          this.exportList = list
+        }
       })
     },
-    exportList(){
-      exportList().then(response=>{
-
+    toExport(){
+       console.log("列表22222222222",this.exportList)
+      import('@/vendor/Export2Excel').then(excel => {
+
+      const tHeader = ['耗材类型', '耗材名称', '规格&单位','批号','入库数量','进货价','总价','生产厂家','生产日期','有效日期','经销商','备注']
+      const filterVal = ['good_type_name', 'good_name', 'unit','number','total_count','price','total_price','manufacturer','product_date','expiry_date','dealer','remark']
+
+      console.log("table",this.exportList)
+      const data = this.formatJson(filterVal, this.exportList)
+      excel.export_json_to_excel({
+        header: tHeader,
+        data,
+        filename: '耗材入库单详情'
       })
-    }
+      this.downloadLoading = false
+    })
+    },
+    formatJson(filterVal, jsonData) {
+    return jsonData.map(v => filterVal.map(j => v[j]));
+   },
   }
 };
 </script>

src/xt_pages/stock/stockOutOrderDetailPrint.vue

@@ -17,7 +17,8 @@
                     </div>
                     <div style="display:flex;justify-content: space-between;">
                       <div style="text-align:left;margin-bottom:1px;font-size: 18px;">
-                        单据编号：{{warehousingOutInfo.info.warehouse_out_order_number}}
+                        <!-- 单据编号：{{warehousingOutInfo.info.warehouse_out_order_number}} -->
+                        单据编号: {{tableList[0].warehouse_out_order_number}}
                       </div>
                       <div style="text-align:right;margin-bottom:1px;font-size: 18px;">
                         打印日期：{{time_now}}
@@ -39,10 +40,10 @@
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr v-for='(item,index) in warehousingOutInfo.warehousingOutData' :key="index">
-                                    <td><span v-if="item.good_id != 0">{{getTypeNameOne(item.good_id)}}</span></td>
-                                    <td><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
-                                    <td><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
+                                <tr v-for='(item,index) in tableList' :key="index">
+                                    <td><span v-if="item.good_id != 0">{{item.good_name}}</span></td>
+                                    <td><span v-if="item.good_id != 0">{{item.specification_name}}</span></td>
+                                    <td><span v-if="item.good_id!=0">{{item.packing_unit}}</span></td>
                                     <td>{{getOutStockCount(item.good_id) + getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id)}}</td>
                                     <td>{{item.price}}</td>
                                     <td>{{((getOutStockCount(item.good_id) +getWarehouseOutInfoCount(item.warehouse_out_id,item.good_id))*item.price).toFixed(2)}}</td>
@@ -82,7 +83,7 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList,getWarehouseOrderInfoList } from "@/api/stock";
+import { GetAllConfig,getWarehouseOutInfo,GetOutStockTotalCount,getGoodInfoList,getWarehouseOrderInfoList,getOrderDetailByOrderId } from "@/api/stock";
 import print from 'print-js'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
@@ -123,7 +124,8 @@ export default {
             wareoutList:[],
             orgId:'',
             orgName:'',
-            orderInList:[]
+            orderInList:[],
+            tableList:[]
         }
     },
     methods:{
@@ -246,10 +248,13 @@ export default {
             return false
           } else {
             this.list = [];
+        
             for (let i = 0; i < response.data.data.list.length; i++) {
+
+              
               this.list.push(response.data.data.list[i])
             }
-            console.log("list22222",this.list)
+          
           }
         })
       },
@@ -329,7 +334,24 @@ export default {
           return uParseTime(val, '{y}-{m}-{d}')
          }
       },
-
+     
+      GetOrderDetailOne(id){
+        const params = {
+          'id': id
+        }
+        getOrderDetailByOrderId(params).then(response=>{
+           if(response.data.state == 1){
+             var list = response.data.data.list
+             console.log("详情打印222222",list)
+             var total_price = 0
+             for(let i=0;i<list.length;i++){
+               total_price += response.data.data.list[i].price * response.data.data.list[i].count
+               this.tableList.push(list[i])
+             }
+             this.allPrice =  total_price
+           }
+        })
+     },
 
     },
     created(){
@@ -338,8 +360,9 @@ export default {
       const order_id = this.$route.query.id;
       const warehouse_out_time = this.$route.query.warehouse_out_time;
       this.GetConfigInfo();
-      this.GetOrderDetail(order_id);
+      // this.GetOrderDetail(order_id);
       this.GetTotalCount(warehouse_out_time);
+      this.GetOrderDetailOne(order_id)
       this.getList()
       //获取所有入库单
       this.getWarehouseOrderInfoList()

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -76,7 +76,7 @@
                       v-model="scope.row.good_name"
                       :fetch-suggestions="querySearchAsync"
                       :trigger-on-focus="false"
-                      placeholder="请输入病人名字"
+                      placeholder="请输入耗材名称"
                       @select="handleSelect"
                       @input="changeGoodName(scope.$index)"
                       style="width:150px;"