修改

src/components/flow/process-form.vue

@@ -208,7 +208,7 @@
             <!-- 稿酬 -->
             <q-toggle
               v-if="AuthorityObj.isroyalties==1 &&saveObj.FlowNodeList[NodeIndex].FlowAduitList&&saveObj.FlowNodeList[NodeIndex].FlowAduitList.length>0 && aIndex==0"
-              v-model="saveObj.FlowNodeList[NodeIndex].FlowAduitList[0].IsSpecNode" label="稿酬状态" left-label
+              v-model="saveObj.FlowNodeList[NodeIndex].FlowAduitList[0].IsSpecNode" label="稿酬显示" left-label
               :true-value="1" :false-value="0"
               @input="changeSpecNode(saveObj.FlowNodeList[NodeIndex].FlowAduitList[0])" />
           </div>

src/components/flow/tougao-form.vue

@@ -227,7 +227,7 @@
                 item.FlowAduitList[0].IsSpecNode == 1
               "
             >
-              <span class="SetShouSun">设定收损</span>
+              <span class="SetShouSun">设定稿酬</span>
             </template>
             <div class="operationDiv">
               <i

src/pages/sale/mystu.vue

@@ -167,8 +167,9 @@
             label="我下属的"
           />
         </div>
-        <div class="col-3">
+        <!-- <div class="col-3">
             <q-select
+            @input="resetSearch"
             dense
             clearable
             filled
@@ -182,7 +183,7 @@
           />
         </div>
         <div class="col-3">
-          <q-select filled v-model="msg.StuChannel" label="收客渠道" dense :options="StuChannelList" option-label="Name" option-value="Id" emit-value map-options use-input
+          <q-select filled v-model="msg.StuChannel" @input="resetSearch" label="收客渠道" dense :options="StuChannelList" option-label="Name" option-value="Id" emit-value map-options use-input clearable
             @filter="filterStuChannel">
             <template v-slot:no-option>
               <q-item>
@@ -192,7 +193,7 @@
               </q-item>
             </template>
           </q-select>
-        </div>
+        </div> -->
       </div>
     </div>
     <div class="page-content">

src/pages/sale/studentTracking.vue

@@ -107,7 +107,33 @@
                         :options="hetongList" emit-value map-options label="合同状态"
                     />
                 </div>
-                
+                <div class="col-3">
+            <q-select
+                    @input="resetSearch"
+                    dense
+                    clearable
+                    filled
+                    option-value="Id"
+                    option-label="Name"
+                    v-model="msg.CreateType"
+                    :options="customFromList"
+                    emit-value
+                    map-options
+                    label="客户来源"
+                />
+                </div>
+                <div class="col-3">
+                    <q-select filled v-model="msg.StuChannel" @input="resetSearch" label="收客渠道" dense :options="StuChannelList" option-label="Name" option-value="Id" emit-value map-options use-input clearable
+                        @filter="filterStuChannel">
+                        <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-3">
                     <q-field filled dense>
                         <template v-slot:control>
@@ -322,7 +348,12 @@ import {
   queryCourseDropdownList,
 } from '../../api/course/index'
 import { queryEmployee } from "../../api/users/user";
-
+import {
+    queryGuestStateList,
+     
+    CreateTypeList,
+    GetStuChannelList
+  } from "../../api/sale/sale.js";
 import {
     queryStuStageList,
     GetStudentTypeList,
@@ -364,6 +395,9 @@ export default {
                 School_Id :'-1',//校区
                 CourseId:'',//课程
                 ConsultantId:'',//课程顾问
+                CreateType:'', //客户来源
+                StuChannel: "", //收客渠道
+                
 
             },
             //归属类型列表
@@ -410,7 +444,9 @@ export default {
             allCourseList: [],//课程
             myCourseList:[],
             RoleListData: [], //课程顾问下拉数据
-
+            customFromList: [], //客户来源
+            StuChannelList: [], //收客渠道
+            allStuChannelList: [], //所有收客渠道
 
             
 
@@ -433,9 +469,43 @@ export default {
         this.getBranchList()
         this.getCourseList();//获取课程下拉
         this.getRole()
+        this.getCustomFrom();
+      this.GetStuChannelList();
 
     },
     methods: {
+        //获取收客渠道
+        GetStuChannelList() {
+            GetStuChannelList({}).then(res => {
+            if (res.Code == 1) {
+                this.StuChannelList = res.Data;
+                this.allStuChannelList = res.Data;
+            }
+            });
+        },
+        //筛选渠道
+        filterStuChannel(val, update) {
+            update(() => {
+            if (val === "") {
+                this.StuChannelList = JSON.parse(
+                JSON.stringify(this.allStuChannelList)
+                );
+            } else {
+                const needle = val.toLowerCase();
+                this.StuChannelList = this.allStuChannelList.filter(
+                v => v.Name.toLowerCase().indexOf(needle) > -1
+                );
+            }
+            });
+        },
+        //获取客户来源
+        getCustomFrom() {
+            CreateTypeList({}).then(res => {
+            if (res.Code == 1) {
+                this.customFromList = res.Data;
+            }
+            });
+        },
         getRole() {
             queryEmployee({
                 IsLeave: 1,
@@ -520,6 +590,12 @@ export default {
             if(msg.ConsultantId=='' ||msg.ConsultantId == null){
                 msg.ConsultantId = 0
             }
+            if(msg.StuChannel=='' ||msg.StuChannel == null){
+                msg.StuChannel = 0
+            }
+            if(msg.CreateType=='' ||msg.CreateType == null){
+                msg.CreateType = 0
+            }
             
             getStudentFollowUpPageList(msg).then(res => {
                 this.loading = false;

src/pages/stuMan/stuList.vue

@@ -230,6 +230,33 @@
             </template>
           </q-select>
         </div>
+        <div class="col-3">
+            <q-select
+            @input="resetSearch"
+            :dense="false"
+            clearable
+            filled
+            option-value="Id"
+            option-label="Name"
+            v-model="msg.CreateType"
+            :options="customFromList"
+            emit-value
+            map-options
+            label="客户来源"
+          />
+        </div>
+        <div class="col-3">
+          <q-select filled v-model="msg.StuChannelId" @input="resetSearch" label="收客渠道" :dense="false" :options="StuChannelList" option-label="Name" option-value="Id" emit-value map-options use-input clearable
+            @filter="filterStuChannel">
+            <template v-slot:no-option>
+              <q-item>
+                <q-item-section class="text-grey">
+                  未找到相关数据
+                </q-item-section>
+              </q-item>
+            </template>
+          </q-select>
+        </div>
       </div>
     </div>
     <div class="page-content">
@@ -392,7 +419,10 @@
     getTypeEnum,
   } from "../../api/stuMan/index.js";
   import {
-    queryGuestStateList
+    queryGuestStateList,
+     
+    CreateTypeList,
+    GetStuChannelList
   } from "../../api/sale/sale.js";
   import MoreQuery from "../../components/stuMan/moreQuery.vue";
   import StopLessonForm from "../../components/teacher/stopLessonForm";
@@ -403,7 +433,7 @@
   import list from "../../components/stuMan/makeUpHours.vue"; //可补课课时，缺勤次数，请假次数
   import eventLog from "../../components/stuMan/eventRecord.vue"; //事件记录
   import studentRightForm from "../../components/school/student/studentRight-form";
-
+  
   export default {
     meta: {
       title: "学员名单",
@@ -442,6 +472,8 @@
           OrderTime: "", //下单时间
           EndOrderTime: "", //下单结束时间
           GuestState: "", //学员状态
+          CreateType:'', //客户来源
+          StuChannelId: "" //收客渠道
         },
         pageCount: 0,
         columns: [{
@@ -668,7 +700,10 @@
         stuOption: null,
         BelongType:1,
         isShowStuRight:false,
-        isJudgeTrans:1
+        isJudgeTrans:1,
+         customFromList: [], //客户来源
+      StuChannelList: [], //收客渠道
+      allStuChannelList: [], //所有收客渠道
 
       };
     },
@@ -682,8 +717,42 @@
       this.getTypeEnum();
       this.getEarlyWarningEnum();
       this.getList();
+      this.getCustomFrom();
+      this.GetStuChannelList();
     },
     methods: {
+      //获取收客渠道
+      GetStuChannelList() {
+        GetStuChannelList({}).then(res => {
+          if (res.Code == 1) {
+            this.StuChannelList = res.Data;
+            this.allStuChannelList = res.Data;
+          }
+        });
+      },
+       //筛选渠道
+      filterStuChannel(val, update) {
+        update(() => {
+          if (val === "") {
+            this.StuChannelList = JSON.parse(
+              JSON.stringify(this.allStuChannelList)
+            );
+          } else {
+            const needle = val.toLowerCase();
+            this.StuChannelList = this.allStuChannelList.filter(
+              v => v.Name.toLowerCase().indexOf(needle) > -1
+            );
+          }
+        });
+      },
+       //获取客户来源
+      getCustomFrom() {
+        CreateTypeList({}).then(res => {
+          if (res.Code == 1) {
+            this.customFromList = res.Data;
+          }
+        });
+      },
       //获取学员状态列表
       getGuestStateList() {
         queryGuestStateList({}).then(res => {

src/pages/teacher/contribution/contributeManage.vue

@@ -52,7 +52,7 @@
          <template v-slot:body-cell-RemunerationState="props">
           <q-td :props="props">
             <span v-if="props.row.RemunerationState==1">发放</span>
-            <span v-if="props.row.RemunerationState==2">不发放</span>
+            <span v-else>不发放</span>
           </q-td>
         </template>
         <template v-slot:body-cell-optioned="props">
@@ -140,7 +140,7 @@
           <div style="display: flex;align-items: center;margin: 10px 0 ;" v-if="gaochouMsg">
             稿酬状态：
             <q-radio v-model="gaochouMsg.RemunerationState" val="1" label="发放"  />
-            <q-radio v-model="gaochouMsg.RemunerationState" val="2" label="不发放"  />
+            <q-radio v-model="gaochouMsg.RemunerationState" val="0" label="不发放"  />
           </div>
        
         </q-card-section>
@@ -342,7 +342,7 @@
       gaochou(row){//稿酬状态设置
         this.gaochouMsg = {
           ContributeId  :row.Id,
-          RemunerationState:row.RemunerationState?row.RemunerationState.toString():2,
+          RemunerationState:row.RemunerationState?row.RemunerationState.toString():0,
         }
         this.isgaochouMsg = true