基础数据

master
xhj 2 years ago
parent 53c3ea7d2e
commit 6fa1c3af24

@ -128,7 +128,7 @@
> >
<template #expand="{ row }"> <template #expand="{ row }">
<div class="expand-wrapper">
<vxe-grid <vxe-grid
id="id1" id="id1"
ref="xGrid1" ref="xGrid1"
@ -147,13 +147,12 @@
> >
<template #expand1="{ row }"> <template #expand1="{ row }">
<div class="expand-wrapper">
<vxe-grid <vxe-grid
id="id1" id="id1"
ref="xGrid2" ref="xGrid2"
border border
resizable resizable
:align="'center'" :align="'center'"
:height="600" :height="600"
:columns="tableColumn2" :columns="tableColumn2"
@ -164,11 +163,11 @@
show-header-overflow show-header-overflow
></vxe-grid> ></vxe-grid>
</div>
</template> </template>
</vxe-grid> </vxe-grid>
</div>
</template> </template>
</vxe-grid> </vxe-grid>
@ -230,7 +229,7 @@ export default {
], ],
tableColumn2: [ tableColumn2: [
{ type: 'seq', width: 60, title: '序号' }, { type: 'seq', width: 40, title: '序号' },
// { field: 'dcChZ', title: '', width: 100, // { field: 'dcChZ', title: '', width: 100,
@ -305,14 +304,14 @@ export default {
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }, // filterRender: { name: 'FilterCombination', },
// }, // },
// { field: 'dcCh', title: '', width: 100, { field: 'dcCh', title: '船号', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
// }, },
// { field: 'dcPl', title: '', width: 100, { field: 'dcPl', title: '批量', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
// }, },
{ field: 'ylzd1', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'], { field: 'ylzd1', title: '划线类型', width: 100,formatter: ['dictFormat','HXLX'],
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
@ -371,7 +370,7 @@ export default {
{ type: 'expand', width: 60, slots: { { type: 'expand', width: 60, slots: {
content: 'expand', content: 'expand',
} ,fixed: 'left'}, } },
{ field: 'dcChZ', title: '船号', width: 100, { field: 'dcChZ', title: '船号', width: 100,
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@ -851,6 +850,6 @@ export default {
} }
.expand-wrapper{ .expand-wrapper{
padding: 20px; //padding: 10px;
} }
</style> </style>

@ -45,10 +45,10 @@
<el-form-item style="float: right" > <el-form-item style="float: right" >
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
@click="tjClick" <!-- @click="tjClick"-->
>保存</el-button> <!-- >保存</el-button>-->
<!-- type="success"--> <!-- type="success"-->
<!-- @click="bomClick"--> <!-- @click="bomClick"-->
@ -132,13 +132,14 @@
border border
show-header-overflow show-header-overflow
show-overflow show-overflow
:align="center" align="center"
:data="tableupload"> :data="tableupload">
<vxe-column type="seq" width="50"></vxe-column> <vxe-column type="seq" width="50"></vxe-column>
<vxe-column field="czbh" title="船号" width="100"></vxe-column> <vxe-column field="czbh" title="船号" width="100"></vxe-column>
<vxe-column field="ph" title="批号" width="100"></vxe-column> <vxe-column field="ph" title="批号" width="100"></vxe-column>
<vxe-column field="stype" title="小类" width="100"></vxe-column>
<vxe-column field="type" title="类型"width="100"></vxe-column> <vxe-column field="type" title="类型"width="100"></vxe-column>
<vxe-column field="stype" title="小类" width="100"></vxe-column>
<vxe-column field="name" title="名称" width="400"></vxe-column> <vxe-column field="name" title="名称" width="400"></vxe-column>
<vxe-column field="xqrq" title="图纸需求期" width="100"></vxe-column> <vxe-column field="xqrq" title="图纸需求期" width="100"></vxe-column>
<vxe-column field="xqrq" title="导入次数" width="100"></vxe-column> <vxe-column field="xqrq" title="导入次数" width="100"></vxe-column>

@ -117,7 +117,7 @@ export default {
tableColumn: [ tableColumn: [
{ type: 'checkbox', width: 50 , { type: 'checkbox', width: 50 ,
}, },
{ title: '操作', width: 70, slots: { default: 'operation' }, },
{ type: 'seq', width: 60, title: '序号' }, { type: 'seq', width: 60, title: '序号' },
{ field: 'cbbm', title: '船号编码', width: 120,editRender: { name: 'input' }, { 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: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
filterRender: { name: 'FilterCombination', }, filterRender: { name: 'FilterCombination', },
}, },
{ title: '操作', width: 70, slots: { default: 'operation' }, },
{ field: 'pdrq', title: '铺底日期', width: 120, editRender: { { field: 'pdrq', title: '铺底日期', width: 120, editRender: {
name: '$input', name: '$input',
props: {type: 'date', labelFormat: "yyyy/MM/dd", valueFormat: "yyyy/MM/dd"}, props: {type: 'date', labelFormat: "yyyy/MM/dd", valueFormat: "yyyy/MM/dd"},

@ -202,15 +202,7 @@ export default {
filterRender: { name: 'FilterCombination', }, 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' }, { field: 'bz', title: '备注', width: 100,editRender: { name: 'input' },
filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
@ -362,6 +354,16 @@ export default {
filterRender: { name: 'FilterCombination', }, 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, // { field: 'dzjsq1', title: 'dzjsq1', width: 100,
// filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }], // filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
// filterRender: { name: 'FilterCombination', }, // filterRender: { name: 'FilterCombination', },

Loading…
Cancel
Save