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

src/api/sale/sale.js

@@ -457,6 +457,16 @@ export function CheckExistsStu(data) {
   });
 }
 
+//获取客户下拉
+export function GetCustomerList(data) {
+  return request({
+    url: '/B2BCustomer/GetCustomerList',
+    method: 'post',
+    data
+  });
+}
+
+
 
 
 

src/components/sale/b2bcustomerinfo/passbook.vue

@@ -56,7 +56,7 @@
         />
       </template>
     </q-table>
-    <withdraw  v-if="tabs==2" :Type="2"></withdraw>
+    <withdraw  v-if="tabs==2" :Type="2" :Id="Id"></withdraw>
   </div>
 </template>
 <script>
@@ -164,6 +164,7 @@ export default {
     },
     //获取数据
     getList() {
+      this.msg.CustomerId=this.Id
       this.loading = true;
       GetCustomerBalanceDetailPage(this.msg)
         .then(res => {

src/components/sale/b2bcustomerinfo/rakeback.vue

@@ -56,7 +56,7 @@
         />
       </template>
     </q-table>
-     <withdraw  v-if="tabs==2" :Type="1"></withdraw>
+     <withdraw  v-if="tabs==2" :Type="1" :Id="Id"></withdraw>
   </div>
 </template>
 <script>
@@ -84,7 +84,7 @@ export default {
         pageIndex: 1,
         pageSize: 10,
         rowsPerPage: 10,
-        RebateType: 2,
+        RebateType: 1,
         Description: ""
       },
       pageCount: 0,
@@ -165,6 +165,7 @@ export default {
     },
     //获取数据
     getList() {
+      this.msg.CustomerId=this.Id
       this.loading = true;
       GetCustomerBalanceDetailPage(this.msg)
         .then(res => {

src/components/sale/b2bcustomerinfo/withdraw.vue

@@ -137,7 +137,11 @@ export default {
       Type:{
           type:Number,
           default:1
-      }  
+      }, 
+      Id:{
+          type:Number,
+          default:0
+      }   
     },
     data() {
         return {
@@ -149,6 +153,7 @@ export default {
                 rowsPerPage: 12,
                 Type: '0', //	类型 1返佣 2幸福存折
                 AuditStatus: '0', //状态 1申请中 2待打款 3已打款 4拒绝
+                CustomerId:0
 
             },
             loading: false,
@@ -271,6 +276,7 @@ export default {
         //获取分页数据
         getList() {
             this.msg.Type=this.Type
+            this.msg.CustomerId=this.Id
             getCustomerRemitPageList(this.msg).then(res => {
                 this.dataList = res.Data.PageData;
                 this.loading = false;

src/components/school/student/student-left.vue

@@ -84,7 +84,7 @@
       <div class="info_item">
         <div class="item_label">客户来源</div>
         <div class="item_value">
-          <q-select filled v-model="customObj.CreateType" dense :options="customFromList" option-label="Name" option-value="Id"
+          <q-select filled v-model="customObj.CreateType" @input="resetStuSource()" dense :options="customFromList" option-label="Name" option-value="Id"
             emit-value map-options label="客户来源" />
         </div>
       </div>
@@ -94,8 +94,8 @@
           <span v-if="customObj.CreateType==4">转介人</span>
         </div>
         <div class="item_value">
-          <q-select filled v-model="customObj.StuSourceId" dense @filter="filterEmployee" use-input
-            :options="myEmployeeList" option-label="EmployeeName" option-value="Id" emit-value map-options />
+          <q-select filled v-model="customObj.StuSourceId" dense :options="customList" option-label="CustomerName"
+            option-value="CustomerId" emit-value map-options />
         </div>
       </div>
 
@@ -200,7 +200,8 @@
     getGuestLearningGoalsEnumList,
     GetStuChannelList,
     CreateTypeList,
-    CheckExistsStu
+    CheckExistsStu,
+    GetCustomerList
   } from '../../../api/sale/sale'
   import {
     queryEmployee
@@ -259,6 +260,7 @@
         StuChannelList: [], //收客渠道
         AssistDropList: [], //协助人员
         customFromList: [], //客户来源
+        customList: [],
         checkMsg:{
           StuId:0,
           StuTel:''
@@ -273,6 +275,7 @@
       this.getEmployeeList();
       this.GetStuChannelList();
       this.getCustomFrom();
+      this.GetCustomerList();
       if (this.saveObj && this.saveObj.StuId > 0) {
         this.customMsg.StuId = this.saveObj.StuId;
         this.checkMsg.StuId = this.saveObj.StuId;
@@ -417,6 +420,15 @@
           this.customState = res.Data;
         })
       },
+      //获取客户下拉数据
+      GetCustomerList(){
+        GetCustomerList().then(res => {
+          if(res.Code==1){
+            this.customList = res.Data;
+          }
+          console.log(res,'数据');
+        })
+      },
       queryStuInfo() {
         getStudentInfo({
           StuId: this.customMsg.StuId
@@ -461,6 +473,10 @@
         CheckExistsStu(this.checkMsg).then(res => {
           
         })
+      },
+      //切换客户来源重置
+      resetStuSource(){
+        this.customObj.StuSourceId = 0;
       }
     }
   }

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

@@ -115,10 +115,10 @@
           </q-step>
           <q-step :name="2" title="确认" icon="settings" :done="step > 2">
             <orderForm
-                ref="orderForm"
+              ref="orderForm"
               :save-obj="saveObj"
               :stuData="stuData"
-              :isChaBan="isChaBan"
+              :modityOrderType="1"
               @success="$emit('close')"
             ></orderForm>
           </q-step>
@@ -226,7 +226,6 @@ export default {
       courseData: [], //课程列表
       coursePageCount: 0, //课程页数
       saveObj: {}, //所选课程
-      isChaBan: 0, //是否插班
       //关联校区列表
       schoolList: [],
       ClassList: [], //关联课程下拉数据
@@ -250,11 +249,6 @@ export default {
       const ids = this.select.map(e => e.StuId).toString();
       getOrderGuestRenewState({ StuIds: ids }).then(res => {
         this.stuData = res.Data;
-        if (res.Data.RenewNum == 0) {
-          this.isChaBan = 0;
-        } else {
-          this.isChaBan = 1;
-        }
       });
     },
     //获取课程分页列表

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

 <style>
-.editOrderDrawerTop {
-  width: 100%;
-  height: 50px;
-  display: flex;
-  justify-content: space-between;
-  background-color: #f0f5fb;
-  padding: 5px 10px;
-  align-items: center;
+.field {
+  height: 60px;
 }
 </style>
 <!--订单操作-->
 <template>
   <div>
-    <!-- <div class="editOrderDrawerTop">
-        <div style="display:flex;align-items:center;margin-left:10px;">
-          <span class="drawer_Span">{{
-            OrderMsg.OrderId > 0 ? "修改订单" : "立即下单"
-          }}</span>
-        </div>
-      </div> -->
     <div class="row q-mb-md">
       <div class="col-10">
         <div v-for="(item, index) in stuData.StuList">
@@ -29,25 +16,31 @@
         </div>
       </div>
       <div class="col-2">
-        <q-toggle v-model="isChaBan" :true-value="1"  :false-value='0' label="插班报入" />
+        <q-toggle
+          v-model="OrderMsg.isChaBan"
+          :true-value="1"
+          :false-value="0"
+          label="插班报入"
+        />
       </div>
     </div>
     <div style="row items-center">
       <div class="col row wrap q-mr-lg q-col-gutter-md">
-        <q-input
-          filled
-          stack-label
-          maxlength="3"
-          :dense="false"
-          @keyup.native="checkInteger(OrderMsg, 'GuestNum')"
-          v-model="OrderMsg.GuestNum"
-          @input="calcPrice()"
-          class="col-6"
-          label="人数"
-          :rules="[val => !!val || '请填写人数']"
-          disable
-        />
-        <template v-if="isChaBan == 1">
+        <div class="col-6 field">
+          <q-input
+            filled
+            stack-label
+            maxlength="3"
+            :dense="false"
+            @keyup.native="checkInteger(OrderMsg, 'GuestNum')"
+            v-model="OrderMsg.GuestNum"
+            @input="calcPrice()"
+            label="人数"
+            :rules="[val => !!val || '请填写人数']"
+            disable
+          />
+        </div>
+        <template v-if="OrderMsg.isChaBan == 1">
           <q-select
             filled
             option-value="CourseId"
@@ -268,7 +261,7 @@
             </q-item>
           </template>
         </q-select>
-        <q-select
+        <!-- <q-select
           :disable="modityOrderType == 2 || OrderMsg.JoinType == 3"
           v-model="OrderMsg.CustomerId"
           :options="myCustomerList"
@@ -290,7 +283,7 @@
               </q-item-section>
             </q-item>
           </template>
-        </q-select>
+        </q-select> -->
         <q-input
           :disable="modityOrderType == 2"
           v-if="OrderMsg.OrderSource == 3"
@@ -401,13 +394,12 @@ export default {
   data() {
     return {
       IsShowEditOrder: true,
-      
+
       OrderMsg: {
         ClassId: 0, //班级编号
         GuestNum: 0, //人数
         B2CRatio: 0,
         B2CReNewRatio: 0,
-        CustomerId: 0, //市场专员
         Unit_Price: 0,
         PreferPrice: 0, //应收
         OrderSource: 0,
@@ -435,9 +427,10 @@ export default {
         CourseConsultantId: 0, //课程顾问
         CustomerId: 0, //同行
         OrderIdentify: 2, //标识参数，  1产品下单   2客户转订单
-        StuIds: ""
+        StuIds: "",
         //  NormalCommission:'',//正常返佣金额
         //  RenewCommission:"",// 预计返佣金额
+        isChaBan: 0
       },
       Unit_PriceRemark: "", //单价规则
       IsShowUpPrice: false, //是否显示高于定价
@@ -610,8 +603,8 @@ export default {
       if (this.OrderMsg.OrderType == 2) {
         this.OrderMsg.OldPreferPrice = Number(guestNum * unit_price).toFixed(2);
       }
+
       this.OrderMsg.GuestNum = this.stuData.StuList.length;
-      console.log("tag551", this.OrderMsg.GuestNum);
       this.OrderMsg.DiscountMoney = 0;
       this.stuData.StuList.map(e => {
         if (e.IsRenewGuest == 0) {
@@ -624,7 +617,7 @@ export default {
       });
     },
     initData() {
-      console.log("tag", "init", this.saveObj);
+      console.log("init", this.saveObj);
       if (this.saveObj && this.saveObj.OrderId > 0) {
         getClassOrderInfo({
           OrderId: this.saveObj.OrderId
@@ -730,8 +723,6 @@ export default {
         }
         this.IsShowEditOrder = true;
         this.calcPrice();
-
-        // console.log("this.saveObj", this.saveObj);
       }
     },
     //筛选员工
@@ -797,7 +788,7 @@ export default {
     //修改订单
     saveOrderInfo() {
       //插班验证课程和生效时间
-      if (this.isChaBan == 1) {
+      if (this.OrderMsg.isChaBan == 1) {
         this.$refs.CourseId.validate();
         this.$refs.EffectTime.validate();
         if (this.$refs.CourseId.hasError) {
@@ -852,6 +843,7 @@ export default {
         }
       }
       this.OrderMsg.StuIds = this.stuData.StuList.map(e => e.StuId).toString();
+      this.OrderMsg.CustomerId = this.stuData.CustomerId;
       setClassOrder(this.OrderMsg).then(res => {
         if (res.Code == 1) {
           this.$q.notify({
@@ -910,10 +902,3 @@ export default {
   }
 };
 </script>
-<style>
-.savebtn {
-  position: absolute;
-  bottom: 0;
-  right: 0;
-}
-</style>