monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by XuHaoJie
Commit f9ac891224e11499f937cb25e20aea619c5a7f4f 1 parent 713201c5

天津-值班管理-优化调班替换成替班

Inline Side-by-side
Showing 6 changed files with 20 additions and 20 deletions
@@ -33,7 +33,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -33,7 +33,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
33 var exchangeSelect; 33 var exchangeSelect;
34 //时间段下拉框 34 //时间段下拉框
35 var dataTimeSelect; 35 var dataTimeSelect;
36 - //判断调班还是换班状态 36 + //判断替班还是换班状态
37 var exchangeSign=1; 37 var exchangeSign=1;
38 38
39 //初始化时间 39 //初始化时间
@@ -388,12 +388,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -388,12 +388,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
388 388
389 var changeUserName = ''; 389 var changeUserName = '';
390 var changeUserAccount = ''; 390 var changeUserAccount = '';
391 - //调班 391 + //替班
392 if (exchangeSign == 1) { 392 if (exchangeSign == 1) {
393 - //如果已经选择了调班对象，不能再选择其他对象 393 + //如果已经选择了替班对象，不能再选择其他对象
394 var judge = iSExchange(id); 394 var judge = iSExchange(id);
395 if (!judge) { 395 if (!judge) {
396 - layer.msg('调班过程中不能再次调班!', {icon: 7, time: 3000}); 396 + layer.msg('替班过程中不能再次替班!', {icon: 7, time: 3000});
397 return; 397 return;
398 } 398 }
399 var changeUserId = exchangeSelect.getValue('value') ? exchangeSelect.getValue('value') : ''; 399 var changeUserId = exchangeSelect.getValue('value') ? exchangeSelect.getValue('value') : '';
@@ -482,7 +482,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl @@ -482,7 +482,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
482 }); 482 });
483 } 483 }
484 484
485 - //是否已调班 485 + //是否已替班
486 function iSExchange(id){ 486 function iSExchange(id){
487 var value=false; 487 var value=false;
488 admin.req({ 488 admin.req({
@@ -1653,8 +1653,8 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -1653,8 +1653,8 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
1653 return d.userName+'请求'+d.dutyTime+' '+d.dutyDuration+'与您的值班时间' 1653 return d.userName+'请求'+d.dutyTime+' '+d.dutyDuration+'与您的值班时间'
1654 +d.changeDutyTime.split(" ")[0]+' '+d.changeDutyDuration.split(" ")[0]+'进行换班，请确认'; 1654 +d.changeDutyTime.split(" ")[0]+' '+d.changeDutyDuration.split(" ")[0]+'进行换班，请确认';
1655 }else{ 1655 }else{
1656 - //xx请求与您值班时间2021-09-26 18:00-8:00进行调班，请确认!  
1657 - return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行调班，请确认!'; 1656 + //xx请求与您值班时间2021-09-26 18:00-8:00进行替班，请确认!
  1657 + return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行替班，请确认!';
1658 } 1658 }
1659 } 1659 }
1660 },{ 1660 },{
@@ -1665,7 +1665,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -1665,7 +1665,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
1665 if (d.dutyChangeType == '2') { 1665 if (d.dutyChangeType == '2') {
1666 return '换班'; 1666 return '换班';
1667 } else { 1667 } else {
1668 - return '调班'; 1668 + return '替班';
1669 } 1669 }
1670 } 1670 }
1671 1671
@@ -1673,8 +1673,8 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -1673,8 +1673,8 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
1673 return d.userName+'请求'+d.dutyTime+' '+d.dutyDuration+'与您的值班时间' 1673 return d.userName+'请求'+d.dutyTime+' '+d.dutyDuration+'与您的值班时间'
1674 +d.changeDutyTime.split(" ")[0]+' '+d.changeDutyDuration.split(" ")[0]+'进行换班，请确认'; 1674 +d.changeDutyTime.split(" ")[0]+' '+d.changeDutyDuration.split(" ")[0]+'进行换班，请确认';
1675 }else{ 1675 }else{
1676 - //xx请求与您值班时间2021-09-26 18:00-8:00进行调班，请确认!  
1677 - return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行调班，请确认!'; 1676 + //xx请求与您值班时间2021-09-26 18:00-8:00进行替班，请确认!
  1677 + return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行替班，请确认!';
1678 } 1678 }
1679 } 1679 }
1680 },{ 1680 },{
@@ -1685,7 +1685,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions',' @@ -1685,7 +1685,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
1685 if (d.dutyChangeType == '2') { 1685 if (d.dutyChangeType == '2') {
1686 return '换班'; 1686 return '换班';
1687 } else { 1687 } else {
1688 - return '调班'; 1688 + return '替班';
1689 } 1689 }
1690 } 1690 }
1691 1691
@@ -304,8 +304,8 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -304,8 +304,8 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
304 return d.userName+'请求'+d.dutyTime+' '+d.dutyDuration+'与您的值班时间' 304 return d.userName+'请求'+d.dutyTime+' '+d.dutyDuration+'与您的值班时间'
305 +d.changeDutyTime.split(" ")[0]+' '+d.changeDutyDuration.split(" ")[0]+'进行换班，请确认'; 305 +d.changeDutyTime.split(" ")[0]+' '+d.changeDutyDuration.split(" ")[0]+'进行换班，请确认';
306 }else{ 306 }else{
307 - //xx请求与您值班时间2021-09-26 18:00-8:00进行调班，请确认!  
308 - return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行调班，请确认!'; 307 + //xx请求与您值班时间2021-09-26 18:00-8:00进行替班，请确认!
  308 + return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行替班，请确认!';
309 } 309 }
310 } 310 }
311 },{ 311 },{
@@ -316,7 +316,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions @@ -316,7 +316,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
316 if (d.dutyChangeType == '2') { 316 if (d.dutyChangeType == '2') {
317 return '换班'; 317 return '换班';
318 } else { 318 } else {
319 - return '调班'; 319 + return '替班';
320 } 320 }
321 } 321 }
322 322
@@ -905,8 +905,8 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','msgTips','l @@ -905,8 +905,8 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','msgTips','l
905 return d.userName+'请求'+d.dutyTime+' '+d.dutyDuration+'与您的值班时间' 905 return d.userName+'请求'+d.dutyTime+' '+d.dutyDuration+'与您的值班时间'
906 +d.changeDutyTime.split(" ")[0]+' '+d.changeDutyDuration.split(" ")[0]+'进行换班，请确认'; 906 +d.changeDutyTime.split(" ")[0]+' '+d.changeDutyDuration.split(" ")[0]+'进行换班，请确认';
907 }else{ 907 }else{
908 - //xx请求与您值班时间2021-09-26 18:00-8:00进行调班，请确认!  
909 - return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行调班，请确认!'; 908 + //xx请求与您值班时间2021-09-26 18:00-8:00进行替班，请确认!
  909 + return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行替班，请确认!';
910 } 910 }
911 } 911 }
912 },{ 912 },{
@@ -917,7 +917,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','msgTips','l @@ -917,7 +917,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','msgTips','l
917 if (d.dutyChangeType == '2') { 917 if (d.dutyChangeType == '2') {
918 return '换班'; 918 return '换班';
919 } else { 919 } else {
920 - return '调班'; 920 + return '替班';
921 } 921 }
922 } 922 }
923 923
@@ -102,10 +102,10 @@ @@ -102,10 +102,10 @@
102 </div> 102 </div>
103 <div class="duty-td-div-line"> 103 <div class="duty-td-div-line">
104 {{# if(item.list.length != 1){ }} 104 {{# if(item.list.length != 1){ }}
105 - <div class="table-duty-td-name-left" lay-filter="duty-name" data-id="{{ item.list[0].id }}" data-dutytime="{{ item.list[0].dutyTime }}" data-dutyduration="{{ item.list[0].dutyDuration }}" data-dutycena="{{ item.list[0].dutyCena }}" data-remark="{{ item.list[0].remark }}" data-userid="{{ item.list[0].userId }}" data-username="{{ item.list[0].userName }}" data-useraccount="{{ item.list[0].userAccount }}"> 105 + <div class="table-duty-td-name-right" lay-filter="duty-name" data-id="{{ item.list[0].id }}" data-dutytime="{{ item.list[0].dutyTime }}" data-dutyduration="{{ item.list[0].dutyDuration }}" data-dutycena="{{ item.list[0].dutyCena }}" data-remark="{{ item.list[0].remark }}" data-userid="{{ item.list[0].userId }}" data-username="{{ item.list[0].userName }}" data-useraccount="{{ item.list[0].userAccount }}">
106 <sapn>{{ item.list[0].userName }}</sapn> 106 <sapn>{{ item.list[0].userName }}</sapn>
107 </div> 107 </div>
108 - <div class="table-duty-td-name-right" lay-filter="duty-name" data-id="{{ item.list[1].id }}" 108 + <div class="table-duty-td-name-left" lay-filter="duty-name" data-id="{{ item.list[1].id }}"
109 data-dutytime="{{ item.list[1].dutyTime }}" 109 data-dutytime="{{ item.list[1].dutyTime }}"
110 data-dutyduration="{{ item.list[1].dutyDuration }}" 110 data-dutyduration="{{ item.list[1].dutyDuration }}"
111 data-dutycena="{{ item.list[1].dutyCena }}" data-remark="{{ item.list[1].remark }}" 111 data-dutycena="{{ item.list[1].dutyCena }}" data-remark="{{ item.list[1].remark }}"
@@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
178 <div class="layui-form-item"> 178 <div class="layui-form-item">
179 <label class="layui-form-label" style="width: 150px">调换类型：</label> 179 <label class="layui-form-label" style="width: 150px">调换类型：</label>
180 <div class="layui-input-block" style="margin-left: 150px"> 180 <div class="layui-input-block" style="margin-left: 150px">
181 - <input type="radio" name="dutyType" lay-filter="radio-duty-type-exchange" value="0" title="调班" checked> 181 + <input type="radio" name="dutyType" lay-filter="radio-duty-type-exchange" value="0" title="替班" checked>
182 <input type="radio" name="dutyType" lay-filter="radio-duty-type-exchange" value="1" title="换班"> 182 <input type="radio" name="dutyType" lay-filter="radio-duty-type-exchange" value="1" title="换班">
183 </div> 183 </div>
184 </div> 184 </div>