diff --git a/src/views/modules/order/poOrder.vue b/src/views/modules/order/poOrder.vue index 4dedd44..c937871 100644 --- a/src/views/modules/order/poOrder.vue +++ b/src/views/modules/order/poOrder.vue @@ -108,6 +108,15 @@ {{ scope.row[item.columnProp] }} @@ -199,25 +209,25 @@ height="250" style="width:100%;margin-top:10px" > - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + +
@@ -798,7 +808,7 @@ export default { fixed: '', columnWidth: 120, showOverflowTooltip: true, - editAble: false, + editAble: true, editType: 'date', selectOptionsKey: '', selectOptions: null @@ -821,7 +831,7 @@ export default { fixed: '', columnWidth: 130, showOverflowTooltip: true, - editAble: false, + editAble: true, editType: 'date', selectOptionsKey: '', selectOptions: null @@ -950,7 +960,7 @@ export default { columnProp: 'flexid', headerAlign: 'center', align: 'center', - columnLabel: 'FLEXPORT ID', + columnLabel: 'Flexport Id', columnHidden: false, columnImage: false, columnSortable: false, @@ -1711,7 +1721,9 @@ export default { if (data && this.currentShipViaRow) { // 更新当前行的运输方式信息 // 根据 SQL: select method_no, method_desc from ship_method - this.$set(this.currentShipViaRow, 'shipVia', data.method_no || data.methodNo || data.shipVia || '') + // 显示运输方式名称 method_desc,保存运输方式编号 method_no + this.$set(this.currentShipViaRow, 'shipVia', data.method_desc || data.methodDesc || data.shipVia || '') + this.$set(this.currentShipViaRow, 'shipViaCode', data.method_no || data.methodNo || '') this.$set(this.currentShipViaRow, 'changeFlag', 1) console.log('更新后的行数据:', this.currentShipViaRow) @@ -1719,6 +1731,13 @@ export default { // 清空当前选择行 this.currentShipViaRow = null } + }, + + /** + * 判断是否为新增行(没有 id 或 id 为空表示新增) + */ + isNewRow(row) { + return !row.id || row.id === '' || row.id === null || row.id === undefined } }