Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1058,7 +1058,7 @@
         for (let keys in treatment_mode) {
           if (treatment_mode[keys].id == val) {
             treatment_mode_name = treatment_mode[keys].name
-            if (treatment_mode_name == 'HD') {
+            if (treatment_mode_name == 'HD' || treatment_mode_name == 'HD+HP' || treatment_mode_name == 'HP' || treatment_mode_name == 'HF' || treatment_mode_name == 'SCUF' || treatment_mode_name == 'IUF' || treatment_mode_name == 'HFHD' || treatment_mode_name == 'HFHD +HP' || treatment_mode_name == 'PHF'|| treatment_mode_name == 'HFR' || treatment_mode_name == 'CRRT' || treatment_mode_name == '腹水回收' || treatment_mode_name == 'HD前置换' || treatment_mode_name == 'HD后置换') {
               this.zhiShow = false
               this.totalShow = false
               this.huShow = false

src/pages/product/index.vue

@@ -37,25 +37,24 @@
 
 <script>
 export default {
-  name: "Product",
-  data() {
+  name: 'Product',
+  data () {
     return {}
   },
   computed: {
-    avatar: function() {
+    avatar: function () {
       var avatar = this.$store.getters.user.user.avatar
-      return avatar.length > 0 ? avatar : require("@/assets/product/test.jpg")
+      return avatar.length > 0 ? avatar : require('@/assets/product/test.jpg')
     }
   },
   methods: {
-    doctorEnterAction: function() {
-      this.$store.dispatch("SwitchRoleTypeToDoctor")
-      this.$router.push({path: "/main"})
+    doctorEnterAction: function () {
+      this.$store.dispatch('SwitchRoleTypeToDoctor')
+      this.$router.push({path: '/main'})
       // this.$router.push({path: "/layout"})
-      console.log(".")
     }
   }
-};
+}
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped >
@@ -160,4 +159,3 @@ export default {
   }
 }
 </style>
-