Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -879,6 +879,8 @@
                     :key="item.id"
                     :label="item.projectName"
                     :value="item.id">
+                    <span style="float: left">{{ item.projectName }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.projectCode }}</span>
                     </el-option>
                 </el-select>
             </div>
@@ -6255,7 +6257,7 @@
                                 //按比例分配
                                 formData.append("progress", this.workForm.domains[i].progress);
                                 formData.append("workingTime", this.workForm.domains[i].workingTime);
-                            }
+                            } 
 
                             if(this.user.timeType.choseFromAlbum == 1 ) {
                                 console.log(this.workForm.domains[i].imgList)
@@ -6269,7 +6271,7 @@
                                     m = m.replace(/,/g,"@");//replaceAll(',','@');企业微信不兼容replaceAll
                                     formData.append("picStr", m);
                                 } else {
-                                    formData.append("picStr", []);
+                                    formData.append("picStr", '[]');
                                 }
                             }