|
|
@@ -524,7 +524,7 @@
|
|
|
<!-- 选择时间 -->
|
|
|
<el-dialog title="时间选择" :visible.sync="btnZho" width="30%" :before-close="handleClose">
|
|
|
<span>这是一段信息</span>
|
|
|
- <span slot="footer" class="dialog-footer">
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
<el-button @click="btnZho = false">取 消</el-button>
|
|
|
<el-button type="primary" @click="btnZho = false">确 定</el-button>
|
|
|
</span>
|
|
|
@@ -2838,6 +2838,8 @@
|
|
|
zhoAdd() {
|
|
|
var zhi = this.zhoData
|
|
|
var ll = 0
|
|
|
+ console.log(this.reportTimeType.type)
|
|
|
+ console.log(this.reportTimeType.multiWorktime)
|
|
|
if(this.reportTimeType.type == 2) {
|
|
|
for(var i in zhi) {
|
|
|
this.dateAr = []
|
|
|
@@ -2915,6 +2917,9 @@
|
|
|
var objjs = {}
|
|
|
objjs.startTime = zhoD[j].time[0]
|
|
|
objjs.endTime = zhoD[j].time[1]
|
|
|
+ if (zhoD[j].con == null || zhoD[j].con == '') {
|
|
|
+ zhoD[j].con == '-'
|
|
|
+ }
|
|
|
objjs.content = zhoD[j].con
|
|
|
lix.push(objjs)
|
|
|
var zhiZhi = JSON.stringify(lix)
|
|
|
@@ -2924,7 +2929,6 @@
|
|
|
formData.append("professionProgress", "[]")
|
|
|
zhoD[j].stage ? formData.append("stage", zhoD[j].stage) : formData.append("stage", '');
|
|
|
formData.append("createDate",zhoD.zhoDataTime)
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -2949,7 +2953,7 @@
|
|
|
formData.append("endTime", zhoD[j].time[1]);
|
|
|
formData.append("startTime", zhoD[j].time[0]);
|
|
|
formData.append("multiWorktime", this.reportTimeType.multiWorktime);
|
|
|
- formData.append("content", zhoD[j].con)
|
|
|
+ zhoD[j].con == '' || zhoD[j].con == null ? formData.append("content", '-') : formData.append("content", zhoD[j].con)
|
|
|
formData.append("isOvertime", 0)
|
|
|
formData.append("professionProgress", "[]")
|
|
|
zhoD[j].stage ? formData.append("stage", zhoD[j].stage) : formData.append("stage", '');
|
|
|
@@ -2982,7 +2986,7 @@
|
|
|
formData.append("workingTime", zhoD[j].workingTime);
|
|
|
}
|
|
|
formData.append("multiWorktime", this.reportTimeType.multiWorktime);
|
|
|
- formData.append("content", zhoD[j].con)
|
|
|
+ zhoD[j].con == '' || zhoD[j].con == null ? formData.append("content", '-') : formData.append("content", zhoD[j].con)
|
|
|
formData.append("isOvertime", 0)
|
|
|
formData.append("professionProgress", "[]")
|
|
|
zhoD[j].stage ? formData.append("stage", zhoD[j].stage) : formData.append("stage", '');
|
