Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -1457,5 +1457,8 @@
   "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"
+  "zan-wu-ren-wu": "No job at the moment",
+  "xiu-gai-xiang-mu-dang-qian-jie-duan": "Modifying the current phase",
+  "zheng-shi-xiang-mu": "Formal Project",
+  "fei-xiang-mu": "Non item"
 }

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

@@ -1457,5 +1457,8 @@
   "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": "任务截止时间不能小于开始时间"
+  "ren-wu-jie-zhi-shi-jian-bu-neng-xiao-yu-kai-shi-shi-jian": "任务截止时间不能小于开始时间",
+  "xiu-gai-xiang-mu-dang-qian-jie-duan": "修改项目当前阶段",
+  "zheng-shi-xiang-mu": "正式项目",
+  "fei-xiang-mu": "非项目"
 }

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

@@ -441,8 +441,10 @@
                     <el-form-item :label="$t('projecttype')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" prop="isPublic">
                         <!-- <el-select v-model="addForm.isPublic" style="width:32%;" @change="selectPublic" :disabled="!permissions.projectManagement && addForm.creatorId != user.id"> -->
                         <el-select v-model="addForm.isPublic" style="width:32%;" @change="selectPublic">
-                            <el-option :value="0" :label="$t('commonproject')"></el-option>
-                            <el-option :value="1" :label="$t('publicprojects')"></el-option>
+                            <!-- <el-option :value="0" :label="$t('commonproject')"></el-option>
+                            <el-option :value="1" :label="$t('publicprojects')"></el-option> -->
+                            <el-option :value="0" :label="$t('zheng-shi-xiang-mu')"></el-option>
+                            <el-option :value="1" :label="$t('fei-xiang-mu')"></el-option>
                         </el-select>
                         <el-tooltip effect="dark" :content="$t('ordinaryprojectsareopen')" placement="top-start">
                         <i class="el-icon-question"></i>
@@ -1226,12 +1228,12 @@
             </div>
         </el-dialog>
 
-        <el-dialog title="修改项目当前阶段" v-if="changeStageDialogVisible" :visible.sync="changeStageDialogVisible" width="300px">
+        <el-dialog :title="$t('xiu-gai-xiang-mu-dang-qian-jie-duan')" v-if="changeStageDialogVisible" :visible.sync="changeStageDialogVisible" width="300px">
             <el-select v-model="curChangeProject.curStageId" filterable :placeholder="$t('pleaseselecttheprojectphase')" style="margin: 0 auto;">
                 <el-option v-for="(item, index) in phaseList" :key="index" :label="item.projectStageName" :value="item.id"> </el-option>
             </el-select>
             <div slot="footer" class="dialog-footer" style="text-algin:center;">
-                <el-button type="primary" @click="confirmChangeStage">确定</el-button>
+                <el-button type="primary" @click="confirmChangeStage">{{ $t('btn.determine') }}</el-button>
             </div>
         </el-dialog>