数据

src/api/stock.js

@@ -625,3 +625,11 @@ export function getAllStockList(params) {
     params: params
   })
 }
+
+export function getStockDrugCount(params) {
+  return request({
+    url: '/api/good/getstockdrugcount',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/stock/stockInOrder.vue

@@ -71,9 +71,9 @@
           @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
@@ -188,7 +188,7 @@
     </div>
 
 
-   <div v-show="tableShow" style="margin-bottom:10px">
+   <div v-show="tableShow" style="margin-top:80px">
       <el-table
         :data="tableList"
         :class="signAndWeighBoxPatients"
@@ -204,8 +204,8 @@
           color: '#606266'
         }"
       >
-       <el-table-column align="center" type="selection" width="55">
-       </el-table-column>
+       <!-- <el-table-column align="center" type="selection" width="55">
+       </el-table-column> -->
 
        <el-table-column label="耗材名称" align="center">
           <template slot-scope="scope">
@@ -790,7 +790,8 @@ export default {
       drug_id:1,
       tableShow:false,
       tableList:[],
-      isVisibility:false
+      isVisibility:false,
+      order_id:0,
     };
     
   
@@ -1119,7 +1120,10 @@ export default {
       }
     },
     select(selection) {
+      this.order_id = selection[0].id
+      console.log("selection",selection)
       this.selectedTableData = selection;
+
     },
     batchDelete() {
       if (this.selectedTableData.length <= 0) {
@@ -1465,6 +1469,13 @@ export default {
 
       this.propForm.goodType = [];
     },
+    toPrint(){
+      if(this.order_id == 0){
+        this.$message.error("请勾选入库单")
+      }else{
+        this.$router.push("/stock/in/detail/print?id="+this.order_id)
+      }
+    }
   }
 };
 </script>

src/xt_pages/stock/stockInOrderAdd.vue

@@ -76,7 +76,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.good_name }}</div>
+                    <div class="name">{{ item.good_name +"  " +item.specification_name }}</div>
                   </template>
                  </el-autocomplete>
             </template>

src/xt_pages/stock/stockInOrderEdit.vue

@@ -50,7 +50,7 @@
         </el-date-picker>
       </div>
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
         <el-select
           size="small"
@@ -66,9 +66,9 @@
           >
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
 
         <el-select
@@ -85,7 +85,7 @@
           >
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table
@@ -115,7 +115,7 @@
                   >
                     <i class="el-icon-search el-input__icon" slot="suffix"></i>
                   <template slot-scope="{ item }">
-                    <div class="name">{{ item.good_name }}</div>
+                    <div class="name">{{ item.good_name +" " + item.specification_name}}</div>
                   </template>
                  </el-autocomplete>
             </template>

src/xt_pages/stock/stockQuery.vue

@@ -185,14 +185,25 @@
             {{scope.row.price}}
           </template>
         </el-table-column>
-        <el-table-column label="厂商">
+        <el-table-column label="厂商" align="center">
           <template slot-scope="scope">
            {{getManufacture(scope.row.manufacturer)}}
           </template>
         </el-table-column>
-       <el-table-column label="剩余库存量">
+       <el-table-column label="入库数量" align="center">
          <template slot-scope="scope">
-          <span v-if="scope.row.stock_count!=0">{{scope.row.stock_count}}</span>
+          <span>{{getInCount(scope.row.good_id)}}</span>
+         </template>
+       </el-table-column> 
+       <el-table-column label="出库数量" align="center">
+         <template slot-scope="scope">
+           <span>{{getOutCount(scope.row.good_id)+getAutoCount(scope.row.good_id)}}</span>
+          
+         </template>
+       </el-table-column> 
+       <el-table-column label="剩余库存量" align="center">
+         <template slot-scope="scope">
+           {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id)}}
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" width="260px">
@@ -252,7 +263,8 @@ import {
   GetAllGoodInfo,
   GetAllGoodType,
   getAllStockQueryList,
-  getAllStockList
+  getAllStockList,
+  getStockDrugCount
 } from "@/api/stock";
 
 export default {
@@ -262,6 +274,7 @@ export default {
     this.GetAllGoodInfo();
     this.GetAllGoodType();
     this.getlist()
+    this.getStockDrugCount()
   },
   components: {
     BreadCrumb
@@ -291,7 +304,10 @@ export default {
       type_name:0,
       types:[],
       tableList:[],
-      manufacturerList:[]
+      manufacturerList:[],
+      countList:[],
+      outCountList:[],
+      autoCountList:[],
     };
   },
   methods: {
@@ -548,7 +564,54 @@ export default {
     },
     toClickOne(val){
       this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.good_id+"&good_name="+val.good_name})
-    }
+    },
+    getStockDrugCount(){
+        var params ={
+          keywords: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+        }
+      getStockDrugCount(params).then(response=>{
+         if(response.data.state == 1){
+           var count = response.data.data.count
+           console.log("入库统计",count)
+           this.countList = count
+           var outlist = response.data.data.outList
+           console.log("出库数量",outlist)
+           this.outCountList = outlist
+           var autoCount = response.data.data.autoCount
+           console.log("autoCount",autoCount)
+           this.autoCountList = autoCount
+         }
+      })
+    },
+    getInCount(id){
+      var count= ""
+     for(let i=0;i<this.countList.length;i++){
+      if(id == this.countList[i].good_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].good_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].good_id){
+         count = this.outCountList[i].count
+       }
+     }
+     return count
+   }
   }
 };
 </script>