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

src/pages/main/dialog/OrdersDialog.vue

@@ -42,8 +42,8 @@
           :class="{ forbid: current_group_index < 0 || currentAdvices.length <= 0 || (this.$store.getters.user.user.user_type == 3 && !isPremission) }"
         >删除</span>
 
-        <span v-if="currentSubAdvices.length > 0" @click="modifySubdviceAction">修改子医嘱</span>
-        <span v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
+        <span :class="{ forbid:(this.$store.getters.user.user.user_type == 3 && !isPremission) }" v-if="currentSubAdvices.length > 0" @click="modifySubdviceAction">修改子医嘱</span>
+        <span :class="{ forbid:(this.$store.getters.user.user.user_type == 3 && !isPremission) }" v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
       </div>
       <div class="DialogContent choose" id="dialogTop" style="height:6.5rem;">
 
@@ -781,6 +781,9 @@
         }
         return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':00'
       }, deleteSubAdviceAction: function () {
+        if (this.$store.getters.user.user.user_type == 3&& !this.isPremission){
+          return
+        }
         if (this.currentSubAdvices.length <= 0) {
           return
         }
@@ -820,7 +823,7 @@
 
       },
       deleteAdviceAction: function () {
-        if (this.$store.getters.user.user.user_type == 3){
+        if (this.$store.getters.user.user.user_type == 3&& !this.isPremission){
           return
         }
         if (this.current_select_object == 1) {
@@ -1187,6 +1190,9 @@
         this.current_advice_index = -1
         this.current_advice = null
       }, modifySubdviceAction: function () {
+        if (this.$store.getters.user.user.user_type == 3&& !this.isPremission){
+          return
+        }
         if (this.currentSubAdvices.length <= 0) {
           return
         }
@@ -1213,7 +1219,7 @@
 
       },
       modifyAdviceAction: function () {
-        if (this.$store.getters.user.user.user_type == 3){
+        if (this.$store.getters.user.user.user_type == 3 && !this.isPremission){
           return
         }
         if (this.current_group_index < 0) {