11月14日 库存扣减更新

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

@@ -138,6 +138,11 @@
           <template slot-scope="scope">
             {{scope.row.count}} 
           </template>
+        </el-table-column>
+         <el-table-column label="单位" align="center">
+          <template slot-scope="scope">
+            {{scope.row.count_unit}} 
+          </template>
         </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
@@ -145,9 +150,9 @@
            <span v-else>
              <span v-if="scope.row.price >0">
                 <span v-if="scope.row.count >= scope.row.min_number">
-                 {{((scope.row.last_price * scope.row.count)/scope.row.min_number).toFixed(2)}}
+                 {{((scope.row.price * scope.row.count)/scope.row.min_number).toFixed(2)}}
                 </span>  
-                <span v-else>{{(scope.row.last_price * scope.row.count).toFixed(2)}}</span>
+                <span v-else>{{(scope.row.price * scope.row.count).toFixed(2)}}</span>
               </span>
              <span v-if="scope.row.price  == 0">
                <span v-if="scope.row.count >=scope.row.min_number">

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -218,14 +218,25 @@
           </el-table-column>
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
-              <!-- <span v-if="scope.row.is_sys ==  0">{{getTotalCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span> -->
               <span> {{getTotalCountOne(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="出货单价" align="center">
+       
+          <el-table-column label="出库单价" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.price > 0"> {{scope.row.price}}</span>
+              
+              <span v-if="scope.row.price > 0">
+               <span v-if="scope.row.count_unit == scope.row.max_unit">
+                  <span v-if="scope.row.retail_price > 0">{{scope.row.retail_price}}</span> 
+                  <span v-if="scope.row.retail_price == 0">{{scope.row.price}}</span> 
+                </span>
+                <span v-if="scope.row.count_unit == scope.row.min_unit">
+                  <span v-if="scope.row.min_price >0">{{scope.row.min_price}}</span> 
+                  <span v-if="scope.row.min_price == 0">{{scope.row.price}}</span> 
+                </span>
+              </span>
               <span v-if="scope.row.price == 0"> {{scope.row.retail_price}}</span>
+              
             </template>
           </el-table-column>
           <!-- <el-table-column label="拆零零售价" align="center">