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

src/pages/sale/courseoffer.vue

@@ -141,8 +141,25 @@
             <div>
               <q-btn v-if="props.row.CustomerStatus==1||props.row.CustomerStatus==2" flat size="xs" icon="edit"
                 color="accent" style="font-weight:400" label="编辑" @click="editQuotation(props.row)" />
-              <q-btn v-if="props.row.CustomerStatus==1||props.row.CustomerStatus==2" flat color="primary" label="转订单" @click="offerTransOrder(props.row)" />
-              <q-btn flat color="primary" label="详情" @click="gotoDetails(props.row)" />
+              <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
+                <q-list>
+                  <q-item clickable v-close-popup @click="gotoDetails(props.row)">
+                    <q-item-section>
+                      <q-item-label>详情</q-item-label>
+                    </q-item-section>
+                  </q-item>
+                  <q-item clickable v-close-popup v-if="props.row.CustomerStatus==1||props.row.CustomerStatus==2" @click="offerTransOrder(props.row)">
+                    <q-item-section>
+                      <q-item-label>转订单</q-item-label>
+                    </q-item-section>
+                  </q-item>
+                  <q-item clickable v-close-popup @click="editOrderPrice(props.row)">
+                    <q-item-section>
+                      <q-item-label>改价</q-item-label>
+                    </q-item-section>
+                  </q-item>
+                </q-list>
+              </q-btn-dropdown>
             </div>
           </q-td>
         </template>
@@ -160,11 +177,17 @@
     <q-dialog v-model="showOrderForm" persistent>
       <offertransorder-form :obj="offerObj" @save="refreshPage()"></offertransorder-form>
     </q-dialog>
+
+    <q-dialog v-model="showEditPrice" persistent>
+      <edittransorder-form :obj="offerObj" @save="refreshPage()"></edittransorder-form>
+    </q-dialog>
+
   </div>
 </template>
 <script>
   import quotationForm from '../../components/sale/quotation-form'
   import offertransorderForm from '../../components/sale/offertransorder-form'
+  import edittransorderForm from '../../components/sale/edittransorder-form'
   import {
     queryCourseOfferPage,
   } from '../../api/course/index'
@@ -176,7 +199,8 @@
     },
     components: {
       quotationForm,
-      offertransorderForm
+      offertransorderForm,
+      edittransorderForm
     },
     data() {
       return {
@@ -273,12 +297,13 @@
           }
         ],
         showOrderForm: false, //是否显示转订单表单
-        commonId:0
+        commonId:0,
+        showEditPrice:false, //是否显示改价表单
       }
     },
     computed: mapState({
       isHavePriceAction(state) {
-        if (state.user.userInfo.ActionMenuList) {
+        if (state.user.userInfo&&state.user.userInfo.ActionMenuList) {
           let commonNum=0;
           let action = state.user.userInfo.ActionMenuList.find(x => {
             if (x.FunctionCode == "Query_All_Offer") {
@@ -314,10 +339,16 @@
         this.offerObj = item;
         this.showOrderForm = true;
       },
+      //改价
+      editOrderPrice(item){
+        this.offerObj = item;
+        this.showEditPrice = true;
+      },
       //刷新页面
       refreshPage() {
         this.showForm = false;
         this.showOrderForm = false;
+        this.showEditPrice = false;
         this.getcourseofferpage();
       },
       gotoDetails(item) {