修改

src/components/schedul/schedul-visit.vue

@@ -91,7 +91,10 @@
   .schedulVisit .q-table tbody td:before {
     background: transparent !important;
   }
-
+  .scheduVipop .el-textarea__inner{
+    background: #F0F2F5!important;
+    border:0;
+  }
 </style>
 <template>
   <div class="schedulVisit">
@@ -112,7 +115,7 @@
             </el-input>
           </div>
           <div class="page-option addVisit">
-            <el-popover v-model="isShowVform" placement="left" popper-class="tufaPop" width="300" trigger="click">
+            <el-popover v-model="isShowVform" placement="left" popper-class="scheduVipop" width="300" trigger="click">
               <div>
                 <el-form label-width="70px" style="margin-top:10px;" class="visit_FORM">
                   <el-form-item label="姓名">
@@ -136,6 +139,18 @@
                       </el-option>
                     </el-select>
                   </el-form-item>
+                  <el-form-item label="状态">
+                    <el-select v-model="addMsg.VisitorStatus" style="width:200px;" placeholder="请选择">
+                      <el-option v-for="item in statusList" :key="item.Id" :label="item.Name" :value="item.Name">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="意向评估">
+                    <el-input v-model="addMsg.Evaluate" placeholder="请输入意向评估"></el-input>
+                  </el-form-item>
+                  <el-form-item label="备注">
+                    <el-input type="textarea" v-model="addMsg.Remark" :rows="4" placeholder="请输入备注"></el-input>
+                  </el-form-item>
                 </el-form>
                 <q-btn color="accent" size="sm" @click="isShowVform=!isShowVform,SaveVisitor()"
                   style="float:right;margin-bottom:10px;" label="保存" />
@@ -151,7 +166,9 @@
         </template>
         <template v-slot:body-cell-VisitorStatus="props">
           <q-td :props="props">
-            <span>{{props.row.VisitorStatusStr}}</span>
+            <img v-if="props.row.VisitorStatus==1" src="../../assets/images/normal.png" />
+            <img v-if="props.row.VisitorStatus==2" src="../../assets/images/vip.png" />
+            <img v-if="props.row.VisitorStatus==3" src="../../assets/images/blackList.png" />
           </q-td>
         </template>
         <template v-slot:bottom>
@@ -160,7 +177,7 @@
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
-            <el-popover placement="left" popper-class="tufaPop" width="300" ref="popover2" trigger="click">
+            <el-popover placement="left" popper-class="scheduVipop" width="300" ref="popover2" trigger="click">
               <div>
                 <el-form label-width="70px" style="margin-top:10px;" class="visit_FORM">
                   <el-form-item label="姓名">
@@ -180,10 +197,22 @@
                   </el-form-item>
                   <el-form-item label="当前水平">
                     <el-select v-model="addMsg.LevelType" style="width:200px;" placeholder="请选择">
-                      <el-option v-for="item in GBList" :key="item.Id" :label="item.Name" :value="item.Name">
+                      <el-option v-for="item in GBList" :key="item.Name" :label="item.Name" :value="item.Name">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item label="状态">
+                    <el-select v-model="addMsg.VisitorStatus" style="width:200px;" placeholder="请选择">
+                      <el-option v-for="item in statusList" :key="item.Id" :label="item.Name" :value="item.Name">
                       </el-option>
                     </el-select>
                   </el-form-item>
+                  <el-form-item label="意向评估">
+                    <el-input v-model="addMsg.Evaluate" placeholder="请输入意向评估"></el-input>
+                  </el-form-item>
+                  <el-form-item label="备注">
+                    <el-input type="textarea" v-model="addMsg.Remark" :rows="4" placeholder="请输入备注"></el-input>
+                  </el-form-item>
                 </el-form>
                 <q-btn color="accent" size="sm" @click="SaveVisitor()" style="float:right;margin-bottom:10px;"
                   label="保存" />
@@ -310,6 +339,9 @@
           StudyTime: "", //学习时间
           LevelType: "", //当前水平
           PlanId: 0, //值班编号
+          VisitorStatus:1, //状态
+          Evaluate:'', //意向评估
+          Remark:'' //备注
         },
         statusMsg: {
           Id: 0, //编号
@@ -333,6 +365,7 @@
       }
     },
     created() {
+      this.msg.PlanId=this.saveObj.Id;
       this.getGuestBasics();
     },
     mounted() {
@@ -377,6 +410,7 @@
           }).then(res => {
             if (res.Code == 1) {
               var tempData = res.Data;
+              console.log(tempData,'tempData');
               if (tempData) {
                 this.addMsg.Id = tempData.Id;
                 this.addMsg.Name = tempData.Name;
@@ -384,8 +418,11 @@
                 this.addMsg.WeChatNum = tempData.WeChatNum;
                 this.addMsg.CourseName = tempData.CourseName;
                 this.addMsg.StudyTime = tempData.StudyTime;
-                this.addMsg.LevelType = JSON.parse(tempData.LevelType);
+                this.addMsg.LevelType = tempData.LevelType;
                 this.addMsg.PlanId = tempData.PlanId;
+                this.addMsg.VisitorStatus = tempData.VisitorStatus;
+                this.addMsg.Evaluate = tempData.Evaluate;
+                this.addMsg.Remark = tempData.Remark;
               }
             }
           })

src/pages/scheduling/scheduleBoard.vue

@@ -118,7 +118,7 @@
     background-color: #fff;
   }
 
-  .myscroll {
+  .schScroll {
     background-color: #F6F8FA;
   }
 
@@ -226,7 +226,9 @@
     border-radius: 50%;
     margin-right: 10px;
   }
-
+  .schScroll::-webkit-scrollbar {
+    display: none; 
+  }
 </style>
 
 <template>
@@ -244,12 +246,14 @@
           <!-- <span class="schedu_st xxz"></span>休息中
             <span class="schedu_st wdk"></span>未打卡 -->
         </div>
-        <div class="clockon_Duty">
-          值班打卡<i class="iconfont icon-jiejue1 sche_daka" @click="SetDutyCheck(1)"></i>
+        <div class="clockon_Duty" @click="SetDutyCheck(1)">
+          值班打卡<i class="iconfont icon-jiejue1 sche_daka"></i>
+        </div>
+        <div class="clockon_Duty" @click="SetDutyCheck(2)">
+          值班交接<i class="iconfont icon-jiejue1 sche_daka"></i>
         </div>
-        <div class="schedu_jiaojie" @click="SetDutyCheck(2)">值班交接</div>
       </div>
-      <div class="col scroll myscroll">
+      <div class="col scroll schScroll">
         <div class="sche_rightTop">
           <div class="sche_Topflex">
             <div class="Sctop_Color Scdu_benci" style="position:relative;">本次值班信息</div>