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

src/xt_pages/dialysis/components/consumables.vue

@@ -182,20 +182,23 @@
           console.log(desc)
 
           return desc
-        } else if (good_user != null && good_user.length <= 0) {
-          if (last_good_user != null && last_good_user.length > 0) {
-            let desc = ""
-            for (let b = 0; b < last_good_user.length; b++){
-              if(good_type_id == last_good_user[b].good_type_id)
-                desc = desc+ "\n" + last_good_user[b].info.specification_name +"*" +last_good_user[b].count
-            }
-            console.log(desc)
-
-            return desc
-
-          }
-          return ""
         }
+        return ""
+
+        // else if (good_user != null && good_user.length <= 0) {
+        //   if (last_good_user != null && last_good_user.length > 0) {
+        //     let desc = ""
+        //     for (let b = 0; b < last_good_user.length; b++){
+        //       if(good_type_id == last_good_user[b].good_type_id)
+        //         desc = desc+ "\n" + last_good_user[b].info.specification_name +"*" +last_good_user[b].count
+        //     }
+        //     console.log(desc)
+        //
+        //     return desc
+        //
+        //   }
+        //   return ""
+        // }
       },
       GetDialysisgoods() {
         GetDialysisgoods(this.query).then(response => {