|
|
@@ -70,9 +70,9 @@
|
|
|
</span>
|
|
|
<span style="float:right;">
|
|
|
<el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReport(-1,0)">填写日报</el-link>
|
|
|
+ <el-link v-if="reportTimeType.type == 2" type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportss()">按周填报</el-link>
|
|
|
<el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReport(-1,0)">代填日报</el-link>
|
|
|
<el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReport(-1,1)">批量填报</el-link>
|
|
|
- <el-link v-if="reportTimeType.type == 2" type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=false;fillInReportss()">按周填报</el-link>
|
|
|
<el-link type="primary" v-if="user.role==1||user.role==2||user.manageDeptId != 0" style="margin-right:10px;" :underline="false" @click="imports()">工时导入</el-link>
|
|
|
|
|
|
<!-- <el-link type="primary" style="margin-right:10px;" :underline="false" @click="isSubstitude=true; fillInReport(-1,1)">批量代填</el-link> -->
|
|
|
@@ -2573,6 +2573,7 @@
|
|
|
// 提交按周填报
|
|
|
zhoAdd() {
|
|
|
var zhi = this.zhoData
|
|
|
+ var ll = 0
|
|
|
for(var i in zhi) {
|
|
|
this.dateAr = []
|
|
|
var alp = []
|
|
|
@@ -2586,8 +2587,10 @@
|
|
|
}
|
|
|
}
|
|
|
this.dateAr = alp
|
|
|
+ console.log(this.dateAr, i)
|
|
|
if(this.dateAr.length > 0) {
|
|
|
let trus = this.fns()
|
|
|
+ ll += 1
|
|
|
if(!trus) {
|
|
|
this.$message({
|
|
|
message: '填写的时间段重叠',
|
|
|
@@ -2596,11 +2599,13 @@
|
|
|
return false
|
|
|
}
|
|
|
} else {
|
|
|
- this.$message({
|
|
|
- message: '请填写时间',
|
|
|
- type: 'error'
|
|
|
- })
|
|
|
- return false
|
|
|
+ if(ll == 0) {
|
|
|
+ this.$message({
|
|
|
+ message: '请填写时间',
|
|
|
+ type: 'error'
|
|
|
+ })
|
|
|
+ return false
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
var submits = []
|
Lijy