11月14日 库存扣减更新

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -212,6 +212,8 @@ export default {
   name: "stockOutDetail",
 
   created() {
+    this.org_id = this.$store.getters.xt_user.org.id
+    console.log("jj233223323223",this.org_id)
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -281,7 +283,8 @@ export default {
       tableData:[],
       tableList:[],
       drugList:[],
-      tablePrint:[]
+      tablePrint:[],
+      org_id:0,
     };
   },
   methods: {
@@ -452,7 +455,7 @@ export default {
                  count:0,
                  price:item.price,
                  remark:item.remark,
-                 total_price:0,
+                 total_price:0.0,
                  dose:item.dose,
                  dose_unit:item.dose_unit,
                  min_number:item.min_number,
@@ -507,23 +510,32 @@ export default {
         console.log("hh23233223",this.tablePrint)
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
-          
         }
         for(let i=0;i<this.tablePrint.length;i++){
-           this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
-           this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price)
-           this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
-            this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price) 
+           if(this.org_id == 9671 || this.org_id == 9919 ){
+             this.tablePrint[i].count = this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child)
+             this.tablePrint[i].total_price = this.getCountSenven(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
+             this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
+             this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
+           }else{
+              this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
+              this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price)
+              this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
+              this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price) 
+           }
+         
+          
         }
        console.log("列表数据333333333",this.tablePrint)
-     
+    
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
        const filterVal = ['index','drug_name', 'unit', 'min_unit','count','price','total_price','remark']
-       let obj = {'index':'合计','total_price':0}
+       let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tablePrint.length;i++){
-         obj.total_price += this.tablePrint[i].total 
+         obj.total_price += this.tablePrint[i].total
        }
+       obj.total_price = obj.total_price.toFixed(2)
        this.tablePrint.push(obj)
        const data = this.formatJson(filterVal, this.tablePrint)
        console.log("data",data)
@@ -561,9 +573,9 @@ export default {
         this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
         this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
        }
-       let obj = {'index':'合计','total_price':0}
+       let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tableData.length;i++){
-         obj.total_price += this.tableData[i].total 
+         obj.total_price += this.tableData[i].total
        }
        
        this.tableData.push(obj)
@@ -628,7 +640,7 @@ export default {
                   drug_spec:item.XtBaseDrug.drug_spec,
                   min_unit:item.XtBaseDrug.min_unit,
                   count:0,
-                  price:item.XtBaseDrug.min_price,
+                  price:item.XtBaseDrug.last_price,
                   remark:item.XtBaseDrug.remark,
                   total_price:"",
                   dose:item.XtBaseDrug.dose,
@@ -709,7 +721,29 @@ export default {
         }
         console.log("total23232",total)
         return total*min_price
-      }
+      },
+      getCountSix(drug_id,val){
+        console.log("val233232",val)
+        var count = 0 
+        for(let i=0;i<val.length;i++){
+          count+= val[i].count
+        }
+        return count
+      },
+      getCountSenven(drug_id,val,price){
+        var count = 0 
+        for(let i=0;i<val.length;i++){
+          count+= val[i].count
+        }
+        return (count*price).toFixed(2)
+      },
+      getCountSenvenOne(drug_id,val,price){
+        var count = 0 
+        for(let i=0;i<val.length;i++){
+          count+= val[i].count
+        }
+        return (count*price)
+      },
   }
 };
 </script>

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -37,23 +37,21 @@
                 <span>{{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</span>
               </td>
               <td style="line-height: 50px">
-                <span>{{item.min_unit}}</span>
+                <span v-if="org_id == 9671 || org_id == 9919 ">{{item.max_unit}}</span>
+                <span v-else>{{item.min_unit}}</span>
               </td>
             
               <td style="line-height: 50px">
-                  <!-- {{item.count}} -->
-                  {{getCount(item.child,item.max_unit,item.min_unit,item.min_number)}}
+                <span v-if="org_id == 9671 || org_id == 9919">{{getCountSix(item.drug_id,item.child)}}</span>  
+                <span v-else>{{getCount(item.child,item.max_unit,item.min_unit,item.min_number)}}</span>
               </td>
               <td style="line-height:50px">
-                  {{item.min_price}}
-                  <!-- {{getPrice(item.drug_id)}} -->
+                  <span v-if="org_id ==9671 || org_id == 9919">{{item.price}}</span>
+                  <span v-else>{{item.min_price}}</span> 
               </td>
               <td style="line-height:50px">
-                  <!-- {{(item.count * getPrice(item.drug_id)).toFixed(2)}} -->
-                  <!-- {{item.count*item.price}} -->
-                <!-- <span>{{getTotalPrice(item.child,item.max_unit,item.min_number,item.min_price)}}</span> -->
-               
-                <span>{{(getCountOne(item.child,item.max_unit,item.min_unit,item.min_number)*item.min_price).toFixed(2)}}</span>
+                <span v-if="org_id ==9671 || org_id == 9919">{{(getCountSenven(item.drug_id,item.child,item.price))}}</span>
+                <span v-else>{{(getCountOne(item.child,item.max_unit,item.min_unit,item.min_number)*item.min_price).toFixed(2)}}</span>
               </td>
               <td style="line-height: 50px">
                  {{item.remark}}
@@ -121,8 +119,8 @@
         limit:this.$route.query.limit,
         page:this.$route.query.page,
         cancelStockDate:[],
-        drugList:[]
-       
+        drugList:[],
+        org_id:0
       }
     },
     methods: {
@@ -163,67 +161,6 @@
         }
         return name
       },
-      // getlist(){
-      //   var params = {
-      //   start_time:this.start_time,
-      //   end_time:this.end_time,
-      //   order_type:this.order_type,
-      //   manufacturer_id:this.manufacturer_id,
-      //   keyword:this.searchKey,
-      //   limit:this.limit,
-      //   page:this.page,
-      //  }
-      //  console.log("出库数据22222",params)
-      // getDrugOutDetail(params).then(response=>{
-      //   if(response.data.state == 1){
-      //     var drugInOrder = response.data.data.order
-      //     console.log("出库数据22",drugInOrder)
-      //     let objInfo = {}
-      //     drugInOrder.forEach((item,index)=>{
-      //        let { drug_id } = item
-      //        if(!objInfo[drug_id]){
-      //          objInfo[drug_id] = {
-      //            drug_id,
-      //            child:[],
-      //            drug_name:item.drug_name,
-      //            drug_spec:item.drug_spec,
-      //            min_unit:item.min_unit,
-      //            count:0,
-      //            last_price:item.XtBaseDrug.last_price,
-      //            remark:item.remark,
-      //            total_price:"",
-      //            dose:item.dose,
-      //            dose_unit:item.dose_unit,
-      //            min_number:item.min_number,
-      //            max_unit:item.max_unit,
-                
-      //          }
-      //        }
-      //     })
-      //     let list = Object.values(objInfo);
-      //     console.log("list2334444",list)
-      //     for(let i=0;i<drugInOrder.length;i++){
-      //       list.map(item=>{
-      //         if(drugInOrder[i].drug_id == item.drug_id){
-      //            item.child.push(drugInOrder[i])
-      //         }
-      //       })
-      //     }
-          
-      //     console.log("药品出库明细",list)
-      //     for(let i=0;i<list.length;i++){
-      //       for(let j=0;j<list[i].child.length;j++){
-      //         if(list[i].child[j].count!=null || list[i].child[j].count != "" || list[i].child[j].count!=0){
-      //           list[i].count += list[i].child[j].count
-      //         }
-      //       }
-      //     }
-      //     console.log("药品出库明细",list)
-      //     this.cancelStockDate = list
-        
-      //   }
-      // })  
-      // },
       getTotal(){
          var total = 0
          for(let i=0;i<this.cancelStockDate.length;i++){
@@ -312,7 +249,6 @@
         })
       },
       getCount(arr,max_unit,min_unit,min_number){
-        console.log("arr2332332233232",arr)
         var total = 0
         var str = ""
         var min_str = ""
@@ -328,7 +264,6 @@
         for(let i=0;i<arr.length;i++){
           total+= parseInt(arr[i].total_count)
         }
-       console.log("total233223232323",total,min_number)
        if(total<min_number){
            str = ""
            min_str = total + min_unit
@@ -379,9 +314,26 @@
         }
         console.log("totla",total)
         return (total*min_price).toFixed(2)
+      },
+      getCountSix(drug_id,val){
+        console.log("val233232",val)
+        var count = 0 
+        for(let i=0;i<val.length;i++){
+          count+= val[i].count
+        }
+        return count
+      },
+      getCountSenven(drug_id,val,price){
+        var count = 0 
+        for(let i=0;i<val.length;i++){
+          count+= val[i].count
+        }
+        return (count*price).toFixed(2)
       }
     },
     created() {
+      this.org_id = this.$store.getters.xt_user.org.id
+      console.log("jj233223323223",this.org_id)
       var xtuser = this.$store.getters.xt_user
       this.orgname = xtuser.org.org_name
       this.getDrugOutOrderPrint()

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -441,6 +441,7 @@ export default {
       drugList:[],
       manufacturerList:[],
       dealerList:[],
+      org_id:0,
     };
   },
   methods: {
@@ -869,6 +870,7 @@ export default {
 
   },
   created() {
+   
     this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;