Skip to content

M
mySkill-x
Commit 0c8e08af by Nattana Chaiyamat
Options

psm เช็คว่าแก้ไขได้ไหม

parent a2a4d1f6
Showing with 3 additions and 3 deletions
src/app/components/performance-evaluation/evaluation/evaluation.component.ts
...@@ -81,8 +81,8 @@ export class EvaluationComponent implements OnInit { ...@@ -81,8 +81,8 @@ export class EvaluationComponent implements OnInit {
next: response => { next: response => {
this.appraisalCompentency.data = JSON.parse(JSON.stringify(response)) this.appraisalCompentency.data = JSON.parse(JSON.stringify(response))
if (this.appraisalCompentency.data?.masfromEvaluationAssessment1lList[0]) { if (this.appraisalCompentency.data?.masfromEvaluationAssessment1lList[0]) {
this.canSave = (this.appraisalCompentency.data.currentStep == this.appraisalCompentency.data.checkStep) && this.appraisalCompentency.data.masfromStatusType.code != 'Boss_finish' this.canSave = (this.appraisalCompentency.data.currentStep == this.appraisalCompentency.data.checkStep) && this.appraisalCompentency.data.masfromStatusType.code != 'Boss_finish' && this.appraisalCompentency.data.masfromStatusType.code != 'Not_evaluating_yet'
this.canEdit = (this.appraisalCompentency.data.currentStep == this.appraisalCompentency.data.checkStep && (+(this.appraisalCompentency.data.checkStep) <= 1)) this.canEdit = (this.appraisalCompentency.data.currentStep == this.appraisalCompentency.data.checkStep && (+(this.appraisalCompentency.data.checkStep) <= 1)) && this.appraisalCompentency.data.masfromStatusType.code != 'Boss_finish' && this.appraisalCompentency.data.masfromStatusType.code != 'Not_evaluating_yet'
switch (this.appraisalCompentency.data?.currentStep) { switch (this.appraisalCompentency.data?.currentStep) {
case ("0"): { case ("0"): {
if (this.canSave) { if (this.canSave) {
......
src/app/components/performance-evaluation/pms-evaluation/pms-evalution.component.ts
...@@ -175,7 +175,7 @@ export class PmsEvalutionComponent { ...@@ -175,7 +175,7 @@ export class PmsEvalutionComponent {
this.changePercentage() this.changePercentage()
if (this.appraisalPms.data) { if (this.appraisalPms.data) {
this.canSave = (this.appraisalPms.data.currentStep == this.appraisalPms.data.checkStep) && this.appraisalPms.data.masfromStatusType.code != 'Boss_finish' && this.appraisalPms.data.masfromStatusType.code != 'Not_evaluating_yet' this.canSave = (this.appraisalPms.data.currentStep == this.appraisalPms.data.checkStep) && this.appraisalPms.data.masfromStatusType.code != 'Boss_finish' && this.appraisalPms.data.masfromStatusType.code != 'Not_evaluating_yet'
this.canEdit = (this.appraisalPms.data.currentStep == this.appraisalPms.data.checkStep) && this.appraisalPms.data.masfromStatusType.code != 'Boss_finish' && this.appraisalPms.data.masfromStatusType.code != 'Not_evaluating_yet' this.canEdit = (this.appraisalPms.data.currentStep == this.appraisalPms.data.checkStep) && (+(this.appraisalPms.data.checkStep) <= 1) && this.appraisalPms.data.masfromStatusType.code != 'Boss_finish' && this.appraisalPms.data.masfromStatusType.code != 'Not_evaluating_yet'
switch (this.appraisalPms.data?.currentStep) { switch (this.appraisalPms.data?.currentStep) {
case ("0"): { case ("0"): {
if (this.canSave) { if (this.canSave) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment