diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.html b/src/app/key-unit/key-unit-management/key-unit-management.component.html
index 6a62535..ffb8368 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.html
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.html
@@ -81,7 +81,8 @@
- arrow forward
+ 🠚
+
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
index 21a58c6..5bc72a0 100644
--- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
+++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
@@ -277,15 +277,20 @@ export class EntryPlanLookComponent implements OnInit {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
- if(element.auditStatus == 4){
+ /* if(element.auditStatus == 4){
this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config);
- }else{
+ } */
if(element.planType == 1){//如果提交审核的是二维预案
- this.http.put(`/api/PlanComponents2D/${element.id}/Commit`,"").subscribe(data=>{
- this.getAllPlanComponents()
- },err => {
- this.snackBar.open(err,'确定',config);
- })
+ if(element.auditStatus ==8){
+ this.http.put(`/api/PlanComponents2D/${element.id}/Commit`,"").subscribe(data=>{
+ this.getAllPlanComponents()
+ },err => {
+ this.snackBar.open(err,'确定',config);
+ })
+ }
+ else{
+ this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config);
+ }
}else{
this.http.put(`/api/PlanComponents/${element.id}/Commit`,"").subscribe(data=>{
this.getAllPlanComponents()
@@ -293,7 +298,7 @@ export class EntryPlanLookComponent implements OnInit {
this.snackBar.open(err,'确定',config);
})
}
- }
+
}
//撤销审核
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.html b/src/app/plan-management/meet-plan/meet-plan.component.html
index cbbcb42..280d8e3 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.html
+++ b/src/app/plan-management/meet-plan/meet-plan.component.html
@@ -33,7 +33,8 @@
- arrow forward
+
+ 🠊
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts
index 9923850..10d1ec2 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.ts
+++ b/src/app/plan-management/meet-plan/meet-plan.component.ts
@@ -160,15 +160,15 @@ export class MeetPlanComponent implements OnInit {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
- if(element.auditStatus == 4){
+ /* if(element.auditStatus == 4){
this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config);
- }else{
+ } */
this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`,"").subscribe(data=>{
this.getAlltabledate()
},err => {
this.snackBar.open(err,'确定',config);
})
- }
+
}
//撤销审核
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
index e2b1644..927c709 100644
--- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
+++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-24 14:15:10
* @LastEditors: sueRimn
- * @LastEditTime: 2021-03-25 14:24:32
+ * @LastEditTime: 2021-03-25 16:33:38
-->