Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/stock/drugs/drugInventoryModePrint.vue

@@ -96,19 +96,22 @@
                         </td>
                         <td align="center" style="width: 200px;">
 
-                           {{item.month_in_total_price }}
+                         <span v-if="item.is_total == 0">{{item.month_in_total_price }}</span>
+                         <span v-if="item.is_total == 1">{{(item.month_in_total_price).toFixed(2) }}</span>
                         </td>
                         <td align="center">{{ getOutCount(item.drug_id,item.min_number,item.min_unit,item.max_unit) }}</td> 
                         <td align="center" style="width: 200px;">{{ getRetailPrice(item.drug_id) }}</td>
                         <td align="center" style="width: 200px;">
-                            {{ item.month_out_total_price}}
+                          <span v-if="item.is_total == 0">  {{ item.month_out_total_price}}</span>
+                          <span v-if="item.is_total == 1">  {{ (item.month_out_total_price).toFixed(2)}}</span>
                         </td>
                         <td align="center">{{ getSumCount(item.sum_count,item.min_number,item.min_unit,item.max_unit) }}</td>
                         <td align="center" style="width: 200px;">
                             {{ getBuyPrice(item.drug_id) }}
                         </td>
                         <td align="center" style="width: 200px;">
-                            {{ item.month_over_total_price}}
+                           <span v-if="item.is_total == 0">{{ item.month_over_total_price}}</span> 
+                           <span v-if="item.is_total == 1">{{ (item.month_over_total_price).toFixed(2)}}</span> 
                         </td>
                         <td align="center">
                            <span v-if="item.is_total == 0">
@@ -313,7 +316,8 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
           warehouseInfoFlow:[],
           warehouseOutFlow:[],
           cancelFlow:[],
-
+          cancelOutInfo:[],
+          cancelInfoList:[],
        }
      },
      methods:{
@@ -376,6 +380,8 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
                  this.warehouseInfoFlow = response.data.data.warehouseInfoFlow
                  this.warehouseOutFlow = response.data.data.warehouseOutFlow
                  this.cancelFlow = response.data.data.cancelFlow
+
+                 this.cancelInfoList = response.data.data.cancelOutInfo
                 if(list!=null && list.length > 0){
                   let dataInfo = {}
                   list.forEach((item, index) => {
@@ -401,6 +407,9 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
                       month_over_total:0,//本月剩余库存
                       month_over_total_price:0,
                       is_total:0,
+                      month_in_total_price_one:0,
+                      month_out_total_price_one:0,
+                      month_over_total_price:0,
                     }
                   }
                 })
@@ -419,9 +428,13 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
                   arr[i].month_in_total = this.getInCount(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)
                   arr[i].last_price = this.getBuyPrice(arr[i].drug_id)
                   arr[i].month_in_total_price = (this.getBuyPrice(arr[i].drug_id)*this.getInCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)).toFixed(2)
+                  arr[i].month_in_total_price_one =this.getBuyPrice(arr[i].drug_id)*this.getInCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit)
                   arr[i].retail_price = this.getRetailPrice(arr[i].retail_price)
                   arr[i].month_out_total_price = (this.getOutCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getRetailPrice(arr[i].drug_id)).toFixed(2)
+                  
+                  arr[i].month_out_total_price_one =this.getOutCountOne(arr[i].drug_id,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getRetailPrice(arr[i].drug_id)
                   arr[i].month_over_total_price = (this.getSumCountOne(arr[i].sum_count,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) * this.getBuyPrice(arr[i].drug_id)).toFixed(2)
+                  arr[i].month_over_total_price_one =this.getSumCountOne(arr[i].sum_count,arr[i].min_number,arr[i].min_unit,arr[i].max_unit) *  this.getBuyPrice(arr[i].drug_id)
                 }
 
                 this.tableList = arr
@@ -430,11 +443,13 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
 
               
                 for(let i=0;i<this.tableList.length;i++){
-                  obj.month_in_total_price += parseFloat(this.tableList[i].month_in_total_price) 
-                  obj.month_out_total_price +=parseFloat(this.tableList[i].month_out_total_price)
-                  obj.month_over_total_price +=parseFloat(this.tableList[i].month_over_total_price) 
+                  obj.month_in_total_price += parseFloat(this.tableList[i].month_in_total_price_one) 
+                  obj.month_out_total_price +=parseFloat(this.tableList[i].month_out_total_price_one)
+                  obj.month_over_total_price +=parseFloat(this.tableList[i].month_over_total_price_one) 
                 }
-                obj.mon
+                // obj.month_in_total_price = obj.month_in_total_price.toFixed(2)
+                // obj.month_out_total_price = obj.month_out_total_price.toFixed(2)
+                // obj.month_over_total_price = obj.month_out_total_price.toFixed(2)
                 console.log("obj=====================",obj)
                 this.tableList.push(obj)
                 // console.log("arr--------------",arr)
@@ -540,10 +555,10 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
                 }
              }
 
-             console.log("drug_id=================",drug_id)
-             console.log("total_in_count",total_in_count)
-             console.log("total_cancel_count",total_cancel_count)
-             console.log("total_out_count",total_out_count)
+            //  console.log("drug_id=================",drug_id)
+            //  console.log("total_in_count",total_in_count)
+            //  console.log("total_cancel_count",total_cancel_count)
+            //  console.log("total_out_count",total_out_count)
              total = total_in_count + total_cancel_count - total_out_count
 
 
@@ -800,11 +815,20 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
           var total =0
           var min_str  =""
           var max_str = ""
+          var cancelNewArr = []
+          var all_total = 0
+          var cancel_total = 0
           for(let i=0;i<this.outList.length;i++){
             if(drug_id == this.outList[i].drug_id){
                newArr.push(this.outList[i])
             }
           }
+
+          for(let i=0;i<this.cancelInfoList.length;i++){
+            if(drug_id == this.cancelInfoList[i].drug_id){
+                cancelNewArr.push(this.cancelInfoList[i])
+            }
+          }
         
          if(newArr!=null){
             for(let i=0;i<newArr.length;i++){
@@ -829,20 +853,45 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
             }
           }
 
+          if(cancelNewArr!=null){
+            for(let i=0;i<cancelNewArr.length;i++){
+               if(cancelNewArr[i].max_unit == max_unit && max_unit!=min_unit){
+                cancelNewArr[i].last_stock_max_number = cancelNewArr[i].count * min_number
+               } 
+               if(cancelNewArr[i].max_unit == min_unit && max_unit!=min_unit){
+                cancelNewArr[i].last_stock_max_number = cancelNewArr[i].count 
+               } 
+               if(cancelNewArr[i].max_unit == max_unit && max_unit==min_unit){
+                cancelNewArr[i].last_stock_max_number = cancelNewArr[i].count 
+               } 
+            }
+         }
+
+
+
+        console.log("newARR========",newArr)
+          if(cancelNewArr!=null){
+            for(let i=0;i<cancelNewArr.length;i++){
+              cancel_total += parseInt(cancelNewArr[i].last_stock_max_number)
+            }
+          }
+
+          var all_total = total - cancel_total
+
         
-          if (total < min_number) {
-               min_str = total + min_unit;
+          if (all_total < min_number) {
+               min_str = all_total + min_unit;
            }
             if (total == 0) {
                 min_str = "";
                 max_str = "";
             }
-            if (total >= min_number) {
-                if (parseInt(total / min_number) != 0) {
-                max_str = parseInt(total / min_number) + max_unit;
+            if (all_total >= min_number) {
+                if (parseInt(all_total / min_number) != 0) {
+                max_str = parseInt(all_total / min_number) + max_unit;
                 }
-                if (total % min_number != 0) {
-                min_str = (total % min_number) + min_unit;
+                if (all_total % min_number != 0) {
+                min_str = (all_total % min_number) + min_unit;
                 }
             }
             console.log("max_str",max_str)
@@ -857,12 +906,20 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
           
           var newArr =[]
           var total =0
-
+          var cancelNewArr = []
+          var all_total = 0
+          var cancel_total = 0
           for(let i=0;i<this.outList.length;i++){
             if(drug_id == this.outList[i].drug_id){
                newArr.push(this.outList[i])
             }
           }
+
+          for(let i=0;i<this.cancelInfoList.length;i++){
+            if(drug_id == this.cancelInfoList[i].drug_id){
+                cancelNewArr.push(this.cancelInfoList[i])
+            }
+          }
         
          if(newArr!=null){
             for(let i=0;i<newArr.length;i++){
@@ -883,7 +940,41 @@ import { getDrugInventroyModePrintList } from  "@/api/stock"
             }
           }
 
-         return total
+       
+
+
+          if(cancelNewArr!=null){
+            for(let i=0;i<cancelNewArr.length;i++){
+               if(cancelNewArr[i].max_unit == max_unit && max_unit!=min_unit){
+                cancelNewArr[i].last_stock_max_number = cancelNewArr[i].count * min_number
+               } 
+               if(cancelNewArr[i].max_unit == min_unit && max_unit!=min_unit){
+                cancelNewArr[i].last_stock_max_number = cancelNewArr[i].count 
+               } 
+               if(cancelNewArr[i].max_unit == max_unit && max_unit==min_unit){
+                cancelNewArr[i].last_stock_max_number = cancelNewArr[i].count 
+               } 
+            }
+         }
+
+
+
+       
+          if(cancelNewArr!=null){
+            for(let i=0;i<cancelNewArr.length;i++){
+              cancel_total += parseInt(cancelNewArr[i].last_stock_max_number)
+            }
+          }
+
+          var all_total = total - cancel_total
+          if(drug_id == 25194){
+            console.log("drug_id =====",drug_id)
+            console.log("total =====",total)
+            console.log("cancel_total =====",cancel_total)
+            console.log("all_total555555555",all_total)
+          }
+         
+         return all_total
         },
         getSumCount(total,min_number,min_unit,max_unit){
            var min_str  =""