考勤 H5修改
diff --git a/src/main/java/com/supwisdom/dlpay/atte/bean/ClockSearchBean.java b/src/main/java/com/supwisdom/dlpay/atte/bean/ClockSearchBean.java
index f6ccf0b..6eeda85 100644
--- a/src/main/java/com/supwisdom/dlpay/atte/bean/ClockSearchBean.java
+++ b/src/main/java/com/supwisdom/dlpay/atte/bean/ClockSearchBean.java
@@ -5,6 +5,7 @@
private Integer custtypeid;
private String deptcode;
private Integer status;
+ private String ex_custid;
public String getAttedate() {
return attedate;
@@ -37,4 +38,12 @@
public void setStatus(Integer status) {
this.status = status;
}
+
+ public String getEx_custid() {
+ return ex_custid;
+ }
+
+ public void setEx_custid(String ex_custid) {
+ this.ex_custid = ex_custid;
+ }
}
diff --git a/src/main/java/com/supwisdom/dlpay/atte/bean/RestSearchBean.java b/src/main/java/com/supwisdom/dlpay/atte/bean/RestSearchBean.java
index 6d26e33..5d5aa7f 100644
--- a/src/main/java/com/supwisdom/dlpay/atte/bean/RestSearchBean.java
+++ b/src/main/java/com/supwisdom/dlpay/atte/bean/RestSearchBean.java
@@ -9,6 +9,7 @@
private Integer status;
private Integer rtype;
private Integer custtypeid;
+ private String ex_custid;
public String getStartdate() {
return startdate;
@@ -73,4 +74,12 @@
public void setCusttypeid(Integer custtypeid) {
this.custtypeid = custtypeid;
}
+
+ public String getEx_custid() {
+ return ex_custid;
+ }
+
+ public void setEx_custid(String ex_custid) {
+ this.ex_custid = ex_custid;
+ }
}
diff --git a/src/main/java/com/supwisdom/dlpay/atte/controller/AppAtteController.java b/src/main/java/com/supwisdom/dlpay/atte/controller/AppAtteController.java
index af075db..d1a3581 100644
--- a/src/main/java/com/supwisdom/dlpay/atte/controller/AppAtteController.java
+++ b/src/main/java/com/supwisdom/dlpay/atte/controller/AppAtteController.java
@@ -184,11 +184,14 @@
TCustomer cust=webInterfaceService.findCustomerById(custid);
if(StringUtil.isEmpty(cust.getDeptcode())){
searchBean.setDeptcode("99");
+ }else if("WP01".equals(cust.getDeptcode())){
+ searchBean.setDeptcode(null);
}else {
searchBean.setDeptcode(cust.getDeptcode());
}
Pagination page=null;
if(atteRestService.isreview(custid)){
+ searchBean.setEx_custid(custid);
page=atteRestService.getRestInfo(searchBean,pageNo,pageSize);
}
map.put("page",page);
@@ -376,10 +379,13 @@
TCustomer cust=webInterfaceService.findCustomerById(custid);
if(StringUtil.isEmpty(cust.getDeptcode())){
searchBean.setDeptcode("99");
+ }else if("WP01".equals(cust.getDeptcode())){
+ searchBean.setDeptcode(null);
}else {
searchBean.setDeptcode(cust.getDeptcode());
}
if(atteRestService.isreview(custid)){
+ searchBean.setEx_custid(custid);
Pagination page=atteRestService.getClockPage(searchBean,pageNo,pageSize);
map.put("page",page);
}
diff --git a/src/main/java/com/supwisdom/dlpay/atte/dao/impl/AtteClockDaoImpl.java b/src/main/java/com/supwisdom/dlpay/atte/dao/impl/AtteClockDaoImpl.java
index bb3e0dd..1969c5f 100644
--- a/src/main/java/com/supwisdom/dlpay/atte/dao/impl/AtteClockDaoImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/atte/dao/impl/AtteClockDaoImpl.java
@@ -87,6 +87,11 @@
}
if(!StringUtil.isEmpty(searchBean.getDeptcode())){
sql.append(" and td.deptcode=:dcode ");
+ }else{
+ sql.append(" and t.custid in (select custid from t_atte_review ) ");
+ }
+ if(!StringUtil.isEmpty(searchBean.getEx_custid())){
+ sql.append(" and t.custid !=:eid ");
}
if(searchBean.getStatus()!=null){
sql.append(" and t.status=:stat ");
@@ -108,6 +113,9 @@
if(searchBean.getCusttypeid()!=null){
query.setParameter("ctypeid",searchBean.getCusttypeid());
}
+ if(searchBean.getEx_custid()!=null){
+ query.setParameter("eid",searchBean.getEx_custid());
+ }
pageNo = pageNo <= 0 ? 1 : pageNo;
query.setFirstResult((pageNo - 1) * pageSize);
query.setMaxResults(pageSize);
diff --git a/src/main/java/com/supwisdom/dlpay/atte/dao/impl/AtteRestDaoImpl.java b/src/main/java/com/supwisdom/dlpay/atte/dao/impl/AtteRestDaoImpl.java
index b247f7b..2e4f2b9 100644
--- a/src/main/java/com/supwisdom/dlpay/atte/dao/impl/AtteRestDaoImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/atte/dao/impl/AtteRestDaoImpl.java
@@ -84,8 +84,13 @@
if(!StringUtil.isEmpty(searchBean.getCustid())){
sql.append(" and r.custid = :cid ");
}
+ if(!StringUtil.isEmpty(searchBean.getEx_custid())){
+ sql.append(" and r.custid != :eid ");
+ }
if(!StringUtil.isEmpty(searchBean.getDeptcode())){
sql.append(" and c.deptcode = :dcode ");
+ }else{
+ sql.append(" and r.custid in (select custid from t_atte_review )");
}
if(!StringUtil.isEmpty(searchBean.getCustname())){
sql.append(" and c.custname like :cname ");
@@ -108,6 +113,9 @@
if(!StringUtil.isEmpty(searchBean.getCustid())){
query.setParameter("cid",searchBean.getCustid());
}
+ if(!StringUtil.isEmpty(searchBean.getEx_custid())){
+ query.setParameter("eid",searchBean.getEx_custid());
+ }
if(!StringUtil.isEmpty(searchBean.getDeptcode())){
query.setParameter("dcode",searchBean.getDeptcode());
}
diff --git a/src/main/resources/templates/apph5/askforleave.html b/src/main/resources/templates/apph5/askforleave.html
index 71fc951..f1bbc1f 100644
--- a/src/main/resources/templates/apph5/askforleave.html
+++ b/src/main/resources/templates/apph5/askforleave.html
@@ -78,7 +78,9 @@
</el-form>
<div slot="footer" style="text-align:center; ">
- <el-button type="primary" @click="saveTemp('tempform')">申 请</el-button>
+ <el-button type="primary" @click="saveTemp('tempform')">申  请</el-button>
+ <br><br>
+ <el-button type="primary" @click="searchHis()">查看历史</el-button>
</div>
</div>
@@ -167,6 +169,9 @@
// 通过浏览器宽度(图片宽度)计算高度
this.bannerHeight = this.screenWidth;
},
+ searchHis:function () {
+ window.location="[[@{'/app/atte/searchindex?custid='}]]"+this.confid
+ }
},
created: function () {
var _self = this;
@@ -183,24 +188,19 @@
});
sexl.push({
value: '11',
- label: '事假'
- });sexl.push({
- value: '12',
- label: '病假'
- });sexl.push({
- value: '13',
- label: '年假'
- });sexl.push({
- value: '14',
- label: '调休'
+ label: '请假'
});
sexl.push({
value: '7',
label: '补休'
});
sexl.push({
- value: '15',
- label: '其他'
+ value: '9',
+ label: '出差'
+ });
+ sexl.push({
+ value: '8',
+ label: '外出办案'
});
_self.rtypelist = sexl;
diff --git a/src/main/resources/templates/apph5/doclock.html b/src/main/resources/templates/apph5/doclock.html
index 4bdda42..31cc0e4 100644
--- a/src/main/resources/templates/apph5/doclock.html
+++ b/src/main/resources/templates/apph5/doclock.html
@@ -104,7 +104,7 @@
</el-input>
</el-col>
</el-form-item>
- <el-form-item label="备注:" prop="remark">
+ <el-form-item label="补签原因:" prop="remark">
<el-col :span="18">
<el-input type="textarea" style="width: 90%;" v-model="applyform.remark" placeholder="填写备注"
>
diff --git a/src/main/resources/templates/apph5/leavehistory.html b/src/main/resources/templates/apph5/leavehistory.html
index 87fb2e1..9cd9ffe 100644
--- a/src/main/resources/templates/apph5/leavehistory.html
+++ b/src/main/resources/templates/apph5/leavehistory.html
@@ -410,34 +410,20 @@
label: '请选择'
});
sexl.push({
- value: '8',
- label: '外出办案'
- });sexl.push({
- value: '9',
- label: '出差'
- });sexl.push({
+ value: '11',
+ label: '请假'
+ });
+ sexl.push({
value: '7',
label: '补休'
});
sexl.push({
- value: '11',
- label: '事假'
+ value: '9',
+ label: '出差'
});
sexl.push({
- value: '12',
- label: '病假'
- });
- sexl.push({
- value: '13',
- label: '年假'
- });
- sexl.push({
- value: '14',
- label: '调休'
- });
- sexl.push({
- value: '15',
- label: '其他'
+ value: '8',
+ label: '外出办案'
});
_self.rtypelist = sexl;
var statl = [];
@@ -528,21 +514,15 @@
_self.historyform.statusname = "删除"
}
if (row.rtype == "11") {
- _self.historyform.rtypename = "事假"
- } else if (row.rtype == "12") {
- _self.historyform.rtypename = "病假"
- } else if (row.rtype == "13") {
- _self.historyform.rtypename = "年假"
- } else if (row.rtype == "14") {
- _self.historyform.rtypename = "调休"
- } else if (row.rtype == "15") {
- _self.historyform.rtypename = "其他"
- } else if (row.rtype == "8") {
- _self.historyform.rtypename = "外出办案"
- } else if (row.rtype == "9") {
- _self.historyform.rtypename = "出差"
+ _self.historyform.rtypename = "请假"
} else if (row.rtype == "7") {
_self.historyform.rtypename = "补休"
+ } else if (row.rtype == "9") {
+ _self.historyform.rtypename = "出差"
+ } else if (row.rtype == "8") {
+ _self.historyform.rtypename = "外出办案"
+ } else {
+ _self.historyform.rtypename = "其他"
}
_self.historyform.remark = row.remark;
}
diff --git a/src/main/resources/templates/apph5/myleave.html b/src/main/resources/templates/apph5/myleave.html
index 3af662c..03c422a 100644
--- a/src/main/resources/templates/apph5/myleave.html
+++ b/src/main/resources/templates/apph5/myleave.html
@@ -221,7 +221,8 @@
</div>
</div>
</el-form-item>
- <el-form-item label="状 态:" prop="status">
+ <el-form-item label="状态:" prop="status">
+ <label slot="label">状  态:</label>
<div class="el-col el-col-18">
<div class="el-input" style="width: 90%;">
<el-select v-model="tempform.status" id="status">
@@ -384,37 +385,23 @@
value: '',
label: '请选择'
});
- sexl.push({
- value: '8',
- label: '外出办案'
- });sexl.push({
- value: '9',
- label: '出差'
- });
+
sexl.push({
value: '11',
- label: '事假'
- });
- sexl.push({
- value: '12',
- label: '病假'
- });
- sexl.push({
- value: '13',
- label: '年假'
- });
- sexl.push({
- value: '14',
- label: '调休'
- });
- sexl.push({
- value: '15',
- label: '其他'
+ label: '请假'
});
sexl.push({
value: '7',
label: '补休'
});
+ sexl.push({
+ value: '9',
+ label: '出差'
+ });
+ sexl.push({
+ value: '8',
+ label: '外出办案'
+ });
_self.rtypelist = sexl;
var statl = [];
statl.push({
@@ -505,21 +492,15 @@
_self.historyform.statusname = "删除"
}
if (row.rtype == "11") {
- _self.historyform.rtypename = "事假"
- } else if (row.rtype == "12") {
- _self.historyform.rtypename = "病假"
- } else if (row.rtype == "13") {
- _self.historyform.rtypename = "年假"
- } else if (row.rtype == "14") {
- _self.historyform.rtypename = "调休"
- } else if (row.rtype == "15") {
- _self.historyform.rtypename = "其他"
- } else if (row.rtype == "8") {
- _self.historyform.rtypename = "外出办案"
- } else if (row.rtype == "9") {
- _self.historyform.rtypename = "出差"
+ _self.historyform.rtypename = "请假"
} else if (row.rtype == "7") {
_self.historyform.rtypename = "补休"
+ } else if (row.rtype == "9") {
+ _self.historyform.rtypename = "出差"
+ } else if (row.rtype == "8") {
+ _self.historyform.rtypename = "外出办案"
+ } else {
+ _self.historyform.rtypename = "其他"
}
_self.historyform.remark = row.remark;
}
diff --git a/src/main/resources/templates/apph5/reviewclock.html b/src/main/resources/templates/apph5/reviewclock.html
index dddbe06..4a5d105 100644
--- a/src/main/resources/templates/apph5/reviewclock.html
+++ b/src/main/resources/templates/apph5/reviewclock.html
@@ -127,7 +127,7 @@
</el-input>
</el-col>
</el-form-item>
- <el-form-item label="备注:" prop="remark">
+ <el-form-item label="补签原因:" prop="remark">
<el-col :span="18">
<el-input type="textarea" style="width: 90%;" v-model="historyform.remark" placeholder="填写备注"
readonly>
diff --git a/src/main/resources/templates/atte/timedtl/index.html b/src/main/resources/templates/atte/timedtl/index.html
index de0f0c4..3808c78 100644
--- a/src/main/resources/templates/atte/timedtl/index.html
+++ b/src/main/resources/templates/atte/timedtl/index.html
@@ -153,7 +153,7 @@
<span v-if="scope.row.state=='0'" class="layui-badge layui-bg-orange">未打卡</span>
<span v-if="scope.row.state=='1'" class="layui-badge layui-bg-green">正常</span>
<span v-if="scope.row.state=='2'" class="layui-badge layui-bg-red">异常</span>
- <span v-if="scope.row.state=='11'" class="layui-badge layui-bg-gray">事假</span>
+ <span v-if="scope.row.state=='11'" class="layui-badge layui-bg-gray">请假</span>
<span v-if="scope.row.state=='12'" class="layui-badge layui-bg-gray">病假</span>
<span v-if="scope.row.state=='13'" class="layui-badge layui-bg-gray">年假</span>
<span v-if="scope.row.state=='14'" class="layui-badge layui-bg-gray">调休</span>
@@ -170,7 +170,7 @@
<span v-if="scope.row.oldstate=='0'" class="layui-badge layui-bg-orange">未打卡</span>
<span v-if="scope.row.oldstate=='1'" class="layui-badge layui-bg-green">正常</span>
<span v-if="scope.row.oldstate=='2' " class="layui-badge layui-bg-red">异常</span>
- <span v-if="scope.row.oldstate=='11'" class="layui-badge layui-bg-gray">事假</span>
+ <span v-if="scope.row.oldstate=='11'" class="layui-badge layui-bg-gray">请假</span>
<span v-if="scope.row.oldstate=='12'" class="layui-badge layui-bg-gray">病假</span>
<span v-if="scope.row.oldstate=='13'" class="layui-badge layui-bg-gray">年假</span>
<span v-if="scope.row.oldstate=='14'" class="layui-badge layui-bg-gray">调休</span>
@@ -262,7 +262,7 @@
totSize:0,
currentRow: null,
stategrplist:[{value:0,label:'未打卡'},{value:1,label:'正常'},{value:2,label:'异常'},
- {value:7,label:'补休'},{value:8,label:'外出办案'},{value:9,label:'出差'},{value:11,label:'事假'},{value:12,label:'病假'},{value:13,label:'年假'},{value:14,label:'调休'},{value:15,label:'其他'},],
+ {value:11,label:'请假'},{value:7,label:'补休'},{value:9,label:'出差'},{value:8,label:'外出办案'},],
timedtlform:{
startdate:Date.now(),
enddate:Date.now(),