Browse Source

增加编辑项目名称和编辑的权限,任务提交加了转圈等待

Lijy 2 years ago
parent
commit
acbfccced3

+ 2 - 0
fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -15,6 +15,7 @@ const StringUtil = {
         projectContract: false, // 查看合同金额 //
         projectAllocate: false, // 下拨成本预算 //
         projectPhase: false, // 项目阶段管理 // 
+        projectCodeAndName: false, // 编辑负责项目编码和名称 //
 
         // 组织架构
         structurePersonnel: false, // 人员成本管理 (月成本,时薪,操作) //
@@ -197,6 +198,7 @@ const StringUtil = {
         arr[i] == '负责部门月度工时表' ? obj.reportResponsiblePersonnel = true : ''
         arr[i] == '全部部门参与项目情况表' ? obj.reportAllDepartmentParticipation = true : ''
         arr[i] == '负责部门参与项目情况表' ? obj.reportResponsibleDepartmentParticipation = true : ''
+        arr[i] == '编辑负责项目编码和名称' ? obj.projectCodeAndName = true : ''
     }
 
     return obj

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/project/info.vue

@@ -325,10 +325,10 @@
         <el-dialog :title="$t('jiebnxx')" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="960px">
             <el-form ref="basicInfoForm" :model="addForm" :rules="rules" label-width="120px">
                 <el-form-item :label="$t('Itemno')" >
-                    <el-input v-model="addForm.code"  :placeholder="$t('peaseenterthe')" clearable></el-input>
+                    <el-input v-model="addForm.code"  :placeholder="$t('peaseenterthe')" clearable :disabled="!permissions.projectManagement && addForm.creatorId != user.id && !permissions.projectCodeAndName"></el-input> 
                 </el-form-item>
                 <el-form-item :label="$t('headerTop.projectName')" prop="name">
-                    <el-input v-model="addForm.name"  :placeholder="$t('peaseenterthe')" clearable></el-input>
+                    <el-input v-model="addForm.name"  :placeholder="$t('peaseenterthe')" clearable :disabled="!permissions.projectManagement && addForm.creatorId != user.id && !permissions.projectCodeAndName"></el-input>
                 </el-form-item>
                 <el-form-item :label="$t('other.projectDescription')" prop="projectDesc">
                     <el-input type="textarea" :rows="2" v-model="addForm.projectDesc" maxlength="4000" show-word-limit  :placeholder="$t('peaseenterthe')" clearable></el-input>

+ 2 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -405,7 +405,7 @@
                 <el-form ref="form1" :model="addForm" :rules="rules" label-width="120px">
                     <el-form-item :label="$t('Itemno')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''">
                         <!-- <el-input v-model="addForm.code" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目编号" clearable></el-input> -->
-                        <el-input v-model="addForm.code" :placeholder="$t('peaseenterthe')" clearable></el-input>
+                        <el-input v-model="addForm.code" :placeholder="$t('peaseenterthe')" clearable :disabled="!permissions.projectManagement && addForm.creatorId != user.id && !permissions.projectCodeAndName"></el-input>
                     </el-form-item>
                     <el-form-item :label="$t('zhu-xiang-mu')" :class="title == $t('newproject') && user.companyId == 936 ? 'wpgCssClass' : ''" v-if="user.timeType.mainProjectState == '1'">
                         <!-- <el-select v-model="addForm.projectMainId" clearable :disabled="!permissions.projectManagement && addForm.creatorId != user.id" @change="projectManagementChange"> -->
@@ -424,7 +424,7 @@
                     </el-form-item>
                     <el-form-item :label="$t('headerTop.projectName')" prop="name">
                         <!-- <el-input v-model="addForm.name" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目名称" clearable></el-input> -->
-                        <el-input v-model="addForm.name" :placeholder="$t('peaseenterthe')" clearable></el-input>
+                        <el-input v-model="addForm.name" :placeholder="$t('peaseenterthe')" clearable :disabled="!permissions.projectManagement && addForm.creatorId != user.id && !permissions.projectCodeAndName"></el-input>
                     </el-form-item>
                     <el-form-item :label="$t('other.projectDescription')" prop="projectDesc">
                         <!-- <el-input v-model="addForm.projectDesc" :disabled="!permissions.projectManagement && addForm.creatorId != user.id" placeholder="请输入项目描述" clearable maxlength="4000"></el-input> -->

+ 3 - 0
fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -1601,6 +1601,7 @@ import { error } from 'dingtalk-jsapi';
                 })
             },
             submitInsert() {
+                this.addLoading = true
                 if (this.textContent !== true) return  this.$message({
                     showClose: true,
                     message: this.$t('pictureistoolargepleaseuploaditagain'),
@@ -1633,6 +1634,7 @@ import { error } from 'dingtalk-jsapi';
                         this.addForm.executorListStr = JSON.stringify(this.addForm.executorListFront);
                         this.http.post('/task/save',this.addForm,
                             res => {
+                                this.addLoading = false
                                 if (res.code == "ok") {
                                     this.$message({
                                         message: this.$t('message.submittedSuccessfully'),
@@ -1658,6 +1660,7 @@ import { error } from 'dingtalk-jsapi';
                                 }
                             },
                             error => {
+                                this.addLoading = false
                                 this.$message({
                                     message: error,
                                     type: "error"