创建任务时间做限制

fhKeeper/formulahousekeeper/timesheet/src/i18n/en.json

@@ -1449,5 +1449,12 @@
   "dao-chu-jia-qi": "Export holidays",
   "an-ji-du-dao-chu": "export by quarter",
   "han-qing-jia": "（including leave）",
-  "ke-fu-wei-xin": "Customer service wechat"
+  "ke-fu-wei-xin": "Customer service wechat",
+  "bian-ji-mo-ban": "Edit a Template",
+  "mo-ban-ming-cheng": "Template Name",
+  "mo-ban-ming-cheng-bu-neng-wei-kong": "template name cannot be empty",
+  "ren-wu-jie-zhi-shi-jian-bu-neng-xiao-yu-kai-shi-shi-jian": "The task expiration time cannot be later than the start time",
+  "ren-wu-lie-biao-ming-cheng-bu-neng-wei-kong": "The task list name cannot be empty",
+  "xin-zeng-ren-wu-lie-biao": "Adding a Task List",
+  "zan-wu-ren-wu": "No job at the moment"
 }

fhKeeper/formulahousekeeper/timesheet/src/i18n/zh.json

@@ -1449,5 +1449,12 @@
   "dao-chu-jia-qi": "导出假期",
   "an-ji-du-dao-chu": "按季度导出",
   "han-qing-jia": "（含请假）",
-  "ke-fu-wei-xin": "客服微信"
+  "ke-fu-wei-xin": "客服微信",
+  "zan-wu-ren-wu": "暂无任务",
+  "bian-ji-mo-ban": "编辑模板",
+  "mo-ban-ming-cheng": "模板名称",
+  "xin-zeng-ren-wu-lie-biao": "新增任务列表",
+  "mo-ban-ming-cheng-bu-neng-wei-kong": "模板名称不能为空",
+  "ren-wu-lie-biao-ming-cheng-bu-neng-wei-kong": "任务列表名称不能为空",
+  "ren-wu-jie-zhi-shi-jian-bu-neng-xiao-yu-kai-shi-shi-jian": "任务截止时间不能小于开始时间"
 }

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

@@ -231,7 +231,7 @@
                                                     </div>
                                                 </draggable>
                                                 <el-button v-if="canAddTask" slot="footer" role="people" @click="addTask(stage)" style="width:300px;" size="small" icon="el-icon-plus"></el-button>
-                                                <el-label v-if="!canAddTask && (stage.taskList.length == 0)" style="width:300px;color:#666;">暂无任务</el-label>
+                                                <el-label v-if="!canAddTask && (stage.taskList.length == 0)" style="width:300px;color:#666;">{{ $t('zan-wu-ren-wu') }}</el-label>
                                             </div>
                                         </v-flex>
                                     <!-- </transition-group > -->
@@ -930,20 +930,20 @@
                 </el-tab-pane>
                 </el-tabs>
             </div>
-            <el-dialog title="编辑模板" append-to-body v-if="setTemplateDialog" :visible.sync="setTemplateDialog" width="500px">
+            <el-dialog :title="$t('bian-ji-mo-ban')" append-to-body v-if="setTemplateDialog" :visible.sync="setTemplateDialog" width="500px">
                 <el-form label-width="20%">
-                    <el-form-item label="模板名称"><el-input v-model="setTemplateData.name" style="width:80%" clearable></el-input></el-form-item>
-                    <el-form-item label=""><el-checkbox v-model="setTemplateData.creWithPro">随项目自动创建</el-checkbox></el-form-item>
+                    <el-form-item :label="$t('mo-ban-ming-cheng')"><el-input v-model="setTemplateData.name" style="width:80%" clearable></el-input></el-form-item>
+                    <el-form-item label=""><el-checkbox v-model="setTemplateData.creWithPro">{{ $t('suixiangmuzidongchuangjian') }}</el-checkbox></el-form-item>
                     <el-form-item v-for="item,index in setTemplateData.stagesList" :key="item.id" :label="index == 0 ? '任务列表' : ''">
                         <el-input v-model="item.stagesName"  style="width:70%" clearable></el-input>
                         <el-link :underline="false" type="primary" style="color:#aaa;" @click="deleteStages(item,index)"  v-if="index != 0">
                             <i class="el-icon-delete"></i>
                         </el-link>
                     </el-form-item>
-                    <el-link style="margin-left:20%" :underline="false" type="primary" @click="addStages()">新增任务列表</el-link>
+                    <el-link style="margin-left:20%" :underline="false" type="primary" @click="addStages()">{{ $t('xin-zeng-ren-wu-lie-biao') }}</el-link>
                 </el-form>
                 <div slot="footer" class="dialog-footer">
-                    <el-button type="primary" @click="setTemplateDialog = false">取消</el-button>
+                    <el-button type="primary" @click="setTemplateDialog = false">{{ $t('btn.cancel') }}</el-button>
                     <el-button type="primary" @click="setTemplateSave()">{{ $t('save') }}</el-button>
                 </div>
             </el-dialog>
@@ -1769,7 +1769,7 @@
             setTemplateSave(){
                 if(this.setTemplateData.name == '' || this.setTemplateData.name == null){
                     this.$message({
-                        message: '模板名称不能为空',
+                        message: this.$t('mo-ban-ming-cheng-bu-neng-wei-kong'),
                         type: 'error'
                     })
                     return
@@ -1777,7 +1777,7 @@
                 for(let i in this.setTemplateData.stagesList){
                     if(this.setTemplateData.stagesList[i].stagesName == '' || this.setTemplateData.stagesList[i].stagesName == null){
                         this.$message({
-                            message: '任务列表名称不能为空',
+                            message: this.$t('ren-wu-lie-biao-ming-cheng-bu-neng-wei-kong'),
                             type: 'error'
                         })
                         return
@@ -1787,7 +1787,7 @@
                 res => {
                     if(res.code == 'ok'){
                         this.$message({
-                            message: '修改成功',
+                            message: this.$t('message.modifyTheSuccess'),
                             type: 'success'
                         })
                         this.getGroupTemplate()
@@ -3193,7 +3193,16 @@
                         });
                     }
                 }
-
+                if(this.addForm.startDate && this.addForm.endDate) {
+                    if(this.addForm.endDate < this.addForm.startDate) {
+                        return this.$message({
+                            showClose: true,
+                            message: this.$t('ren-wu-jie-zhi-shi-jian-bu-neng-xiao-yu-kai-shi-shi-jian'),
+                            type: 'error'
+                        });
+                    }
+                }
+                
                 this.$refs.form1.validate(valid => {
                     if (valid) {
                         delete this.addForm.subTaskList;