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
var exchangeSelect;
//时间段下拉框
var dataTimeSelect;
//判断调班还是换班状态
//判断替班还是换班状态
var exchangeSign=1;
//初始化时间
... ... @@ -388,12 +388,12 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
var changeUserName = '';
var changeUserAccount = '';
//调班
//替班
if (exchangeSign == 1) {
//如果已经选择了调班对象，不能再选择其他对象
//如果已经选择了替班对象，不能再选择其他对象
var judge = iSExchange(id);
if (!judge) {
layer.msg('调班过程中不能再次调班!', {icon: 7, time: 3000});
layer.msg('替班过程中不能再次替班!', {icon: 7, time: 3000});
return;
}
var changeUserId = exchangeSelect.getValue('value') ? exchangeSelect.getValue('value') : '';
... ... @@ -482,7 +482,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
});
}
//是否已调班
//是否已替班
function iSExchange(id){
var value=false;
admin.req({
... ...
... ... @@ -1653,8 +1653,8 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
return d.userName+'请求'+d.dutyTime+' '+d.dutyDuration+'与您的值班时间'
+d.changeDutyTime.split(" ")[0]+' '+d.changeDutyDuration.split(" ")[0]+'进行换班，请确认';
}else{
//xx请求与您值班时间2021-09-26 18:00-8:00进行调班，请确认!
return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行调班，请确认!';
//xx请求与您值班时间2021-09-26 18:00-8:00进行替班，请确认!
return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行替班，请确认!';
}
}
},{
... ... @@ -1665,7 +1665,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
if (d.dutyChangeType == '2') {
return '换班';
} else {
return '调班';
return '替班';
}
}
... ...
... ... @@ -1673,8 +1673,8 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
return d.userName+'请求'+d.dutyTime+' '+d.dutyDuration+'与您的值班时间'
+d.changeDutyTime.split(" ")[0]+' '+d.changeDutyDuration.split(" ")[0]+'进行换班，请确认';
}else{
//xx请求与您值班时间2021-09-26 18:00-8:00进行调班，请确认!
return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行调班，请确认!';
//xx请求与您值班时间2021-09-26 18:00-8:00进行替班，请确认!
return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行替班，请确认!';
}
}
},{
... ... @@ -1685,7 +1685,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','sessions','
if (d.dutyChangeType == '2') {
return '换班';
} else {
return '调班';
return '替班';
}
}
... ...
... ... @@ -304,8 +304,8 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
return d.userName+'请求'+d.dutyTime+' '+d.dutyDuration+'与您的值班时间'
+d.changeDutyTime.split(" ")[0]+' '+d.changeDutyDuration.split(" ")[0]+'进行换班，请确认';
}else{
//xx请求与您值班时间2021-09-26 18:00-8:00进行调班，请确认!
return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行调班，请确认!';
//xx请求与您值班时间2021-09-26 18:00-8:00进行替班，请确认!
return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行替班，请确认!';
}
}
},{
... ... @@ -316,7 +316,7 @@ layui.define(['common', 'swiper', 'admin', 'commonDetail', 'mxClient', 'sessions
if (d.dutyChangeType == '2') {
return '换班';
} else {
return '调班';
return '替班';
}
}
... ...
... ... @@ -905,8 +905,8 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','msgTips','l
return d.userName+'请求'+d.dutyTime+' '+d.dutyDuration+'与您的值班时间'
+d.changeDutyTime.split(" ")[0]+' '+d.changeDutyDuration.split(" ")[0]+'进行换班，请确认';
}else{
//xx请求与您值班时间2021-09-26 18:00-8:00进行调班，请确认!
return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行调班，请确认!';
//xx请求与您值班时间2021-09-26 18:00-8:00进行替班，请确认!
return d.userName+'请求与您值班时间'+d.dutyTime+' '+d.dutyDuration+'进行替班，请确认!';
}
}
},{
... ... @@ -917,7 +917,7 @@ layui.define(['common', 'swiper', 'admin','commonDetail','mxClient','msgTips','l
if (d.dutyChangeType == '2') {
return '换班';
} else {
return '调班';
return '替班';
}
}
... ...
... ... @@ -102,10 +102,10 @@
</div>
<div class="duty-td-div-line">
{{# if(item.list.length != 1){ }}
<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 }}">
<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 }}">
<sapn>{{ item.list[0].userName }}</sapn>
</div>
<div class="table-duty-td-name-right" lay-filter="duty-name" data-id="{{ item.list[1].id }}"
<div class="table-duty-td-name-left" lay-filter="duty-name" data-id="{{ item.list[1].id }}"
data-dutytime="{{ item.list[1].dutyTime }}"
data-dutyduration="{{ item.list[1].dutyDuration }}"
data-dutycena="{{ item.list[1].dutyCena }}" data-remark="{{ item.list[1].remark }}"
... ... @@ -178,7 +178,7 @@
<div class="layui-form-item">
<label class="layui-form-label" style="width: 150px">调换类型：</label>
<div class="layui-input-block" style="margin-left: 150px">
<input type="radio" name="dutyType" lay-filter="radio-duty-type-exchange" value="0" title="调班" checked>
<input type="radio" name="dutyType" lay-filter="radio-duty-type-exchange" value="0" title="替班" checked>
<input type="radio" name="dutyType" lay-filter="radio-duty-type-exchange" value="1" title="换班">
</div>
</div>
... ...