项目管理增加单个公司的固定字段

fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -89,6 +89,7 @@ const StringUtil = {
         // 工时成本统计
         countHours: false, // 查看工时统计 //
         countCost: false, // 查看成本统计 //
+        countPersonnel: false, // 查看人员数据 //
 
         // 项目报告审核
         projectReportReview: false, // 审核全员日报 //
@@ -172,6 +173,7 @@ const StringUtil = {
         arr[i] == '项目阶段管理' ? obj.projectPhase = true : ''
         arr[i] == '全公司工时统计' ? obj.reportPersonnel = true : ''
         arr[i] == '负责部门工时统计' ? obj.reportResponsible = true : ''
+        arr[i] == '查看人员数据' ? obj.countPersonnel = true : ''
     }
 
     return obj

fhKeeper/formulahousekeeper/timesheet/src/views/centerManage/centerManage.vue

@@ -26,6 +26,7 @@
                 <template slot-scope="scope">{{scope.row.projectNum + '个'}}</template>
             </el-table-column>
             <el-table-column prop="projects" label="相关项目" min-width="180" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="rmark" label="备注" min-width="180" show-overflow-tooltip></el-table-column>
             <el-table-column label="操作" width="170">
                 <template slot-scope="scope" >
                     <el-button size="small" type="primary" @click="addNewSubProject(scope.row)">编辑</el-button>

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

@@ -33,7 +33,7 @@
                 <el-radio-button label="主项目" v-if="user.timeType.mainProjectState"></el-radio-button>
                 <el-radio-button label="项目分类"></el-radio-button>
                 <el-radio-button label="部门"></el-radio-button>
-                <el-radio-button label="人员"></el-radio-button>
+                <el-radio-button label="人员" v-if="permissions.countPersonnel"></el-radio-button>
                 <el-radio-button :label="namess" v-if="jichu.customDegreeActive == 1"></el-radio-button>
             </el-radio-group>
 

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

@@ -74,7 +74,7 @@
                                 </el-upload>
                             </el-dropdown-item>
                             <el-dropdown-item v-if="permissions.projectImport">
-                                <el-link type="primary" :underline="false" @click="downloadmb" v-if="user.company.packageCustomer == 1 || user.company.packageProvider == 1 || user.timeType.mainProjectState == 1">模板下载</el-link>
+                                <el-link type="primary" :underline="false" @click="downloadmb" v-if="user.company.packageCustomer == 1 || user.company.packageProvider == 1 || user.timeType.mainProjectState == 1 || user.companyId == '936'">模板下载</el-link>
                                 <el-link type="primary" :underline="false" href="./upload/项目导入模板.xlsx" download="项目导入模板.xlsx" v-else>模板下载</el-link>
                             </el-dropdown-item>
                             <el-dropdown-item v-if="permissions.projectExport">
@@ -400,7 +400,37 @@
                      placeholder="选择日期"></el-date-picker>
                 </el-form-item>
 
-                
+                <!-- 单个公司的固定字段 -->
+                <div v-if="user.companyId == '936'">
+                <el-form-item label="合同编号" >
+                    <el-input v-model="addForm.contractCode" placeholder="请输入合同编号" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="质保开始时间">
+                    <el-date-picker v-model="addForm.warrantyStartDate" 
+                     :editable="false" style="width:32%;" 
+                     format="yyyy-MM-dd" 
+                     value-format="yyyy-MM-dd"
+                     :clearable="false" type="date" 
+                     placeholder="选择日期"></el-date-picker>
+
+                     <span style="margin-left:63px;margin-right:10px;" >质保截止时间</span>
+                    <el-date-picker v-model="addForm.warrantyEndDate" style="width:33%;"
+                     :editable="false" 
+                     format="yyyy-MM-dd" 
+                     value-format="yyyy-MM-dd"
+                     :clearable="false" type="date" 
+                     placeholder="选择日期"></el-date-picker>
+                </el-form-item>
+                <el-form-item label="自主项目类别" >
+                    <el-input v-model="addForm.projectCategorySub" placeholder="请输入自主项目类别" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="所属大区" >
+                    <el-input v-model="addForm.region" placeholder="请输入 所属大区" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="所属BU" >
+                    <el-input v-model="addForm.bu" placeholder="所属BU" clearable></el-input>
+                </el-form-item>
+                </div>
                 <!-- 项目基线 -->
                 <div style="margin: 10px 0 30px 0;min-height:200px;" v-if="user.company.packageProject == 1">
                     <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -2847,6 +2877,14 @@ a {
                         creatorId: this.user.id,
                         projectMainId: ''
                     }
+                    if(this.user.companyId == '936') {
+                        this.$set(this.addForm, 'contractCode', '')
+                        this.$set(this.addForm, 'warrantyStartDate', '')
+                        this.$set(this.addForm, 'warrantyEndDate', '')
+                        this.$set(this.addForm, 'projectCategorySub', '')
+                        this.$set(this.addForm, 'region', '')
+                        this.$set(this.addForm, 'bu', '')
+                    }
                     this.projectBaseCostData = [];
                     this.auseList = [];
                     for (var m=0;m<this.baseCostItemList.length; m++) {
@@ -2893,6 +2931,16 @@ a {
                         creatorId: item.creatorId
                     }
 
+                    // 判断公司id是否等于936
+                    if(this.user.companyId == '936') {
+                        this.$set(this.addForm, 'contractCode', item.projectSeparate.contractCode)
+                        this.$set(this.addForm, 'warrantyStartDate', item.projectSeparate.warrantyStartDate)
+                        this.$set(this.addForm, 'warrantyEndDate', item.projectSeparate.warrantyEndDate)
+                        this.$set(this.addForm, 'projectCategorySub', item.projectSeparate.projectCategorySub)
+                        this.$set(this.addForm, 'region', item.projectSeparate.region)
+                        this.$set(this.addForm, 'bu', item.projectSeparate.bu)
+                    }
+
                     // 判断是否有供应商
                     if(this.user.company.packageProvider) {
                         // this.addForm.supplierId = item.providerIds.split(',')
@@ -3153,6 +3201,16 @@ a {
                             formData.append("providerIds", this.addForm.supplierId.toString());
                         }
 
+                        // 判断公司id是否等于 936
+                        if(this.user.companyId == '936') {
+                             formData.append("contractCode", this.addForm.contractCode);
+                             formData.append("warrantyStartDate", this.addForm.warrantyStartDate);
+                             formData.append("warrantyEndDate", this.addForm.warrantyEndDate);
+                             formData.append("projectCategorySub", this.addForm.projectCategorySub);
+                             formData.append("region", this.addForm.region);
+                             formData.append("bu", this.addForm.bu);
+                        }
+
                         // formData.append("associateDegreeNames", listName)
                         // console.log("addform",this.addForm);
                         // return