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

src/components/sale/editOrder-form.vue

@@ -97,6 +97,17 @@
             </q-item>
           </template>
         </q-select>
+        <q-select :disable="(modityOrderType==2)||(OrderMsg.JoinType==3)" v-model="OrderMsg.CourseConsultantId"
+          :options="EmployeeList" filled use-input label="课程顾问" option-label="EmployeeName" option-value="Id"
+          ref="EmployeeName" class="col-6 q-pb-lg" emit-value map-options @filter="filterFn">
+          <template v-slot:no-option>
+            <q-item>
+              <q-item-section class="text-grey">
+                未找到相关数据
+              </q-item-section>
+            </q-item>
+          </template>
+        </q-select>
         <q-select :disable="(modityOrderType==2)||(OrderMsg.JoinType==3)" v-model="OrderMsg.CustomerId"
           :options="myCustomerList" filled use-input label="同行" option-label="CustomerName" option-value="CustomerId"
           ref="CustomerName" class="col-6 q-pb-lg" emit-value map-options @filter="cusfilterFn">
@@ -203,6 +214,8 @@
           JoinType: 1, //订单报入类型
           DiscountMoney: 0, //优惠金额
           PerDiscountMoney: 0, //每人优惠金额
+          CourseConsultantId:0,//课程顾问
+          CustomerId:0,//同行
         },
         Unit_PriceRemark: "", //单价规则
         IsShowUpPrice: false, //是否显示高于定价
@@ -392,6 +405,7 @@
               this.OrderMsg.B2CRatio = tempData.B2CRatio>1?(tempData.B2CRatio/100):tempData.B2CRatio;
               this.OrderMsg.B2CReNewRatio = tempData.B2CReNewRatio>1?(tempData.B2CReNewRatio/100):tempData.B2CReNewRatio;
               this.OrderMsg.CustomerId=tempData.CustomerId
+              this.OrderMsg.CourseConsultantId=tempData.CourseConsultantId
               this.UnitPrice = this.OrderMsg.Unit_Price;
               this.IsShowEditOrder = true;
             }
@@ -418,6 +432,7 @@
           this.OrderMsg.B2CRatio = 0;
           this.OrderMsg.B2CReNewRatio = 0;
           this.OrderMsg.CustomerId=0;
+          this.OrderMsg.CourseConsultantId=0;
           if (this.OrderMsg.OrderType == 2) {
             this.OrderMsg.OrderNature = 1;
           }