日报，代李提交

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

@@ -2,14 +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="showMmeiLaiDe" prop="taskPlanType">
-                <el-select v-model="addForm.taskPlanType" :placeholder="$t('defaultText.pleaseChoose')" style="width:100%;" :disabled="doYouWantToDisableAll">
-                    <el-option label="出差" :value="1"></el-option>
-                    <el-option label="在办公事处" :value="2"></el-option>
-                    <el-option label="请假" :value="3"></el-option>
-                </el-select>
-            </el-form-item>
-            <template v-if="addForm.taskPlanType != 3">
+            <template>
                 <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%;" :disabled="doYouWantToDisableAll">
                         <el-option-group v-for="group in integrationProjectList" :key="group.label" :label="group.label">

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

@@ -4,7 +4,7 @@
     </div>
     <!-- 任务详情信息弹出框 -->
     <el-dialog :class="''" :title="title" v-if="addFormVisible" append-to-body
-      :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="840px" :top="'6vh'">
+      :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" :width="user.companyId == 3092?'1150px':'840px'" :top="'6vh'">
       <taskComponent ref="thskComponents" :integrationTask="integrationTask" :showOrNot="showOrNot"
         @closeBounced="closeBounced" :showMmeiLaiDe="true" :showMmeiLaiDeData="showMmeiLaiDeData"></taskComponent>
       <div slot="title" v-if="addForm.parentTid != null">

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

@@ -409,7 +409,7 @@
 
         <!--新增任务界面-->
         <el-dialog :class="addForm.id==null?'':'jm'" :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" 
-        :close-on-click-modal="false" customClass="customWidth" width="840px" ref="addDialog" :top="'6vh'">
+        :close-on-click-modal="false" customClass="customWidth" :width="user.companyId == 3092?'1150px':'850px'" ref="addDialog" :top="'6vh'">
             <!-- 整合 -->
             <taskComponent ref="thskComponents" :integrationTask="integrationTask" @closeBounced="closeBounced"></taskComponent>
             <div slot="title" v-if="addForm.parentTid != null || isRelationItem" >

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

@@ -372,7 +372,7 @@
 
         <!-- 任务详情信息弹出框 -->
         <el-dialog :class="addForm.id==null?'':'jm'" :title="title" v-if="addFormVisible" :visible.sync="addFormVisible" 
-        :close-on-click-modal="false" customClass="customWidth" width="840px" :top="'6vh'">
+        :close-on-click-modal="false" customClass="customWidth" :width="user.companyId == 3092?'1150px':'840px'" :top="'6vh'">
         <!-- <div style="width: 200%;height:80%;position: absolute;right:-100%;top:0;background:#000;opacity: 0;" @click="sss"></div> -->
             <!-- 整合 -->
             <taskComponent ref="thskComponents" :integrationTask="integrationTask" :showOrNot="showOrNot" @closeBounced="closeBounced"></taskComponent>

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -5210,7 +5210,16 @@
             },
 
             getGroupStages(domain, index, keepStage) {
-                // console.log(domain);
+                if(this.user.companyId == '7536') {
+                    const taskGroupsList = domain.taskGroups
+                    const groupId = domain.groupId
+                    const taskGroupRow = taskGroupsList.find(item => item.id == groupId)
+                    if(groupId && taskGroupRow.name.indexOf('出差工时') != '-1') {
+                        domain.extraField4 = ''
+                        domain.extraField5 = ''
+                    }
+                }
+                console.log(domain);
                 if(!domain.groupId){
                     domain.projectAuditorId = ''
                     domain.stages = []
@@ -5218,6 +5227,7 @@
                         domain.taskId = ''
                         domain.sapServiceId = ''
                     }
+                    
                     if(this.user.timeType.reportAuditType >= 1){
                         domain.auditUserList = []
                     }
@@ -7091,7 +7101,21 @@
                     })
                     return
                 }
-
+                if(this.user.companyId == '7536') {
+                    const taskGroupsList = this.zhoBao.taskGroups
+                    const groupId = this.zhoBao.groupId
+                    const taskGroupRow = taskGroupsList.find(item => item.id == groupId)
+                    const extraField4 = this.zhoBao.extraField4
+                    const extraField5 = this.zhoBao.extraField5
+                    if(groupId && taskGroupRow.name.indexOf('研发工时') != '-1' && (extraField4 || extraField5)) {
+                        this.$message({
+                            message: `选择了研发工时，请勿填写工单号和行号`,
+                            type: "error"
+                        });
+                        return
+                    }
+                }
+                
                 this.tianxieDialogVisible = false
                 var zhong = this.zhoData
                 this.zhoBao.hasEdited = true;
@@ -8892,7 +8916,24 @@
                             if(this.user.timeType.reportExtraField5Name) {
                                 formData.append('extraField5', this.workForm.domains[i].extraField5 || '');
                             }
+
+                            if(this.user.companyId == 7536) {
+                                const taskGroupsList = this.workForm.domains[i].taskGroups
+                                const groupId = this.workForm.domains[i].groupId
+                                const taskGroupRow = taskGroupsList.find(item => item.id == groupId)
+                                const extraField4 = this.workForm.domains[i].extraField4
+                                const extraField5 = this.workForm.domains[i].extraField5
+                                const projectName = this.workForm.domains[i].projectName
+                                if(taskGroupRow.name.indexOf('研发工时') != '-1' && (extraField4 || extraField5)) {
+                                    this.$message({
+                                        message: `【${projectName}】项目选择了研发工时，请勿填写工单号和行号`,
+                                        type: "error"
+                                    });
+                                    return
+                                }
+                            }
                         }
+
                         this.submitingReport = true;
                         this.http.uploadFile( this.port.report.editPort, formData,
                         res => {