|
- 单位名称
+
+ 单位名称
+
|
- {{company}}
+
+ {{company}}
+
|
@@ -2386,7 +2394,7 @@
style="font-family:宋体; font-size:9pt">{{item.name}}
- ![]()
-
@@ -139,8 +138,6 @@
{{o.name}}
-
-
|
申请人: {{i.organization.level == 'battalion'? i.creator.name :
@@ -148,23 +145,22 @@
+ *ngIf="i.approvalStatus == '驳回' || i.approvalStatus == '通过'; else elseTemplate6">
-
-
+
+
{{i.inspectionResult}}
-
+
{{i.approvalStatus}}
-
diff --git a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts
index aa3fa2c..c8e815d 100644
--- a/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts
+++ b/src/app/home/task/da-oneself-plan/da-oneself-plan.component.ts
@@ -113,7 +113,7 @@ export class DaOneselfPlanComponent implements OnInit {
this.cardData.forEach(element => {
element.data.forEach(item => {
- item.approvalStatus == '通过' ? element.passed += 1 : null
+ item.approvalStatus == '待检查' ? element.passed += 1 : null
item.approvalStatus == '已检查 ' ? element.inspected += 1 : null
})
})
diff --git a/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.ts b/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.ts
index 3cb0869..23cdc3e 100644
--- a/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.ts
+++ b/src/app/home/task/da-oneself-plan/plan-adjustment/plan-adjustment.component.ts
@@ -34,13 +34,13 @@ export class PlanAdjustmentComponent implements OnInit {
}
push(i, item, e) {
let body = {
- approvalStatus: e ? '通过' : '待处理'
+ approvalStatus: e ? '待检查' : '待处理'
}
this.http.patch(`/api/PlanTasks/${i.id}`, body).subscribe({
next: (data) => {
this.message.create('success', '处理成功');
if (e) {
- i.approvalStatus = '通过'
+ i.approvalStatus = '待检查'
let isTrue = this.data.data.find((item) => {
return item.name == i.taskType
})
diff --git a/src/app/home/task/station-task-execution/station-task-execution.component.html b/src/app/home/task/station-task-execution/station-task-execution.component.html
index b549bb6..f0703b4 100644
--- a/src/app/home/task/station-task-execution/station-task-execution.component.html
+++ b/src/app/home/task/station-task-execution/station-task-execution.component.html
@@ -89,9 +89,9 @@
-
+
- {{item.planTime | date:"yyyy-MM-dd"}}
+ {{item.planTime | date:"yyyy-MM-dd HH:mm:ss"}}
时间
@@ -185,10 +185,11 @@
同步工作
-
+
查看
- 完成
+ 完成
+ 驳回
操作
diff --git a/src/app/home/task/station-task-execution/station-task-execution.component.scss b/src/app/home/task/station-task-execution/station-task-execution.component.scss
index 96cdb68..b653342 100644
--- a/src/app/home/task/station-task-execution/station-task-execution.component.scss
+++ b/src/app/home/task/station-task-execution/station-task-execution.component.scss
@@ -204,6 +204,10 @@
}
+ .flexcolcaozuo {
+ flex: 1.5;
+ }
+
.flexcolassistant {
flex: 2;
overflow: hidden;
@@ -242,6 +246,10 @@
flex: 2;
}
+ .time {
+ flex: 2;
+ }
+
.flexcolcenter {
flex: 0.5;
align-items: center;
diff --git a/src/app/home/task/station-task-execution/station-task-execution.component.ts b/src/app/home/task/station-task-execution/station-task-execution.component.ts
index 0f11077..adf7344 100644
--- a/src/app/home/task/station-task-execution/station-task-execution.component.ts
+++ b/src/app/home/task/station-task-execution/station-task-execution.component.ts
@@ -54,8 +54,29 @@ export class StationTaskExecutionComponent implements OnInit {
this.getTaskList()
}
- cancel(item, type) {
-
+ cancel(item) {
+ this.modal.confirm({
+ nzTitle: `确定要驳回该任务吗?`,
+ nzOkText: '确定',
+ nzOkType: 'default',
+ nzOnOk: () => {
+ item.isLoading = true
+ this.http.post(`/api/PlanTasks/Approval/${item.id}`, null, {
+ params: {
+ approvalStatus: '驳回'
+ }
+ }).subscribe({
+ next: (data) => {
+ this.getTaskList()
+ this.message.create('success', '已驳回');
+ },
+ error: (err) => {
+ this.message.create('warning', '驳回失败');
+ }
+ })
+ },
+ nzCancelText: '取消'
+ });
}
delete(item) {
diff --git a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html
index d38b468..666b978 100644
--- a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html
+++ b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.html
@@ -100,10 +100,10 @@
{{i.company.companyName}}
接受
拒绝
({{i.approvalStatus}})
@@ -111,9 +111,10 @@
{{i.company.organization.name}}
接受
- 拒绝
({{i.approvalStatus}})
@@ -138,15 +139,15 @@
{{element.name}}
单位总数: {{element.allUnitsNum}}/{{TuesdayThursdayNum}}
-
+
完成进度
-
+
{{element.isExpand ? '收起' :'展开'}}
@@ -247,9 +248,10 @@
同步工作
-
+
-
diff --git a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss
index 5fadfbf..a52b49c 100644
--- a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss
+++ b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.scss
@@ -14,6 +14,7 @@
padding: 10px 20px;
padding-bottom: 0px;
color: #000;
+
.inform {
width: 100%;
height: 100%;
@@ -116,7 +117,8 @@
align-items: flex-start;
flex: 1;
box-sizing: border-box;
- nz-badge{
+
+ nz-badge {
width: 80%;
color: #fff;
}
@@ -391,13 +393,14 @@
color: #C7CAD0;
}
}
- .flexcolcenter{
+
+ .flexcolcenter {
align-items: center;
}
.flexcolassistant {
- flex: 2;
+ flex: 1.6;
overflow: hidden;
.assistant {
@@ -433,7 +436,9 @@
width: 100%;
}
}
-
+ .time{
+ flex: 1.2;
+ }
.btnbox {
display: flex;
justify-content: flex-end;
diff --git a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts
index 2b69a7d..b5d5f46 100644
--- a/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts
+++ b/src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts
@@ -100,8 +100,15 @@ export class StationWeeklyPlanComponent implements OnInit {
})
}
checkTime(e, i, element) {
+ console.log(e)
+
+
if (e) {
- i.planTime = moment(e).format('yyyy-MM-DD')
+
+ let time = new Date(moment(e).format('yyyy-MM-DD HH:mm:ss')).toISOString()
+
+ i.planTime = time
+
} else {
i.planTime = null
}
@@ -238,7 +245,7 @@ export class StationWeeklyPlanComponent implements OnInit {
this.cardData.forEach(element => {
element.data.forEach(item => {
- item.approvalStatus == '通过' ? element.passed += 1 : null
+ item.approvalStatus == '待检查' ? element.passed += 1 : null
item.approvalStatus == '已检查' ? element.inspected += 1 : null
})
})
@@ -342,12 +349,12 @@ export class StationWeeklyPlanComponent implements OnInit {
item.isLoading = true
this.http.post(`/api/PlanTasks/Approval/${i.id}`, null, {
params: {
- approvalStatus: '通过'
+ approvalStatus: '待检查'
}
}).subscribe({
next: (data) => {
this.message.create('success', '已接受');
- i.approvalStatus = '通过'
+ i.approvalStatus = '待检查'
item.isLoading = false
item.passed += 1
this.getTaskListPass(this.stationData[0])
@@ -571,7 +578,7 @@ export class StationWeeklyPlanComponent implements OnInit {
supervisorIds: this.isSupervisor ? [this.userId] : [],
assistantOrganizationIds: this.isSupervisor ? [] : [this.OrganizationId],
creationType: '自主任务',
- approvalStatus: '通过'
+ approvalStatus: '待检查'
}
this.http.post('/api/PlanTasks', body).subscribe({
next: (data: any) => {
@@ -663,13 +670,13 @@ export class StationWeeklyPlanComponent implements OnInit {
this.http.post(`/api/PlanTasks/ApprovalMany`, null, {
params: {
ids: ids,
- approvalStatus: '通过'
+ approvalStatus: '待检查'
}
}).subscribe({
next: (data) => {
this.message.create('success', '成功');
item.data.forEach(element => {
- element.approvalStatus = '通过'
+ element.approvalStatus = '待检查'
});
this.getTaskListPass(this.stationData[0])
},
diff --git a/src/app/home/task/station-weekly-plan/task-details/task-details.component.ts b/src/app/home/task/station-weekly-plan/task-details/task-details.component.ts
index 39f9f83..97682be 100644
--- a/src/app/home/task/station-weekly-plan/task-details/task-details.component.ts
+++ b/src/app/home/task/station-weekly-plan/task-details/task-details.component.ts
@@ -26,12 +26,12 @@ export class TaskDetailsComponent implements OnInit {
nzOnOk: () => {
this.http.post(`/api/PlanTasks/Approval/${i.id}`, null, {
params: {
- approvalStatus: '通过'
+ approvalStatus: '待检查'
}
}).subscribe({
next: (data) => {
this.message.create('success', '已接受');
- i.approvalStatus = '通过'
+ i.approvalStatus = '待检查'
this.parent.stationData.forEach(element => {
if (element.id == i.company.organizationId) {
if (element.isExpand) {
diff --git a/src/app/home/task/zhi-indicators/zhi-indicators.component.ts b/src/app/home/task/zhi-indicators/zhi-indicators.component.ts
index 5dc5fb1..df3312e 100644
--- a/src/app/home/task/zhi-indicators/zhi-indicators.component.ts
+++ b/src/app/home/task/zhi-indicators/zhi-indicators.component.ts
@@ -805,12 +805,12 @@ export class ZhiIndicatorsComponent implements OnInit {
item.isLoading = true
this.http.post(`/api/PlanTasks/Approval/${item.id}`, null, {
params: {
- approvalStatus: '通过'
+ approvalStatus: '待检查'
}
}).subscribe({
next: (data) => {
this.message.create('success', '已派发');
- item.approvalStatus = '通过'
+ item.approvalStatus = '待检查'
item.isLoading = false
item.passed += 1
type == '投诉举报' ? this.complaint.allocated += 1 : null
|