修改立项代码

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectApprovalController.java

@@ -185,6 +185,7 @@ public class ProjectApprovalController {
             List<ProjectApprovalCheck> projectApprovalCheckList = projectApproval.getProjectApprovalCheckList();
             projectApprovalCheckList.forEach(p->{
                 p.setProjectApprovalId(projectApproval.getId());
+                p.setStatus(0);
             });
             projectApprovalCheckList=projectApprovalCheckList.stream().filter(p-> !StringUtils.isEmpty(p.getUserId())).collect(Collectors.toList());
             for (int i = 0; i < projectApprovalCheckList.size(); i++) {

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

@@ -891,9 +891,8 @@ public class ProjectApprovalServiceImpl extends ServiceImpl<ProjectApprovalMappe
                 break;
             /*驳回*/
             case 2:
-                ProjectApprovalCheck check = first.get();
-                check.setStatus(2);
-                projectApprovalCheckService.updateById(check);
+                projectApprovalChecks.forEach(p->p.setStatus(-1));
+                projectApprovalCheckService.saveOrUpdateBatch(projectApprovalChecks);
                 projectApproval.setStatus(2);
                 projectApproval.setRejectInfo(rejectInfo);
                 projectApprovalService.updateById(projectApproval);

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

@@ -90,10 +90,10 @@
                         <el-table-column prop="rejectInfo" :label="$t('dismissreason')" min-width="250" ></el-table-column>
                         <el-table-column :label="$t('operation')" :width="300" align="left" fixed="right">
                             <template slot-scope="scope">
-                                <el-button size="mini" type="primary" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck)&&scope.row.status!=1" :disabled="scope.row.status!==-1"  @click="handleAdd(scope.$index, scope.row)">{{'编辑'}}</el-button>
+                                <el-button size="mini" type="primary" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck)&&scope.row.status!=1" :disabled="scope.row.status!==-1&& scope.row.status!==2 "  @click="handleAdd(scope.$index, scope.row)">{{'编辑'}}</el-button>
                                 <el-button size="mini" type="success" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck) && scope.row.status==0" :disabled="!scope.row.isFirstCheckUser"  @click="check(scope.row,1)" >{{'通过'}}</el-button>
                                 <el-button size="mini" v-if="(permissions.projectApprovalEdit||permissions.projectApprovalCheck) && scope.row.status==0" :disabled="!scope.row.isFirstCheckUser"  @click="showDenyDialog(scope.row,2)">{{'驳回'}}</el-button>
-                                <el-button size="mini" v-if="(permissions.projectApprovalEdit ||permissions.projectApprovalCheck) && scope.row.status==-1" @click="check(scope.row,3)">{{'撤销'}}</el-button>
+                                <!-- <el-button size="mini" v-if="(permissions.projectApprovalEdit ||permissions.projectApprovalCheck) && scope.row.status==-1" @click="check(scope.row,3)">{{'撤销'}}</el-button> -->
                             </template>
                         </el-table-column>
                     </el-table>
@@ -257,15 +257,15 @@
                                     <div>
                                         <div v-for="(item, index) in pointList" :key="index" style="margin-bottom: 10px; padding: 10px; border: 1px solid #e0e0e0; border-radius: 5px;">
                                             第{{index + 1}}审核人:
-                                            <el-select v-if="user.userNameNeedTranslate != 1" :disabled="item.status != 0" v-model="item.userId" style="width: 140px; margin-left: 10px;" :placeholder="$t('defaultText.pleaseChoose')" clearable @change="manageSelect" size="small" filterable popper-class="managePopperClass">
+                                            <el-select v-if="user.userNameNeedTranslate != 1" :disabled="item.status != -1" v-model="item.userId" style="width: 140px; margin-left: 10px;" :placeholder="$t('defaultText.pleaseChoose')" clearable @change="manageSelect" size="small" filterable popper-class="managePopperClass">
                                                 <el-option v-for="participatorItem in participator" :key="participatorItem.id" :label="participatorItem.name" :value="participatorItem.id">
                                                     <span style="float: left">{{ participatorItem.name }}</span>
                                                 </el-option>
                                             </el-select>
                                             <selectCat v-if="user.userNameNeedTranslate == 1" :size="'medium'" :subject="participator" :subjectId="item.userId" :distinction="'12'" @selectCal="selectCal" :disabled="canOnlyModParticipator || projectManagerEdit || isShowProjectName"></selectCat>
                                             <i class="el-icon-circle-plus-outline" @click="addInput(index)" v-if="index == pointList.length - 1" style="margin-left: 10px;"></i>
-                                            <i class="el-icon-remove-outline" v-if="pointList.length > 1 && item.status == 0" @click="deleteInput(index)" style="margin-left: 10px;"></i>
-                                            <span style="margin-left: 10px;">{{ item.status == 0 ? '待审核' : item.status == 1 ? "已审核" : "已驳回" }}</span>
+                                            <i class="el-icon-remove-outline" v-if="pointList.length > 1 && item.status == -1" @click="deleteInput(index)" style="margin-left: 10px;"></i>
+                                            <span style="margin-left: 10px;">{{ item.status == -1 ? '待提交' : item.status == 0 ? "待审核" : item.status == 1 ? "已审核" : "已驳回" }}</span>
                                         </div>
                                     </div>
                                 </template>
@@ -510,9 +510,9 @@ return {
     pointList:[{
         userId:"",
         seq:1,
-        status:0
+        status:-1
     }],
-    idx: 1,
+    idx: 0,
     tableHeight: 0,
     projectApprovalDetailVisible:false,
     projectApprocalDetail:{},
@@ -565,6 +565,7 @@ methods: {
                 });
                 this.addFormVisible=false
                 this.denyReasonDialog=false
+                this.denyReasonRReason='',
                 this.getList();
             } else {
                 this.$message({
@@ -906,7 +907,7 @@ methods: {
             }
             this.pointList=[{
                 "userId":"",
-                "status":0
+                "status":-1
             }]
         } else {
             this.http.post('/project-approval/getDetail', {id: item.id},
@@ -1304,7 +1305,7 @@ methods: {
         } else if(obj.distinction == '12') {
             this.pointList.push({
                 "userId":obj.id,
-                "status":0
+                "status":-1
             })
             this.pointList=this.pointList.filter(i=>i.userId!="")
         }
@@ -1347,7 +1348,7 @@ methods: {
                         }else{
                             this.pointList=[{
                                 "userId":"",
-                                "status":0
+                                "status":-1
                             }]
                         }
                     } else {
@@ -1416,7 +1417,7 @@ methods: {
         this.pointList.push({
             userId:"",
             seq:index+2,
-            status:0
+            status:-1
         })
     },
     deleteInput(index){