diff --git a/src/views/sjzx/bclqCX1.vue b/src/views/sjzx/bclqCX1.vue index 3a4b918..e24ef73 100644 --- a/src/views/sjzx/bclqCX1.vue +++ b/src/views/sjzx/bclqCX1.vue @@ -128,7 +128,7 @@ > @@ -230,7 +229,7 @@ export default { ], tableColumn2: [ - { type: 'seq', width: 60, title: '序号' }, + { type: 'seq', width: 40, title: '序号' }, // { field: 'dcChZ', title: '船号', width: 100, @@ -305,14 +304,14 @@ export default { // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filterRender: { name: 'FilterCombination', }, // }, - // { field: 'dcCh', title: '船号', width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }, - // }, - // { field: 'dcPl', title: '批量', width: 100, - // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - // filterRender: { name: 'FilterCombination', }, - // }, + { field: 'dcCh', title: '船号', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + { field: 'dcPl', title: '批量', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, { field: 'ylzd1', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, @@ -371,7 +370,7 @@ export default { { type: 'expand', width: 60, slots: { content: 'expand', - } ,fixed: 'left'}, + } }, { field: 'dcChZ', title: '船号', width: 100, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], @@ -851,6 +850,6 @@ export default { } .expand-wrapper{ - padding: 20px; + //padding: 10px; } diff --git a/src/views/sjzx/bomwh.vue b/src/views/sjzx/bomwh.vue index 08a739b..ae44d16 100644 --- a/src/views/sjzx/bomwh.vue +++ b/src/views/sjzx/bomwh.vue @@ -45,10 +45,10 @@ - 保存 + + + + @@ -132,13 +132,14 @@ border show-header-overflow show-overflow - :align="center" + align="center" :data="tableupload"> - + + diff --git a/src/views/sjzx/czbhwh.vue b/src/views/sjzx/czbhwh.vue index 0b34ee7..6dcd710 100644 --- a/src/views/sjzx/czbhwh.vue +++ b/src/views/sjzx/czbhwh.vue @@ -117,7 +117,7 @@ export default { tableColumn: [ { type: 'checkbox', width: 50 , }, - { title: '操作', width: 70, slots: { default: 'operation' }, }, + { type: 'seq', width: 60, title: '序号' }, { field: 'cbbm', title: '船号编码', width: 120,editRender: { name: 'input' }, @@ -173,6 +173,7 @@ export default { filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filterRender: { name: 'FilterCombination', }, }, + { title: '操作', width: 70, slots: { default: 'operation' }, }, { field: 'pdrq', title: '铺底日期', width: 120, editRender: { name: '$input', props: {type: 'date', labelFormat: "yyyy/MM/dd", valueFormat: "yyyy/MM/dd"}, diff --git a/src/views/sjzx/czplwh.vue b/src/views/sjzx/czplwh.vue index fe83687..5cf736a 100644 --- a/src/views/sjzx/czplwh.vue +++ b/src/views/sjzx/czplwh.vue @@ -202,15 +202,7 @@ export default { filterRender: { name: 'FilterCombination', }, }, - { field: 'lrr', title: '录入人', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, - { field: 'lrrq', title: '录入日期', width: 100, - filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], - filterRender: { name: 'FilterCombination', }, - }, { field: 'bz', title: '备注', width: 100,editRender: { name: 'input' }, filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], @@ -362,6 +354,16 @@ export default { filterRender: { name: 'FilterCombination', }, }, + { field: 'lrr', title: '录入人', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + + { field: 'lrrq', title: '录入日期', width: 100, + filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], + filterRender: { name: 'FilterCombination', }, + }, + // { field: 'dzjsq1', title: 'dzjsq1', width: 100, // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filterRender: { name: 'FilterCombination', },