Pārlūkot izejas kodu

2022.7.18 填报日报主项目控制

ggooalice 2 gadi atpakaļ
vecāks
revīzija
338102e55a

+ 5 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -336,6 +336,7 @@
                                 <span style="float: right;margin-left: 20px">{{ item.projectName }}</span>
                             </el-option>
                         </el-select>
+                        <template v-if="user.timeType.mainProjectState != 1">
                         <span v-if="domain.subProjectList != null && domain.subProjectList.length> 0 && domain.projectId != ''"
                             style="margin-left:45px;">子项目</span>
 
@@ -345,6 +346,7 @@
                         :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" @change="updateSubProject">
                             <el-option v-for="item in domain.subProjectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                         </el-select>
+                        </template>
                         
                         <el-link v-if="index >= 1&&canEdit" type="primary" :underline="false" @click="delDomain(index)" style="float:right;margin-right:10px;"
                             :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
@@ -443,6 +445,7 @@
                                     <span style="float: right;margin-left: 20px">{{ item.projectName }}</span>
                                 </el-option>
                             </el-select>
+                            <template v-if="user.timeType.mainProjectState != 1">
                             <span  v-if="domain.subProjectList != null && domain.subProjectList.length> 0 && domain.projectId != ''"
                                 style="margin-left:45px;">子项目</span>
                             <!--子项目 -->
@@ -451,6 +454,7 @@
                             :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)" @change="updateSubProject">
                                 <el-option v-for="item in domain.subProjectList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                             </el-select>
+                            </template>
 
                             <el-link v-if="index >= 1&&canEdit" type="primary" :underline="false" @click="delDomain(index)" style="float:right;margin-right:10px;"
                                 :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)">
@@ -677,7 +681,7 @@
         <!-- 按周填报弹窗 -->
         <el-dialog title="请填写" :visible.sync="tianxieDialogVisible" width="30%" :before-close="handleClose">
             <div>
-                <div class="zhoFel" v-if="zhoBao.subProjectList != null && zhoBao.subProjectList.length > 0">
+                <div class="zhoFel" v-if="zhoBao.subProjectList != null && zhoBao.subProjectList.length > 0 && user.timeType.mainProjectState != 1">
                     <p>子项目</p>
                     <el-select v-model="zhoBao.subProjectId" placeholder="请选择" clearable="true" style="width: 355px">
                         <el-option v-for="item in zhoBao.subProjectList" :key="item.id" :label="item.name" :value="item.id"></el-option>

+ 4 - 3
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -42,7 +42,7 @@
 
                    
 
-                    <van-field  readonly  name="subProjectId" v-if="item.subProjectList != null && item.subProjectList.length > 0" clickable 
+                    <van-field  readonly  name="subProjectId" v-if="item.subProjectList != null && item.subProjectList.length > 0 && user.timeType.mainProjectState != 1" clickable 
                         :value="item.subProjectName" label="子项目" placeholder="请选择子项目" 
                     @click="clickPickSubProject(index, item)" />
 
@@ -498,8 +498,9 @@
 
                 this.showPickerUserddp = false;
                 //获取子项目
-                this.getSubprojectList(this.form.domains[this.clickIndex]);
-                
+                if(this.user.timeType.mainProjectState != 1){
+                    this.getSubprojectList(this.form.domains[this.clickIndex]);
+                }
                 //加载项目相关的工程进度
                 if (this.user.company.packageEngineering == 1){
                     this.getProjectProfessions(this.form.domains[this.clickIndex],index);

+ 4 - 3
fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/weekEdit.vue

@@ -46,7 +46,7 @@
                     <!--按周填报的项目改成非必填-->
                     <van-field  readonly  name="projectId" clickable :value="item.projectName" :label="user.companyId==781?'工作任务':'投入项目'" :placeholder="user.companyId==781?'请选择工作任务':'请选择项目'" @click="clickPicker(index, item)"
                     />
-                    <van-field  readonly  name="subProjectId" v-if="item.subProjectList != null && item.subProjectList.length > 0" clickable 
+                    <van-field  readonly  name="subProjectId" v-if="item.subProjectList != null && item.subProjectList.length > 0 && user.timeType.mainProjectState != 1" clickable 
                         :value="item.subProjectName" label="子项目" placeholder="请选择子项目" 
                     @click="clickPickSubProject(index, item)" />
 
@@ -550,8 +550,9 @@
 
                 this.showPickerUserddp = false;
                 //获取子项目
-                this.getSubprojectList(this.currentForm.domains[this.proIdx]);
-                
+                if(this.user.timeType.mainProjectState != 1){
+                    this.getSubprojectList(this.currentForm.domains[this.proIdx]);
+                }
                 //加载项目相关的工程进度
                 if (this.user.company.packageEngineering == 1){
                     this.getProjectProfessions(this.currentForm.domains[this.proIdx],index);