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

src/components/finance/marketCommissionfrom.vue

@@ -123,7 +123,7 @@
                      <q-checkbox v-model="personnel" label="全选" @input='getallpersonnel(1)'/>
                 </div>
             </div>
-            <div style="display: flex;align-items: center;margin-bottom: 15px;">
+            <!-- <div style="display: flex;align-items: center;margin-bottom: 15px;">
                 <q-select
                     filled
                     stack-label
@@ -147,7 +147,7 @@
                  <div class="q-gutter-sm" style="margin-right: 18px;">
                      <q-checkbox v-model="branch" label="全选" @input='getallpersonnel(2)'/>
                 </div>
-            </div>
+            </div> -->
 
 
             <div>

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

@@ -527,7 +527,7 @@
       this.getStudentDorpDown();
       this.getGetNeedsList();
       this.queryStuTelType();
-
+      console.log("this.StudentType",this.StudentType);
       if (this.saveObj) {
         if (this.saveObj.StuId > 0) {
           this.customMsg.StuId = this.saveObj.StuId;
@@ -871,11 +871,11 @@
         this.customObj.StuEducation = tempDate.StuEducation;
         this.customObj.StuPurpose = tempDate.StuPurpose;
         this.customObj.StudentType = tempDate.StudentType;
+       
         if(tempDate.StuPurpose&&tempDate.StuPurpose.length>0&&tempDate.StuPurpose!="0"){
           this.customObj.StuPurposeList=tempDate.StuPurpose.split(",").map(Number);
         }
         
-        console.log("StuPurposeList", this.customObj.StuPurposeList);
         this.customObj.CreateBy = tempDate.CreateBy;
         this.customObj.CustomerId = tempDate.CustomerId;
         this.customObj.StuType = tempDate.StuType;

src/components/school/student/stufollowlist.vue

@@ -68,7 +68,7 @@
         <tr>
           <th width="120" rowspan="2" style="min-width: 110px;z-index: 999;">学生</th>
           <th width="120" rowspan="2" style="min-width: 110px;">电话</th>
-          <th width="120" rowspan="2" style="min-width: 110px;">课程顾问</th>
+          <!-- <th width="120" rowspan="2" style="min-width: 110px;">课程顾问</th> -->
           <th width="120" rowspan="2" style="min-width: 110px;">班主任</th>
           <th width="100" rowspan="2" style="min-width: 100px;">合同时间</th>
           <th width="200" rowspan="2" style="min-width: 200px;">所报课程</th>
@@ -106,9 +106,9 @@
             <td>
               <span>{{ item.StuTel }}</span>
             </td>
-            <td>
+            <!-- <td>
               <span v-html="getCurseManager(item)"></span>
-            </td>
+            </td> -->
             <td>
               <span v-html="getTeacherManager(item)"></span>
             </td>

src/components/school/student/stulist.vue

@@ -265,7 +265,7 @@
       :checkType="checkType" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList"
       @reload="referDataHandler">
     </studentRight-form>
-    <studentAdd-form v-if="isShowAdd" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
+    <studentAdd-form v-if="isShowAdd" :StudentType="StudentType" :save-obj="stuOption" @close="closeStuForm" @success="refreshStuList">
     </studentAdd-form>
     <transfer-order v-if="isShowTransfer" :select="selection" @close="closeStuForm" @success="refreshStuList">
     </transfer-order>

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

@@ -29,7 +29,7 @@
             </q-item>
           </template>
         </q-select>
-        <q-select v-model="OrderMsg.CourseConsultantId" :disable="CourseConsultantDisable" :options="EmployeeList2" filled use-input label="课程顾问"
+        <q-select v-if="false" v-model="OrderMsg.CourseConsultantId" :disable="CourseConsultantDisable" :options="EmployeeList2" filled use-input label="课程顾问"
           option-label="EmployeeName" option-value="Id" ref="EmployeeName2" class="col-6 q-py-sm" emit-value map-options
           @filter="filterFn2">
           <template v-slot:no-option>

src/pages/financial/market/commissionRule.vue

@@ -73,8 +73,8 @@
             <th width="">课程</th>
             <th width="7%">首次发放比例</th>
             <th width="10%">课程比例</th>
-            <th width="10%">提成人员</th>
-            <th width="10%">部门人员</th>
+            <th width="10%">参与人员</th>
+            <!-- <th width="10%">部门人员</th> -->
             <th width="10%">操作</th>
           </tr>
           <tr>
@@ -129,7 +129,7 @@
               </el-popover>
             </td>
 
-            <td style="padding: 0 10px;">
+            <!-- <td style="padding: 0 10px;">
               <span v-for="( son , sIndex ) in item.ChildEmpList" :key="sIndex">
                 <span v-if="sIndex<8">{{ son.EmployeeName }}{{item.ChildEmpList.length==sIndex+1?'':'、'}}</span>
               </span>
@@ -142,7 +142,7 @@
                 :content="item.ChildEmpListtext">
                 <el-button slot="reference" style="border: none;" type="text">查看更多</el-button>
               </el-popover>
-            </td>
+            </td> -->
             <td>
               <q-btn
                 flat
@@ -229,7 +229,7 @@
               >{{ son.StartValue }} <span>{{son.EndValue && son.EndValue!=-1?'<=人头<=':'<=人头'}}</span><span v-if="son.EndValue && son.EndValue!=-1">{{ son.EndValue }}</span></th>
             </tr>
             <tr style="">
-              <td style="min-width: 220px;" v-for="( son , sIndex ) in item.ZGAwardList" :key="sIndex">{{ son.Rate }}</td>
+              <td style="min-width: 220px;" v-for="( son , sIndex ) in item.ZGAwardList" :key="sIndex">{{ son.Rate }}/人</td>
 
             </tr>
           </table>

src/pages/sale/guestConsultation.vue

@@ -73,9 +73,9 @@
         <template v-if="morequery">
           <div class="col-3">
             <q-select @input="resetSearch" dense filled v-model="msg.StuStage" :options="customState"
-              option-label="Name" option-value="Id" emit-value map-options label="客户状态" clearable />
+              option-label="Name" option-value="Id" emit-value map-options label="客户进度" clearable />
           </div>
-          <div class="col-3">
+          <div class="col-3" v-if="false">
             <q-select @input="resetSearch" dense filled option-value="Id" option-label="EmployeeName"
               v-model="msg.ConsultantId" clearable :options="RoleListData" emit-value map-options label="课程顾问" />
           </div>
@@ -288,12 +288,12 @@
             field: "EnrollState",
             align: "left"
           },
-          {
-            name: "AssistName",
-            label: "顾问名称",
-            field: "AssistName",
-            align: "left"
-          },
+          // {
+          //   name: "AssistName",
+          //   label: "顾问名称",
+          //   field: "AssistName",
+          //   align: "left"
+          // },
           {
             name: "StuBirthStr",
             required: true,
@@ -337,12 +337,12 @@
             field: "BaseCondition",
             align: "left"
           },
-          {
-            name: "FURemark",
-            label: "顾问跟进备注",
-            field: "FURemark",
-            align: "left"
-          },
+          // {
+          //   name: "FURemark",
+          //   label: "顾问跟进备注",
+          //   field: "FURemark",
+          //   align: "left"
+          // },
         ],
         stuOption: null,
         BelongType: 1,

src/pages/sale/marketTracking.vue

@@ -100,7 +100,7 @@
               v-model="msg.CourseId" clearable emit-value use-input :options="myCourseList" label="课程" dense map-options
               @filter="filterFnkec" />
           </div>
-          <div class="col-3">
+          <div class="col-3" v-if="false">
             <q-select @input="resetSearch" dense filled option-value="Id" option-label="EmployeeName"
               v-model="msg.ConsultantId" clearable :options="RoleListData" emit-value map-options label="课程顾问" />
           </div>

src/pages/sale/studentTracking.vue

@@ -49,7 +49,7 @@
               v-model="msg.CourseId" clearable emit-value use-input :options="myCourseList" label="课程" dense map-options
               @filter="filterFnkec" />
           </div>
-          <div class="col-3">
+          <div class="col-3" v-if="false">
             <q-select @input="resetSearch" dense filled option-value="Id" option-label="EmployeeName"
               v-model="msg.ConsultantId" clearable :options="RoleListData" emit-value map-options label="课程顾问" />
           </div>