深夜班版本

toktok-work-attendance/config/index.js

@@ -13,7 +13,7 @@ module.exports = {
     proxyTable: {},
 
     // Various Dev Server settings
-    host: '192.168.2.70', // can be overwritten by process.env.HOST
+    host: '192.168.2.75', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

toktok-work-attendance/src/pages/dateBatchShift.vue

@@ -43,6 +43,17 @@
                 <div class="add-btn" @click="addP(workSchedule.workeDate, workSchedule.workScheduleId, '晚班', workSchedule.evenShiftEmpList)">修改</div>
             </div>
         </div>
+        <div class="date-box" v-if="getScheduleId('深夜班')">
+            <span>深夜班</span>
+            <span>：</span>
+            <div>
+                <div class="people-list" v-for="(item, index) in workSchedule.lateNightShiftEmpList" :key="index">
+                    <span>{{item.name}}{{item.startPartTime?'('+timeFormat(item.startPartTime)+'-'+timeFormat(item.endPartTime)+')':''}}</span>
+                    <!-- <img src="../assets/img/reduce.png" alt="" /> -->
+                </div>
+                <div class="add-btn" @click="addP(workSchedule.workeDate, workSchedule.workScheduleId, '深夜班', workSchedule.lateNightShiftEmpList)">修改</div>
+            </div>
+        </div>
 
         <div class="dialog-Popup" v-show="dialog_status">
             <div class="dialog-bg" @click.stop="closeDialogV()"></div>
@@ -57,7 +68,7 @@
                             <span @click="timePopShowFun(0, item.employeeId, item.startPartTime_object)"><span style="color:black;">上班时间：</span>{{item.startPartTime_object?showTimeHM(item.startPartTime_object):'选择时间'}}</span>
                             <span @click="timePopShowFun(1, item.employeeId, item.endPartTime_object)"><span style="color:black;">下班时间：</span>{{item.endPartTime_object?showTimeHM(item.endPartTime_object):'选择时间'}}</span>
                         </div>
-                    </div>                    
+                    </div>
                 </div>
                 <div class="select-sure" @click.stop="sureP()">确定</div>
             </div>
@@ -481,7 +492,7 @@ export default {
     height: 100vh;
     display: flex;
     justify-content: center;
-    align-items: center;    
+    align-items: center;
 }
 .dialog-bg{
     position: absolute;
@@ -544,7 +555,7 @@ export default {
 }
 .peo-box{
     width: auto;
-    height: 160px;
+    height: 320px;
     overflow-y: scroll;
 }
 .peo-list{
@@ -581,4 +592,4 @@ export default {
     text-align: left;
 }
 
-</style>
+</style>

toktok-work-attendance/src/pages/flexibleBatchShift.vue

@@ -3,8 +3,8 @@
 
         <table class="shift-table">
             <tr style="height:60px;">
-                <th style="width:60px;">{{departmentName}}</th>
-                <th v-for="(item, index) in scheduleList" :key="index" style="width:92px;">{{item.scheduleName}}</th>
+                <th style="width:44px;">{{departmentName}}</th>
+                <th v-for="(item, index) in scheduleList" :key="index" style="width:73px;">{{item.scheduleName}}</th>
                 <!-- <th style="width:92px;">中班</th>
                 <th style="width:92px;">晚班</th> -->
             </tr>
@@ -54,7 +54,7 @@
                             <span @click="timePopShowFun(0, item.employeeId, item.startPartTime_object)"><span style="color:black;">上班时间：</span>{{item.startPartTime_object?showTimeHM(item.startPartTime_object):'选择时间'}}</span>
                             <span @click="timePopShowFun(1, item.employeeId, item.endPartTime_object)"><span style="color:black;">下班时间：</span>{{item.endPartTime_object?showTimeHM(item.endPartTime_object):'选择时间'}}</span>
                         </div>
-                    </div>                    
+                    </div>
                 </div>
                 <div class="select-sure" @click.stop="sureP()">确定</div>
             </div>
@@ -411,7 +411,7 @@ img{
     height: 100vh;
     display: flex;
     justify-content: center;
-    align-items: center;    
+    align-items: center;
 }
 .dialog-bg{
     position: absolute;
@@ -475,7 +475,7 @@ img{
 }
 .peo-box{
     width: auto;
-    height: 160px;
+    height: 320px;
     overflow-y: scroll;
 }
 .peo-list{
@@ -535,4 +535,4 @@ img{
     margin: 0;
     padding: 0;
 }
-</style>
+</style>

toktok-work-attendance/src/pages/historyShiftRecord.vue

@@ -14,7 +14,7 @@
         <div class="head-box-copy"></div>
         <table class="store-table" v-for="(item, index) in storeList" :key="index" :style="index%2?'background-color:#EBEDF0;':''">
             <tr>
-                <td rowspan="3">{{item.departmentName}}</td>
+                <td rowspan="4">{{item.departmentName}}</td>
                 <td style="width:40px;">早班</td>
                 <td style="width:250px;text-align: left;">
                     <div style="display:flex;flex-flow: row wrap;">
@@ -59,6 +59,21 @@
                     </div>
                 </td>
             </tr>
+            <tr>
+                <td>深夜班</td>
+                <td style="text-align: left;">
+                    <div style="display:flex;flex-flow: row wrap;">
+                        <div class="peo-item" v-for="(item1, index1) in item.lateNightScheduleList" :key="index1">
+                            <span>{{item1.name}}</span>
+                            <span v-show="item1.tagName=='机动'">机</span>
+                            <span v-show="item1.tagName=='兼职'">兼</span>
+                            <span v-show="item1.storeDepartmentName">调</span>
+                            <span v-show="item1.tagName=='兼职'">{{timeFormat(item1.startPartTime)}}~{{timeFormat(item1.endPartTime)}}</span>
+                            <span>({{attendanceFun(item1.attendanceStatus)}}{{remarkFun(item1.remark)}})、</span>
+                        </div>
+                    </div>
+                </td>
+            </tr>
         </table>
 
         <loading
@@ -66,7 +81,7 @@
         />
 
     </div>
-    
+
 </template>
 
 <script>
@@ -310,4 +325,4 @@ td{
     border: 1px solid #ddd;
 }
 
-</style>
+</style>

toktok-work-attendance/src/pages/index.vue

@@ -111,7 +111,7 @@ export default {
         //         console.log(err)
         //     });
         // }
-
+        //that.tagName = "店长";
         let code = net.getUrlKey('code');
         if(code){
             localStorage.setItem('code', code);
@@ -168,7 +168,8 @@ export default {
             this.$router.push({name:'dateBatchShift',query:{}})
         },
         toFlexibleShift() {
-            this.$router.push({name:'flexibleBatchShift',query:{}})
+            //this.$router.push({name:'flexibleBatchShift',query:{}})
+            alert("机动灵活排班已弃用")
         },
         toMenus() {
             let code = localStorage.getItem('code')

toktok-work-attendance/src/pages/main.vue

@@ -179,4 +179,4 @@ export default {
     height: 80px;
     background-color: #fff;
 }
-</style>
+</style>

toktok-work-attendance/src/pages/weekBatchShift.vue

@@ -3,13 +3,14 @@
 
         <table class="shift-table">
             <tr style="height:60px;">
-                <th style="width:60px;">{{departmentName}}</th>
+                <!-- <th style="width:60px;">{{departmentName}}</th> -->
+                <th style="width:60px;">日期</th>
                 <th v-for="(item, index) in scheduleList" :key="index" style="width:92px;">{{item.scheduleName}}</th>
                 <!-- <th style="width:92px;">中班</th>
                 <th style="width:92px;">晚班</th> -->
             </tr>
             <tr v-if="workScheduleList.length==0">
-                <td colspan="4">{{ noDataText }}</td>
+                <td colspan="5">{{ noDataText }}</td>
             </tr>
             <tr v-for="(item, index) in workScheduleList" :key="index">
                 <td>{{dateFormat(item.workeDate)}}</td>
@@ -34,6 +35,13 @@
                     </div>
                     <div class="add-btn" @click="addP(item.workeDate, item.workScheduleId, '晚班', item.evenShiftEmpList)">添加</div>
                 </td>
+                <td v-if="item.lateNightShiftEmpList">
+                    <div class="peo-muster" v-for="(item1, index1) in item.lateNightShiftEmpList" :key="index1">
+                        <span>{{item1.name}}({{item1.tagName}}{{item1.startPartTime?timeFormat(item1.startPartTime)+'-'+timeFormat(item1.endPartTime):''}})</span>
+                        <img v-show="item1.storeDepartmentName==null" src="../assets/img/reduce.png" alt="" @click="removeP(item.workScheduleId, '深夜班', item1.employeeId)">
+                    </div>
+                    <div class="add-btn" @click="addP(item.workeDate, item.workScheduleId, '深夜班', item.lateNightShiftEmpList)">添加</div>
+                </td>
             </tr>
         </table>
 
@@ -50,7 +58,7 @@
                             <span @click="timePopShowFun(0, item.employeeId, item.startPartTime_object)"><span style="color:black;">上班时间：</span>{{item.startPartTime_object?showTimeHM(item.startPartTime_object):'选择时间'}}</span>
                             <span @click="timePopShowFun(1, item.employeeId, item.endPartTime_object)"><span style="color:black;">下班时间：</span>{{item.endPartTime_object?showTimeHM(item.endPartTime_object):'选择时间'}}</span>
                         </div>
-                    </div>                    
+                    </div>
                 </div>
                 <div class="select-sure" @click.stop="sureP()">确定</div>
             </div>
@@ -287,6 +295,7 @@ export default {
                     return;
                 }
                 that.departmentName = res.data.data.departmentName;
+                document.title = that.departmentName + '批量排班';
                 that.simpleEmployeeDTOS = res.data.data.simpleEmployeeDTOS;
                 that.simpleEmployeeDTOS.forEach(element => {
                     element.startPartTime = '';
@@ -305,7 +314,6 @@ export default {
                 console.log(err)
                 that.loadShow = true;
             });
-            
         },
         //标准时间转换时分
         showTimeHM(value) {
@@ -418,7 +426,7 @@ img{
     height: 100vh;
     display: flex;
     justify-content: center;
-    align-items: center;    
+    align-items: center;
 }
 .dialog-bg{
     position: absolute;
@@ -482,7 +490,7 @@ img{
 }
 .peo-box{
     width: auto;
-    height: 160px;
+    height: 320px;
     overflow-y: scroll;
 }
 .peo-list{
@@ -518,4 +526,4 @@ img{
     line-height: 30px;
     text-align: left;
 }
-</style>
+</style>

toktok-work-attendance/src/pages/workTable.vue

@@ -21,13 +21,13 @@
                 </div>
                 <div class="date-list">
                     <span v-for="(item, index) in dayList" :key="index" @click="dateClick(index, item)" :class="dates==item?'date-click':''">{{item}}</span>
-                </div>                
+                </div>
             </div>
         </div>
         <div class="date-box-copy"></div>
         <table class="store-table" v-for="(item, index) in storeList" :key="index" :style="index%2?'background-color:#EBEDF0;':''">
             <tr>
-                <td rowspan="4">{{item.departmentName}}</td>
+                <td rowspan="5">{{item.departmentName}}</td>
                 <td style="width:40px;">早班</td>
                 <td style="width:250px;text-align: left;">
                     <div style="display:flex;flex-flow: row wrap;">
@@ -73,6 +73,21 @@
                 </td>
             </tr>
             <tr>
+                <td>深夜班</td>
+                <td style="text-align: left;">
+                    <div style="display:flex;flex-flow: row wrap;">
+                        <div class="peo-item" v-for="(item1, index1) in item.lateNightScheduleList" :key="index1">
+                            <span>{{item1.name}}</span>
+                            <span v-show="item1.tagName=='机动'">机</span>
+                            <span v-show="item1.tagName=='兼职'">兼</span>
+                            <span v-show="item1.tagName=='试工'">试</span>
+                            <span v-show="item1.tagName=='兼职'||item1.tagName=='机动'||item1.tagName=='试工'">{{timeFormat(item1.startPartTime)}}~{{timeFormat(item1.endPartTime)}}</span>
+                            <span>{{attendanceFun(item1.attendanceStatus)}}</span>
+                        </div>
+                    </div>
+                </td>
+            </tr>
+            <tr>
                 <td>休息</td>
                 <td style="text-align: left;">
                     <div style="display:flex;flex-flow: row wrap;">
@@ -361,4 +376,4 @@ td{
     font-size: 12px;
     border: 1px solid #ddd;
 }
-</style>
+</style>