refactor: rename isSubmit --> isAlreadySubmit

This commit is contained in:
Cindy Chang
2024-06-05 11:05:55 +08:00
parent 205b75450c
commit 427b9b6aed

View File

@@ -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,13 +1310,7 @@ export default {
this.$emitter.emit('coverPlate', false); this.$emitter.emit('coverPlate', false);
this.$toast.success('Rule applied.'); this.$toast.success('Rule applied.');
}, },
}, setTaskByCategoryOnRadioEmitting () {
created() {
this.isShowBarOpen = this.conformanceLogCreateCheckId || this.conformanceFilterCreateCheckId ? false : true;
// 選取 list 的結果
this.$emitter.on('actListData', (data) => {
this.selectConformanceTask = data;
});
this.$emitter.on('actRadioData', (data) => { this.$emitter.on('actRadioData', (data) => {
switch (data.category) { switch (data.category) {
// Activity sequence // Activity sequence
@@ -1408,6 +1402,8 @@ export default {
break; break;
}; };
}); });
},
setTaskByCategoryOnListSeqEmitting(){
this.$emitter.on('getListSequence', (data) => { this.$emitter.on('getListSequence', (data) => {
switch (data.category) { switch (data.category) {
case 'cfmSeqDirectly': case 'cfmSeqDirectly':
@@ -1420,6 +1416,18 @@ export default {
break; break;
} }
}); });
},
},
created() {
this.isShowBarOpen = this.conformanceLogCreateCheckId || this.conformanceFilterCreateCheckId ? false : true;
// 選取 list 的結果
this.$emitter.on('actListData', (data) => {
this.selectConformanceTask = data;
});
this.setTaskByCategoryOnRadioEmitting();
this.setTaskByCategoryOnListSeqEmitting();
// Radio 切換時,資料要清空 // Radio 切換時,資料要清空
this.$emitter.on('isRadioChange', (data) => { this.$emitter.on('isRadioChange', (data) => {
if(data) { if(data) {