11月14日 库存扣减更新

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -286,7 +286,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
                                                <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
                                                <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
                                               </span>
@@ -383,7 +383,7 @@
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088">
+                                              <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
                                                    {{scope.row.stock_count}}
                                               </span>
                                               <span v-else> {{ scope.row.total }}</span>
@@ -2658,7 +2658,7 @@
       selectDrugs(selection, row) {
         console.log('selection', selection)
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 ){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245){
             if (row.count <= 0) {
               if (selection) {
                 selection.forEach(row => {
@@ -2933,7 +2933,7 @@
       },
       selectChange(selection, row) {
         console.log('row', row)
-        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088){
+        if(this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id ==3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id ==10245 ){
            if (row.stock_count <= 0) {
             if (row.type == 3) {
               if (selection) {

src/xt_pages/stock/drugs/query.vue

@@ -77,9 +77,9 @@
           >搜索
           </el-button>
       </div>
-      
+
        <el-table :data="tableList" border style="width: 100%">
-      
+
         <el-table-column prop="drug_type" label="药品类型" width="180" align="center">
            <template slot-scope="scope">
              {{getDrugType(scope.row.drug_type)}}
@@ -107,15 +107,15 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span> 
+            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">{{getWarehoseInfo(scope.row.drug_warehouse_info)}}{{scope.row.max_unit}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
-             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243 || org_id == 10088">
-                <span> 
+             <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id ==10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
+                <span>
                  {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
-                </span> 
+                </span>
              </span>
              <span v-else>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
            </template>
@@ -123,10 +123,10 @@
         <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)!=0">
-               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243 || org_id == 10088">
+               <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10138 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245">
                 {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
                </span>
-               
+
                <span v-else>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>
             </div>
            </template>
@@ -148,7 +148,7 @@
           </template>
         </el-table-column>
        </el-table>
-       
+
     <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -194,13 +194,13 @@ import { min } from 'moment'
       this.getlist()
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
-      var drugTypeList = getDictionaryDataConfig('system','drug_type') 
+      var drugTypeList = getDictionaryDataConfig('system','drug_type')
       this.drugTypeList.push(...drugTypeList)
       this.org_id =  this.$store.getters.xt_user.org.id
       console.log("机构ID",this.org_id)
       this.getDrugCountList()
-     
-      
+
+
     },
     components: {
       SettingDialog,
@@ -213,7 +213,7 @@ import { min } from 'moment'
           { path: '/stock/drugs/stock/query', name: '药品库存查询' }
         ],
         keywords: '',
-       
+
         multipleSelection: [],
         signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
         start_time: '',
@@ -279,7 +279,7 @@ import { min } from 'moment'
                for(let z=0;z<list[i].drug_cancel_stock_info.length;z++){
                  if(list[i].drug_cancel_stock_info[z].max_unit == list[i].max_unit){
                    list[i].drug_cancel_stock_info[z].count = list[i].drug_cancel_stock_info[z].count * list[i].min_number
-                 } 
+                 }
                }
              }
              console.log("列表list232323323232323223",list)
@@ -287,7 +287,7 @@ import { min } from 'moment'
              var total = response.data.data.total
              this.total = total
              this.manufacturerList = response.data.data.manufacturerList
-           
+
            }
         })
       },
@@ -337,7 +337,7 @@ import { min } from 'moment'
           }
         }
       },
-    
+
       getSpecificationName: function(id) {
         let name = ''
         for (let i = 0; i < this.goodInfo.length; i++) {
@@ -373,7 +373,7 @@ import { min } from 'moment'
       calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       },
-  
+
     startTimeChange: function(val) {
       window.sessionStorage.removeItem('start_time')
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
@@ -381,7 +381,7 @@ import { min } from 'moment'
         this.$message.error("开始时间不能大于结束时间");
         this.start_time = "";
       } else {
-     
+
         this.getlist()
       }
     },
@@ -392,10 +392,10 @@ import { min } from 'moment'
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
-       
+
         this.getlist()
       }
-     
+
     },
       stockInCount: function(row) {
         let total = 0
@@ -430,7 +430,7 @@ import { min } from 'moment'
       search: function() {
         this.getlist()
         this.getDrugCountList()
-      }, 
+      },
       setting: function() {
         this.$refs.dialog.show()
       },
@@ -446,13 +446,13 @@ import { min } from 'moment'
           this.tableList[i].outCount = this.getWarehouseOutInfo(this.tableList[i].drug_warehouse_out,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
           this.tableList[i].overplusCount =  this.getOverFlushInfo(this.tableList[i].drug_warehouse_info,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
          }
-       
+
          console.log("hhhhhhhadhfadf 列表",this.tableList)
          import('@/vendor/Export2Excel').then(excel => {
          const tHeader = ['序号', '药品类型', '药品名称','规格型号&单位','进货单价','厂家','入库数量','出库数量','剩余库存量']
          const filterVal = ['index', 'drug_type_name', 'drug_name','unit','last_price','manufacturer_name','inCount','outCount','overplusCount']
-       
-        
+
+
          const data = this.formatJson(filterVal, this.tableList)
          excel.export_json_to_excel({
            header: tHeader,
@@ -483,7 +483,7 @@ import { min } from 'moment'
         });
       },
       getDrugType(id){
-       
+
         var name = ""
         for(let i=0;i<this.drugTypeList.length;i++){
            if(this.drugTypeList[i].id == id){
@@ -491,7 +491,7 @@ import { min } from 'moment'
              name = this.drugTypeList[i].name
            }
         }
-     
+
         return name
       },
       getManufacturerList(id){
@@ -630,10 +630,10 @@ import { min } from 'moment'
             min_str =  total%min_number + min_unit
           }
         }
-    
+
         return str + min_str
       },
-  
+
       getCountOne(drug_id){
         var count= 0
         for(let i=0;i<this.drugOutList.length;i++){
@@ -644,7 +644,7 @@ import { min } from 'moment'
         return count
       },
      getCountTwo(drug_id,min_number,max_unit,min_unit){
-      
+
        var total_count = 0
        var out_count = 0
        var count = 0
@@ -658,7 +658,7 @@ import { min } from 'moment'
        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
        }
@@ -683,11 +683,11 @@ import { min } from 'moment'
         if(total == 0){
            total = ""
         }
-       
+
         return total
       },
       getOverFlushInfo(arr,max_unit,min_unit,min_number){
-       
+
          var max_str=  ""
          var min_str = ""
          var total = 0
@@ -711,7 +711,7 @@ import { min } from 'moment'
            if(total%min_number!=0){
               min_str = total%min_number + min_unit
            }
-         
+
          }
         return max_str + min_str
       },
@@ -724,7 +724,7 @@ import { min } from 'moment'
             total += parseInt(arr[i].count)
           }
         }
-      
+
         if (total < min_number){
            min_str = total + min_unit
          }
@@ -739,7 +739,7 @@ import { min } from 'moment'
            if(total%min_number!=0){
               min_str = total%min_number + min_unit
            }
-         
+
          }
         return max_str + min_str
 
@@ -793,7 +793,7 @@ import { min } from 'moment'
          return str + str_min
       },
       getOutFlush(info,max_unit,min_unit,min_number,cancel_info){
-        
+
         var str = ""
         var str_min = ""
         //总库存

src/xt_pages/stock/stockQuery.vue

@@ -108,19 +108,19 @@
        </el-table-column>
        <el-table-column label="出库数量" align="center">
          <template slot-scope="scope">
-          <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">
+          <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(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
             </span>
           </span>
-          <span v-else>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span> 
+          <span v-else>{{getAutoCount(scope.row.id) + getOutCount(scope.row.id)}} </span>
          </template>
        </el-table-column>
 
        <el-table-column label="剩余库存量" align="center">
          <template slot-scope="scope">
-          <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">{{getOverFlushInfo(scope.row.xt_warehouse_info)}}</span>
-          <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</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(scope.row.xt_warehouse_info)}}</span>
+          <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>
          </template>
        </el-table-column>
        <el-table-column label="操作" align="center" width="260px">
@@ -171,7 +171,7 @@ export default {
 
     var start_time =  window.sessionStorage.getItem('start_time')
     var end_time =  window.sessionStorage.getItem('end_time')
-   
+
     if(start_time !=null){
       this.start_time = start_time
     }
@@ -221,7 +221,7 @@ export default {
     };
   },
   methods: {
-  
+
     GetAllGoodType: function() {
       GetAllGoodType().then(response => {
         if (response.data.state == 0) {
@@ -259,7 +259,7 @@ export default {
       this.limit = val;
       this.getlist()
       this.getStockDrugCount()
-      
+
     },
     handleCurrentChange(val) {
       this.page = val;
@@ -335,7 +335,7 @@ export default {
          const tHeader = ['耗材类型', '耗材名称', '规格&单位','进货单价','生产商','入库数量','出库数量','库存剩余量']
          const filterVal = ['type_name', 'good_name', 'unit','buy_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
@@ -347,7 +347,7 @@ export default {
           }else{
              this.tableList[i].overplus = 0
           }
-          
+
          }
          const data = this.formatJson(filterVal, this.tableList)
          excel.export_json_to_excel({
@@ -429,7 +429,7 @@ export default {
        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  
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
           }
        }
       specification_name = val.specification_name + "/" + val.packing_unit
@@ -443,7 +443,7 @@ export default {
        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  
+            manufacturer_name = this.manufacturerList[i].manufacturer_name
           }
        }
       specification_name = val.specification_name + "/" + val.packing_unit