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

fhKeeper/formulahousekeeper/inva_4_tivo/css/index.css

@@ -74,7 +74,7 @@
     height: 34.625rem;
     position: absolute;
     top: 150px;
-    right: 225px;
+    right: 330px;
     z-index: 1;
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -1165,7 +1165,10 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         List<ProjectAuditor> auditorList = projectAuditorMapper.selectList(new QueryWrapper<ProjectAuditor>().eq("project_id", id));
         project.setAuditorList(auditorList);
         project.setAuditUserIds(auditorList.stream().map(ProjectAuditor::getAuditorId).collect(Collectors.toList()));
-
+        if(project.getCompanyId()==936){
+            ProjectSeparate projectSeparate = projectSeparateMapper.selectById(id);
+            project.setProjectSeparate(projectSeparate);
+        }
         HttpRespMsg msg = new HttpRespMsg();
         msg.data = project;
 

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

@@ -46,6 +46,33 @@
                         <el-col :span="5" ><span class="gray_label">{{yonghuUser.customDegreeName}}:</span></el-col>
                         <el-col :span="18" ><span>{{project.associateDegreeNames}}</span></el-col>
                     </el-row>
+                    
+
+                    <!-- this.project  -->
+                    <div v-if="user.companyId == '936'">
+                        <el-row :gutter="10" >
+                            <el-col :span="5" ><span class="gray_label">合同编号:</span></el-col><el-col :span="7" ></el-col>
+                            <el-col :span="18" ><span>{{project.projectSeparate.contractCode}}</span></el-col>
+                        </el-row>
+                        <el-row :gutter="10">
+                            <el-col :span="5" ><span class="gray_label">质保开始时间</span></el-col><el-col :span="7" >
+                                <span >{{project.projectSeparate.warrantyStartDate==null?'-':project.projectSeparate.warrantyStartDate}}</span></el-col>
+                            <el-col :span="5" ><span class="gray_label">质保截止时间:</span></el-col><el-col :span="7" ><span>
+                                {{project.projectSeparate.warrantyEndDate == null?'-':project.projectSeparate.warrantyEndDate}}</span></el-col>
+                        </el-row>
+                        <el-row :gutter="10" >
+                            <el-col :span="5" ><span class="gray_label">自主项目类别:</span></el-col><el-col :span="7" ></el-col>
+                            <el-col :span="18" ><span>{{project.projectSeparate.projectCategorySub}}</span></el-col>
+                        </el-row>
+                        <el-row :gutter="10" >
+                            <el-col :span="5" ><span class="gray_label">所属大区:</span></el-col><el-col :span="7" ></el-col>
+                            <el-col :span="18" ><span>{{project.projectSeparate.region}}</span></el-col>
+                        </el-row>
+                        <el-row :gutter="10" >
+                            <el-col :span="5" ><span class="gray_label">所属BU:</span></el-col><el-col :span="7" ></el-col>
+                            <el-col :span="18" ><span>{{project.projectSeparate.bu}}</span></el-col>
+                        </el-row>
+                    </div>
                 </div>
                 <div class="box" style="margin-top:10px;">
                     <div><label>相关人员</label>
@@ -238,7 +265,7 @@
 
         
         <!--编辑基本信息界面-->
-        <el-dialog title="项目基本信息" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth" width="600px">
+        <el-dialog title="项目基本信息" 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="项目编号" >
                     <el-input v-model="addForm.code"  placeholder="请输入项目编号" clearable></el-input>
@@ -285,6 +312,37 @@
                         </span> 
                     </el-select>
                 </el-form-item>
+
+                <div v-if="user.companyId == '936'">
+                    <el-form-item label="合同编号" >
+                        <el-input v-model="addForm.projectSeparate.contractCode" placeholder="请输入合同编号" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item label="质保开始时间">
+                        <el-date-picker v-model="addForm.projectSeparate.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.projectSeparate.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.projectSeparate.projectCategorySub" placeholder="请输入自主项目类别" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item label="所属大区" >
+                        <el-input v-model="addForm.projectSeparate.region" placeholder="请输入 所属大区" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item label="所属BU" >
+                        <el-input v-model="addForm.projectSeparate.bu" placeholder="所属BU" clearable></el-input>
+                    </el-form-item>
+                </div>
                
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -1360,6 +1418,15 @@
                         console.log(listId, listName)
                         formData.append("associateDegrees", listId)
                         formData.append("associateDegreeNames", listName)
+                        // 判断公司id是否等于 936
+                        if(this.user.companyId == '936') {
+                             formData.append("contractCode", this.addForm.projectSeparate.contractCode);
+                             formData.append("warrantyStartDate", this.addForm.projectSeparate.warrantyStartDate);
+                             formData.append("warrantyEndDate", this.addForm.projectSeparate.warrantyEndDate);
+                             formData.append("projectCategorySub", this.addForm.projectSeparate.projectCategorySub);
+                             formData.append("region", this.addForm.projectSeparate.region);
+                             formData.append("bu", this.addForm.projectSeparate.bu);
+                        }
                         // return
                         this.http.uploadFile(this.port.project.add,formData,
                         res => {
@@ -1404,21 +1471,24 @@
                 this.addFormVisible = true;
                 console.log(this.addForm, 123)
                 var arr = []
-                if(this.addForm.associateDegrees.length > 0) {
-                    if(this.addForm.associateDegrees.length == 1) {
-                        var sl = +this.addForm.associateDegrees + 0
-                        arr.push(sl)              
-                    } else {
-                        var spl =  this.addForm.associateDegrees.split(',')
-                        for(var i in spl) {
-                            var ss  = +spl[i] + 0
-                            arr.push(ss)
+                // if(this.addForm.associateDegrees != null) {
+                    if(this.addForm.associateDegrees.length > 0) {
+                        if(this.addForm.associateDegrees.length == 1) {
+                            var sl = +this.addForm.associateDegrees + 0
+                            arr.push(sl)              
+                        } else {
+                            var spl =  this.addForm.associateDegrees.split(',')
+                            for(var i in spl) {
+                                var ss  = +spl[i] + 0
+                                arr.push(ss)
+                            }
                         }
+                    } else {
+                        arr = []
                     }
-                } else {
-                    arr = []
-                }
+                // }
                 this.auseList = arr
+                console.log(this.auseList, '看看是个什么值')
             },
             showEditPar() {
                 this.addForm = JSON.parse(JSON.stringify(this.project));
@@ -1575,6 +1645,7 @@
                     this.listLoading = false;
                     if (res.code == "ok") {
                         this.project = res.data;
+                        console.log('看看值')
                         console.log('test123',this.project);
                         this.participator = this.project.participationList;
                     } else {