11月14日 库存扣减更新

src/api/stock.js

@@ -970,3 +970,11 @@ export function getDamageDetailByGoodId(params) {
     params: params
   })
 }
+
+export function getInventoryExportList(params) {
+  return request({
+    url: '/api/stock/getinventoryexportlist',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/drugs.js

@@ -50,24 +50,24 @@ export default {
     //   name: 'drugDamaged',
     //   meta: { title: 'drugDamaged', noCache: true }
     // },
-    {
-      path: '/stock/drugs/drugDamagePrint',
-      component: () => import('@/xt_pages/stock/drugs/drugDamagePrint'),
-      name: 'drugDamaged',
-      meta: { title: 'drugDamaged', noCache: true }
-    },
+    // {
+    //   path: '/stock/drugs/drugDamagePrint',
+    //   component: () => import('@/xt_pages/stock/drugs/drugDamagePrint'),
+    //   name: 'drugDamaged',
+    //   meta: { title: 'drugDamaged', noCache: true }
+    // },
     // {
     //   path: '/stock/drugs/drugWarning',
     //   component: () => import('@/xt_pages/stock/drugs/drugWarning'),
     //   name: 'drugWarning',
     //   meta: { title: 'drugWarning', noCache: true }
     // },
-    // {
-    //   path: '/stock/drugs/drugInventory',
-    //   component: () => import('@/xt_pages/stock/drugs/drugInventory'),
-    //   name: 'drugInventory',
-    //   meta: { title: 'drugInventory', noCache: true }
-    // },
+    {
+      path: '/stock/drugs/drugInventory',
+      component: () => import('@/xt_pages/stock/drugs/drugInventory'),
+      name: 'drugInventory',
+      meta: { title: 'drugInventory', noCache: true }
+    },
     {
       path: '/stock/drugs/inventoryPrint',
       component: () => import('@/xt_pages/stock/drugs/inventoryPrint'),

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -372,8 +372,9 @@
         this.currentIndex = -1
       }, cancle: function() {
         this.$refs.dialog.hide()
-      },calculate: function(val) {
-        if (val == 0) {
+      },
+      calculate: function(val) {
+        if (val == 0 || val == "NaN") {
           return ''
         }
         return Math.round(parseFloat(val) * 100) / 100
@@ -433,7 +434,7 @@
         const tempObj = {}
         tempObj['id'] = 0
         tempObj["return_count"] = "";
-        tempObj["price"] = "";
+        tempObj["price"] = 0;
         tempObj["retail_price"] = "";
         tempObj["register_account"] = ""
         tempObj["dealer"] = ""
@@ -443,7 +444,7 @@
         tempObj["expiry_date"] = ""
         tempObj["batch_number"] = ""
         tempObj["batch_number_id"] = 0
-
+         tempObj["count"] = 0
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
         if (row.id == 0) {

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -96,7 +96,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="原因:">
-                  <el-select v-model="form.type" placeholder="请选择">
+                  <el-select v-model="form.type" placeholder="请选择" @change="changeReason">
                       <el-option
                         v-for="item in reasonList"
                         :key="item.id"
@@ -146,7 +146,7 @@
 
               <el-table-column prop="address" label="盘点原因" align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.type == 0">默认</span> 
+                  <span v-if="scope.row.type == 6">默认</span> 
                   <span v-if="scope.row.type == 1">到期退货</span> 
                   <span v-if="scope.row.type == 2">异常退货</span> 
                   <span v-if="scope.row.type == 3">退货</span> 
@@ -243,7 +243,7 @@ export default {
             unitList:[],
             datamageList:[],
             reasonList:[
-              {id:0,name:"默认"},
+              {id:6,name:"默认"},
               {id:1,name:"到期退货"},
               {id:2,name:"异常退货"},
               {id:3,name:"退货"},
@@ -284,6 +284,10 @@ export default {
             return uParseTime(val, '{y}-{m}-{d}')
          }
         },
+      changeReason(val){
+        this.form.type = val
+        this.clickDetai(this.drug_id)
+      },
       getlist(){
         var params = {
           limit:this.limit,
@@ -292,14 +296,13 @@ export default {
           end_time:this.end_time,
           keyword:this.searchKey,
         }
-        console.log("博阿孙param232332232323",params)
+       
         getDrugDamageList(params).then(response=>{
            if(response.data.state == 1){
              this.tableList = response.data.data.list
              this.total = response.data.data.total
              this.doctorList = response.data.data.doctorList
              var datamagelist = response.data.data.damagelist
-             console.log("hhh233223",datamagelist)
              this.datamageList = datamagelist
            }
         })
@@ -355,6 +358,7 @@ export default {
            warehouseing_order:this.form.warehousing_order,
            type:this.form.type,
          }
+        
         this.dialogVisible = true
         getDamagedByDrugId(params).then(response=>{
            if(response.data.state ==1){
@@ -364,7 +368,7 @@ export default {
                list[i].min_number == list[i].XtBaseDrug.min_number
                list[i].total = 0
              }
-             console.log("list232232332",list)
+            
 
              for(let i=0;i<list.length;i++){
                this.drug_name = list[0].drug_name
@@ -423,10 +427,7 @@ export default {
        this.clickDetai(this.drug_id)
      },
      getDrugDamageRadio(count){
-
        var total_count =  this.getDamagedCountOne(this.total_count)
-       console.log("count888888888888",count)
-       console.log("hh23232数据列表23322323",total_count)
        var all_count = 0
        all_count =  total_count * this.min_number
       

src/xt_pages/stock/drugs/drugQueryPrint.vue

@@ -45,10 +45,19 @@
               <td style="line-height: 50px">
                 <span> {{getManufacturerList(item.manufacturer)}}</span>
               </td>
-              <td><span v-if="getWarehoseInfo(item.drug_warehouse_info)!=0">{{getWarehoseInfo(item.drug_warehouse_info)}}{{item.max_unit}}</span ></td>
-              <td><span v-if="getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)!=0">{{getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)}}</span></td>
               <td>
-                <span v-if="getOverFlushInfo(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number)!=0">{{getOverFlushInfo(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number)}}</span>
+                <span v-if="getWarehoseInfo(item.drug_warehouse_info)!=0">{{getWarehoseInfo(item.drug_warehouse_info)}}{{item.max_unit}}</span >
+              </td>
+              <td>
+                <!-- <span v-if="getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)!=0">
+                  {{getWarehouseOutInfo(item.drug_warehouse_out,item.max_unit,item.min_unit,item.min_number)}}
+                </span> -->
+                  {{getOutFlush(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number,item.drug_cancel_stock_info)}}
+              </td>
+              <td>
+              <span v-if="getOverFlushInfo(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number)!=0">
+                  {{getOverFlushInfo(item.drug_warehouse_info,item.max_unit,item.min_unit,item.min_number)}}
+              </span>
              </td> 
             </tr>
             </tbody>
@@ -346,23 +355,6 @@
         }
         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
-      // },
         getCount(drug_id,min_number,max_unit,min_unit){
         var total= 0
         var str = ""
@@ -506,6 +498,34 @@
          }
         return max_str + min_str
 
+      },
+      getOutFlush(info,max_unit,min_unit,min_number,cancel_info){
+        var str = ""
+        var str_min = ""
+        var total = 0
+        var out_count = 0
+        var over_count = 0
+        var cancel_count = 0
+        for(let i=0;i<info.length;i++){
+           total += (info[i].warehousing_count * min_number)
+        }
+        
+        for(let j=0;j<info.length;j++){
+           out_count += (info[j].stock_max_number + info[j].stock_min_number)
+        }
+       
+        for(let z=0;z<cancel_info.length;z++){
+           cancel_count += cancel_info[z].count
+        }
+        over_count = total - out_count + cancel_count
+    
+        if(parseInt(over_count/min_number)!=0){
+            str = parseInt(over_count/min_number)+ max_unit
+         }
+         if(over_count%min_number !=0){
+           str_min =  over_count%min_number + min_unit
+         }
+       return str+str_min
       }
     },
     created() {

src/xt_pages/stock/drugs/inventory.vue

@@ -186,7 +186,7 @@ export default {
             index:"",
             unitList:[],
             reasonList:[
-              {id:0,name:"默认"},
+              {id:6,name:"默认"},
               {id:1,name:"到期退货"},
               {id:2,name:"异常退货"},
               {id:3,name:"退货"},
@@ -293,7 +293,7 @@ export default {
                    list[i].last_stock_min_number = ""
                    list[i].min_number = list[i].XtBaseDrug.min_number
                    list[i].manufacturer_name  = ""
-                   list[i].type = 0
+                   list[i].type = 6
                    for(let j=0;j<this.manufacturerList.length;j++){
                      if(list[i].manufacturer == this.manufacturerList[j].id){
                         list[i].manufacturer_name = this.manufacturerList[j].manufacturer_name

src/xt_pages/stock/drugs/query.vue

@@ -805,16 +805,16 @@ import { min } from 'moment'
         for(let i=0;i<info.length;i++){
            total += (info[i].warehousing_count * min_number)
         }
-        console.log("total232323232332323223",total)
+        
         for(let j=0;j<info.length;j++){
            out_count += (info[j].stock_max_number + info[j].stock_min_number)
         }
-        console.log("剩余库存",out_count)
+       
         for(let z=0;z<cancel_info.length;z++){
            cancel_count += cancel_info[z].count
         }
         over_count = total - out_count + cancel_count
-        console.log("hh233223232322323232323322332",over_count)
+    
         if(parseInt(over_count/min_number)!=0){
             str = parseInt(over_count/min_number)+ max_unit
          }

src/xt_pages/stock/inventory.vue

@@ -181,7 +181,7 @@ export default {
          id:0,
          numberList:[],
          reasonList:[
-          {id:0,name:"默认"},
+          {id:6,name:"默认"},
           {id:1,name:"到期退货"},
           {id:2,name:"异常退货"},
           {id:3,name:"退货"},
@@ -420,7 +420,7 @@ export default {
          if(response.data.state == 1){
            var list = response.data.data.list
            for(let i=0;i<list.length;i++){
-              list[i].type = 0
+              list[i].type = 6
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
               for(let j=0;j<this.manufacturerList.length;j++){

src/xt_pages/stock/inventoryDetails.vue

@@ -16,6 +16,9 @@
                 icon="el-icon-search"
                 @click="search">搜索</el-button>
             </div>
+            <div>
+              <el-button type="primary" @click="inventoryExportList">盘点模版打印</el-button>
+            </div>
             <!-- <div>
                 <el-button size="small" type="primary" @click="print">打印</el-button>
                 <el-button size="small" type="primary" @click="exportList">导出</el-button>
@@ -60,7 +63,7 @@
            
             <el-table-column prop="name" label="盘点原因" width="230" align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.inventory_type ==0">默认</span>
+                <span v-if="scope.row.inventory_type ==6">默认</span>
                 <span v-if="scope.row.inventory_type ==1">到期退货</span>
                 <span v-if="scope.row.inventory_type ==2">异常退货</span>
                 <span v-if="scope.row.inventory_type ==3">退货</span>
@@ -87,6 +90,7 @@
 <script>
 import { uParseTime } from '@/utils/tools'
 import { getInventoryDetailList } from "@/api/stock"
+
 export default {
     name: "inventory",
     data() {
@@ -182,6 +186,9 @@ export default {
             return uParseTime(val, '{y}-{m}-{d}')
          }
        },
+      inventoryExportList(){
+        this.$router.push({path:'/stock/inventoryPrint'})
+      }
     },
     created(){
       this.getlist()

src/xt_pages/stock/inventoryPrint.vue

@@ -10,41 +10,34 @@
         </div>
         <div class="app-container" style="background-color: white;">
             <div id="print_content">
-                <div class="printTitle">库存盘点核单数</div>
-                <div style="float:right;">调价日期：{{getTime(this.tableData[0].start_time)}}</div>
+              
                 <table class="printTable" border="1">
                     <tr>
                         <td>序号</td>
-                        <td>耗材名称</td>
+                        <td>名称</td>
                         <td>规格</td>
+                        <td>批号</td>
+                        <td>生产日期</td>
+                        <td>有效日期</td>
+                        <td>生产企业</td>
+                        <td>国药准字</td>
                         <td>单位</td>
-                        <td>零售价</td>
-                        <td>当前库存</td>
-                        <td>盘点数</td>
-                        <td>亏损金额</td>
+                        <td>库存量</td>
                     </tr>
                     <tr v-for="(item,index) in tableData" :key="index">
                         <td>{{index+1}}</td>
                         <td>{{item.good_name}}</td>
                         <td>{{item.specification_name}}</td>
+                        <td>{{item.number}}</td>
+                        <td>{{getTime(item.product_date)}}</td>
+                        <td>{{getTime(item.expiry_date)}}</td>
+                        <td>{{getManufacturerName(item.manufacturer)}}</td>
+                        <td>{{item.remark}}</td>
                         <td>{{item.warehousing_unit}}</td>
-                        <td>{{item.packing_price}}</td>
-                        <td></td>
-                        <td>{{item.count}}</td>
                         <td></td>
                     </tr>
                 </table>
-                <div style="margin-top:10px;">
-                    <span>合计：库存金额</span>
-                    <span>    库存盘点金额：亏损总计</span>
-                </div>
-                <div style="display:flex;float:right;margin-top:10px;border-top:1px solid #000;padding-top:10px;width:100%;">
-                    <div style="width:80px;">审批：</div><div style="width:100px;"></div>
-                    <div style="width:100px;">药材主任：</div><div style="width:60px;"></div>
-                    <div style="width:50px;">会计：</div><div style="width:100px;"></div>
-                    <div style="width:50px;">审核：</div><div style="width:100px;"></div>
-                    <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
-                </div>
+               
             </div>
         </div>
     </div>
@@ -54,7 +47,7 @@
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
-import { getInventoryPrintList } from "@/api/stock"
+import { getInventoryExportList } from "@/api/stock"
 export default {
     components:{
         BreadCrumb
@@ -68,6 +61,7 @@ export default {
           ],
           ids:"",
           tableData:[],
+          manufacturerList:[],
         }
     },
     methods:{
@@ -81,18 +75,6 @@ export default {
             scanStyles: false
             })
         },
-        
-        getInventoryPrintList(){
-            var params = {
-                ids:this.ids,
-            }
-         getInventoryPrintList(params).then(response=>{
-           if(response.data.state == 1){
-             var list = response.data.data.list
-             this.tableData = list
-           }
-         })
-        },
         getTime(val) {
          if(val < 0){
             return ""
@@ -103,11 +85,28 @@ export default {
             return uParseTime(val, '{y}-{m}-{d}')
          }
         },
-
+        getlist(){
+         getInventoryExportList().then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("list233233232323",list)
+             this.tableData = list
+             this.manufacturerList = response.data.data.manufacturerList
+           }
+         })
+        },
+        getManufacturerName(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
+        }
     },
     created(){
-      this.ids  = this.$route.query.ids
-      this.getInventoryPrintList()
+      this.getlist()
     }
 }
 </script>

src/xt_pages/stock/stockDamaged.vue

@@ -348,7 +348,7 @@
 
               <el-table-column prop="address" label="盘点原因" align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.inventory_type == 0">默认</span> 
+                  <span v-if="scope.row.inventory_type == 6">默认</span> 
                   <span v-if="scope.row.inventory_type == 1">到期退货</span> 
                   <span v-if="scope.row.inventory_type == 2">异常退货</span> 
                   <span v-if="scope.row.inventory_type == 3">退货</span> 
@@ -433,7 +433,7 @@ export default {
             damageList:[],
             modifyDialogVisible:false,
             reasonList:[
-              {id:0,name:"默认"},
+              {id:6,name:"默认"},
               {id:1,name:"到期退货"},
               {id:2,name:"异常退货"},
               {id:3,name:"退货"},
@@ -479,7 +479,7 @@ export default {
         if (response.data.state == 1) {
         
             var list = response.data.data.list
-            console.log("列表数据",list)
+           
             this.goodList = list
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
@@ -584,8 +584,7 @@ export default {
               this.tableData[i].dealer = ""   
            }
          }
-         console.log("比阿哥",this.tableData)
-         console.log("numberlist",this.numberList)
+
          for(let i=0;i<this.tableData.length;i++){
            this.tableData[i].count =  parseInt(this.tableData[i].count)
            this.tableData[i].expiry_date = parseInt(this.tableData[i].expiry_date)
@@ -601,8 +600,7 @@ export default {
           var params = {
             tableData:this.tableData,
           }
-          console.log("params",params)
-       
+        
         saveReportStock(params).then(response=>{
            if(response.data.state == 1){
              var msg = response.data.data.msg
@@ -644,17 +642,16 @@ export default {
           limit:this.limit,
           page:this.page,
          }
-         console.log("param23223232322323",params)
        getReportStockList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("list",list)
+     
             this.total = response.data.data.total
             this.tableList = list
            var doctorlist = response.data.data.doctorlist
            this.doctorList = doctorlist
            var damageList =  response.data.data.damageList
-           console.log("datamagelist",damageList)
+          
           this.damageList = damageList
           }
        })   
@@ -697,7 +694,7 @@ export default {
       getStockBatchNumber(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-          console.log("批号列表",list)
+         
           this.numberList = list
         }
       })
@@ -710,7 +707,7 @@ export default {
          if(response.data.state == 1){
            var list = response.data.data.list
            this.form.total =  list.stock_count
-           console.log("list23232",list)
+          
          }
       })
      },
@@ -723,8 +720,7 @@ export default {
        this.getlist()
      },
      chageNumberlist(val){
-       console.log("val2323322",val)
-       
+      
        for(let i=0;i<this.numberList.length;i++){
          if(this.numberList[i].number == val){
             this.form.warehousing_info_id = this.numberList[i].id
@@ -739,7 +735,7 @@ export default {
         getWarehouseTotal(params).then(response=>{
           if(response.data.state == 1){
             var list =  response.data.data.list
-            console.log("档期批次库促",list)
+        
             this.form.total = list.stock_count
           }
         })
@@ -753,20 +749,22 @@ export default {
         }
         return count
       },
-      changeReason(){
-
+      changeReason(val){
+        this.form.type = val
+        this.toDamagedDetail(this.good_id)
       },
       toDamagedDetail(good_id){
+         this.good_id = good_id
           var params = {
             good_id:good_id,
             warehousing_order:this.form.warehousing_order,
             type:this.form.type,
           }
-          console.log("para2233232",params)
+    
          getDamageDetailByGoodId(params).then(response=>{
             if(response.data.state == 1){
               var list = response.data.data.list
-              console.log("list233232",list)
+             
               if (list.length>0){
                 this.modifyDialogVisible = true
                 this.good_name = list[0].good_name

src/xt_pages/stock/stockPrint.vue

@@ -42,13 +42,18 @@
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
                                    </td>
                                    <td>
-                                        {{getAutoCount(item.id) + getOutCount(item.id)}}
-                                       <!-- <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info) - getOverplus(item.xt_warehouse_info) - getCancelInfo(item.cancel_stock_info)}}{{item.packing_unit}}</span> -->
+                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245">
+                                        <span>
+                                          {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info) }}
+                                          </span>
+                                        </span>
+                                        <span v-else>{{getAutoCount(item.id) + getOutCount(item.id)}} </span>
                                    </td>
                                   
                                    <td>
-                                     <span v-if="getWareInfo(item.xt_warehouse_info) > 0">{{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}</span> 
-                                     <!-- <span v-if="getOverplus(item.xt_warehouse_info)>0">{{getOverplus(item.xt_warehouse_info)}}{{item.packing_unit}}</span>   -->
+                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245">{{getOverFlushInfo(item.xt_warehouse_info)}}</span>
+                                     <span v-else>{{getWareInfo(item.xt_warehouse_info) - getAutoCount(item.id) - getOutCount(item.id) + getCancelCount(item.id) }}</span>
+                                    
                                    </td>
                                 </tr>
                             </tbody>
@@ -97,6 +102,7 @@ export default {
           outCountList:[],
           autoCountList:[],
           cancelCountList:[],
+          org_id:0,
         }
     },
     methods:{
@@ -122,10 +128,10 @@ export default {
         getAllStockList(params).then(response=>{
          if(response.data.state == 1){
            var list = response.data.data.list
-           console.log("list22222",list)
+          //  console.log("list22222",list)
            this.tableList = list
            var total = response.data.data.total
-           console.log("total",total)
+          //  console.log("total",total)
            this.total = total
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
@@ -199,16 +205,16 @@ export default {
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
            var count = response.data.data.count
-           console.log("入库统计",count)
+          //  console.log("入库统计",count)
            this.countList = count
            var outlist = response.data.data.outList
-           console.log("出库数量",outlist)
+          //  console.log("出库数量",outlist)
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
-           console.log("autoCount",autoCount)
+          //  console.log("autoCount",autoCount)
            this.autoCountList = autoCount
            var totalCount = response.data.data.totalCount
-           console.log("totalcount",totalCount)
+          //  console.log("totalcount",totalCount)
            this.cancelCountList = totalCount
          }
       })
@@ -290,9 +296,31 @@ export default {
        total = ""
      }
      return total
+   },
+   getOverFlushInfo(arr){
+     var total = 0
+     if(arr.length >0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }
+     return total
+   },
+   getCancelSotckInfo(arr){
+     console.log("2332323232322332",arr)
+     var cancle_toal = 0
+     if(arr.length >0){
+      for(let z=0;z<arr.length;z++){
+        cancle_toal += arr[z].count
+      }
+     }
+     console.log("total",cancle_toal)
+     return cancle_toal
    }
-    },
+   },
     created(){
+      this.org_id =  this.$store.getters.xt_user.org_id
+      console.log("机构ID232323323233232",this.org_id)
       var starttime =  this.$route.query.start_time
       this.start_time = starttime
       var endtime =  this.$route.query.end_time

src/xt_pages/stock/stockQuery.vue

@@ -341,12 +341,19 @@ export default {
            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.getWareInfo(this.tableList[i].xt_warehouse_info)
-           this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
-          if(this.getWareInfo(this.tableList[i].xt_warehouse_info) > 0){
-            this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
+
+        
+          if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245){
+             this.tableList[i].outCount  = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getOverFlushInfo(this.tableList[i].xt_warehouse_info) + this.getCancelSotckInfo(this.tableList[i].cancel_stock_info) 
           }else{
-             this.tableList[i].overplus = 0
+            this.tableList[i].outCount =  this.getAutoCount(this.tableList[i].id) + this.getOutCount(this.tableList[i].id)
           }
+          
+           if(this.org_id == 9671 || this.org_id == 10138 || this.org_id == 10028 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245){
+              this.tableList[i].overplus = this.getOverFlushInfo(this.tableList[i].xt_warehouse_info)
+           }else{
+             this.tableList[i].overplus = this.getWareInfo(this.tableList[i].xt_warehouse_info) - this.getAutoCount(this.tableList[i].id) - this.getOutCount(this.tableList[i].id) + this.getCancelCount(this.tableList[i].id)
+           }
 
          }
          const data = this.formatJson(filterVal, this.tableList)