2022.3.24

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -612,6 +612,12 @@
                     <el-form-item prop="name">
                         <el-input v-model="templateForm.name" placeholder="请输入模板名称" maxlength="12"
                             show-word-limit clearable></el-input>
+                            <div>
+                                <span>同时保存</span>
+                                <el-checkbox v-model="templateForm.saveTask" label="任务"></el-checkbox>
+                                <el-checkbox v-model="templateForm.saveMileStone" label="风险"></el-checkbox>
+                                <el-checkbox v-model="templateForm.saveRisk" label="里程碑"></el-checkbox>
+                            </div>
                     </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -707,7 +713,11 @@
                 setInchargerDialog: false,
                 recentProgressInfo:{},
                 addToTmpDialog:false,
-                templateForm:{},
+                templateForm:{
+                    saveTask:true,
+                    saveMileStone:true,
+                    saveRisk:false
+                    },
                 importTaskDialog:false,
                 importToStageId:null,
                 exportDialog: false,
@@ -837,7 +847,7 @@
                 ProgressList: [],
                 checkboxGrounp: [], // 选中人的数据
                 checkLists: [], // 选中人数据的ID
-                taskIid: null
+                taskIid: null,
             };
             
         },
@@ -890,23 +900,24 @@
             },
             //创建模板
             createTemplate() {
-                this.http.post('/group-template/addTemplate', this.templateForm,
-                    res => {
-                        if (res.code == "ok") {
-                            this.addToTmpDialog = false;
-                            this.getGroupTemplate();
-                            this.$message({
-                                message: '添加模板成功',
-                                type: "success"
-                            });
-                        } else {
-                            this.$message({
-                                message: res.msg,
-                                type: "error"
-                            });
-                        }
-                    }
-                );
+                console.log("templateForm",this.templateForm);
+                // this.http.post('/group-template/addTemplate', this.templateForm,
+                //     res => {
+                //         if (res.code == "ok") {
+                //             this.addToTmpDialog = false;
+                //             this.getGroupTemplate();
+                //             this.$message({
+                //                 message: '添加模板成功',
+                //                 type: "success"
+                //             });
+                //         } else {
+                //             this.$message({
+                //                 message: res.msg,
+                //                 type: "error"
+                //             });
+                //         }
+                //     }
+                // );
             },
             addToTemplate(item) {
                 this.addToTmpDialog = true;

fhKeeper/formulahousekeeper/timesheet_h5/src/views/timetool/timetool.vue

@@ -180,13 +180,14 @@ export default {
     },
     // 计时器
     startTiming() {
+      if (this.selectValue == "请选择项目" || this.loadata1 == null) {
         if(this.selectValue == "请选择项目"){
             this.valueclass = "valuecolor"
-            if(this.loadata1 == null){
-                this.selectgxshow = true
-            }
-            return
+        }if(this.loadata1 == null){
+            this.selectgxshow = true
         }
+        return
+      }
         
       let date = new Date();
       let nowH = date.getHours();