Commit 51d58543 authored by 沈翠玲's avatar 沈翠玲

生产版本

parent 4db5c739
...@@ -67,10 +67,10 @@ ...@@ -67,10 +67,10 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('工序备注')" prop="remark111111" align="center" width="140"> <el-table-column :label="$t('工序备注')" prop="processRemarkNew" align="center" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.remark111111" v-model="scope.row.processRemarkNew"
disabled disabled
clearable clearable
/> />
...@@ -579,7 +579,7 @@ export default { ...@@ -579,7 +579,7 @@ export default {
unitOfMeasure: null, unitOfMeasure: null,
keyFlag: 'N', keyFlag: 'N',
isCheck: 'N', isCheck: 'N',
remark111111: null, processRemarkNew: null,
processRemark: null, processRemark: null,
drawingList: [] drawingList: []
}, },
...@@ -651,7 +651,7 @@ export default { ...@@ -651,7 +651,7 @@ export default {
this.tableData.forEach((item) => { this.tableData.forEach((item) => {
const item1 = this.processOptions.find(v => v.processId === item.processId) const item1 = this.processOptions.find(v => v.processId === item.processId)
if (item1) { if (item1) {
item['remark111111'] = item1.remark item['processRemarkNew'] = item1.remark
} }
}); });
}); });
...@@ -858,7 +858,7 @@ export default { ...@@ -858,7 +858,7 @@ export default {
const item = this.processOptions.find(v => v.processId === e) const item = this.processOptions.find(v => v.processId === e)
row['processCode'] = item.processCode row['processCode'] = item.processCode
row['processName'] = item.processName row['processName'] = item.processName
row['remark111111'] = item.remark row['processRemarkNew'] = item.remark
if (e && this.tableData[this.tableData.length - 1]['processId']) { if (e && this.tableData[this.tableData.length - 1]['processId']) {
this.tableData.push(JSON.parse(JSON.stringify(this.breakData))) this.tableData.push(JSON.parse(JSON.stringify(this.breakData)))
} }
......
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