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

src/pages/main/dialog/OrdersDialog.vue

@@ -34,7 +34,7 @@
         <span
           v-if="currentSubAdvices.length <= 0"
           @click="modifyAdviceAction"
-          :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1 || (this.$store.getters.user.user.user_type == 3 && !isPremission) }"
+          :class="{ forbid: current_group_index < 0 ||  currentAdvices.length != 1  || current_select_object== 2 || (this.$store.getters.user.user.user_type == 3 && !isPremission) }"
         >修改</span>
         <span
           v-if="currentSubAdvices.length <= 0"
@@ -1223,6 +1223,9 @@
 
       },
       modifyAdviceAction: function () {
+        if (this.currentAdvices.length != 1 || this.current_select_object == 2){
+          return
+        }
         if (this.$store.getters.user.user.user_type == 3 && !this.isPremission){
           return
         }
@@ -1345,7 +1348,6 @@
       }, selectGroupAdviceAction: function (group_index, advice_index, advice, group) {
 
         if (this.current_group_index != -1 && this.current_group_index != group_index) { //选择其他组，将原来的组选择状态清除
-          console.log("111111111")
           this.currentAdvices = []
           this.currentSubAdvices = []
           for (let i = 0; i < this.advice_groups.length; i++) {

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1086,7 +1086,6 @@
               this.zhiShow = true
               this.totalShow = true
               this.huShow = true
-              console.log("a")
             }
           }
         }