refactor: rename isSubmit --> isAlreadySubmit
This commit is contained in:
@@ -24,7 +24,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- select result -->
|
<!-- select result -->
|
||||||
<ConformanceSelectResult
|
<ConformanceSelectResult
|
||||||
:isSubmit="isSubmit"
|
:isSubmit="isAlreadySubmit"
|
||||||
:isSubmitTask="isSubmitTask"
|
:isSubmitTask="isSubmitTask"
|
||||||
:isSubmitStartAndEnd="isSubmitStartAndEnd"
|
:isSubmitStartAndEnd="isSubmitStartAndEnd"
|
||||||
:isSubmitCfmSeqDirectly="isSubmitCfmSeqDirectly"
|
:isSubmitCfmSeqDirectly="isSubmitCfmSeqDirectly"
|
||||||
@@ -89,7 +89,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- show bar -->
|
<!-- show bar -->
|
||||||
<ConformanceShowBar v-if="!notShowActList" :class="isShowBarOpen?'':'hidden'"
|
<ConformanceShowBar v-if="!notShowActList" :class="isShowBarOpen?'':'hidden'"
|
||||||
:isSubmit="isSubmit"
|
:isSubmit="isAlreadySubmit"
|
||||||
:isSubmitTask="isSubmitTask"
|
:isSubmitTask="isSubmitTask"
|
||||||
:isSubmitStartAndEnd="isSubmitStartAndEnd"
|
:isSubmitStartAndEnd="isSubmitStartAndEnd"
|
||||||
:isSubmitCfmSeqDirectly="isSubmitCfmSeqDirectly"
|
:isSubmitCfmSeqDirectly="isSubmitCfmSeqDirectly"
|
||||||
@@ -191,7 +191,7 @@ export default {
|
|||||||
selectCfmCtEteEnd: null,
|
selectCfmCtEteEnd: null,
|
||||||
selectCfmCtEteSEStart: null,
|
selectCfmCtEteSEStart: null,
|
||||||
selectCfmCtEteSEEnd: null,
|
selectCfmCtEteSEEnd: null,
|
||||||
isSubmit: false,
|
isAlreadySubmit: false,
|
||||||
isSubmittedData: null, // 已 Apply 後,沒有重新改變規則的 Data
|
isSubmittedData: null, // 已 Apply 後,沒有重新改變規則的 Data
|
||||||
isSubmitTask: null,
|
isSubmitTask: null,
|
||||||
isSubmitStartAndEnd: null, // Activity sequence
|
isSubmitStartAndEnd: null, // Activity sequence
|
||||||
@@ -355,7 +355,7 @@ export default {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'Start & End':
|
case 'Start & End':
|
||||||
if(!this.isSubmit) {
|
if(!this.isAlreadySubmit) {
|
||||||
if(this.selectCfmPtEteSEStart && this.selectCfmPtEteSEEnd){
|
if(this.selectCfmPtEteSEStart && this.selectCfmPtEteSEEnd){
|
||||||
disabled = false;
|
disabled = false;
|
||||||
}
|
}
|
||||||
@@ -384,7 +384,7 @@ export default {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'From & To':
|
case 'From & To':
|
||||||
if(!this.isSubmit) {
|
if(!this.isAlreadySubmit) {
|
||||||
if(this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd) {
|
if(this.selectCfmPtPSEStart && this.selectCfmPtPSEEnd) {
|
||||||
disabled = false;
|
disabled = false;
|
||||||
}
|
}
|
||||||
@@ -417,7 +417,7 @@ export default {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'Start & End':
|
case 'Start & End':
|
||||||
if(!this.isSubmit) {
|
if(!this.isAlreadySubmit) {
|
||||||
if(this.selectCfmWtEteSEStart && this.selectCfmWtEteSEEnd) {
|
if(this.selectCfmWtEteSEStart && this.selectCfmWtEteSEEnd) {
|
||||||
disabled = false;
|
disabled = false;
|
||||||
} else {
|
} else {
|
||||||
@@ -446,7 +446,7 @@ export default {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'From & To':
|
case 'From & To':
|
||||||
if(!this.isSubmit) {
|
if(!this.isAlreadySubmit) {
|
||||||
if(this.selectCfmWtPSEStart && this.selectCfmWtPSEEnd) {
|
if(this.selectCfmWtPSEStart && this.selectCfmWtPSEEnd) {
|
||||||
disabled = false;
|
disabled = false;
|
||||||
}
|
}
|
||||||
@@ -480,7 +480,7 @@ export default {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'Start & End':
|
case 'Start & End':
|
||||||
if(!this.isSubmit) {
|
if(!this.isAlreadySubmit) {
|
||||||
if(this.selectCfmCtEteSEStart && this.selectCfmCtEteSEEnd) {
|
if(this.selectCfmCtEteSEStart && this.selectCfmCtEteSEEnd) {
|
||||||
disabled = false;
|
disabled = false;
|
||||||
}
|
}
|
||||||
@@ -514,7 +514,7 @@ export default {
|
|||||||
const rule = newValue.rule;
|
const rule = newValue.rule;
|
||||||
|
|
||||||
this.isSubmittedData = newValue.rule;
|
this.isSubmittedData = newValue.rule;
|
||||||
this.isSubmit = true;
|
this.isAlreadySubmit = true;
|
||||||
switch (rule.type) {
|
switch (rule.type) {
|
||||||
case 'contains-tasks': // Rule Type 選 Have activity 的行為
|
case 'contains-tasks': // Rule Type 選 Have activity 的行為
|
||||||
this.selectedRuleType = 'Have activity';
|
this.selectedRuleType = 'Have activity';
|
||||||
@@ -896,7 +896,7 @@ export default {
|
|||||||
// is submit select Reset
|
// is submit select Reset
|
||||||
this.isSubmitReset();
|
this.isSubmitReset();
|
||||||
this.isSubmittedData = null; // 已 Apply 後,沒有重新改變規則的 Data
|
this.isSubmittedData = null; // 已 Apply 後,沒有重新改變規則的 Data
|
||||||
this.isSubmit = false;
|
this.isAlreadySubmit = false;
|
||||||
|
|
||||||
// 其他子元件 reset
|
// 其他子元件 reset
|
||||||
this.selectTimeReset();
|
this.selectTimeReset();
|
||||||
@@ -1299,7 +1299,7 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.isLoading = true;
|
this.isLoading = true;
|
||||||
this.isSubmit = true;
|
this.isAlreadySubmit = true;
|
||||||
this.isSubmittedData = dataToSave; // 已 Apply 後,沒有重新改變規則的 Data
|
this.isSubmittedData = dataToSave; // 已 Apply 後,沒有重新改變規則的 Data
|
||||||
this.conformanceRuleData = dataToSave; // 給存檔的 Data
|
this.conformanceRuleData = dataToSave; // 給存檔的 Data
|
||||||
await this.conformanceStore.addConformanceCheckId(dataToSave);
|
await this.conformanceStore.addConformanceCheckId(dataToSave);
|
||||||
@@ -1310,6 +1310,113 @@ export default {
|
|||||||
this.$emitter.emit('coverPlate', false);
|
this.$emitter.emit('coverPlate', false);
|
||||||
this.$toast.success('Rule applied.');
|
this.$toast.success('Rule applied.');
|
||||||
},
|
},
|
||||||
|
setTaskByCategoryOnRadioEmitting () {
|
||||||
|
this.$emitter.on('actRadioData', (data) => {
|
||||||
|
switch (data.category) {
|
||||||
|
// Activity sequence
|
||||||
|
case 'cfmSeqStart':
|
||||||
|
if(this.isStartSelected === true && data.task !== this.selectCfmSeqStart) this.selectCfmSeqEnd = null;
|
||||||
|
this.selectCfmSeqStart = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmSeqEnd':
|
||||||
|
if(this.isEndSelected === true && data.task !== this.selectCfmSeqEnd) this.selectCfmSeqStart = null;
|
||||||
|
this.selectCfmSeqEnd = data.task;
|
||||||
|
break;
|
||||||
|
// Processing time
|
||||||
|
case 'cfmPtEteStart':
|
||||||
|
this.selectCfmPtEteStart = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmPtEteEnd':
|
||||||
|
this.selectCfmPtEteEnd = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmPtEteSEStart':
|
||||||
|
if(this.isStartSelected === true && data.task !== this.selectCfmPtEteSEStart) this.selectCfmPtEteSEEnd = null;
|
||||||
|
this.selectCfmPtEteSEStart = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmPtEteSEEnd':
|
||||||
|
if(this.isEndSelected === true && data.task !== this.selectCfmPtEteSEEnd) this.selectCfmPtEteSEStart = null;
|
||||||
|
this.selectCfmPtEteSEEnd = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmPtPStart':
|
||||||
|
this.selectCfmPtPStart = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmPtPEnd':
|
||||||
|
this.selectCfmPtPEnd = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmPtPSEStart':
|
||||||
|
if(this.isStartSelected === true && data.task !== this.selectCfmPtPSEStart) this.selectCfmPtPSEEnd = null;
|
||||||
|
this.selectCfmPtPSEStart = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmPtPSEEnd':
|
||||||
|
if(this.isEndSelected === true && data.task !== this.selectCfmPtPSEEnd) this.selectCfmPtPSEStart = null;
|
||||||
|
this.selectCfmPtPSEEnd = data.task;
|
||||||
|
break;
|
||||||
|
// Waiting time
|
||||||
|
case 'cfmWtEteStart':
|
||||||
|
this.selectCfmWtEteStart = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmWtEteEnd':
|
||||||
|
this.selectCfmWtEteEnd = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmWtEteSEStart':
|
||||||
|
if(this.isStartSelected === true && data.task !== this.selectCfmWtEteSEStart) this.selectCfmWtEteSEEnd = null;
|
||||||
|
this.selectCfmWtEteSEStart = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmWtEteSEEnd':
|
||||||
|
if(this.isEndSelected === true && data.task !== this.selectCfmWtEteSEEnd) this.selectCfmWtEteSEStart = null;
|
||||||
|
this.selectCfmWtEteSEEnd = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmWtPStart':
|
||||||
|
this.selectCfmWtPStart = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmWtPEnd':
|
||||||
|
this.selectCfmWtPEnd = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmWtPSEStart':
|
||||||
|
if(this.isStartSelected === true && data.task !== this.selectCfmWtPSEStart) this.selectCfmWtPSEEnd = null;
|
||||||
|
this.selectCfmWtPSEStart = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmWtPSEEnd':
|
||||||
|
if(this.isEndSelected === true && data.task !== this.selectCfmWtPSEEnd) this.selectCfmWtPSEStart = null;
|
||||||
|
this.selectCfmWtPSEEnd = data.task;
|
||||||
|
break;
|
||||||
|
// Cycle time
|
||||||
|
case 'cfmCtEteStart':
|
||||||
|
this.selectCfmCtEteStart = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmCtEteEnd':
|
||||||
|
this.selectCfmCtEteEnd = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmCtEteSEStart':
|
||||||
|
if(this.isStartSelected === true && data.task !== this.selectCfmCtEteSEStart) this.selectCfmCtEteSEEnd = null;
|
||||||
|
this.selectCfmCtEteSEStart = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmCtEteSEEnd':
|
||||||
|
if(this.isEndSelected === true && data.task !== this.selectCfmCtEteSEEnd) this.selectCfmCtEteSEStart = null;
|
||||||
|
this.selectCfmCtEteSEEnd = data.task;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
if(this.selectedRuleType === 'Activity duration') {
|
||||||
|
this.selectDurationData = [data.task];
|
||||||
|
};
|
||||||
|
break;
|
||||||
|
};
|
||||||
|
});
|
||||||
|
},
|
||||||
|
setTaskByCategoryOnListSeqEmitting(){
|
||||||
|
this.$emitter.on('getListSequence', (data) => {
|
||||||
|
switch (data.category) {
|
||||||
|
case 'cfmSeqDirectly':
|
||||||
|
this.selectCfmSeqDirectly = data.task;
|
||||||
|
break;
|
||||||
|
case 'cfmSeqEventually':
|
||||||
|
this.selectCfmSeqEventually = data.task;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.isShowBarOpen = this.conformanceLogCreateCheckId || this.conformanceFilterCreateCheckId ? false : true;
|
this.isShowBarOpen = this.conformanceLogCreateCheckId || this.conformanceFilterCreateCheckId ? false : true;
|
||||||
@@ -1317,109 +1424,10 @@ export default {
|
|||||||
this.$emitter.on('actListData', (data) => {
|
this.$emitter.on('actListData', (data) => {
|
||||||
this.selectConformanceTask = data;
|
this.selectConformanceTask = data;
|
||||||
});
|
});
|
||||||
this.$emitter.on('actRadioData', (data) => {
|
|
||||||
switch (data.category) {
|
this.setTaskByCategoryOnRadioEmitting();
|
||||||
// Activity sequence
|
this.setTaskByCategoryOnListSeqEmitting();
|
||||||
case 'cfmSeqStart':
|
|
||||||
if(this.isStartSelected === true && data.task !== this.selectCfmSeqStart) this.selectCfmSeqEnd = null;
|
|
||||||
this.selectCfmSeqStart = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmSeqEnd':
|
|
||||||
if(this.isEndSelected === true && data.task !== this.selectCfmSeqEnd) this.selectCfmSeqStart = null;
|
|
||||||
this.selectCfmSeqEnd = data.task;
|
|
||||||
break;
|
|
||||||
// Processing time
|
|
||||||
case 'cfmPtEteStart':
|
|
||||||
this.selectCfmPtEteStart = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmPtEteEnd':
|
|
||||||
this.selectCfmPtEteEnd = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmPtEteSEStart':
|
|
||||||
if(this.isStartSelected === true && data.task !== this.selectCfmPtEteSEStart) this.selectCfmPtEteSEEnd = null;
|
|
||||||
this.selectCfmPtEteSEStart = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmPtEteSEEnd':
|
|
||||||
if(this.isEndSelected === true && data.task !== this.selectCfmPtEteSEEnd) this.selectCfmPtEteSEStart = null;
|
|
||||||
this.selectCfmPtEteSEEnd = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmPtPStart':
|
|
||||||
this.selectCfmPtPStart = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmPtPEnd':
|
|
||||||
this.selectCfmPtPEnd = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmPtPSEStart':
|
|
||||||
if(this.isStartSelected === true && data.task !== this.selectCfmPtPSEStart) this.selectCfmPtPSEEnd = null;
|
|
||||||
this.selectCfmPtPSEStart = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmPtPSEEnd':
|
|
||||||
if(this.isEndSelected === true && data.task !== this.selectCfmPtPSEEnd) this.selectCfmPtPSEStart = null;
|
|
||||||
this.selectCfmPtPSEEnd = data.task;
|
|
||||||
break;
|
|
||||||
// Waiting time
|
|
||||||
case 'cfmWtEteStart':
|
|
||||||
this.selectCfmWtEteStart = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmWtEteEnd':
|
|
||||||
this.selectCfmWtEteEnd = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmWtEteSEStart':
|
|
||||||
if(this.isStartSelected === true && data.task !== this.selectCfmWtEteSEStart) this.selectCfmWtEteSEEnd = null;
|
|
||||||
this.selectCfmWtEteSEStart = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmWtEteSEEnd':
|
|
||||||
if(this.isEndSelected === true && data.task !== this.selectCfmWtEteSEEnd) this.selectCfmWtEteSEStart = null;
|
|
||||||
this.selectCfmWtEteSEEnd = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmWtPStart':
|
|
||||||
this.selectCfmWtPStart = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmWtPEnd':
|
|
||||||
this.selectCfmWtPEnd = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmWtPSEStart':
|
|
||||||
if(this.isStartSelected === true && data.task !== this.selectCfmWtPSEStart) this.selectCfmWtPSEEnd = null;
|
|
||||||
this.selectCfmWtPSEStart = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmWtPSEEnd':
|
|
||||||
if(this.isEndSelected === true && data.task !== this.selectCfmWtPSEEnd) this.selectCfmWtPSEStart = null;
|
|
||||||
this.selectCfmWtPSEEnd = data.task;
|
|
||||||
break;
|
|
||||||
// Cycle time
|
|
||||||
case 'cfmCtEteStart':
|
|
||||||
this.selectCfmCtEteStart = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmCtEteEnd':
|
|
||||||
this.selectCfmCtEteEnd = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmCtEteSEStart':
|
|
||||||
if(this.isStartSelected === true && data.task !== this.selectCfmCtEteSEStart) this.selectCfmCtEteSEEnd = null;
|
|
||||||
this.selectCfmCtEteSEStart = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmCtEteSEEnd':
|
|
||||||
if(this.isEndSelected === true && data.task !== this.selectCfmCtEteSEEnd) this.selectCfmCtEteSEStart = null;
|
|
||||||
this.selectCfmCtEteSEEnd = data.task;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
if(this.selectedRuleType === 'Activity duration') {
|
|
||||||
this.selectDurationData = [data.task];
|
|
||||||
};
|
|
||||||
break;
|
|
||||||
};
|
|
||||||
});
|
|
||||||
this.$emitter.on('getListSequence', (data) => {
|
|
||||||
switch (data.category) {
|
|
||||||
case 'cfmSeqDirectly':
|
|
||||||
this.selectCfmSeqDirectly = data.task;
|
|
||||||
break;
|
|
||||||
case 'cfmSeqEventually':
|
|
||||||
this.selectCfmSeqEventually = data.task;
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
// Radio 切換時,資料要清空
|
// Radio 切換時,資料要清空
|
||||||
this.$emitter.on('isRadioChange', (data) => {
|
this.$emitter.on('isRadioChange', (data) => {
|
||||||
if(data) {
|
if(data) {
|
||||||
|
|||||||
Reference in New Issue
Block a user