Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop

Browse Source
This commit is contained in:
Nicola Carminati
2018-09-06 16:22:56 +02:00
parent 3b3524c1f9 80dee74b07
commit fb854e28a2
3 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/wwwroot/src/components/tooling/tooling-equipment.ts
+14 -13
View File
@@ -367,23 +367,23 @@ export default class toolingEquipment extends Vue {
}
public cancel = function () {
if(this.isSiemens){
if (this.copySelectedTool) {
this.selectedTool = this.copySelectedTool;
toolingActions.updateTool(store, this.copySelectedTool);
}
}
else{
if (this.copySelectedTool) {
this.selectedTool = this.copySelectedTool;
toolingActions.updateNcTool(store, this.copySelectedTool);
}
}
debugger
if (this.selectedTool.id == null || this.selectedTool.id == 0) {
this.selectedTool = null;
}
else {
if(this.isSiemens){
if (this.copySelectedTool) {
this.selectedTool = this.copySelectedTool;
toolingActions.updateTool(store, this.copySelectedTool);
}
}
else{
if (this.copySelectedTool) {
this.selectedTool = this.copySelectedTool;
toolingActions.updateNcTool(store, this.copySelectedTool);
}
}
for (let l in this.selectedTool.edgesData) {
if (this.selectedTool.edgesData[l].id <= 0) {
this.selectedTool.edgesData.splice(l, 1);
@@ -403,6 +403,7 @@ export default class toolingEquipment extends Vue {
}
public cancelNc = function () {
debugger
if(this.copySelectedTool && this.selectedTool.id > 0){
this.selectedTool = this.copySelectedTool;
toolingActions.updateNcTool(store, this.copySelectedTool);
Step/wwwroot/src/components/tooling/tooling-families.vue
+1 -1
View File
@@ -145,7 +145,7 @@
</div>
<div class="tooling-equipment-footer" v-if="!(isSiemens) || !isSiemens">
<button class="btn" v-if="!enableModify" @click="modify()">{{'tooling_equipment_button_modify' | localize("Modifica")}}</button>
<button class="btn" v-if="enableModify && selectedTool && !selectedTool.id" @click="cancelNewFamily()">{{'tooling_equipment_button_cancelNewFamily' | localize("Annulla")}}</button>
<!-- <button class="btn" v-if="enableModify && selectedTool && !selectedTool.id" @click="cancelNewFamily()">{{'tooling_equipment_button_cancelNewFamily' | localize("Annulla")}}</button> -->
<button class="btn" v-if="enableModify" @click="cancel()">{{'tooling_equipment_button_cancel' | localize("Annulla")}}</button>
<button class="btn blue-reverse" v-if="enableModify" @click="buttonSave(selectedTool)">{{'tooling_equipment_button_save' | localize("Salva")}}</button>
</div>
Step/wwwroot/src/components/tooling/tooling-shanks.ts
+14 -2
View File
@@ -317,6 +317,7 @@ export default class toolingShanks extends Vue {
}
public cancel = function () {
debugger
if(this.selectedTool.id == null || this.selectedTool.id == 0){
this.selectedTool = null;
}
@@ -337,11 +338,23 @@ export default class toolingShanks extends Vue {
}
public cancelNc = function () {
debugger
if(this.selectedTool.id == null || this.selectedTool.id == 0){
this.selectedTool = null;
}
else{
if(this.isSiemens){
if (this.copySelectedTool) {
this.selectedTool = this.copySelectedTool;
toolingActions.updateTool(store, this.copySelectedTool);
}
}
else{
if (this.copySelectedTool) {
this.selectedTool = this.copySelectedTool;
toolingActions.updateNcTool(store, this.copySelectedTool);
}
}
for (let l in this.selectedTool.childsTools) {
if (this.selectedTool.childsTools[l].id <= 0) {
this.selectedTool.childsTools.splice(l, 1);
@@ -351,7 +364,6 @@ export default class toolingShanks extends Vue {
}
}
}
this.selectedTool = this.copySelectedTool;
this.enableAddToolToShank = false;
this.enableModify = false;
this.disableList = false;