新分支

src/xt_pages/stock/drugs/historyDrugInvetory.vue

@@ -19,7 +19,7 @@
                 style="width: 200px"
                 v-model="keywords"
                 class="filter-item"
-                placeholder="请输入耗材名称"
+                placeholder="请输入药品名称"
                 clearable
               />
               <el-button
@@ -294,7 +294,7 @@
         var now_in_number = 0
         stock_in_number = row.warehousing_count * row.XtBaseDrug.min_number
 
-        now_in_number = row.last_stock_max_number * row.XtBaseDrug.min_number + row.last_stock_min_number
+        now_in_number = parseInt(row.last_stock_max_number * row.XtBaseDrug.min_number) +parseInt(row.last_stock_min_number) 
        if(parseInt(row.last_stock_max_number)<0 && parseInt(row.last_stock_min_number)<0){
         this.$message.error("盘点后数量不能为负数!")
         return false

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -47,11 +47,11 @@
                  {{scope.row.specification_name}}
                </template>
             </el-table-column>
-            <el-table-column prop="name" label="单位" width="80"  align="center">
+            <!-- <el-table-column prop="name" label="单位" width="80"  align="center">
                 <template slot-scope="scope">
                   {{scope.row.warehousing_unit}}
                </template>
-            </el-table-column>
+            </el-table-column> -->
           
             <el-table-column prop="name" label="进价" width="80"  align="center">
                 <template slot-scope="scope">

src/xt_pages/stock/historyInventory.vue

@@ -282,6 +282,7 @@
        })
      },
      UpdateWarehouseInfo(row){
+    
        if(parseInt(row.last_stock_count)<0){
         this.$message.error("盘点后数量不能为负数!")
         return false