修改

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

@@ -10,17 +10,31 @@
     </div>
     <template v-if="isShowAdd">
       <div class="row wrap studentDate">
-        <q-select filled stack-label option-value="Id" @input="getRate(conMsg.AdvisorStatus)" dense option-label="Name" v-model="conMsg.AdvisorStatus"
-          ref="AdvisorStatus" :options="consultList" label="跟进状态" :rules="[val => !!val || '请选择跟进状态']" class="col-6 q-pb-lg q-pr-lg" emit-value
-          map-options />
+        <q-select filled stack-label option-value="Id" @input="getRate(conMsg.AdvisorStatus)" dense option-label="Name"
+          v-model="conMsg.AdvisorStatus" ref="AdvisorStatus" :options="consultList" label="跟进状态"
+          :rules="[val => !!val || '请选择跟进状态']" class="col-6 q-pb-lg q-pr-lg" emit-value map-options />
         <q-input filled stack-label maxlength="50" disable dense v-model="conMsg.AdvisorRate" ref="AdvisorRate"
           class="col-6 q-pb-lg" label="胜率" />
       </div>
       <div class="row wrap">
-        <q-input filled stack-label maxlength="50" dense v-model="conMsg.AdvisorDate" ref="AdvisorDate"
-          class="col-6 q-pb-lg q-pr-lg" :label="commonName+'跟进月份'" />
-        <q-input filled v-if="dataList.length==0" stack-label maxlength="50" dense v-model="conMsg.AdvisorExpectDate" ref="AdvisorExpectDate"
-          class="col-6 q-pb-lg" :label="commonName+'期望达成协议日期'" />
+        <q-input filled v-model="conMsg.AdvisorDate" dense class="col-6 q-pb-lg q-pr-lg" mask="date" :label="commonName+'跟进月份'">
+          <template v-slot:append>
+            <q-icon name="event" class="cursor-pointer">
+              <q-popup-proxy ref="AdvisorDate" transition-show="scale" transition-hide="scale">
+                <q-date v-model="conMsg.AdvisorDate" @input=' () => $refs.AdvisorDate.hide()' />
+              </q-popup-proxy>
+            </q-icon>
+          </template>
+        </q-input>
+        <q-input filled v-model="conMsg.AdvisorExpectDate" v-if="dataList.length==0" dense class="col-6 q-pb-lg" mask="date" :label="commonName+'期望达成协议日期'">
+          <template v-slot:append>
+            <q-icon name="event" class="cursor-pointer">
+              <q-popup-proxy ref="AdvisorExpectDate" transition-show="scale" transition-hide="scale">
+                <q-date v-model="conMsg.AdvisorExpectDate" @input=' () => $refs.AdvisorExpectDate.hide()' />
+              </q-popup-proxy>
+            </q-icon>
+          </template>
+        </q-input>
       </div>
       <div class="row wrap">
         <q-input filled type="textarea" :rows="3" stack-label maxlength="2000" v-model="conMsg.AdvisorRemark"
@@ -113,7 +127,7 @@
         dataList: [],
         page_Count: 0,
         consultList: [], //跟进状态下拉
-        commonName:''
+        commonName: ''
       };
     },
     created() {
@@ -139,9 +153,9 @@
           }
         })
       },
-      getRate(Id){
-        this.consultList.forEach(x=>{
-            if(x.Id==Id){
+      getRate(Id) {
+        this.consultList.forEach(x => {
+          if (x.Id == Id) {
             this.conMsg.AdvisorRate = x.Rate;
             this.commonName = x.Name;
           }
@@ -158,6 +172,26 @@
           });
           return;
         }
+        if(this.conMsg.AdvisorDate ==''){
+          this.$q.notify({
+            type: "negative",
+            position: "top",
+            timeout: 2000,
+            message: "请选择跟进日期！"
+          });
+          return;
+        }
+        if(this.dataList.length==0){
+          if(this.conMsg.AdvisorExpectDate ==''){
+            this.$q.notify({
+              type: "negative",
+              position: "top",
+              timeout: 2000,
+              message: "请选择期望达成协议日期！"
+            });
+            return;
+          }
+        }
         SetStudentAdvisor(this.conMsg)
           .then(res => {
             if (res.Code == 1) {

src/pages/sale/studentTracking.vue

@@ -21,6 +21,30 @@
     position: sticky;
     left: 0px;
   }
+  .stulistNumber {
+    display: inline-block;
+    width: 25px;
+    height: 25px;
+    text-align: center;
+    line-height: 22px;
+    border: 1px solid #2961FE;
+    border-radius: 50%;
+    cursor: pointer;
+    color: #2961FE;
+  }
+  .OCourseTable {
+    width: 400px;
+    text-align: center;
+  }
+
+  .OCourseTable tr td {
+    height: 40px;
+  }
+
+  .OCourseTable tr th {
+    height: 40px;
+    background-color: rgb(238, 238, 239);
+  }
 </style>
 <template>
   <div class="page-body studentTracking">
@@ -182,8 +206,8 @@
 
     <div style="width: 100%;margin-top: 20px">
       <div style="width: 100%;overflow-x: auto;">
-        <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"
-          v-loading="loading">
+        <table class="po_content singeRowTable" ref="table" style="border:1px solid #E6E6E6;" cellspacing="0"
+          cellpadding="0" v-loading="loading">
           <tr>
             <th width="120" rowspan="2" style="min-width: 110px;z-index: 999;">学生</th>
             <th width="120" rowspan="2" style="min-width: 110px;">电话</th>
@@ -199,6 +223,11 @@
             <th width="100" rowspan="2" style="min-width: 100px;">收客渠道</th>
             <th width="100" rowspan="2" style="min-width: 100px;">负责人</th>
             <th width="100" rowspan="2" style="min-width: 100px;">合同状态</th>
+            <th width="100" rowspan="2" style="min-width: 100px;">期望达成协议日期</th>
+            <th width="100" rowspan="2" style="min-width: 100px;">目前状态</th>
+            <th width="100" rowspan="2" style="min-width: 100px;">胜率</th>
+            <th width="100" rowspan="2" style="min-width: 100px;">跟踪记录</th>
+
             <th width="500" colspan="3" style="min-width: 500px;" v-for=" ( item , index ) in RListlength "
               :key='index'>
               <div>第{{index+1}}个月</div>
@@ -256,6 +285,47 @@
             <td>
               <span>{{ item.StuGuestStateName }}</span>
             </td>
+            <td>
+              {{item.AdvisorExpectDate}}
+            </td>
+            <td>
+              {{item.AdvisorStatusName}}
+            </td>
+            <td>
+              {{item.AdvisorWinRate}}%
+            </td>
+            <td>
+              <template v-if="item.AdvisorList">
+                <template v-if="item.AdvisorList.length>0">
+                  {{item.AdvisorList[0].AdvisorStatusName}}
+                  <span class="stulistNumber">
+                    {{item.AdvisorList.length}}
+                    <q-popup-proxy>
+                      <q-banner>
+                        <table class="OCourseTable" style="border-collapse:collapse;">
+                          <tr>
+                            <th>跟进状态</th>
+                            <th>跟进日期</th>
+                            <th>跟进比例</th>
+                            <th>跟进备注</th>
+                          </tr>
+                          <tr v-for="(sItem,sIndex) in item.AdvisorList" style="border-bottom:1px dashed #d1d1d1;"
+                            :key="sIndex">
+                            <td>{{sItem.AdvisorStatusName}}</td>
+                            <td>{{sItem.AdvisorDate}}</td>
+                            <td>{{sItem.AdvisorRate}}</td>
+                            <td>{{sItem.AdvisorRemark}}</td>
+                          </tr>
+                        </table>
+                      </q-banner>
+                    </q-popup-proxy>
+                  </span>
+                </template>
+                <template v-if="item.AdvisorList.length==0">
+                  无
+                </template>
+              </template>
+            </td>
             <td v-for=" ( x , y ) in titlelist " :key="y">
               <div v-if="item.MonthList[x.index]">
 
@@ -451,7 +521,7 @@
         myEmployeeList: [],
         TransListData: [], //转介人数据
         MyTransListData: [],
-        goalsList: [] //学习目的列表
+        goalsList: [], //学习目的列表
       }
     },
     created() {
@@ -823,9 +893,11 @@
 
     },
   }
+
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
+
 </style>
 <style scoped>
   /deep/.el-input__inner,
@@ -852,4 +924,5 @@
   .roatImg {
     transform: rotate(180deg);
   }
+
 </style>