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

src/components/sale/editOrder-form.vue

@@ -83,7 +83,7 @@
           label="应收" />
 
 
-        <q-select :disable="modityOrderType==2" standout="bg-primary text-white" option-value="Id" option-label="Name"
+        <q-select :disable="modityOrderType==2" filled option-value="Id" option-label="Name"
           v-model="OrderMsg.OrderSource" :options="SourceEnumList" emit-value map-options class="q-pb-lg"
           label="客人来源" />
         <q-select :disable="(modityOrderType==2)||(OrderMsg.JoinType==3)" v-model="OrderMsg.HelpEnterId"
@@ -281,6 +281,7 @@
           guestNum = Number(this.OrderMsg.GuestNum);
         }
         let temp = this.CourseList.find(x => x.CourseId == this.OrderMsg.CourseId);
+        //插班
         if (temp) {
           this.courseObj = temp;
           var tempDiscountMoney = 0; //优惠金额
@@ -334,6 +335,7 @@
           }
           // this.OrderMsg.SaleRemark = tempSaleRemark;
         } else {
+          //未插班
           if (this.saveObj.ClassId) {
             this.OrderMsg.ClassId = this.saveObj.ClassId;
           }
@@ -369,6 +371,7 @@
         } else {
           this.OrderMsg.PreferPrice = Number(guestNum * unit_price).toFixed(2) - this.OrderMsg.LessPrice;
         }
+        
         //留学就业订单
         if (this.OrderMsg.OrderType == 2) {
           this.OrderMsg.OldPreferPrice = Number(guestNum * unit_price).toFixed(2);

src/components/sale/orderlist.vue

@@ -180,7 +180,7 @@
                   {{ item.ClassName }}
                 </div>
                 <div v-if="item.CustomerId > 0">
-                  同行信息：{{ item.CustomerName }}{{ item.CustomerNumber }}
+                  同行信息：{{ item.CustomerName }} <span v-if="item.CustomerNumber">-{{ item.CustomerNumber }}</span>
                 </div>
                 <div v-if="item.HelpEnterName">
                   协助人员：{{ item.HelpEnterName }}

src/components/school/student/stulist.vue

@@ -244,8 +244,18 @@
 
       };
     },
+    watch:{
+      dataList:{
+        handler(val){
+          console.log(201,val)
+          this.selection=[];
+        },
+        deep:true
+      }
+    },
     created() {
       this.initAuth();
+      
     },
     mounted() {},
     methods: {

src/components/school/student/transfer-order/order-form.vue

@@ -255,29 +255,6 @@
             </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-py-sm"
-          emit-value
-          map-options
-          @filter="cusfilterFn"
-        >
-          <template v-slot:no-option>
-            <q-item>
-              <q-item-section class="text-grey">
-                未找到相关数据
-              </q-item-section>
-            </q-item>
-          </template>
-        </q-select> -->
         <q-input
           :disable="modityOrderType == 2"
           v-if="OrderMsg.OrderSource == 3"
@@ -344,7 +321,6 @@ import {
   setClassOrder, //修改订单
   queryChaClassInfo,
   GetSelectClassOrderList, //获取前置下拉
-  getMyCustomerList //同行下拉
 } from "../../../../api/sale/sale";
 import { queryEmployee } from "../../../../api/users/user"; //获取员工
 import { mapState } from "vuex";
@@ -365,10 +341,6 @@ export default {
       type: Number,
       default: 0 //1-销售修改，2-OP修改，3-总经理修改
     },
-    isChaBan: {
-      type: Number,
-      default: 0 //1-是插班报入
-    },
     stuData: {
       //学生是否续费
       type: Object,
@@ -424,8 +396,6 @@ export default {
       CourseList: [], //课程列表
       courseObj: {}, //选择的课程
       beforeOrderList: [], //前置订单数据
-      myCustomerList: [], //同行列表
-      allCustomerList: [] //所有同行列表
     };
   },
   created() {
@@ -436,7 +406,6 @@ export default {
     this.getEmployee();
     this.initConfig();
     this.getSelectClass();
-    // this.getCustomerList();
   },
   mounted() {
     this.initData();
@@ -671,21 +640,6 @@ export default {
         }
       });
     },
-    //筛选同行
-    cusfilterFn(val, update) {
-      update(() => {
-        if (val === "") {
-          this.myCustomerList = JSON.parse(
-            JSON.stringify(this.allCustomerList)
-          );
-        } else {
-          const needle = val.toLowerCase();
-          this.myCustomerList = this.allCustomerList.filter(
-            v => v.CustomerName.toLowerCase().indexOf(needle) > -1
-          );
-        }
-      });
-    },
     //获取业务员
     getEmployee() {
       var qMsg = {
@@ -742,40 +696,6 @@ export default {
           return;
         }
       }
-
-      //插班报名计算应收
-      // if (this.OrderMsg.IsChaBan == 1) {
-      //   if (this.modityOrderType == 1 || this.modityOrderType == 2) {
-      //     if (
-      //       !this.courseObj ||
-      //       (this.courseObj && !this.courseObj.ClassHours)
-      //     ) {
-      //       if (this.OrderMsg && this.OrderMsg.CourseId) {
-      //         this.courseObj = this.CourseList.find(
-      //           x => x.CourseId == this.OrderMsg.CourseId
-      //         );
-      //       }
-      //     }
-      //     //插班课时单价
-      //     var classHourPrice =
-      //       this.courseObj.SellPrice / this.courseObj.ClassHours;
-      //     var chaBanPrice = Number(
-      //       classHourPrice *
-      //         (this.courseObj.ClassHours - this.OrderMsg.StartClassHours)
-      //     ).toFixed(2);
-      //     var newPreferPrice =
-      //       chaBanPrice * this.OrderMsg.GuestNum - this.OrderMsg.LessPrice;
-      //     this.OrderMsg.PreferPrice = Number(newPreferPrice).toFixed(2);
-      //   }
-      // }
-      //正常报名计算应收
-      // if (this.OrderMsg.IsChaBan == 0) {
-      //   if (this.modityOrderType == 1 || this.modityOrderType == 2) {
-      //     this.OrderMsg.PreferPrice =
-      //       this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price -
-      //       this.OrderMsg.LessPrice;
-      //   }
-      // }
       this.OrderMsg.StuIds = this.stuData.StuList.map(e => e.StuId).toString();
       this.OrderMsg.CustomerId = this.stuData.CustomerId;
       setClassOrder(this.OrderMsg).then(res => {
@@ -823,16 +743,6 @@ export default {
       }
       return str;
     },
-    getCustomerList() {
-      getMyCustomerList({}).then(res => {
-        this.myCustomerList = res.Data;
-        this.allCustomerList = res.Data;
-        this.myCustomerList.unshift({
-          CustomerId: 0,
-          CustomerName: "不限"
-        });
-      });
-    }
   }
 };
 </script>

src/pages/sale/mystu.vue

@@ -34,7 +34,7 @@
           </q-select>
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" standout="bg-primary text-white" option-value="Id" option-label="Name"
+          <q-select @input="resetSearch" filled option-value="Id" option-label="Name"
             v-model="msg.BelongType" :options="BelongTypeList" emit-value map-options label="归属类型" />
         </div>
       </div>