|
|
@@ -391,7 +391,7 @@
|
|
|
</el-form-item>
|
|
|
<!-- 自定义文本 -->
|
|
|
<el-form-item :label="yonghuUser.customTextName" v-if="yonghuUser.customTextActive == 1" :prop="'domains.' + index + '.customText'" :rules="user.timeType.customTextStatus == 1 ? { required: true, message: '请填写' + yonghuUser.customTextName, trigger: ['change','blur'] } : null">
|
|
|
- <el-input :disabled="!canEdit" v-model="domain.customText" style="width:75%;margin-right:7%" maxlength="25" show-word-limit></el-input>
|
|
|
+ <el-input :disabled="!canEdit" v-model="domain.customText" type="textarea" :rows="1" style="width:75%;margin-right:7%" maxlength="1000" show-word-limit></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item v-if="reportTimeType.type == 3" label="用时占比" :prop="'domains.' + index + '.'+timeFields[reportTimeType.type]"
|
|
|
:rules="{ required: true, message: '请设置用时占比', trigger: 'blur' }">
|
|
|
@@ -511,7 +511,7 @@
|
|
|
</el-form-item>
|
|
|
<!-- 自定义文本 -->
|
|
|
<el-form-item :label="yonghuUser.customTextName" v-if="yonghuUser.customTextActive == 1" :prop="'domains.' + index + '.customText'" :rules="user.timeType.customTextStatus == 1 ? { required: true, message: '请填写' + yonghuUser.customTextName, trigger: ['change','blur'] } : null">
|
|
|
- <el-input :disabled="!canEdit" v-model="domain.customText" style="width:75%;margin-right:7%" maxlength="1000"></el-input>
|
|
|
+ <el-input :disabled="!canEdit" v-model="domain.customText" style="width:75%;margin-right:7%" type="textarea" :rows="1" maxlength="1000"></el-input>
|
|
|
</el-form-item>
|
|
|
<!--项目管理专业版模式下，项目下的近期执行的任务 -->
|
|
|
<el-form-item label="任务/里程碑" :prop="'domains.' + index + '.taskId'" v-if="user.company.packageProject==1" >
|
|
|
@@ -721,7 +721,7 @@
|
|
|
<!-- 自定义文本 -->
|
|
|
<div class="zhoFel" v-if="user.timeType.customTextActive == 1">
|
|
|
<p>{{user.timeType.customTextName}}</p>
|
|
|
- <el-input :disabled="!canEdit" v-model="zhoBao.customText" style="width:355px;" maxlength="25" show-word-limit></el-input>
|
|
|
+ <el-input :disabled="!canEdit" v-model="zhoBao.customText" type="textarea" :rows="1" style="width:355px;" maxlength="1000" show-word-limit></el-input>
|
|
|
</div>
|
|
|
<div class="zhoFel" v-if="reportTimeType.type == 2">
|
|
|
<p>选择时间</p>
|
|
|
@@ -3438,9 +3438,10 @@
|
|
|
this.curDate = curMonthDay;
|
|
|
} else {
|
|
|
var d = new Date(this.date.replace(/-/g, "/")+'/01')
|
|
|
- this.curDate = (d.getMonth()+1)+'月'+d.getDate()+'日';
|
|
|
+ this.curDate = (d.getMonth()+1)+'月'+d.getDate()+'日';
|
|
|
}
|
|
|
}
|
|
|
+ this.curDate = this.curDate.split('月')[0] + '月' + (this.choseDay + 1) + '日'
|
|
|
this.getReportFillStatus();
|
|
|
},
|
|
|
|
