518合并代码

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

@@ -420,6 +420,7 @@ export default {
         this.tableList = []
         if(response.data.state == 1){
           var order = response.data.data.order
+          console.log("order233322332323223",order)
           var obj = {id:0,storehouse_name:"全部"}
           this.houseList = []
           this.houseList.push(obj)
@@ -441,22 +442,18 @@ export default {
                  }
                  if(order[i].count_unit == order[i].max_unit){
                    order[i].total_price += order[i].count * order[i].price * order[i].min_number
-                  //  total_price += order[i].total_price
                  }
                 
                }
                if(order[i].price ==0 ){
                  if(order[i].count_unit == order[i].min_unit && order[i].max_unit!=order[i].min_unit){
                     order[i].total_price = order[i].count * this.getPrice(order[i].drug_id)
-                   // total_price += order[i].count * this.getPrice(order[i].drug_id)
                    total_price +=order[i].total_price
                     order[i].price = this.getPrice(order[i].drug_id)
                  }
                 
                 if(order[i].count_unit == order[i].max_unit){
                    order[i].total_price += order[i].count * this.getPrice(order[i].drug_id) * order[i].min_number
-                   //total_price += order[i].count * this.getPrice(order[i].drug_id)
-                  //  order[i].total_price = order[i].total_price
                    order[i].price = this.getPrice(order[i].drug_id)
                 }
                  

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -249,7 +249,7 @@
           <el-table-column label="总价" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.price > 0">{{getAllPriceOne(scope.row.drug_id,scope.row.price,scope.row.price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number,scope.row.is_sys).toFixed(2)}}</span>
-              <span v-if="scope.row.price == 0">{{getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number).toFixed(2)}}</span>
+              <span v-if="scope.row.price == 0">{{getAllPriceOne(scope.row.drug_id,scope.row.retail_price,scope.row.min_price,scope.row.max_unit,scope.row.count_unit,scope.row.min_number,scope.row.is_sys).toFixed(2)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="生产厂家" align="center">
@@ -961,7 +961,7 @@ export default {
           this.tableShow = true
           this.tableList = []
           var list =  response.data.data.list
-
+         console.log("lisrt233232323232233223",list)
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
@@ -971,6 +971,8 @@ export default {
             for(let i=0;i<drugFlowList.length;i++){
                 if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.max_unit){
                     drugFlowList[i].count = drugFlowList[i].count * drugFlowList[i].XtBaseDrug.min_number
+                   
+
                 }
                 if(drugFlowList[i].count_unit == drugFlowList[i].XtBaseDrug.min_unit){
                     drugFlowList[i].count = drugFlowList[i].count
@@ -983,16 +985,20 @@ export default {
          }
          if(is_sys == 0 || is_sys == 12){
             var flowlist = response.data.data.flowlist
+            console.log("flowlist233232232323233223",flowlist)
             this.drugFlowList = []
             for(let i=0;i<flowlist.length;i++){
               if(flowlist[i].count_unit == flowlist[i].max_unit){
-                  flowlist[i].count = flowlist[i].count * flowlist[i].min_number
+                flowlist[i].count = flowlist[i].count * flowlist[i].min_number
+                flowlist[i].count_unit = flowlist[i].min_unit
               }
               if(flowlist[i].count_unit == flowlist[i].min_unit){
                   flowlist[i].count = flowlist[i].count
               }
             }
             this.drugFlowList = flowlist
+            console.log("this.drugFlowList32323232322323323232322323我的",flowlist)
+
          }
 
          for(let i=0;i<list.length;i++){
@@ -1257,10 +1263,7 @@ export default {
       return jsonData.map(v => filterVal.map(j => v[j]));
      },
       getAllPriceOne(drug_id,price,min_price,max_unit,count_unit,min_number,is_sys){
-        console.log("drugfalowlist22332233232",this.drugFlowList)
-        console.log("max_unit23223232323",max_unit)
-        console.log("count_unit2323333",count_unit)
-        console.log("is_sys232232323",is_sys)
+        
         var total = 0
         var all_price = 0
         for(let i=0;i<this.drugFlowList.length;i++){
@@ -1271,7 +1274,7 @@ export default {
         if(max_unit == count_unit && is_sys!=0 && is_sys!=12){
           total = total * min_number
         }
-        all_price = total * price
+        all_price = (total/min_number) * price
 
         return  all_price
       },