修改

src/components/sale/editOrder-form.vue

@@ -13,8 +13,23 @@
         <q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" :disable="UPrice==true?false:true"
           @blur="priceNumber" class="col-12" label="成交单价" :rules="[val => !!val || '请填成交单价']" />
         <q-toggle v-model="UPrice" label="高于定价收生" class="q-mb-md" /> <!-- @change="resetSearch"-->
+        <q-select v-model="OrderMsg.HelpEnterId" :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 standout="bg-primary text-white" option-value="Id" option-label="Name" v-model="OrderMsg.OrderSource"
-          :options="SourceEnumList" emit-value map-options label="客人来源" />
+          :options="SourceEnumList" emit-value map-options class="q-pb-lg" label="客人来源" />
+        <q-input v-if="OrderMsg.OrderSource==3" filled stack-label :dense="false" v-model="OrderMsg.GeneralOccupation" class="col-12 q-pb-lg" label="一般同行" />
+        <q-input v-if="OrderMsg.OrderSource==7" filled stack-label :dense="false" v-model="OrderMsg.EduOccupation" class="col-12 q-pb-lg" label="教育同行" />
+        <q-toggle v-model="OrderMsg.IsLessPrice" :false-value="0" :true-value="1" label="是否少价" class="q-mb-md" />
+        <q-input v-if="OrderMsg.IsLessPrice==1" @keyup.native="checkPrice(OrderMsg,'LessPrice')" filled stack-label :dense="false" v-model="OrderMsg.LessPrice" class="col-12" label="少价金额" />
         <q-input filled stack-label :dense="false" v-model="OrderMsg.SaleRemark" style="margin-top: 20px"
           type="textarea" class="col-12" label="备注" />
         <div style="margin:30px 10px 0 0;">
@@ -35,6 +50,10 @@
     getOrderSourceEnumList, //获取订单来源 枚举
     setClassOrder, //修改订单
   } from '../../api/sale/sale'
+  import {
+    queryEmployee
+  } from '../../api/users/user'; //获取员工
+
   export default {
     name: "editOrder-form",
     props: {
@@ -57,11 +76,18 @@
           OrderId: 0,
           OrderType: 0, //订单类型(1-班级课程订单，2-留学就业订单)
           SourceId: 0, //来源编号
+          HelpEnterId: 0, //协助人员编号
+          GeneralOccupation: "", //一般同行
+          EduOccupation: "", //教育同行
+          IsLessPrice: 0, //是否少价 0 不少 1 少
+          LessPrice: 0 //少价金额
         },
         UPrice: false,
         StepPriceList: [],
         UnitPrice: 0,
         SourceEnumList: [], //订单来源
+        EmployeeList: [], //员工列表
+        AllemployeeList: [], //所有员工列表
       }
     },
     created() {
@@ -69,8 +95,32 @@
     },
     mounted() {
       this.getOrderInfo();
+      this.getEmployee();
     },
     methods: {
+      //筛选员工
+      filterFn(val, update) {
+        update(() => {
+          if (val === '') {
+            this.EmployeeList = JSON.parse(JSON.stringify(this.AllemployeeList))
+          } else {
+            const needle = val.toLowerCase();
+            this.EmployeeList = this.AllemployeeList.filter(v => v.EmployeeName.toLowerCase().indexOf(needle) > -1);
+          }
+        })
+      },
+      //获取业务员
+      getEmployee() {
+        var qMsg = {
+          Dept_Id: 0
+        }
+        queryEmployee(qMsg).then(res => {
+          if (res.Code == 1) {
+            this.EmployeeList = res.Data;
+            this.AllemployeeList = res.Data;
+          }
+        }).catch(() => {})
+      },
       //关闭弹窗
       closeEditOrder() {
         this.IsShowEditOrder = false;
@@ -172,7 +222,7 @@
       },
       //修改订单
       saveOrderInfo() {
-        this.OrderMsg.PreferPrice = this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price
+        this.OrderMsg.PreferPrice = (this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price)-this.OrderMsg.LessPrice;
         setClassOrder(this.OrderMsg).then(res => {
           if (res.Code == 1) {
             this.$q.notify({

src/pages/sale/japaneseTrain.vue

@@ -236,10 +236,23 @@
               :disable="IsUpPrice==true?false:true" @blur="priceNumber" class="col-12" label="成交单价"
               :rules="[val => !!val || '请填成交单价']" />
             <q-toggle v-model="IsUpPrice" label="高于定价收生" class="q-mb-md" />
-
-
+            <q-select v-model="enrollMsg.HelpEnterId" :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 standout="bg-primary text-white" option-value="Id" option-label="Name"
-              v-model="enrollMsg.OrderSource" :options="SourceEnumList" emit-value map-options label="客人来源" />
+              v-model="enrollMsg.OrderSource" :options="SourceEnumList" class="q-pb-lg" emit-value map-options label="客人来源" />
+            <q-input v-if="enrollMsg.OrderSource==3" filled stack-label :dense="false" v-model="enrollMsg.GeneralOccupation" class="col-12 q-pb-lg" label="一般同行" />
+            <q-input v-if="enrollMsg.OrderSource==7" filled stack-label :dense="false" v-model="enrollMsg.EduOccupation" class="col-12 q-pb-lg" label="教育同行" />
+            <q-toggle v-model="enrollMsg.IsLessPrice" :false-value="0" :true-value="1" label="是否少价" class="q-mb-md" />
+            <q-input v-if="enrollMsg.IsLessPrice==1" @keyup.native="checkPrice(enrollMsg,'LessPrice')" filled stack-label :dense="false" v-model="enrollMsg.LessPrice" class="col-12" label="少价金额" />
             <q-input filled stack-label type="textarea" maxlength="500" :dense="false" v-model="enrollMsg.SaleRemark"
               style="margin-top: 20px" class="col-12" label="备注" />
             <div style="margin:30px 10px 0 0;">
@@ -270,6 +283,10 @@
   import {
     queryCourseDropdownList,
   } from '../../api/course/index'
+  import {
+    queryEmployee
+  } from '../../api/users/user'; //获取员工
+
   export default {
     meta: {
       title: "日语培训"
@@ -307,7 +324,7 @@
           HelpEnterId: 0, //协助人员编号
           GeneralOccupation: "", //一般同行
           EduOccupation: "", //教育同行
-          IsLessPrice: 0, //是否少价
+          IsLessPrice: 0, //是否少价 0 不少 1 少
           LessPrice: 0, //少价金额
         },
         //关联校区列表
@@ -320,6 +337,8 @@
         ClassList: [], //关联课程下拉数据
         TeacherList: [], //关联教师下拉数据
         elvalue: new Date(),
+        EmployeeList: [], //员工列表
+        AllemployeeList: [], //所有员工列表
       }
     },
     created() {
@@ -337,8 +356,32 @@
 
       this.msg.StartTime = currentDay
       this.getList();
+      this.getEmployee();
     },
     methods: {
+      //筛选员工
+      filterFn(val, update) {
+        update(() => {
+          if (val === '') {
+            this.EmployeeList = JSON.parse(JSON.stringify(this.AllemployeeList))
+          } else {
+            const needle = val.toLowerCase();
+            this.EmployeeList = this.AllemployeeList.filter(v => v.EmployeeName.toLowerCase().indexOf(needle) > -1);
+          }
+        })
+      },
+      //获取业务员
+      getEmployee() {
+        var qMsg = {
+          Dept_Id: 0
+        }
+        queryEmployee(qMsg).then(res => {
+          if (res.Code == 1) {
+            this.EmployeeList = res.Data;
+            this.AllemployeeList = res.Data;
+          }
+        }).catch(() => {})
+      },
       //跳转到班级订单
       goclassorder(item) {
         var tempStr = '/course/classorder?ClassId=' + item.ClassId;
@@ -534,8 +577,13 @@
         this.dialog = true;
         this.enrollMsg.ClassId = item.ClassId;
         this.enrollMsg.SaleRemark = ''; //清空备注
-        this.enrollMsg.Unit_Price = this.countPrice(this.enrollMsg.GuestNum)
-        this.UnitPrice = this.enrollMsg.Unit_Price
+        this.enrollMsg.Unit_Price = this.countPrice(this.enrollMsg.GuestNum);
+        this.UnitPrice = this.enrollMsg.Unit_Price;
+        this.enrollMsg.HelpEnterId=0;
+        this.enrollMsg.GeneralOccupation='';
+        this.enrollMsg.EduOccupation='';
+        this.enrollMsg.IsLessPrice=0;
+        this.enrollMsg.LessPrice=0;
       },
       peopleNumber(val) {
         if (val > this.selectitem.SurplusNum) {
@@ -553,7 +601,7 @@
         }
       },
       saveSatMsg() { //立即报名
-        this.enrollMsg.PreferPrice = this.enrollMsg.GuestNum * this.enrollMsg.Unit_Price
+        this.enrollMsg.PreferPrice = (this.enrollMsg.GuestNum * this.enrollMsg.Unit_Price)-this.enrollMsg.LessPrice;
         setClassOrder(this.enrollMsg).then(res => {
           if (res.Code == 1) {
             this.$q.notify({