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

src/components/schedul/schedul-orderlist.vue

@@ -645,6 +645,7 @@
         this.addMsg2.Id = obj.Id;
         SetDutyContent(this.addMsg2).then(res => {
           this.getWorkList();
+          this.$refs.hengLine.click();
         })
       },
       //保存编辑交接
@@ -654,6 +655,7 @@
         this.addMsg3.Id = obj.Id;
         SetDutyContent(this.addMsg3).then(res => {
           this.getWorkList();
+          this.$refs.hengLine.click();
         })
       },
       //交接工作
@@ -662,6 +664,7 @@
         this.addMsg3.PlanId = this.saveObj.Id;
         SetDutyContent(this.addMsg3).then(res => {
           this.getWorkList();
+          this.$refs.hengLine.click();
         })
       },
       //删除交接新增图片

src/pages/scheduling/scheduleInfo.vue

@@ -141,6 +141,9 @@
     color: #AAAAAA;
     font-size: 14px;
     margin-right: 15px;
+    display: inline-block;
+    text-align: right;
+    width:60px;
   }
 
   .Scdu_benci::after {
@@ -231,7 +234,11 @@
   .schScroll::-webkit-scrollbar {
     display: none;
   }
+  .Sch_MainColor{
+    font-size:18px;
+    color:#000000;
 
+  }
 </style>
 
 <template>
@@ -240,41 +247,41 @@
 
       <div class="col scroll schScroll">
         <div class="scheInfo_rightTop">
-          <div class="scheInfo_Topflex">
-            <div class="Sctop_Color Scdu_benci" style="position:relative;">本次值班信息</div>
-            <div class="Sctop_Color">
+          <table class="" style="width:100%;margin:0 20px;font-size:18px;color:#000000;">
+            <tr>
+              <td style="width:12%">
+                <span class="Sch_MainColor">本次值班信息</span>
+              </td>
+              <td style="width:16%">
                 <span class="Scotop_little">校区</span>{{dataList.SchoolName}}
-            </div>
-            <div class="Sctop_Color" style="width:400px;">
+              </td>
+              <td style="width:29%;">
                 <span class="Scotop_little">时间</span>
                 <span v-if="dataList.PlanDate">{{dataList.PlanDate.replaceAll('-','.')}}</span>
                 <span v-if="dataList.WeekDay"> {{dataList.WeekDay.replace('星期','周')}}</span>
                 {{dataList.StartTime}}-{{dataList.EndTime}}
-            </div>
-            <div class="Sctop_Color" style="text-align:left;">
+              </td>
+              <td style="width:25%;">
                 <span class="Scotop_little">班次</span>{{dataList.ShiftName}}
-            </div>
-            <div class="Sctop_Color">
+              </td>
+              <td>
               <span class="Scotop_little">值班状态</span>{{dataList.DutyStatusStr}}
-            </div>
-          </div>
-          <div class="scheInfo_Topflex" style="margin-top:10px;">
-            <div class="Sctop_Color"></div>
-            <div class="Sctop_Color Scdu_benci" style="position:relative;padding-left:15px;width:246px;">
-              <span class="Scotop_little">值班人员</span>
-              <!-- <img v-if="dataList.DutyManIcon" :src="dataList.DutyManIcon" alt="" style="width:40px;height:40px;margin-right:10px;" />  -->
-              {{dataList.DutyManName}}
-            </div>
-            <div class="Sctop_Color" style="width:350px;padding-left:10px;">
+              </td>
+            </tr>
+            <tr>
+              <td></td>
+              <td>
+                <span class="Scotop_little">值班人员</span>{{dataList.DutyManName}}
+              </td>
+              <td>
                 <span class="Scotop_little">打卡时间</span>
                 <span v-if="dataList.CheckTime">{{dataList.CheckTime}}</span>
-            </div>
-            <div class="Sctop_Color" style="width:350px;padding-left:8px;">
+              </td>
+              <td>
                 <span class="Scotop_little">交接时间</span>{{dataList.FinishTime}}
-            </div>
-            <div class="Sctop_Color"></div>
-          </div>
-
+              </td>
+            </tr>
+          </table>
         </div>
         <div class="Sche_Bottom">
           <schedulOrder :save-obj="msg" :authObj="workAuthObj" @refreshPage="refreshPage"></schedulOrder>