数据

src/api/stock.js

@@ -641,3 +641,11 @@ export function getOrderDetailByOrderId(params) {
     params: params
   })
 }
+
+export function getOrderDetailById(params) {
+  return request({
+    url: '/api/good/getorderdetaibyid',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/stock/stockBatchNumber.vue

@@ -166,15 +166,13 @@
       }
     },
     methods:{
-    
-     
        handleSizeChange(val) {
         this.limit = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
         
     startTimeChange: function(val) {
@@ -184,7 +182,7 @@
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+        this.getlist()
       }
     },
     endTimeChange: function(val) {
@@ -193,7 +191,7 @@
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+       this.getlist()
       }
      },
      changeDrug(){},
@@ -238,26 +236,10 @@
          }
       })
      },
-    //  getOutList(){
-    //   var params= {
-    //       limit:this.limit,
-    //       page:this.page,
-    //       id:this.$route.query.id,
-    //       start_time:this.start_time,
-    //       end_time:this.end_time, 
-    //     } 
-    //    getStockOutList(params).then(response=>{
-    //       if(response.data.state == 1){
-    //          var outlist = response.data.data.outList
-    //          console.log("出库数据",outlist)
-    //          for(let i=0;i<outlist.length;i++){
-    //            outlist[i].stock_way = 2
-    //            this.tableList.push(outlist[i])
-    //          }
-    //          console.log("hhhhhhhhhhh",this.tableList)
-    //       }
-    //    })  
-    //  }
+     getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+     },
     }
   }
 </script>

src/xt_pages/stock/stockFlow.vue

@@ -6,8 +6,9 @@
     <div class="app-container ">
       <div class="cell clearfix">
        耗材名称:{{this.$route.query.good_name}}
-       <!-- 库存:
-       厂家: -->
+       库存:{{getInCount(this.$route.query.id)}}
+       <!-- 厂家:{{this.$route.query.manufacturer}}
+       规格: -->
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -38,15 +39,15 @@
               @change="endTimeChange"
           ></el-date-picker>
 
-        <span>出入库方式:</span>
-        <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+        <!-- <span>出入库方式:</span> -->
+        <!-- <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
             <el-option
               v-for="(item,index) in stockType"
               :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
-        </el-select>
+        </el-select> -->
         
         
       </div>
@@ -84,9 +85,10 @@
              <span v-if="scope.row.stock_way == 2 && scope.row.count!=0">{{scope.row.count}}</span>
            </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.stock_count!=0">{{scope.row.stock_count}} </span>
+             <!-- <span v-if="scope.row.stock_way == 4 && scope.row.stock_count!=0">{{scope.row.stock_count}} </span> -->
+              {{getInCount(scope.row.good_id)- getOutCount(scope.row.good_id) - getAutoCount(scope.row.good_id)}}
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="进/出货单价"  align="center">
@@ -133,15 +135,15 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import {getStockInList,getStockOutList} from "@/api/drug/drug_stock";
+  import {getStockInList} from "@/api/drug/drug_stock";
+  import {getStockDrugCount} from "@/api/stock"
   export default {
     name: 'stockIn',
     created() {
-    //   var drugCategory = getDictionaryDataConfig('system','drug_category')
-    //   this.drugCategory.push(...drugCategory)
-    //   this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
+     
       this.getlist()
-      this.getOutList()
+      this.getStockDrugCount()
+
     },
     components: {
       BreadCrumb
@@ -184,7 +186,11 @@
           {id:2,name:"自动出库"},
           {id:3,name:"入库"},
         ],
-      
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
+        keywords:"",
+        obj:{},
       }
     },
     methods:{
@@ -192,11 +198,11 @@
      
        handleSizeChange(val) {
         this.limit = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
       handleCurrentChange(val) {
         this.page = val
-        this.GetAllDrugStockQueryList()
+        this.getlist()
       },
         
     startTimeChange: function(val) {
@@ -206,7 +212,7 @@
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-        this.GetAllDrugStockQueryList();
+        this.getlist()
       }
     },
     endTimeChange: function(val) {
@@ -215,10 +221,9 @@
         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++){
@@ -262,26 +267,58 @@
          }
       })
      },
-    //  getOutList(){
-    //   var params= {
-    //       limit:this.limit,
-    //       page:this.page,
-    //       id:this.$route.query.id,
-    //       start_time:this.start_time,
-    //       end_time:this.end_time, 
-    //     } 
-    //    getStockOutList(params).then(response=>{
-    //       if(response.data.state == 1){
-    //          var outlist = response.data.data.outList
-    //          console.log("出库数据",outlist)
-    //          for(let i=0;i<outlist.length;i++){
-    //            outlist[i].stock_way = 2
-    //            this.tableList.push(outlist[i])
-    //          }
-    //          console.log("hhhhhhhhhhh",this.tableList)
-    //       }
-    //    })  
-    //  }
+    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)
+           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){
+        console.log("id222",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
+      },
+     getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+     },
     }
   }
 </script>

src/xt_pages/stock/stockOutOrder.vue

@@ -232,7 +232,8 @@
         
         <el-table-column label="出库数量" align="center">
           <template slot-scope="scope">
-            {{ scope.row.count}}
+           <span v-if="scope.row.is_sys == 0">{{ scope.row.count}}</span> 
+           <span v-if="scope.row.is_sys == 1">{{getOutStockCount(scope.row.good_id)}}</span> 
           </template>
         </el-table-column>
 
@@ -277,7 +278,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.is_sys == 1"  style="color: #589ff8" @click="GetOrderDetail(scope.row.id)">使用明细</span>
+            <span v-if="scope.row.is_sys == 1"  style="color: #589ff8" @click="GetOrderDetailById(scope.row)">使用明细</span>
           </template>
         </el-table-column>
       </el-table>  
@@ -697,7 +698,8 @@ import {
   deleteWarehouseOutInfo,
   GetAllGoodInfoByID,
   editWarehouseoutInfo,
-  getOrderDetailByOrderId
+  getOrderDetailByOrderId,
+  getOrderDetailById
 } from "@/api/stock";
 import BreadCrumb from "../components/bread-crumb";
 import StockInDialog from './Dialog/stockInDialog'
@@ -1521,8 +1523,35 @@ export default {
         })
       }, 
      
-     
-
+      GetOrderDetailById(val){
+         this.userList =[]
+         var params = {
+           good_id:val.good_id,
+           record_time:val.sys_record_time,
+          }
+         getOrderDetailById(params).then(response=>{
+            if(response.data.state == 1){
+              var total = 0
+              var list = response.data.data.list
+              var arrList =  this.unique(list)
+              for (let i = 0; i < arrList.length; i++) {
+                var obj = arrList[i]
+                obj['is_total'] = 0
+                this.userList.push(obj)
+                total = total + arrList[i].count
+              }
+              this.userList.push({
+                is_total: 1,
+                total: total,
+              })
+              // this.type_name = this.userList[0].type.type_name
+              // this.specification_name = this.userList[0].info.specification_name
+              console.log("详情数据区",this.userList)
+              this.editdialogVisibleThree = true
+            }
+         })
+      },
+    
   }
 };
 </script>

src/xt_pages/stock/stockQuery.vue

@@ -108,7 +108,7 @@
        </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>
+           <span>{{getOutCount(scope.row.good_id) + getAutoCount(scope.row.good_id)}}</span>
 
          </template>
        </el-table-column>
@@ -261,7 +261,7 @@ export default {
 
          }
 
-        console.log("数据2222222",this.WarehouseInfo.warehouseInfoDate)
+       
       });
     },
 
@@ -455,7 +455,14 @@ export default {
        return name
     },
     toClick(val){
-      this.$router.push({path:"/stock/in/stockflow?id="+val.good_id+"&good_name="+val.good_name})
+       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  
+          }
+       }
+      console.log("厂家22222",manufacturer_name)
+      this.$router.push({path:"/stock/in/stockflow?id="+val.good_id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name})
     },
     toClickOne(val){
       this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.good_id+"&good_name="+val.good_name})