考勤h5
diff --git a/src/main/resources/templates/apph5/doclock.html b/src/main/resources/templates/apph5/doclock.html
index 31cc0e4..1398e1b 100644
--- a/src/main/resources/templates/apph5/doclock.html
+++ b/src/main/resources/templates/apph5/doclock.html
@@ -27,7 +27,7 @@
<body>
<div id="app1">
- <div class="page-title" style="text-align:center; font-size: 24px;color: #FF8247;margin-top:7%">补卡</div>
+ <div class="page-title" style="text-align:center; font-size: 24px;color: #FF8247;margin-top:7%">补签</div>
<br>
<el-form ref="tempform" :model="tempform" :rules="rules" size="mini" label-width="36%" style="margin-top:7%">
diff --git a/src/main/resources/templates/apph5/leavehistory.html b/src/main/resources/templates/apph5/leavehistory.html
index 5c3bcf3..303aebe 100644
--- a/src/main/resources/templates/apph5/leavehistory.html
+++ b/src/main/resources/templates/apph5/leavehistory.html
@@ -28,7 +28,7 @@
<body>
<div id="app">
- <div class="page-title" style="text-align:center; font-size: 24px;color: #FF8247;margin-top:7%">假单审核</div><br>
+ <div class="page-title" style="text-align:center; font-size: 24px;color: #FF8247;margin-top:7%">报备审批</div><br>
<el-button type="primary" @click="showdiv()" style="float: right">筛 选</el-button>
@@ -63,7 +63,7 @@
<div style="display: flex;">
<div style="font-size:14px;color:#999;flex: 1">
- 请假时间{{scope.row.startdate}}--{{scope.row.enddate}}
+ 申请时间{{scope.row.startdate}}--{{scope.row.enddate}}
</div>
<div style="font-size:14px;color:#999;margin-left:10px">
<span v-if="scope.row.status== '0'"><el-button
@@ -91,66 +91,11 @@
</template>
</el-table-column>
- <!--<el-table-column
- prop="custname"
- label="名称"
- align="center">
- </el-table-column>
- <el-table-column
- prop="remark"
- label="描述"
- align="center">
- </el-table-column>
- <el-table-column
- prop="startdate"
- label="开始日期"
- align="center">
- </el-table-column>
- <el-table-column
- prop="enddate"
- label="结束日期"
-
- align="center">
- </el-table-column>
-
-<el-table-column
- prop="status"
- label="状态"
-
- align="center">
- <template scope="scope">
- <span v-if="scope.row.status=== '1'"><el-tag
- type="success">已批准</el-tag></span>
- <span v-if="scope.row.status=== '2'"><el-tag
- type="warning">未批准</el-tag></span>
- </template>
-
- </el-table-column>
-
- <el-table-column
- label="操作"
- fixed="right"
- align="center"
- >
- <template scope="scope">
- <button v-if="scope.row.status=== '2'" type="button" class="btn btn-danger btn-xs"
- title="批准"
- @click="delUser(scope.row.ids)">批准
- </button>
- </template>
- </el-table-column>-->
</el-table>
+ <el-input v-if="addmoreVis" id="addmore" type="button" value="加载更多" @click.native="addmore" ></el-input>
<div class="clearfix"></div>
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="currPageChange"
- :current-page="currPage"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="pageSize"
- layout="prev, pager, next,sizes, jumper,total"
- :total="totSize">
- </el-pagination>
+
</template>
</div>
@@ -173,13 +118,14 @@
</el-input>
</el-col>
</el-form-item>
- <el-form-item label="请假类型:" prop="rtypename">
+ <el-form-item label="报备类型:" prop="rtypename">
<el-col :span="18">
<el-input v-model="historyform.rtypename" readonly style="width: 90%;" maxlength="20">
</el-input>
</el-col>
</el-form-item>
<el-form-item label="状态:" prop="statusname">
+ <label slot="label">状  态:</label>
<el-col :span="18">
<el-input v-model="historyform.statusname" readonly style="width: 90%;" maxlength="20">
</el-input>
@@ -196,7 +142,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button @click="resetForm('historyform') ">取 消</el-button>
+ <!--<el-button @click="resetForm('historyform') ">取 消</el-button>-->
<el-button type="primary" v-if="historyform.status== '0'" @click="review('historyform')">通过</el-button>
<el-button type="primary" v-if="historyform.status== '0'" @click="unreview('historyform')">不通过</el-button>
@@ -221,7 +167,7 @@
</div>
</div>
</el-form-item>
- <el-form-item label="请假类型:" prop="rtype">
+ <el-form-item label="报备类型:" prop="rtype">
<div class="el-col el-col-18">
<div class="el-input" style="width: 90%;">
<el-select v-model="tempform.rtype" id="rtype">
@@ -236,6 +182,7 @@
</div>
</el-form-item>
<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">
@@ -278,13 +225,14 @@
tableData: [],
confName: '1234',
currPage: 1,
- pageSize: 20,
+ pageSize: 7,
totSize: 0,
+ addmoreVis:false,
currentRow: null,
tempform: {
rtype: '',
custtype: '',
- status: '',
+ status: '0',
},
historyform: {
custid: '',
@@ -310,21 +258,7 @@
updatetitle: '筛选',
updatetitle2: '详情',
rules: {
- /*visitorname: [
- {required: true, message: '请输入访客姓名', trigger: 'blur'},
- ],
- idno: [
- {required: true, message: '请输入访客身份证号', trigger: 'blur'}
- ],
- sex: [
- {required: true, message: '请输入访客性别', trigger: 'blur'}
- ],
- remarks: [
- {required: true, message: '请输入备注', trigger: 'blur'}
- ],
- phone: [
- {required: true, validator: validatePhone, trigger: 'blur'}
- ]*/
+
},
},
@@ -333,8 +267,9 @@
this.dialogFormVisible = false;
var _that = this;
- this.pagesize = 10;
+ this.pagesize = 7;
this.currPage = 1;
+ this.tableData=[];
commonQuery(this, this.tempform.rtype, this.tempform.custtype, this.tempform.status, this.tempform.custid, this.currPage, this.pageSize);
},
resetForm:function(formName) {
@@ -346,16 +281,18 @@
this.dialogFormVisible2 = false;
var _that = this;
- this.pagesize = 10;
+ this.pagesize = 7;
this.currPage = 1;
+ this.tableData=[];
reviewupdate(this, 1,this.tempform.custid, this.historyform.id);
},unreview: function (formName) {
this.dialogFormVisible2 = false;
var _that = this;
- this.pagesize = 10;
+ this.pagesize = 7;
this.currPage = 1;
+ this.tableData=[];
reviewupdate(this, 2,this.tempform.custid, this.historyform.id);
},
@@ -393,8 +330,13 @@
this.currPage = val;
commonQuery(this, this.tempform.rtype, this.tempform.custtype, this.tempform.status, this.tempform.custid, this.currPage, this.pageSize);
//console.log('当前页:'+val);
+ },
+ addmore:function() {
+ this.currPage=this.currPage+1;
+ commonQuery(this, this.tempform.rtype, this.tempform.custtype, this.tempform.status, this.tempform.custid, this.currPage, this.pageSize);
}
+
},
created: function () {
var _self = this;
@@ -475,8 +417,8 @@
}
})
- this.pagesize = 10;
- this.currPage = 1;
+ _self.pagesize = 7;
+ _self.currPage = 1;
commonQuery(this, this.tempform.rtype, this.tempform.custtype, this.tempform.status, this.tempform.custid, this.currPage, this.pageSize);
}
@@ -560,8 +502,16 @@
success: function (info) {
console.log(info)
- _self.tableData = info.page.list;
_self.totSize = info.page.totalCount;
+ var list=info.page.list;
+ for(var i=0;i<list.length;i++){
+ _self.tableData.push(list[i]);
+ }
+ if(list.length<7){
+ _self.addmoreVis=false;
+ }else {
+ _self.addmoreVis=true;
+ }
}
})
}
diff --git a/src/main/resources/templates/apph5/myleave.html b/src/main/resources/templates/apph5/myleave.html
index 930dc8e..5d7847c 100644
--- a/src/main/resources/templates/apph5/myleave.html
+++ b/src/main/resources/templates/apph5/myleave.html
@@ -28,7 +28,7 @@
<body>
<div id="app">
- <div class="page-title" style="text-align:center; font-size: 24px;color: #FF8247;margin-top:7%">我的假单</div><br>
+ <div class="page-title" style="text-align:center; font-size: 24px;color: #FF8247;margin-top:7%">报备历史</div><br>
<el-button type="primary" @click="showdiv()" style="float: right">筛 选</el-button>
@@ -64,7 +64,7 @@
<div style="display: flex;">
<div style="font-size:14px;color:#999;flex: 1">
- 请假时间{{scope.row.startdate}}--{{scope.row.enddate}}
+ 申请时间{{scope.row.startdate}}--{{scope.row.enddate}}
</div>
<div style="font-size:14px;color:#999;margin-left:10px">
<span v-if="scope.row.status== '0'"><el-button
@@ -92,66 +92,10 @@
</template>
</el-table-column>
- <!--<el-table-column
- prop="custname"
- label="名称"
- align="center">
- </el-table-column>
- <el-table-column
- prop="remark"
- label="描述"
- align="center">
- </el-table-column>
- <el-table-column
- prop="startdate"
- label="开始日期"
- align="center">
- </el-table-column>
- <el-table-column
- prop="enddate"
- label="结束日期"
-
- align="center">
- </el-table-column>
-
-<el-table-column
- prop="status"
- label="状态"
-
- align="center">
- <template scope="scope">
- <span v-if="scope.row.status=== '1'"><el-tag
- type="success">已批准</el-tag></span>
- <span v-if="scope.row.status=== '2'"><el-tag
- type="warning">未批准</el-tag></span>
- </template>
-
- </el-table-column>
-
- <el-table-column
- label="操作"
- fixed="right"
- align="center"
- >
- <template scope="scope">
- <button v-if="scope.row.status=== '2'" type="button" class="btn btn-danger btn-xs"
- title="批准"
- @click="delUser(scope.row.ids)">批准
- </button>
- </template>
- </el-table-column>-->
</el-table>
+ <el-input v-if="addmoreVis" id="addmore" type="button" value="加载更多" @click.native="addmore" ></el-input>
<div class="clearfix"></div>
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="currPageChange"
- :current-page="currPage"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="pageSize"
- layout="prev, pager, next,sizes, jumper,total"
- :total="totSize">
- </el-pagination>
</template>
</div>
@@ -174,13 +118,14 @@
</el-input>
</el-col>
</el-form-item>
- <el-form-item label="请假类型:" prop="rtypename">
+ <el-form-item label="报备类型:" prop="rtypename">
<el-col :span="18">
<el-input v-model="historyform.rtypename" readonly style="width: 90%;" maxlength="20">
</el-input>
</el-col>
</el-form-item>
<el-form-item label="状态:" prop="statusname">
+
<el-col :span="18">
<el-input v-model="historyform.statusname" readonly style="width: 90%;" maxlength="20">
</el-input>
@@ -197,7 +142,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button @click="resetForm('historyform') ">取 消</el-button>
+ <!--<el-button @click="resetForm('historyform') ">取 消</el-button>-->
<el-button type="primary" v-if="historyform.status== '0'" @click="review('historyform')">取消申请</el-button>
@@ -207,7 +152,7 @@
@close="closeDialog('tempform')" size="large">
<el-form ref="tempform" :model="tempform" data-parsley-validate
class="el-form-item" style="width: 100%">
- <el-form-item label="请假类型:" prop="rtype">
+ <el-form-item label="报备类型:" prop="rtype">
<div class="el-col el-col-18">
<div class="el-input" style="width: 90%;">
<el-select v-model="tempform.rtype" id="rtype">
@@ -265,7 +210,7 @@
tableData: [],
confName: '1234',
currPage: 1,
- pageSize: 20,
+ pageSize: 7,
totSize: 0,
currentRow: null,
tempform: {
@@ -291,37 +236,25 @@
bannerHeight: 1000,
screenWidth: 0,
userId: '',
+ addmoreVis:false,
dialogFormVisible: false,
dialogFormVisible2: false,
dlgAllotDevVisible: false,
updatetitle: '筛选',
updatetitle2: '详情',
rules: {
- /*visitorname: [
- {required: true, message: '请输入访客姓名', trigger: 'blur'},
- ],
- idno: [
- {required: true, message: '请输入访客身份证号', trigger: 'blur'}
- ],
- sex: [
- {required: true, message: '请输入访客性别', trigger: 'blur'}
- ],
- remarks: [
- {required: true, message: '请输入备注', trigger: 'blur'}
- ],
- phone: [
- {required: true, validator: validatePhone, trigger: 'blur'}
- ]*/
+
},
},
methods: {
saveTemp: function (formName) {
this.dialogFormVisible = false;
-
+ this.tableData=[];
var _that = this;
- this.pagesize = 10;
+ this.pagesize = 7;
this.currPage = 1;
+ this.tableData=[];
commonQuery(this, this.tempform.rtype, this.tempform.status, this.tempform.custid, this.currPage, this.pageSize);
},
review: function (formName) {
@@ -330,6 +263,7 @@
var _that = this;
this.pagesize = 10;
this.currPage = 1;
+ this.tableData=[];
reviewupdate(this, 3, this.historyform.id);
},
showdiv: function (row) {
@@ -369,8 +303,13 @@
this.$refs[formName].resetFields();
this.dialogFormVisible = false;
this.dialogFormVisible2 = false;
+ },
+ addmore:function() {
+ this.currPage=this.currPage+1;
+ commonQuery(this, this.tempform.rtype, this.tempform.status,this.tempform.custid, this.currPage, this.pageSize);
}
+
},
created: function () {
var _self = this;
@@ -452,9 +391,9 @@
}
})
- this.pagesize = 10;
- this.currPage = 1;
- commonQuery(this, this.tempform.rtype, this.tempform.status, this.tempform.custid, this.currPage, this.pageSize);
+ _self.pagesize = 7;
+ _self.currPage = 1;
+ commonQuery(this, this.tempform.rtype, this.tempform.status, this.tempform.custid, _self.currPage, _self.pageSize);
}
@@ -513,9 +452,16 @@
url: "[[@{/app/atte/getrestlist?rtype=}]]" + rtype + "&status=" + status + "&custid=" + custid + "&pageNo=" + pageno + "&pageSize=" + pagesize,
success: function (info) {
console.log(info)
-
- _self.tableData = info.page.list;
_self.totSize = info.page.totalCount;
+ var list=info.page.list;
+ for(var i=0;i<list.length;i++){
+ _self.tableData.push(list[i]);
+ }
+ if(list.length<7){
+ _self.addmoreVis=false;
+ }else {
+ _self.addmoreVis=true;
+ }
}
})
}
diff --git a/src/main/resources/templates/apph5/reviewclock.html b/src/main/resources/templates/apph5/reviewclock.html
index 0369f44..53a6117 100644
--- a/src/main/resources/templates/apph5/reviewclock.html
+++ b/src/main/resources/templates/apph5/reviewclock.html
@@ -28,7 +28,7 @@
<body>
<div id="app2">
- <div class="page-title" style="text-align:center; font-size: 24px;color: #FF8247;margin-top:7%">补打卡审核</div><br>
+ <div class="page-title" style="text-align:center; font-size: 24px;color: #FF8247;margin-top:7%">补签审批</div><br>
<el-button type="primary" @click="showdiv()" style="float: right">筛 选</el-button>
@@ -63,7 +63,7 @@
<div style="display: flex;">
<div style="font-size:14px;color:#999;flex: 1">
- 补打卡时间{{scope.row.attedate}}--{{scope.row.timename}}
+ 申请时间{{scope.row.attedate}}--{{scope.row.timename}}
</div>
<div style="font-size:14px;color:#999;margin-left:10px">
<span v-if="scope.row.status== '0'"><el-button
@@ -88,16 +88,9 @@
</el-table>
+ <el-input v-if="addmoreVis" id="addmore" type="button" value="加载更多" @click.native="addmore" ></el-input>
<div class="clearfix"></div>
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="currPageChange"
- :current-page="currPage"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="pageSize"
- layout="prev, pager, next,sizes, jumper,total"
- :total="totSize">
- </el-pagination>
+
</template>
</div>
@@ -217,13 +210,13 @@
tableData: [],
confName: '1234',
currPage: 1,
- pageSize: 20,
+ pageSize: 7,
totSize: 0,
currentRow: null,
tempform: {
attedate: '',
custtypeid: '',
- status: '',
+ status: '0',
custid:''
},
historyform: {
@@ -244,6 +237,7 @@
bannerHeight: 1000,
screenWidth: 0,
userId: '',
+ addmoreVis:false,
dialogFormVisible: false,
dialogFormVisible2: false,
dlgAllotDevVisible: false,
@@ -271,12 +265,13 @@
methods: {
saveTemp: function (formName) {
var _that = this;
- this.pagesize = 10;
+ this.pagesize = 7;
this.currPage = 1;
// if(this.tempform.attedate==''||this.tempform.attedate==undefined){
// layer.msg("请选择日期！", {icon: 2, time: 2000});
// return ;
// }
+ this.tableData=[];
this.dialogFormVisible = false;
commonQuery(this, this.currPage, this.pageSize);
},
@@ -289,16 +284,18 @@
this.dialogFormVisible2 = false;
var _that = this;
- this.pagesize = 10;
+ this.pagesize = 7;
this.currPage = 1;
+ this.tableData=[];
reviewupdate(this, 1,this.historyform.id);
},unreview: function (formName) {
this.dialogFormVisible2 = false;
var _that = this;
- this.pagesize = 10;
+ this.pagesize = 7;
this.currPage = 1;
+ this.tableData=[];
reviewupdate(this, 2,this.historyform.id);
},
@@ -340,6 +337,10 @@
this.currPage = val;
commonQuery(this, this.currPage, this.pageSize);
//console.log('当前页:'+val);
+ },
+ addmore:function() {
+ this.currPage=this.currPage+1;
+ commonQuery(this, this.currPage, this.pageSize);
}
},
@@ -391,7 +392,7 @@
}
})
- this.pagesize = 10;
+ this.pagesize = 7;
this.currPage = 1;
commonQuery(this, this.currPage, this.pageSize);
@@ -462,9 +463,16 @@
url: "[[@{/app/atte/getreviewclock?attedate=}]]" + attedate + "&custtypeid=" + custtypeid + "&status=" + status + "&custid=" + custid + "&pageNo=" + pageno + "&pageSize=" + pagesize,
success: function (info) {
console.log(info)
-
- _self.tableData = info.page.list;
_self.totSize = info.page.totalCount;
+ var list=info.page.list;
+ for(var i=0;i<list.length;i++){
+ _self.tableData.push(list[i]);
+ }
+ if(list.length<7){
+ _self.addmoreVis=false;
+ }else {
+ _self.addmoreVis=true;
+ }
}
})
}