修改

src/assets/css/common.css

@@ -87,4 +87,7 @@
  .addTiMuList:hover{
     opacity: 0.7;
   }
-  
+  /* 控制下拉长度 */
\ No newline at end of file
+  .q-menu{
+    max-height: 29vh; 
+  }
\ No newline at end of file

src/pages/sale/courseoffer.vue

@@ -119,6 +119,11 @@
           <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="msg.Name" label="报价单名称"
             @clear="resetSearch" maxlength="20" />
         </div>
+        <div class="col-3">
+          <q-select filled stack-label option-value="Id" @input="resetSearch" option-label="EmployeeName" ref="ID" v-model="msg.CreateBy"
+            :options="EmployeeList" label="直属上级" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value
+            map-options />
+        </div>
       </div>
     </div>
     <div class="page-content">
@@ -127,9 +132,6 @@
         <template v-slot:top="props">
           <div class="col-2 q-table__title">课程报价单</div>
           <q-space />
-          <div class="page-option">
-            <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="创建报价单" @click="editQuotation(null)" />
-          </div>
         </template>
         <template v-slot:body-cell-OrderIdList="props">
           <q-td :props="props">
@@ -165,6 +167,9 @@
     <q-dialog v-model="showEditPrice" persistent>
       <edittransorder-form :obj="offerObj" @save="refreshPage()"></edittransorder-form>
     </q-dialog>
+    <!-- 查看报价单 -->
+    <viewquotation-form v-if="isShowviewQuo" :rId="rId" @close="closeQuota">
+    </viewquotation-form>
 
   </div>
 </template>
@@ -172,9 +177,15 @@
   import quotationForm from '../../components/sale/quotation-form'
   import offertransorderForm from '../../components/sale/offertransorder-form'
   import edittransorderForm from '../../components/sale/edittransorder-form'
+  import viewquotationForm from '../../components/sale/viewquotation-form'
+
   import {
     queryCourseOfferPage,
   } from '../../api/course/index'
+  //员工
+  import {
+    queryEmployee
+  } from '../../api/users/user'
   import {
     mapState
   } from "vuex";
@@ -186,7 +197,8 @@
     components: {
       quotationForm,
       offertransorderForm,
-      edittransorderForm
+      edittransorderForm,
+      viewquotationForm
     },
     data() {
       return {
@@ -198,6 +210,7 @@
           pageSize: 10,
           rowsPerPage: 10,
           Name: "",
+          CreateBy:0,
           IsGetDetails: 1,
           CreateBy: 0
         },
@@ -265,6 +278,12 @@
             align: "left",
             format: (val, row) => `${val}`
           },
+          {
+            name: "CreateByName",
+            label: "销售",
+            field: "CreateByName",
+            align: "left",
+          },
           {
             name: "CreateTimeStr",
             label: "报价时间",
@@ -285,6 +304,9 @@
         showOrderForm: false, //是否显示转订单表单
         commonId: 0,
         showEditPrice: false, //是否显示改价表单
+        EmployeeList:[], //员工列表
+        isShowviewQuo:false,
+        rId:0
       }
     },
     computed: mapState({
@@ -308,9 +330,30 @@
       } else {
         this.msg.CreateBy = this.commonId;
       }
+      this.Employee();
       this.getcourseofferpage();
     },
     methods: {
+      closeQuota(){
+        this.isShowviewQuo=false;
+      },
+      Employee() {
+        var qMsg = {
+          EmployeeName: ''
+        }
+        queryEmployee(qMsg).then(res => {
+          if (res.Code == 1) {
+            this.EmployeeList = res.Data;
+            var obj = {
+              EmployeeName: '请选择',
+              Id: 0
+            }
+            this.EmployeeList.unshift(obj);
+          }
+        }).catch(() => {
+
+        })
+      },
       //跳转到订单列表
       goOrderList(item) {
         this.$router.push({
@@ -338,17 +381,8 @@
         this.getcourseofferpage();
       },
       gotoDetails(item) {
-        this.$router.push({
-          path: "/sale/quotation",
-          query: {
-            Id: item.Id
-          }
-        });
-      },
-      //显示报价单
-      editQuotation(item) {
-        this.showForm = true;
-        this.offerObj = item;
+        this.rId=item.Id;
+        this.isShowviewQuo=true;
       },
       //重新查询
       resetSearch() {

src/pages/sale/myoffer.vue

@@ -183,6 +183,9 @@
     <q-dialog v-model="showEditPrice" persistent>
       <edittransorder-form :obj="offerObj" @save="refreshPage()"></edittransorder-form>
     </q-dialog>
+    <!-- 查看报价单 -->
+    <viewquotation-form v-if="isShowviewQuo" :rId="rId" @close="closeQuota">
+    </viewquotation-form>
 
   </div>
 </template>
@@ -190,6 +193,7 @@
   import quotationForm from '../../components/sale/quotation-form'
   import offertransorderForm from '../../components/sale/offertransorder-form'
   import edittransorderForm from '../../components/sale/edittransorder-form'
+  import viewquotationForm from '../../components/sale/viewquotation-form'
   import {
     queryCourseOfferPage,
   } from '../../api/course/index'
@@ -204,7 +208,8 @@
     components: {
       quotationForm,
       offertransorderForm,
-      edittransorderForm
+      edittransorderForm,
+      viewquotationForm
     },
     data() {
       return {
@@ -303,6 +308,8 @@
         showOrderForm: false, //是否显示转订单表单
         commonId: 0,
         showEditPrice: false, //是否显示改价表单
+        isShowviewQuo:false,
+        rId:0
       }
     },
 
@@ -312,6 +319,9 @@
       this.getcourseofferpage();
     },
     methods: {
+      closeQuota(){
+        this.isShowviewQuo=false;
+      },
       //跳转到订单列表
       goOrderList(item) {
         this.$router.push({
@@ -339,12 +349,8 @@
         this.getcourseofferpage();
       },
       gotoDetails(item) {
-        this.$router.push({
-          path: "/sale/quotation",
-          query: {
-            Id: item.Id
-          }
-        });
+        this.rId=item.Id;
+        this.isShowviewQuo=true;
       },
       //显示报价单
       editQuotation(item) {