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

src/xt_pages/dialysis/components/consumables.vue

@@ -73,7 +73,7 @@
           </template>
 
         </el-table-column>
-        
+
       </el-table>
     </div>
 
@@ -151,6 +151,7 @@
       var schedule_date =
         y + "-" + (m < 10 ? "0" + m : m) + "-" + (d < 10 ? "0" + d : d);
 
+      this.selected_date = date
       this.query.schedule_date = schedule_date
       this.query.schedule_type = 0
       this.query.partition_id = 0
@@ -183,23 +184,26 @@
             if(good_type_id == good_user[b].good_type_id)
               desc = desc + "\n" + good_user[b].info.specification_name +"*" +good_user[b].count
           }
-         
-
-          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
-            }
-          
 
-            return desc
 
-          }
-          return ""
+          return desc
         }
+        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 => {
@@ -250,11 +254,11 @@
                 "good_user_detail":res.data.dialysis_goods[i].good_user_detail,
                 "last_good_user_detail":res.data.dialysis_goods[i].last_good_user_detail,
               }
-             
+
               this.list.push(newObj)
             }
 
-          
+
             for (let a = 0; a <  this.list.length; a++){
               for (let b = 0; b <  this.list[a].good_type.length; b++){
 

src/xt_permission.js

@@ -13,18 +13,18 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 router.beforeEach((to, from, next) => {
   // 线上注释
   // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     store.dispatch('VerifyConfigList', []).then(() => {
+  //       next()
+  //     })
+  //   }
+  //   if (store.getters.permission_routers === undefined) {
+  //     store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //       next()
+  //     })
+  //   } else {
   //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  //   }
+  //   return
   // 线上注释
 
   NProgress.start()