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

src/components/sale/editOrder-form.vue

@@ -216,6 +216,7 @@
           PerDiscountMoney: 0, //每人优惠金额
           CourseConsultantId:0,//课程顾问
           CustomerId:0,//同行
+          OrderIdentify:1,//标识参数，  1产品下单   2客户转订单
         },
         Unit_PriceRemark: "", //单价规则
         IsShowUpPrice: false, //是否显示高于定价

src/components/school/student/stulist.vue

@@ -140,16 +140,22 @@
           },
           {
             name: "CreateTypeStr",
-            label: "获取渠道",
+            label: "客户来源",
             field: "CreateTypeStr",
             align: "left"
           },
           {
             name: "StuSourceIdName",
-            label: "关联人",
+            label: "来源关联人",
             field: "StuSourceIdName",
             align: "left"
           },
+          {
+            name: "StuChannelName",
+            label: "收客渠道",
+            field: "StuChannelName",
+            align: "left"
+          },
           {
             name: "VisitCount",
             label: "到访次数",

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

@@ -70,8 +70,17 @@
                     map-options
                     label="学习课程"
                     clearable
-                  />
+                  >
+                    <template v-slot:no-option>
+                      <q-item>
+                        <q-item-section class="text-grey">
+                          未找到相关数据
+                        </q-item-section>
+                      </q-item>
+                    </template>
+                  </q-select>
                 </div>
+
                 <div class="col-6">
                   <div class="col-3 Sysuser_Date">
                     <q-field filled>
@@ -139,7 +148,12 @@
           v-if="step > 1"
         />
         <q-btn @click="next" color="primary" label="下一步" v-if="step < 2" />
-        <q-btn label="保存" color="primary" @click="saveOrderForm" v-if="step == 2" />
+        <q-btn
+          label="保存"
+          color="primary"
+          @click="saveOrderForm"
+          v-if="step == 2"
+        />
       </q-card-actions>
     </q-card>
   </q-dialog>
@@ -229,7 +243,8 @@ export default {
       //关联校区列表
       schoolList: [],
       ClassList: [], //关联课程下拉数据
-      myClassList: []
+      myClassList: [],
+      allClassList:[],
     };
   },
   mounted() {
@@ -355,30 +370,36 @@ export default {
             CourseName: "不限"
           });
           this.myClassList = this.ClassList;
+          this.allClassList= res.Data
         }
       });
     },
     //课程筛选
     filterCourseFn(val, update, abort) {
       update(() => {
-        this.myClassList = this.ClassList.filter(
-          v => v.CourseName.indexOf(val) > -1
-        );
+        if (val === "") {
+          this.myClassList = JSON.parse(JSON.stringify(this.allClassList));
+        } else {
+          const needle = val.toLowerCase();
+          this.myClassList = this.allClassList.filter(
+            v => v.CourseName.toLowerCase().indexOf(needle) > -1
+          );
+        }
       });
     },
     resetSearch() {
       this.courseMsg.pageIndex = 1;
       this.getCourseList();
     },
-    saveOrderForm(){
-        this.$refs.orderForm.saveOrderInfo()
+    saveOrderForm() {
+      this.$refs.orderForm.saveOrderInfo();
     }
   }
 };
 </script>
 <style scoped>
-    /deep/.el-input__inner{
-        background-color: transparent;
-        border:none;
-    }
+/deep/.el-input__inner {
+  background-color: transparent;
+  border: none;
+}
 </style>

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

@@ -15,8 +15,8 @@
       @update:selected ="emitSel"
     >
       <!-- <template v-slot:body-cell-ClassName="props">
-          <q-td :props="props" style="padding-right: 0px">
-            {{ props.row.ClassName }} 【{{ props.row.ClassNo }}】
+          <q-td :props="props">
+            {{ props.row.ClassName }} 
           </q-td>
         </template> -->
       <template v-slot:bottom> </template>

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

@@ -331,15 +331,6 @@
           label="备注"
         />
       </div>
-
-      <!-- <div style="margin:30px 10px 70px 0;" class="flex justify-end savebtn">
-        <q-btn
-          color="accent"
-          class="q-mr-md"
-          label="保存"
-          @click="saveOrderInfo()"
-        />
-      </div> -->
     </div>
 
     <div
@@ -494,6 +485,7 @@ export default {
       let temp = this.CourseList.find(
         x => x.CourseId == this.OrderMsg.CourseId
       );
+      console.log('tagtemp', this.CourseList)
       if (temp) {
         this.courseObj = temp;
         var tempDiscountMoney = 0; //优惠金额
@@ -567,6 +559,7 @@ export default {
           this.OrderMsg.SourceId = this.saveObj.SourceId;
         }
         this.courseObj = {};
+       
       }
 
       /**计算少价---开始*/
@@ -663,7 +656,7 @@ export default {
           }
         });
       } else {
-        this.OrderMsg.SaleRemark = ""; //清空备注
+       
         this.OrderMsg.HelpEnterId = 0;
         this.OrderMsg.GeneralOccupation = "";
         this.OrderMsg.EduOccupation = "";
@@ -720,7 +713,14 @@ export default {
           }
         }
         this.IsShowEditOrder = true;
+        
         this.calcPrice();
+        if(this.stuData.RenewNum>0){
+           this.OrderMsg.SaleRemark = `直客首次报名优惠比例${this.saveObj.B2CRatio ?? 0}%;直客续费优惠比例${this.saveObj.B2CReNewRatio ?? 0}%`; //备注
+        }else{
+           this.OrderMsg.SaleRemark = `直客首次报名优惠比例${this.saveObj.B2CRatio ?? 0}%`; //备注
+        }
+        
       }
     },
     //筛选员工