数据

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -513,7 +513,7 @@ export default {
             var config = resp.data.config
             console.log("config222222",config.is_open)
             let project_config = resp.data.project_config
-            console.log('project_config',resp.data.hisAdvices)
+            console.log('project_config',)
             if(project_config.is_open == 1){
               this.project = resp.data.project
               resp.data.hisAdvices.map((item,index) => {
@@ -618,7 +618,7 @@ export default {
              this.show = false
              this.showOne  = true
             var schedules =  resp.data.hisAdvices
-          
+            console.log("hhhhhhhh22323232323232",schedules)
             let arr = []
             let newArr = []
             let newSchedules = []

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -371,6 +371,9 @@
           good_name: [
             { required: true, message: '请输入耗材名称', trigger: 'blur' }
           ],
+          packing_unit:[
+            {required:true,message:"请输入包装单位",trigger:'blur'}
+          ],
           good_kind: [
             { required: true, message: '请选择耗材种类', trigger: 'change' }
           ],

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -653,15 +653,16 @@ export default {
       const params = {
         id: order_id
       };
-   
+      console.log("parasm222222222",params)
+      this.WarehouseInfo.warehouseInfoDate = []
       getDrugWarehouseInfoList(params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
         } else {
+          console.log("hhhhhhhhhh",response.data.data.info)
           for (let i = 0; i < response.data.data.info.length; i++) {
             this.showOne = true
-            this.WarehouseInfo.warehouseInfoDate = []
             this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
             console.log("列表详情",this.WarehouseInfo.warehouseInfoDate)
           }

src/xt_pages/stock/stockBatchNumber.vue

@@ -5,9 +5,10 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-       耗材名称:{{this.$route.query.good_name}}
-       <!-- 库存:
-       厂家: -->
+        耗材名称:{{this.$route.query.good_name}} &nbsp;
+        库存:{{getInCount(this.$route.query.id)}} &nbsp;
+        规格:{{this.$route.query.specification_name}} &nbsp;
+        厂家:{{this.$route.query.manufacturer}} 
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -115,11 +116,12 @@
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import {getStockInList} from "@/api/drug/drug_stock";
+  import {getStockDrugCount} from "@/api/stock"
   export default {
     name: 'stockIn',
     created() {
       this.getlist()
-    //   this.getOutList()
+      this.getStockDrugCount()
     },
     components: {
       BreadCrumb
@@ -162,7 +164,10 @@
           {id:2,name:"自动出库"},
           {id:3,name:"入库"},
         ],
-      
+        countList:[],
+        outCountList:[],
+        autoCountList:[],
+        keywords:"",
       }
     },
     methods:{
@@ -236,23 +241,43 @@
            console.log("入库数据",this.tableList)
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
-
-          // var outlist =  response.data.data.outList
-          // console.log("outlist",outlist)
-          // for(let i=0;i<outlist.length;i++){
-          //     outlist[i].stock_way = 2
-          //     this.tableList.push(outlist[i])
-          // }
-          
-           
          }
       })
      },
+    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
+     },
      getTimestamp(time) {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
      },
-     
+    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
+         }
+      })
+    },
 
     }
   }

src/xt_pages/stock/stockFlow.vue

@@ -5,10 +5,10 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-       耗材名称:{{this.$route.query.good_name}}
-       库存:{{getInCount(this.$route.query.id)}}
-       <!-- 厂家:{{this.$route.query.manufacturer}}
-       规格: -->
+       耗材名称:{{this.$route.query.good_name}} &nbsp;
+       库存:{{getInCount(this.$route.query.id)}} &nbsp;
+       规格:{{this.$route.query.specification_name}} &nbsp;
+       厂家:{{this.$route.query.manufacturer}} 
       </div>
       <div class="cell clearfix">
         <span>日期查询:</span>
@@ -39,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>
@@ -63,13 +63,14 @@
         </el-table-column>
         <el-table-column prop="drug_type" label="出入库方式" width="180" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.stock_way == 4">入库</span>
-             <span v-if="scope.row.stock_way == 2">出库</span>
+             <span v-if="scope.row.stock_way == 4">采购入库</span>
+             <span v-if="scope.row.stock_way == 3">手动出库</span>
+             <span v-if="scope.row.stock_way == 2">自动出库</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
            <template slot-scope="scope">
-             <span v-if="scope.row.stock_way == 2"> {{scope.row.warehouse_out_order_number}}</span>
+             <span v-if="scope.row.stock_way == 2 || scope.row.stock_way == 3"> {{scope.row.warehouse_out_order_number}}</span>
              <span v-if="scope.row.stock_way == 4">{{scope.row.warehousing_order}}</span>
             
            </template>
@@ -82,7 +83,7 @@
          <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.count!=0">{{scope.row.count}}</span>
+             <span v-if="(scope.row.stock_way == 2 || scope.row.stock_way == 3) && scope.row.count!=0">{{scope.row.count}}</span>
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="剩余库存量"  align="center">
@@ -94,25 +95,25 @@
         <el-table-column prop="drug_name" label="进/出货单价"  align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.stock_way == 4"> {{scope.row.price}}</span>
-             <span v-if="scope.row.stock_way == 2">{{scope.row.price}}</span>
+             <span v-if="scope.row.stock_way == 2 || scope.row.stock_way == 3">{{scope.row.price}}</span>
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="有效期" align="center">
            <template slot-scope="scope" >
              <span v-if="scope.row.stock_way == 4"> {{getTime(scope.row.expiry_date)}}</span>
-             <span v-if="scope.row.stock_way == 2">{{getTime(scope.row.expiry_date)}}</span>
+             <span v-if="scope.row.stock_way == 2 || scope.row.stock_way == 3">{{getTime(scope.row.expiry_date)}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope" >
              <span v-if="scope.row.stock_way == 2"> {{scope.row.number}}</span>
-             <span v-if="scope.row.stock_way == 4">{{scope.row.number}}</span>
+             <span v-if="scope.row.stock_way == 4 || scope.row.stock_way == 3">{{scope.row.number}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="生产商" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.stock_way == 4"> {{getManufacturer(scope.row.manufacturer)}}</span>
-             <span v-if="scope.row.stock_way == 2">{{getManufacturer(scope.row.manufacturer)}}</span>
+             <span v-if="scope.row.stock_way == 2 || scope.row.stock_way == 3">{{getManufacturer(scope.row.manufacturer)}}</span>
            </template>
         </el-table-column>
        </el-table>
@@ -135,7 +136,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import {getStockInList} from "@/api/drug/drug_stock";
+  import {getStockInList,getStockOutList} from "@/api/drug/drug_stock";
   import {getStockDrugCount} from "@/api/stock"
   export default {
     name: 'stockIn',
@@ -143,7 +144,7 @@
      
       this.getlist()
       this.getStockDrugCount()
-
+      this.getStockOutList()
     },
     components: {
       BreadCrumb
@@ -182,9 +183,9 @@
         manufacturerList:[],
         stockType:[
           {id:0,name:"全部"},
-          {id:1,name:"手动出库"},
+          {id:3,name:"手动出库"},
           {id:2,name:"自动出库"},
-          {id:3,name:"入库"},
+          {id:4,name:"采购入库"},
         ],
         countList:[],
         outCountList:[],
@@ -199,10 +200,12 @@
        handleSizeChange(val) {
         this.limit = val
         this.getlist()
+        this.getStockOutList()
       },
       handleCurrentChange(val) {
         this.page = val
         this.getlist()
+        this.getStockOutList()
       },
         
     startTimeChange: function(val) {
@@ -213,6 +216,7 @@
         this.start_time = "";
       } else {
         this.getlist()
+        this.getStockOutList()
       }
     },
     endTimeChange: function(val) {
@@ -222,6 +226,7 @@
         this.end_time = "";
       } else {
        this.getlist()
+       this.getStockOutList()
       }
      },
      getManufacturer(id){
@@ -250,7 +255,8 @@
           page:this.page,
           id:this.$route.query.id,
           start_time:this.start_time,
-          end_time:this.end_time, 
+          end_time:this.end_time,
+          is_sys:this.stockType 
         } 
       getStockInList(params).then(response=>{
          if(response.data.state == 1){
@@ -267,6 +273,33 @@
          }
       })
      },
+    getStockOutList(){
+       var params= {
+          limit:this.limit,
+          page:this.page,
+          id:this.$route.query.id,
+          start_time:this.start_time,
+          end_time:this.end_time, 
+          is_sys:this.stockType 
+        } 
+      getStockOutList(params).then(response=>{
+        if(response.data.state == 1){
+          var outList = response.data.data.outList
+          console.log("outList990-0000990",outList)
+           for(let i=0;i<outList.length;i++){
+             if(outList[i].is_sys == 0){
+                outList[i].stock_way = 2
+             }
+             if(outList[i].is_sys == 1){
+                outList[i].stock_way = 3
+             }
+             this.tableList.push(outList[i])
+           }
+          var total = response.data.data.total
+          this.total = total
+        }  
+      })
+    },
     getStockDrugCount(){
         var params ={
           keywords: this.keywords,
@@ -280,6 +313,7 @@
            this.countList = count
            var outlist = response.data.data.outList
            console.log("详情出库数量",outlist)
+          
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
            console.log("详情自动出库",autoCount)
@@ -319,6 +353,17 @@
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
      },
+     changeDrug(val){
+       this.tableList= []
+       if(val == 4 || val == 0){
+        this.getlist()
+       }
+       if(val == 2 || val == 3 || val == 0){
+        this.getStockOutList()
+       }
+      
+      
+     }
     }
   }
 </script>

src/xt_pages/stock/stockInOrder.vue

@@ -21,7 +21,7 @@
           style="width: 400px;"
           v-model.trim="searchKey"
           class="filter-item"
-          placeholder="单据编码/制单人/厂商"
+          placeholder="单据编码/制单人/耗材名称"
         />
         <el-button
           size="small"
@@ -74,6 +74,8 @@
         <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
 
         <el-button size="small" type="primary" @click="toPrint">打印</el-button>
+
+        <!-- <el-button size="small" type="primary" @click="exportList">导出</el-button> -->
       </div>
 
       <el-table
@@ -638,7 +640,6 @@ export default {
   name: "stockIn",
   components: { BreadCrumb, stockInDialog },
   created() {
-
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -665,6 +666,8 @@ export default {
     this.fetchAllAdminUsers();
     this.GetAllGoodType()
     this.GetAllGoodInfo()
+    // this.getlist()
+    
   },
   data() {
 
@@ -1164,8 +1167,6 @@ export default {
           this.tableShow = true
           for (let i = 0; i < response.data.data.info.length; i++) {
             this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
-            // response.data.data.info[i].product_date = this.getTime(response.data.data.info[i].product_date,"{y}-{m}-{d}");
-            // response.data.data.info[i].expiry_date = this.getTime(response.data.data.info[i].expiry_date,"{y}-{m}-{d}");
             response.data.data.info[i].price = response.data.data.info[i].price.toString();
             response.data.data.info[i].warehousing_count = response.data.data.info[i].warehousing_count.toString();
 
@@ -1444,6 +1445,21 @@ export default {
       }else{
         this.$router.push("/stock/in/detail/print?id="+this.order_id)
       }
+    },
+    getlist(){
+      var params = {
+        id:this.order_id,
+        start_time:this.start_time,
+        end_time:this.end_time,
+      }
+      getExportStockList().then(response=>{
+
+      })
+    },
+    exportList(){
+      exportList().then(response=>{
+
+      })
     }
   }
 };

src/xt_pages/stock/stockInOrderDetailPrint.vue

@@ -43,7 +43,7 @@
                                     <td style="line-height:18px;">{{ item.remark }}</td>
                                     <td style="line-height:18px;"><span v-if="item.good_id != 0">{{getSpecificationName(item.good_id)}}</span></td>
                                     <td style="line-height:18px;">{{ getManufacturer(item.good_id) }}</td>
-                                    <td style="line-height:18px;"><span v-if="item.good_id!=0">{{getUnit(item.good_id)}}</span></td>
+                                    <td style="line-height:18px;"><span v-if="item.good_id!=0">{{item.GoodInfo.packing_unit}}</span></td>
                                     <td style="line-height:18px;">{{item.price}}</td>
                                     <td style="line-height:18px;">{{item.warehousing_count}}</td> 
                                     <td style="line-height:18px;">{{(item.warehousing_count*item.price).toFixed(2)}}</td>

src/xt_pages/stock/stockPrint.vue

@@ -21,34 +21,26 @@
                         <table class="table">
                             <thead>
                                 <tr>
-                                    <td width="60">商品编码</td>
-                                    <td width="80">耗材名称</td>
                                     <td width="80">耗材类型</td>
-                                    <td width="80">规格型号</td>
+                                    <td width="80">耗材名称</td>
+                                    <td width="80">规格&单位</td>
+                                    <td width="80">进货单价</td>
+                                    <td width="80">生产商</td>
                                     <td width="80">入库数量</td>
-                                    <td width="80">进货价</td>
-                                    <td width="80">入库退货</td>
-                                    <td width="80">实际入库</td>
                                     <td width="80">出库数量</td>
-                                    <td width="80">出库退库</td>
-                                    <td width="80">实际出库</td>
                                     <td width="80">剩余库存</td>
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr v-for='(item,index) in WarehouseInfo.warehouseInfoDate' :key="index">
-                                    <td>{{item.good_code}}</td>
-                                    <td>{{item.good_name}}</td>
-                                    <td>{{item.type.type_name}}</td>
-                                    <td>{{item.specification_name}}</td>
-                                    <td>{{stockInCount(item)}}</td>
-                                    <td>{{item.price}}</td>
-                                    <td>{{salesReturnCount(item)}}</td>
-                                    <td> {{ stockInCount(item) - salesReturnCount(item) }}</td>
-                                    <td>{{ stockOutCount(item) }}</td>
-                                    <td>{{cancelStockCount(item) }}</td>
-                                    <td>{{ stockOutCount(item) - cancelStockCount(item)}}</td>
-                                    <td>{{stockInCount(item) -salesReturnCount(item) -stockOutCount(item) +cancelStockCount(item)}}</td>
+                                <tr v-for='(item,index) in tableList' :key="index">
+                                   <td>{{getGoodType(item.good_type_id)}}</td>
+                                   <td>{{item.good_name }}</td>
+                                   <td><span>{{item.specification_name }} / {{item.packing_unit}}</span></td>
+                                   <td>{{item.price}}</td>
+                                   <td>{{getManufacture(item.manufacturer)}}</td>
+                                   <td>{{getInCount(item.good_id)}}</td>
+                                   <td><span>{{getOutCount(item.good_id) + getAutoCount(item.good_id)}}</span></td> 
+                                   <td>{{getInCount(item.good_id)- getOutCount(item.good_id) - getAutoCount(item.good_id)}}</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -61,7 +53,7 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import { getAllStockQueryList } from "@/api/stock";
+import { getAllStockList,GetAllGoodType,getStockDrugCount } from "@/api/stock";
 import print from 'print-js'
 const moment = require('moment')
 export default {
@@ -87,8 +79,14 @@ export default {
           page:"",
           WarehouseInfo: {
           loading: false,
-          warehouseInfoDate: []
+          warehouseInfoDate: [],
          },
+          tableList:[],
+          goodType:[],
+          manufacturerList:[],
+          countList:[],
+          outCountList:[],
+          autoCountList:[],
         }
     },
     methods:{
@@ -103,39 +101,40 @@ export default {
           })
       },
       getlist(){
-         const Params = {
-            page: this.page,
-            limit: this.limit,
-            keyword: this.keywords,
-            start_time:this.start_time,
-            end_time:this.end_time,
-            type_name:this.type_name,
-        };
-         this.WarehouseInfo.loading = true;
-         this.WarehouseInfo.warehouseInfoDate = [];
-         getAllStockQueryList(Params).then(response => {
-           if (response.data.state == 0) {
-            this.WarehouseInfo.loading = false;
+        const params = {
+          page: this.page,
+          limit: this.limit,
+          keywords: this.keywords,
+          start_time:this.start_time,
+          end_time:this.end_time,
+          type:this.type_name,
+        }
+        getAllStockList(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           console.log("list22222",list)
+           this.tableList = list
+           var total = response.data.data.total
+           console.log("total",total)
+           this.total = total
+           var manufacturerList = response.data.data.manufacturerList
+           this.manufacturerList = manufacturerList
+         }
+       })
+      },
+      GetAllGoodType() {
+        GetAllGoodType().then(response => {
+          if (response.data.state == 0) {
             this.$message.error(response.data.msg);
             return false;
           } else {
-            this.WarehouseInfo.loading = false;
-            this.total = response.data.data.total;
-          for (let i = 0; i < response.data.data.list.length; i++) {
-            this.WarehouseInfo.warehouseInfoDate.push( response.data.data.list[i]);
-          }
-          for(let i=0;i<this.WarehouseInfo.warehouseInfoDate.length;i++){
-            if(this.WarehouseInfo.warehouseInfoDate[i].query_warehousing_info.length>0){
-              this.WarehouseInfo.warehouseInfoDate[i].price = this.WarehouseInfo.warehouseInfoDate[i].query_warehousing_info[0].price
-            }else{
-              this.WarehouseInfo.warehouseInfoDate[i].price = ""
+            for (let i = 0; i < response.data.data.goodType.length; i++) {
+              this.goodType.push(response.data.data.goodType[i]);
             }
           }
-         }
-            console.log("打印数据源头",this.WarehouseInfo.warehouseInfoDate)
-          });
+        });
       },
-       stockInCount: function(row) {
+      stockInCount: function(row) {
       let total = 0;
       for (let i = 0; i < row.query_warehousing_info.length; i++) {
         total = total + row.query_warehousing_info[i].warehousing_count;
@@ -163,6 +162,71 @@ export default {
       }
       return total;
     },
+    getGoodType(id){
+      var name = ""
+      for(let i=0;i<this.goodType.length;i++){
+        if(id == this.goodType[i].id){
+           name = this.goodType[i].type_name
+        }
+      }
+      return name
+     },
+    getManufacture(id){
+       var name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+         if(id == this.manufacturerList[i].id){
+           name = this.manufacturerList[i].manufacturer_name
+         }
+       }
+       return 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.autoCountList[i].count
+          }
+        }
+        return count
+      }
     },
     created(){
       var starttime =  this.$route.query.start_time
@@ -176,6 +240,8 @@ export default {
       this.page = this.$route.query.page
       this.limit = this.$route.query.limit
       this.getlist()
+      this.GetAllGoodType()
+      this.getStockDrugCount()
     }
 }
 </script>

src/xt_pages/stock/stockQuery.vue

@@ -165,7 +165,6 @@ import {
 export default {
   name: "stockIn",
   created() {
-    // this.GetAllStockQuery();
     this.GetAllGoodInfo();
     this.GetAllGoodType();
     this.getlist()
@@ -372,13 +371,22 @@ export default {
     },
 
     exportList(){
-
          import('@/vendor/Export2Excel').then(excel => {
-         const tHeader = ['商品编码', '耗材名称', '耗材类型','规格型号','入库数量','进货价','入库退货','实际入库','出库数量','出库退库','实际出库','剩余库存']
-         const filterVal = ['good_code', 'good_name', 'type_name','specification_name','stockInCount','price','salesReturnCount','realCount','stockOutCount','cancelStockCount','realOutCount','overplus']
-         const data = this.formatJson(filterVal, this.WarehouseInfo.warehouseInfoDate)
-         console.log("data",data)
 
+         const tHeader = ['耗材类型', '耗材名称', '规格&单位','规格型号','进货单价','生产商','入库数量','出库数量','库存剩余量']
+         const filterVal = ['type_name', 'good_name', 'unit','specification_name','price','prodect_name','inCount','outCount','overplus']
+
+       
+         for(let i=0;i<this.tableList.length;i++){
+           this.tableList[i].type_name = this.getGoodType(this.tableList[i].good_type_id)
+           this.tableList[i].unit = this.tableList[i].specification_name + "/" + this.tableList[i].packing_unit
+           this.tableList[i].prodect_name = this.getManufacture(this.tableList[i].manufacturer)
+           this.tableList[i].inCount =  this.getOutCount(this.tableList[i].good_id) + this.getAutoCount(this.tableList[i].good_id)
+           this.tableList[i].outCount = this.getOutCount(this.tableList[i].good_id) + this.getAutoCount(this.tableList[i].good_id)
+           this.tableList[i].overplus =this.getInCount(this.tableList[i].good_id)- this.getOutCount(this.tableList[i].good_id) - this.getAutoCount(this.tableList[i].good_id)
+         }
+         console.log("table",this.tableList)
+         const data = this.formatJson(filterVal, this.tableList)
          excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -391,7 +399,7 @@ export default {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
       changeTypeName(){
-       this.GetAllStockQuery()
+       this.getlist()
       },
       toPrint(){
         this.$router.push("/stock/stockprint?start_time="+this.start_time+"&end_time="+this.end_time+"&keyword="+this.keywords+"&type_name="+this.type_name+"&page="+this.page+"&limit="+this.limit)
@@ -429,7 +437,7 @@ export default {
         keywords: this.keywords,
         start_time:this.start_time,
         end_time:this.end_time,
-        type_name:this.type_name,
+        type:this.type_name,
       };
      console.log("params",params)
       getAllStockList(params).then(response=>{
@@ -456,16 +464,25 @@ export default {
     },
     toClick(val){
        var manufacturer_name = ""
+       var specification_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})
+      specification_name = val.specification_name + "/" + val.packing_unit
+      this.$router.push({path:"/stock/in/stockflow?id="+val.good_id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name})
     },
     toClickOne(val){
-      this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.good_id+"&good_name="+val.good_name})
+       var manufacturer_name = ""
+       var specification_name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+          if(val.manufacturer == this.manufacturerList[i].id){
+            manufacturer_name = this.manufacturerList[i].manufacturer_name  
+          }
+       }
+      specification_name = val.specification_name + "/" + val.packing_unit
+      this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.good_id+"&good_name="+val.good_name+"&manufacturer="+manufacturer_name+"&specification_name="+specification_name})
     },
     getStockDrugCount(){
         var params ={