|
|
|
@ -274,7 +274,7 @@ |
|
|
|
</el-form-item> |
|
|
|
<el-form-item> |
|
|
|
<span slot="label" style="" @click="getBaseList(70,0)"><a herf="#">{{ labels.toolID }}</a></span> |
|
|
|
<el-input v-model="toolData.toolID" @change="getToolDesc()" :disabled="toolmodelInputFlag" |
|
|
|
<el-input v-model="toolData.newToolId" @change="getToolDesc()" |
|
|
|
style="width: 130px;text-align: right"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
@ -836,6 +836,7 @@ export default { |
|
|
|
remark: '', |
|
|
|
user: '', |
|
|
|
add: '', |
|
|
|
newToolId: '' |
|
|
|
}, |
|
|
|
columnList: [ |
|
|
|
{ |
|
|
|
@ -1619,7 +1620,8 @@ export default { |
|
|
|
toolData: { |
|
|
|
deep: true, |
|
|
|
handler: function (newV, oldV) { |
|
|
|
this.toolData.toolID = this.toolData.toolID.toUpperCase() |
|
|
|
//this.toolData.toolID = this.toolData.toolID.toUpperCase() |
|
|
|
this.toolData.newToolId = this.toolData.newToolId.toUpperCase() |
|
|
|
} |
|
|
|
}, |
|
|
|
detailData: { |
|
|
|
@ -1730,7 +1732,7 @@ export default { |
|
|
|
this.detailData.workCenterNo = val.WorkCenterNo |
|
|
|
} |
|
|
|
if (this.tagNo === 70) { |
|
|
|
this.toolData.toolID = val.ToolID |
|
|
|
this.toolData.newToolId = val.ToolID |
|
|
|
this.getToolDesc(); |
|
|
|
} |
|
|
|
if (this.tagNo === 5) { |
|
|
|
@ -1753,9 +1755,7 @@ export default { |
|
|
|
} |
|
|
|
if (val === 70) { |
|
|
|
strVal = this.toolData.toolID |
|
|
|
if (this.toolmodelInputFlag) { |
|
|
|
return false |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
if (val === 5) { |
|
|
|
if (val2 === 1) { |
|
|
|
@ -2089,6 +2089,7 @@ export default { |
|
|
|
itemNo: '', |
|
|
|
operationDesc: '', |
|
|
|
toolID: '', |
|
|
|
newToolId: '', |
|
|
|
toolDescription: '', |
|
|
|
spec: '', |
|
|
|
toolQty: '', |
|
|
|
@ -2129,6 +2130,7 @@ export default { |
|
|
|
itemNo: this.currentRow2.itemNo, |
|
|
|
operationDesc: this.currentRow2.operationDesc, |
|
|
|
toolID: this.currentRow2.toolID, |
|
|
|
newToolId: this.currentRow2.toolID, |
|
|
|
toolDescription: this.currentRow2.toolDescription, |
|
|
|
spec: this.currentRow2.spec, |
|
|
|
toolQty: this.currentRow2.toolQty, |
|
|
|
@ -2147,7 +2149,7 @@ export default { |
|
|
|
}) |
|
|
|
return false; |
|
|
|
} |
|
|
|
if (this.toolData.toolID == '' || this.toolData.toolID == null) { |
|
|
|
if (this.toolData.newToolId == '' || this.toolData.newToolId == null) { |
|
|
|
this.$alert(this.labels.inToolId, this.labels.error, { |
|
|
|
confirmButtonText: this.labels.true |
|
|
|
}) |
|
|
|
|