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

src/xt_pages/outpatientTool/components/drugDetail.vue

@@ -262,7 +262,7 @@ import { min } from 'moment'
        return type_name
      },
      getCount(val,min_number,max_unit,min_unit){
-      
+    
        var total = 0
        var min_str = ""
        var max_str = ""
@@ -271,7 +271,6 @@ import { min } from 'moment'
            total += parseInt(val[i].prescribing_number)
          }
        }
-    
         if (total < min_number){
           min_str = total + min_unit
         }
@@ -279,6 +278,7 @@ import { min } from 'moment'
           min_str = ""
           max_str = ""
         }
+       
         if (total >=min_number) {
            if(parseInt(total/min_number)!=0){
               max_str = parseInt(total/min_number) + max_unit

src/xt_pages/stock/drugs/query.vue

@@ -319,6 +319,7 @@ import { min } from 'moment'
         }
         getDrugStockList(params).then(response=>{
           if(response.data.state == 1){
+            
              var list = response.data.data.list
            
              for(let i=0;i<list.length;i++){
@@ -340,7 +341,13 @@ import { min } from 'moment'
                  }
                }
              }
-             this.tableList = list
+            var arr = []
+             for(let i=0;i<list.length;i++){
+               if(list[i].drug_warehouse_info.length > 0){
+                  arr.push(list[i]) 
+               }
+             }
+             this.tableList = arr
              var total = response.data.data.total
              this.total = total
              this.manufacturerList = response.data.data.manufacturerList

src/xt_pages/stock/stockQuery.vue

@@ -96,7 +96,6 @@
         :class="signAndWeighBoxPatients"
         border
         v-loading="WarehouseInfo.loading"
-        :span-method="objectOneMethod"
       >
         <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
@@ -520,7 +519,14 @@ export default {
     getAllStockList(params).then(response=>{
       if(response.data.state == 1){
           var list = response.data.data.list
-          this.tableList = list
+          var arr = []
+          for(let i=0;i<list.length;i++){
+            if(list[i].warehouse_info.length > 0 ){
+              arr.push(list[i])
+            }
+          }
+         this.tableList = arr
+        
           var total = response.data.data.total
           this.total = total
           var manufacturerList = response.data.data.manufacturerList
@@ -691,9 +697,9 @@ export default {
      return storehouse_name
    },
    objectOneMethod({ row, column, rowIndex, columnIndex }) {
-     console.log("column",column)
-     console.log("rowindex",rowIndex)
-     console.log("columnninex",columnIndex)
+    //  console.log("column",column)
+    //  console.log("rowindex",rowIndex)
+    //  console.log("columnninex",columnIndex)
     //  if(columnIndex === 1){
     //    if(rowIndex === 1){
     //      return {
@@ -753,10 +759,6 @@ export default {
     this.getlist()
    },
    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
-     console.log("当前行",row)
-     console.log("当前列",column)
-     console.log("当前行号",rowIndex)
-     console.log("当前列号",columnIndex)
      if(rowIndex == 1 && columnIndex === 4){
        return {
         rowspan: 2,