|
@@ -273,7 +273,7 @@
|
|
<el-select v-model="domain.workingTime" style="width:200px;"
|
|
<el-select v-model="domain.workingTime" style="width:200px;"
|
|
v-if="reportTimeType.type == 1"
|
|
v-if="reportTimeType.type == 1"
|
|
:disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)"
|
|
:disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)"
|
|
- placeholder="请选择工作时长"
|
|
|
|
|
|
+ :placeholder="'请选择工作时长' + domain.workingTime"
|
|
@change="seleChn(0,domain)">
|
|
@change="seleChn(0,domain)">
|
|
<el-option v-for="item in timeRange" :key="item" :value="item.toFixed(1)">{{item.toFixed(1)}}</el-option>
|
|
<el-option v-for="item in timeRange" :key="item" :value="item.toFixed(1)">{{item.toFixed(1)}}</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
@@ -1248,6 +1248,7 @@
|
|
export default {
|
|
export default {
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ alalal: '8.0',
|
|
timeBasecostList:null,
|
|
timeBasecostList:null,
|
|
tbload: false,
|
|
tbload: false,
|
|
exportTimeDialog: false,
|
|
exportTimeDialog: false,
|
|
@@ -3546,6 +3547,9 @@
|
|
userNames:null,
|
|
userNames:null,
|
|
time: this.report.time
|
|
time: this.report.time
|
|
}
|
|
}
|
|
|
|
+ if(this.user.timeType.type == 1) {
|
|
|
|
+ this.workForm.domains[0].workingTime = this.user.timeType.allday+'.0'
|
|
|
|
+ }
|
|
if (this.timeBasecostList && this.timeBasecostList.length > 0) {
|
|
if (this.timeBasecostList && this.timeBasecostList.length > 0) {
|
|
//默认给第一个,必填字段
|
|
//默认给第一个,必填字段
|
|
this.workForm.domains[0].basecostId = this.timeBasecostList[0].id;
|
|
this.workForm.domains[0].basecostId = this.timeBasecostList[0].id;
|
|
@@ -3590,6 +3594,7 @@
|
|
|
|
|
|
// 打开日报填写
|
|
// 打开日报填写
|
|
fillInReport(i, isBatch) {
|
|
fillInReport(i, isBatch) {
|
|
|
|
+ console.log(this.user.timeType.type, '选择时长')
|
|
if(i != 1) {
|
|
if(i != 1) {
|
|
this.falsss = false
|
|
this.falsss = false
|
|
} else {
|
|
} else {
|
|
@@ -3609,6 +3614,7 @@
|
|
this.workForm.createDate = this.date + day; // 获取个人某天的日报
|
|
this.workForm.createDate = this.date + day; // 获取个人某天的日报
|
|
this.getReport(i);
|
|
this.getReport(i);
|
|
} else {
|
|
} else {
|
|
|
|
+ console.log('执行到了这里')
|
|
this.jsTime = 0
|
|
this.jsTime = 0
|
|
this.jsDay = 0
|
|
this.jsDay = 0
|
|
this.workForm = {
|
|
this.workForm = {
|
|
@@ -3625,6 +3631,10 @@
|
|
worktimeList:[{}],
|
|
worktimeList:[{}],
|
|
}],
|
|
}],
|
|
}
|
|
}
|
|
|
|
+ if(this.user.timeType.type == 1) {
|
|
|
|
+ this.workForm.domains[0].workingTime = this.user.timeType.allday+'.0'
|
|
|
|
+ }
|
|
|
|
+ console.log(this.workForm)
|
|
if (this.timeBasecostList&&this.timeBasecostList.length>0) {
|
|
if (this.timeBasecostList&&this.timeBasecostList.length>0) {
|
|
this.workForm.domains[0].basecostId = this.timeBasecostList[0].id;
|
|
this.workForm.domains[0].basecostId = this.timeBasecostList[0].id;
|
|
}
|
|
}
|