提交相关书

fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue

@@ -2,7 +2,7 @@
   <div>
     <div style="height: 72vh;overflow: auto;">
         <el-form ref="form1" :model="addForm" :rules="taskRules" label-width="120px">
-            <el-form-item label="所属项目" v-if="showOrNot" prop="projectId">
+            <el-form-item :label="$t('subordinatetotheproject')" v-if="showOrNot" prop="projectId">
                 <el-select v-model="addForm.projectId" :placeholder="$t('defaultText.pleaseChoose')" @change="agentCreatesEvents(1)" filterable="true" style="width:100%;">
                     <el-option-group v-for="group in integrationProjectList" :key="group.label" :label="group.label">
                         <el-option v-for="item in group.peojectList" :key="item.id" :label="item.projectName + '\u3000' + item.projectCode" :value="item.id">
@@ -12,12 +12,12 @@
                     </el-option-group>
                 </el-select>
             </el-form-item>
-            <el-form-item label="所属任务分组" v-if="showOrNot" prop="groupId">
+            <el-form-item :label="$t('suoShuRenWuFenZu')" v-if="showOrNot" prop="groupId">
                 <el-select v-model="addForm.groupId" :placeholder="$t('defaultText.pleaseChoose')" @change="agentCreatesEvents(2)" filterable="true" style="width:100%;">
                     <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="所属任务列表" v-if="showOrNot" prop="stagesId">
+            <el-form-item :label="$t('suoShuRenWuLieBiao')" v-if="showOrNot" prop="stagesId">
                 <el-select v-model="addForm.stagesId" :placeholder="$t('defaultText.pleaseChoose')" filterable="true" style="width:100%;">
                     <el-option v-for="item in stageList" :key="item.id" :label="item.stagesName" :value="item.id"></el-option>
                 </el-select>
@@ -28,7 +28,7 @@
                     <el-option v-for="item in stageList" :key="item.id" :label="item.stagesName" :value="item.id"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="前置任务" prop="aheadTidList" >
+            <el-form-item :label="$t('qianZhiRenWu')" prop="aheadTidList" >
                 <el-select v-model="addForm.aheadTidList" style="width:100%;" multiple filterable @change="$forceUpdate()">
                     <el-option v-for="item in relationdata" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
@@ -81,8 +81,8 @@
                             </div>
                             <!-- 项目服务 -->
                             <div v-if="user.companyId==3092">
-                                <span style="margin-left:30px;margin-right:10px;">{{'项目服务'}}</span>
-                                <el-select  clearable collapse-tags  filterable  v-model="executorItem.serviceId" size="small" placeholder="请选择项目服务" style="width: 300px" @change="serviceIdChange()" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !permissions.editAnyTask && !(groupResponsibleId == user.id)">
+                                <span style="margin-left:30px;margin-right:10px;">{{ $t('xiangMuFuWu') }}</span>
+                                <el-select  clearable collapse-tags  filterable  v-model="executorItem.serviceId" size="small" :placeholder="$t('qingXuanZeXiangMuFuWu')" style="width: 300px" @change="serviceIdChange()" :disabled="(addForm.id != null && user.id != addForm.createrId && currentProject.inchargerId != user.id) && !permissions.projectManagement && !permissions.editAnyTask && !(groupResponsibleId == user.id)">
                                     <el-option
                                     v-for="item in sapServiceList"
                                     :key="item.id"
@@ -111,7 +111,7 @@
             <el-link type="primary" v-if="(((addForm.executorListFront == null || addForm.executorListFront.length<100) && 
             (addForm.id == null|| user.id == addForm.createrId || currentProject.inchargerId == user.id || permissions.projectManagement || permissions.editAnyTask)) || 
             groupResponsibleId == user.id)" 
-            style="margin:0 0 10px 35px;position: relative;z-index: 999;" @click.stop="addExecutorLine">添加执行人</el-link>
+            style="margin:0 0 10px 35px;position: relative;z-index: 999;" @click.stop="addExecutorLine">{{ $t('addinganexecutor') }}</el-link>
             </div>
             <el-form-item :label="$t('priority')">
                 <el-select v-model="addForm.taskLevel" style="width:100%;" >
@@ -408,7 +408,7 @@
     </div>
     <div slot="footer" class="dialog-footer foooot">
         <el-button v-if="(user.id == addForm.createrId || currentProject.inchargerId == user.id || currentProject.creatorId == user.id || permissions.projectManagement) && canAddTask" @click.native="deleteTask()" style="float:left;">{{ $t('btn.delete') }}</el-button>
-        <el-button type="primary" v-if="user.userNameNeedTranslate == 1 && !meetingId && !integrationTask.stage && addForm.executorListFront[0].executorId" @click="meetingCli()">发起会议</el-button>
+        <el-button type="primary" v-if="user.userNameNeedTranslate == 1 && !meetingId && !integrationTask.stage && addForm.executorListFront[0].executorId" @click="meetingCli()">{{ $t('faQiHuiYi') }}</el-button>
         <el-button @click.native="closeBounceds()">{{ $t('btn.cancel') }}</el-button>
         <el-button type="primary" @click="submitInsert" :loading="addLoading">{{ $t('btn.submit') }}</el-button>
     </div>
@@ -476,8 +476,8 @@
                                     </p>
                                     <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate != 1">{{item.content}}</p>
                                     <!-- 重启原因和责任人 -->
-                                    <span class="commentSpan" v-if="user.timeType.restartTaskNeedReason == 1 && item.reason != ''">重启原因：{{item.reason}}</span>
-                                    <span class="commentSpan" v-if="user.timeType.restartTaskNeedReason == 1 && item.taskPersonLiableList.length > 0">责任人: 
+                                    <span class="commentSpan" v-if="user.timeType.restartTaskNeedReason == 1 && item.reason != ''">{{ $t('zhongQiYuanYin') }}：{{item.reason}}</span>
+                                    <span class="commentSpan" v-if="user.timeType.restartTaskNeedReason == 1 && item.taskPersonLiableList.length > 0">{{ $t('zeRenRen') }}
                                         <span v-for="responsibility, responsibilityIndex in item.taskPersonLiableList" :key="responsibilityIndex">
                                             <span v-if="user.userNameNeedTranslate == 1">
                                                 <TranslationOpenDataText type='userName' :openid='responsibility.userName'></TranslationOpenDataText>
@@ -756,10 +756,10 @@ export default {
         },
         taskRules : {
             name: [{ required: true, message: this.$t('enterthetaskcontent'), trigger: "blur" }],
-            serviceId: [{ required: true, message: '请选择服务', trigger: "blur" }],
-            projectId: [{ required: true, message: '请选择所属项目', trigger: "blur" }],
-            groupId: [{ required: true, message: '请选择所属任务分组', trigger: "blur" }],
-            stagesId: [{ required: true, message: '请选择所属任务列表', trigger: "blur" }],
+            serviceId: [{ required: true, message: this.$t('qingXuanZeFuWu'), trigger: "blur" }],
+            projectId: [{ required: true, message: this.$t('qingXuanZeSuoShuXiangMu'), trigger: "blur" }],
+            groupId: [{ required: true, message: this.$t('qingXuanZeSuoShuRenWuFenZu'), trigger: "blur" }],
+            stagesId: [{ required: true, message: this.$t('qingXuanZeSuoShuRenWuLieBiao'), trigger: "blur" }],
         },
         formGrouping: {
             name: [{ required: true, message: this.$t('pleaseenteragroupname'), trigger: "blur" }],
@@ -1015,11 +1015,11 @@ export default {
         this.http.post('/project/nearProject',{},res => {
             if(res.code == 'ok'){
                 let topObj = {
-                    label: '最近选择项目',
+                    label: this.$t('zuiJinXuanZeXiangMu'),
                     peojectList: res.data 
                 }
                 let botomObj = {
-                    label: '全部项目',
+                    label: this.$t('other.allProject'),
                     peojectList: this.projectList
                 }
                 this.integrationProjectList = [topObj, botomObj]
@@ -1486,7 +1486,7 @@ export default {
                 if (findSameUser) {
                     return this.$message({
                         showClose: true,
-                        message: '同一个执行人,服务不能相同',
+                        message: this.$t('tongYiGeZhiHangRenFuWuBuNengXiangTong'),
                         type: 'error'
                     });
                 }
@@ -1923,7 +1923,7 @@ export default {
     },
     // 列表的删除按钮
     taskFileDelete(eid){
-        this.$confirm('是否移除此文件？', this.$t('other.prompts'), {
+        this.$confirm(this.$t('shiFouYiChuCiWenJian'), this.$t('other.prompts'), {
             confirmButtonText: this.$t('btn.determine'),
             cancelButtonText: this.$t('btn.cancel'),
             type: 'warning'

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

@@ -2152,5 +2152,14 @@
   "zhuCe": "register",
   "zhuCeChengGong": "registered successfully",
   "zhuanYeBan": "professional edition",
-  "zunJingDeYongHuNinGouMaiDeBanBen": "Dear user! The version you purchased"
+  "zunJingDeYongHuNinGouMaiDeBanBen": "Dear user! The version you purchased",
+  "qianZhiRenWu": "Pre task",
+  "qingXuanZeSuoShuRenWuFenZu": "Please select the task group to which you belong",
+  "qingXuanZeSuoShuRenWuLieBiao": "Please select the task list to which you belong",
+  "qingXuanZeSuoShuXiangMu": "Please select the project to which you belong",
+  "qingXuanZeXiangMuFuWu": "Please select project service",
+  "suoShuRenWuFenZu": "Task group to which it belongs",
+  "suoShuRenWuLieBiao": "Task List",
+  "tongYiGeZhiHangRenFuWuBuNengXiangTong": "The same executor cannot provide the same service",
+  "xiangMuFuWu": "Project Services"
 }

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

@@ -2152,5 +2152,14 @@
   "faSongChengGong": "发送成功",
   "miMaChangDuBuNengShaoYu_6Wei": "密码长度不能少于6位",
   "liangCiShuRuDeMiMaBuYiZhi": "两次输入的密码不一致",
-  "zhuCeChengGong": "注册成功"
+  "zhuCeChengGong": "注册成功",
+  "suoShuRenWuFenZu": "所属任务分组",
+  "suoShuRenWuLieBiao": "所属任务列表",
+  "qianZhiRenWu": "前置任务",
+  "xiangMuFuWu": "项目服务",
+  "qingXuanZeXiangMuFuWu": "请选择项目服务",
+  "qingXuanZeSuoShuXiangMu": "请选择所属项目",
+  "qingXuanZeSuoShuRenWuFenZu": "请选择所属任务分组",
+  "qingXuanZeSuoShuRenWuLieBiao": "请选择所属任务列表",
+  "tongYiGeZhiHangRenFuWuBuNengXiangTong": "同一个执行人,服务不能相同"
 }