Bläddra i källkod

11月14日 库存扣减更新

XMLWAN 3 år sedan
förälder
incheckning
3cba6805b4

+ 7 - 2
src/xt_pages/stock/drugs/components/drugOutDetail.vue Visa fil

138
           <template slot-scope="scope">
138
           <template slot-scope="scope">
139
             {{scope.row.count}} 
139
             {{scope.row.count}} 
140
           </template>
140
           </template>
141
+        </el-table-column>
142
+         <el-table-column label="单位" align="center">
143
+          <template slot-scope="scope">
144
+            {{scope.row.count_unit}} 
145
+          </template>
141
         </el-table-column>
146
         </el-table-column>
142
         <el-table-column label="总价" align="center">
147
         <el-table-column label="总价" align="center">
143
           <template slot-scope="scope">
148
           <template slot-scope="scope">
145
            <span v-else>
150
            <span v-else>
146
              <span v-if="scope.row.price >0">
151
              <span v-if="scope.row.price >0">
147
                 <span v-if="scope.row.count >= scope.row.min_number">
152
                 <span v-if="scope.row.count >= scope.row.min_number">
148
-                 {{((scope.row.last_price * scope.row.count)/scope.row.min_number).toFixed(2)}}
153
+                 {{((scope.row.price * scope.row.count)/scope.row.min_number).toFixed(2)}}
149
                 </span>  
154
                 </span>  
150
-                <span v-else>{{(scope.row.last_price * scope.row.count).toFixed(2)}}</span>
155
+                <span v-else>{{(scope.row.price * scope.row.count).toFixed(2)}}</span>
151
               </span>
156
               </span>
152
              <span v-if="scope.row.price  == 0">
157
              <span v-if="scope.row.price  == 0">
153
                <span v-if="scope.row.count >=scope.row.min_number">
158
                <span v-if="scope.row.count >=scope.row.min_number">

+ 14 - 3
src/xt_pages/stock/drugs/drugStockOutOrder.vue Visa fil

218
           </el-table-column>
218
           </el-table-column>
219
           <el-table-column label="出库数量" align="center">
219
           <el-table-column label="出库数量" align="center">
220
             <template slot-scope="scope">
220
             <template slot-scope="scope">
221
-              <!-- <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> -->
222
               <span> {{getTotalCountOne(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
221
               <span> {{getTotalCountOne(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
223
             </template>
222
             </template>
224
           </el-table-column>
223
           </el-table-column>
225
-          <el-table-column label="出货单价" align="center">
224
+       
225
+          <el-table-column label="出库单价" align="center">
226
             <template slot-scope="scope">
226
             <template slot-scope="scope">
227
-              <span v-if="scope.row.price > 0"> {{scope.row.price}}</span>
227
+              
228
+              <span v-if="scope.row.price > 0">
229
+               <span v-if="scope.row.count_unit == scope.row.max_unit">
230
+                  <span v-if="scope.row.retail_price > 0">{{scope.row.retail_price}}</span> 
231
+                  <span v-if="scope.row.retail_price == 0">{{scope.row.price}}</span> 
232
+                </span>
233
+                <span v-if="scope.row.count_unit == scope.row.min_unit">
234
+                  <span v-if="scope.row.min_price >0">{{scope.row.min_price}}</span> 
235
+                  <span v-if="scope.row.min_price == 0">{{scope.row.price}}</span> 
236
+                </span>
237
+              </span>
228
               <span v-if="scope.row.price == 0"> {{scope.row.retail_price}}</span>
238
               <span v-if="scope.row.price == 0"> {{scope.row.retail_price}}</span>
239
+              
229
             </template>
240
             </template>
230
           </el-table-column>
241
           </el-table-column>
231
           <!-- <el-table-column label="拆零零售价" align="center">
242
           <!-- <el-table-column label="拆零零售价" align="center">