Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/pages/sale/courseoffer.vue

@@ -150,7 +150,7 @@
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
             <div>
-              <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="改价"
+              <q-btn flat size="xs" icon="edit" color="accent" v-if="isHavePriceAction" style="font-weight:400" label="改价"
                 @click="editOrderPrice(props.row)" />
               <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="详情"
                 @click="gotoDetails(props.row)" />
@@ -320,25 +320,19 @@
     },
     computed: mapState({
       isHavePriceAction(state) {
-        if (state.user.userInfo && state.user.userInfo.ActionMenuList) {
-          let commonNum = 0;
+        if (state.user.userInfo.ActionMenuList) {
           let action = state.user.userInfo.ActionMenuList.find(x => {
-            if (x.FunctionCode == "Query_All_Offer") {
-              commonNum += 1;
+            if (x.FunctionCode == "Edit_Offer_Price") {
+              return x;
             }
           });
-          this.commonId = state.user.userInfo.Id;
-          return commonNum;
+          return action && action.FunctionCode;
         }
+        return false;
       }
     }),
     mounted() {
       this.currentUrl = this.$route.path;
-      if (this.isHavePriceAction > 0) {
-        this.msg.CreateBy = 0;
-      } else {
-        this.msg.CreateBy = this.commonId;
-      }
       this.Employee();
       this.getcourseofferpage();
     },