Browse Source

处理手机端的新增项目时传inchargerId为null字符串bug.

seyason 2 years ago
parent
commit
64fbcf4cec

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

@@ -495,7 +495,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         TimeType timeType = timeTypeMapper.selectById(user.getCompanyId());
         boolean isNew = true;
         //检查负责人要在参与人中
-        if (inchargerId != null) {
+        if (!StringUtils.isEmpty(inchargerId)) {
             if (userIds == null || userIds.length == 0) {
                 userIds = new String[1];
                 userIds[0] = inchargerId;//自动加进去
@@ -810,7 +810,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         }
         if (httpRespMsg.code.equals("ok")) {
             //编辑关系
-            participationMapper.delete(new QueryWrapper<Participation>().eq("project_id", id));
+            participationMapper.dele
+        te(new QueryWrapper<Participation>().eq("project_id", id));
             if (userIds != null) {
                 for (String userId : userIds) {
                     participationMapper.insert(new Participation().setProjectId(id).setUserId(userId));

BIN
fhKeeper/formulahousekeeper/management-platform/src/main/resources/upload/员工工时导入模板.xlsx


BIN
fhKeeper/formulahousekeeper/management-platform/src/main/resources/upload/费用报销导入模板.xlsx


+ 10 - 23
fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/index.vue

@@ -388,8 +388,6 @@
                         associateDegreeNames: null,
                         associateDegrees: null
                     }
-                    // this.userList.forEach(u=>u.isChecked=false);
-                    // this.refreshParticipate();
                 } else {
                     this.title = "修改项目";
                     var arrs
@@ -407,7 +405,6 @@
                     } else {
                         name = ''
                     }
-                    console.log(name, '看看')
                     this.form = {
                         id: this.list[i].id,
                         projectName: this.list[i].projectName,
@@ -418,7 +415,6 @@
                         associateDegrees: arrs
                     }
                     var part = this.list[i].participator;
-                    
                     if (part.length>0) {
                         for (var j in part) {
                             this.userList.filter(u=>u.id == part[j].id)[0].isChecked = true;
@@ -439,36 +435,25 @@
                     let formData = new URLSearchParams();
                     formData.append("name", this.form.projectName);
                     formData.append("code", this.form.projectCode);
-                    formData.append("inchargerId", this.form.inchargerId);
+                    if (this.form.inchargerId) {
+                        formData.append("inchargerId", this.form.inchargerId);
+                    }
+                    
                     for (var j in this.form.userId) {
                         formData.append("userId", this.form.userId[j]);
                     }
                     if(this.form.id != null) {
-                        // form.id = this.form.id;
                         formData.append("id", this.form.id);
                     }
-                    if(this.form.associateDegreeNames != '' &&  this.form.associateDegreeNames != null) {
+                    if(this.form.associateDegreeNames) {
                         formData.append("associateDegreeNames", this.form.associateDegreeNames);
-                    } else {
-                        formData.append("associateDegreeNames", null);
-                    }
+                    } 
 
-                    if(this.form.associateDegrees != null && this.form.associateDegrees.length != 0) {
+                    if(this.form.associateDegrees) {
                         var sss = this.form.associateDegrees.toString()
                         formData.append("associateDegrees", sss);
-                    } else {
-                        formData.append("associateDegrees", null);
                     }
-                    // const config = {
-                    //     // headers: {
-                    //     // 'Content-Type': 'multipart/form-data',
-                        
-                    //     // // 'Content-Type': 'application/x-www-form-urlencoded'
-                    //     // },
-                    //     // transformRequest: [function (data, headers) {
-                    //     //     return data;
-                    //     // }],
-                    // }    
+
                     this.$axios.post("/project/editProject", formData)
                     .then(res => {
                         if(res.code == "ok") {    
@@ -483,6 +468,8 @@
                             this.$toast.fail(res.msg);
                         }
                     }).catch(err=> {this.$toast.clear();});
+                    
+
                 } else {
                     this.show = false;
                     this.yanjiuzx()

+ 7 - 7
fhKeeper/formulahousekeeper/timesheet_h5/src/views/project/projectInside.vue

@@ -146,37 +146,37 @@
                     <van-cell>
                         <van-row>
                             <van-col span="7">合同编号:</van-col>
-                            <van-col span="17">{{projectDetail.projectSeparate.contractCode ? projectDetail.projectSeparate.contractCode : '-'}}</van-col>
+                            <van-col span="17" v-if="projectDetail.projectSeparate">{{projectDetail.projectSeparate.contractCode ? projectDetail.projectSeparate.contractCode : '-'}}</van-col>
                         </van-row>
                     </van-cell>
                     <van-cell>
                         <van-row>
                             <van-col span="7">质保开始时间:</van-col>
-                            <van-col span="17">{{projectDetail.projectSeparate.warrantyStartDate == null ? '-' : projectDetail.projectSeparate.warrantyStartDate}}</van-col>
+                            <van-col span="17" v-if="projectDetail.projectSeparate">{{projectDetail.projectSeparate.warrantyStartDate == null ? '-' : projectDetail.projectSeparate.warrantyStartDate}}</van-col>
                         </van-row>
                     </van-cell>
                     <van-cell>
                         <van-row>
                             <van-col span="7">质保截至时间:</van-col>
-                            <van-col span="17">{{projectDetail.projectSeparate.warrantyEndDate == null ? '-' : projectDetail.projectSeparate.warrantyEndDate}}</van-col>
+                            <van-col span="17" v-if="projectDetail.projectSeparate">{{projectDetail.projectSeparate.warrantyEndDate == null ? '-' : projectDetail.projectSeparate.warrantyEndDate}}</van-col>
                         </van-row>
                     </van-cell>
                     <van-cell>
                         <van-row>
                             <van-col span="7">自主项目类别:</van-col>
-                            <van-col span="17">{{projectDetail.projectSeparate.projectCategorySub}}</van-col>
+                            <van-col span="17" v-if="projectDetail.projectSeparate">{{projectDetail.projectSeparate.projectCategorySub}}</van-col>
                         </van-row>
                     </van-cell>
                     <van-cell>
                         <van-row>
                             <van-col span="7">所属大区:</van-col>
-                            <van-col span="17">{{projectDetail.projectSeparate.region}}</van-col>
+                            <van-col span="17" v-if="projectDetail.projectSeparate">{{projectDetail.projectSeparate.region}}</van-col>
                         </van-row>
                     </van-cell>
                     <van-cell>
                         <van-row>
                             <van-col span="7">所属BU:</van-col>
-                            <van-col span="17">{{projectDetail.projectSeparate.bu}}</van-col>
+                            <van-col span="17" v-if="projectDetail.projectSeparate">{{projectDetail.projectSeparate.bu}}</van-col>
                         </van-row>
                     </van-cell>
                 </template>
@@ -186,7 +186,7 @@
                     <van-cell>
                         <van-row>
                             <van-col span="7">项目分组:</van-col>
-                            <van-col span="17">{{projectDetail.projectSeparate.projectCategorySub ? projectDetail.projectSeparate.projectCategorySub : '-'}}</van-col>
+                            <van-col span="17" v-if="projectDetail.projectSeparate">{{projectDetail.projectSeparate.projectCategorySub ? projectDetail.projectSeparate.projectCategorySub : '-'}}</van-col>
                         </van-row>
                     </van-cell>
                 </template>