Browse Source

调整按周填报的三个问题

Lijy 1 year ago
parent
commit
8b08e87a1d

+ 5 - 4
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/weeklyCustomization.vue

@@ -75,9 +75,9 @@
                 </el-table>
             </div>
             <div class="weeklyCustomization_btn">
-                <el-button @click="handleClose()">取消</el-button>
-                <el-button @click="submitWeekData(1)">暂存</el-button>
-                <el-button type="primary" @click="submitWeekData(0)">确定</el-button>
+                <el-button @click="handleClose()">取 消</el-button>
+                <el-button @click="submitWeekData(1)">暂 存</el-button>
+                <el-button type="primary" @click="submitWeekData(0)">提 交</el-button>
             </div>
         </div>
     </div>
@@ -158,7 +158,7 @@ export default {
                     ...fixation,
                     projectId: data.projectId,
                     createDate: data.dateTime,
-                    content: data.content,
+                    content: data.content ? data.content : '',
                     projectAuditorId: data.projectAuditorId,
                     workingTime: data.workingTime,
                     groupId: data.groupId,
@@ -302,6 +302,7 @@ export default {
                 groupId: '',
                 groupList: [],
                 approverList: [],
+                canFill: 1
             })
         },
         // 删除一行