lb #1

Merged
gtz217 merged 128 commits from lb into develop 2022-09-20 14:53:17 +08:00
24 changed files with 96 additions and 86 deletions
Showing only changes of commit f415f30f9e - Show all commits

View File

@ -68,7 +68,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -65,7 +65,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -76,7 +76,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -82,7 +82,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -65,7 +65,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -89,7 +89,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -75,7 +75,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -73,7 +73,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -69,7 +69,7 @@ const tableConfigs =[
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -71,7 +71,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -63,7 +63,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -57,30 +57,30 @@ import BaseTable from '@/components/base-table'
import TableOperateComponent from '@/components/base-table/components/operationComponent' import TableOperateComponent from '@/components/base-table/components/operationComponent'
import TableTextComponent from '@/components/base-table/components/detailComponent' import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs =[ const tableConfigs = [
{ "prop": "id", "name": "id" }, { prop: 'createTime', name: '添加时间' },
{ "prop": "code", "name": "工厂编码" }, { prop: 'name', name: '工厂名称' },
{ "prop": "name", "name": "工厂名称" }, { prop: 'code', name: '工厂编码' },
{ "prop": "address", "name": "地址" }, { prop: 'address', name: '地址' },
{ "prop": "description", "name": "描述" }, { prop: 'remark', name: '备注' },
{ "prop": "enabled", "name": "启用状态:0 、停用1、启用" }, // { prop: 'id', name: 'id' },
{ "prop": "remark", "name": "备注" }, // { prop: 'description', name: '' },
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, // { prop: 'enabled', name: ':0 1' },
{ "prop": "creatorId", "name": "创建人" }, // { prop: 'valid', name: ':1 0' },
{ "prop": "creatorName", "name": "创建人姓名" }, // { prop: 'creatorId', name: '' },
{ "prop": "createTime", "name": "创建时间" }, // { prop: 'creatorName', name: '' },
{ "prop": "updaterId", "name": "更新人" }, // { prop: 'updaterId', name: '' },
{ "prop": "updaterName", "name": "更新人姓名" }, // { prop: 'updaterName', name: '' },
{ "prop": "updateTime", "name": "更新时间" }, // { prop: 'updateTime', name: '' },
{ "prop": "version", "name": "版本号" }, // { prop: 'version', name: '' },
{ "prop": "externalCode", "name": "外部系统编码" }, // { prop: 'externalCode', name: '' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
data() { data() {
return {tableConfigs, return {
tableConfigs,
dataForm: { dataForm: {
key: '' key: ''
}, },
@ -94,7 +94,8 @@ export default {
} }
}, },
components: { components: {
AddOrUpdate,BaseTable AddOrUpdate,
BaseTable
}, },
activated() { activated() {
this.getDataList() this.getDataList()

View File

@ -86,7 +86,7 @@ const tableConfigs = [
// { "prop": "valid", "name": ":1 0" }, // { "prop": "valid", "name": ":1 0" },
// { "prop": "creatorId", "name": "" }, // { "prop": "creatorId", "name": "" },
// { "prop": "creatorName", "name": "" }, // { "prop": "creatorName", "name": "" },
// { "prop": "createTime", "name": "" }, // { "prop": "createTime", "name": "" },
// { "prop": "updaterId", "name": "" }, // { "prop": "updaterId", "name": "" },
// { "prop": "updaterName", "name": "" }, // { "prop": "updaterName", "name": "" },
// { "prop": "version", "name": "" } // { "prop": "version", "name": "" }

View File

@ -71,7 +71,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -37,7 +37,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> --> </el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" /> <base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination <el-pagination
@size-change="sizeChangeHandle" @size-change="sizeChangeHandle"
@current-change="currentChangeHandle" @current-change="currentChangeHandle"
@ -60,29 +60,31 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent' import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [ const tableConfigs = [
{ "prop": "id", "name": "id" }, { prop: 'createTime', name: '添加时间' },
{ "prop": "factoryId", "name": "工厂表ID" }, { prop: 'factoryId', name: '工厂ID' },
{ "prop": "code", "name": "编码" }, { prop: 'name', name: '产线名称' },
{ "prop": "name", "name": "名称" }, { prop: 'code', name: '产线编码' },
{ "prop": "description", "name": "描述" }, { prop: 'status', name: '产线状态' },
{ "prop": "status", "name": "产线状态" }, { prop: 'description', name: '描述' },
{ "prop": "tvalue", "name": "每小时下片数量" }, { prop: 'remark', name: '备注' },
{ "prop": "externalCode", "name": "外部系统编码" }, // { "prop": "tvalue", "name": "" },
{ "prop": "enabled", "name": "启用状态:0 、停用1、启用" }, // { "prop": "externalCode", "name": "" },
{ "prop": "remark", "name": "备注" }, // { "prop": "enabled", "name": ":0 1" },
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, // { "prop": "id", "name": "id" },
{ "prop": "creatorId", "name": "创建人" }, // { "prop": "valid", "name": ":1 0" },
{ "prop": "creatorName", "name": "创建人姓名" }, // { "prop": "creatorId", "name": "" },
{ "prop": "createTime", "name": "创建时间" }, // { "prop": "creatorName", "name": "" },
{ "prop": "updaterId", "name": "更新人" }, // { "prop": "updaterId", "name": "" },
{ "prop": "updaterName", "name": "更新人姓名" }, // { "prop": "updaterName", "name": "" },
{ "prop": "updateTime", "name": "更新时间" }, // { "prop": "updateTime", "name": "" },
{ "prop": "version", "name": "版本号" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } // { prop: 'version', name: '' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
data() { data() {
return {tableConfigs, return {
tableConfigs,
dataForm: { dataForm: {
key: '' key: ''
}, },
@ -96,7 +98,8 @@ export default {
} }
}, },
components: { components: {
AddOrUpdate,BaseTable AddOrUpdate,
BaseTable
}, },
activated() { activated() {
this.getDataList() this.getDataList()

View File

@ -65,7 +65,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -78,7 +78,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -63,7 +63,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -67,7 +67,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -69,7 +69,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -65,7 +65,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -61,7 +61,7 @@ const tableConfigs = [
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, { "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" },
{ "prop": "creatorId", "name": "创建人" }, { "prop": "creatorId", "name": "创建人" },
{ "prop": "creatorName", "name": "创建人姓名" }, { "prop": "creatorName", "name": "创建人姓名" },
{ "prop": "createTime", "name": "创建时间" }, { "prop": "createTime", "name": "添加时间" },
{ "prop": "updaterId", "name": "更新人" }, { "prop": "updaterId", "name": "更新人" },
{ "prop": "updaterName", "name": "更新人姓名" }, { "prop": "updaterName", "name": "更新人姓名" },
{ "prop": "updateTime", "name": "更新时间" }, { "prop": "updateTime", "name": "更新时间" },

View File

@ -36,7 +36,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> --> </el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" /> <base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination <el-pagination
@size-change="sizeChangeHandle" @size-change="sizeChangeHandle"
@current-change="currentChangeHandle" @current-change="currentChangeHandle"
@ -59,28 +59,30 @@ import TableOperateComponent from '@/components/base-table/components/operationC
import TableTextComponent from '@/components/base-table/components/detailComponent' import TableTextComponent from '@/components/base-table/components/detailComponent'
const tableConfigs = [ const tableConfigs = [
{ "prop": "id", "name": "id" }, { prop: 'createTime', name: '添加时间' },
{ "prop": "productionLineId", "name": "产线ID" }, { prop: 'name', name: '工段名称' },
{ "prop": "code", "name": "编码" }, { prop: 'code', name: '工段编码' },
{ "prop": "name", "name": "名称" }, { prop: 'productionLineId', name: '产线ID' },
{ "prop": "description", "name": "描述" }, { prop: 'remark', name: '备注' },
{ "prop": "enabled", "name": "启用状态:0 、停用1、启用" }, // { "prop": "id", "name": "id" },
{ "prop": "sort", "name": "排序" }, // { "prop": "description", "name": "" },
{ "prop": "remark", "name": "备注" }, // { "prop": "enabled", "name": ":0 1" },
{ "prop": "valid", "name": "删除标志,是否有效:1 可用 0不可用" }, // { "prop": "sort", "name": "" },
{ "prop": "creatorId", "name": "创建人" }, // { "prop": "valid", "name": ":1 0" },
{ "prop": "creatorName", "name": "创建人姓名" }, // { "prop": "creatorId", "name": "" },
{ "prop": "createTime", "name": "创建时间" }, // { "prop": "creatorName", "name": "" },
{ "prop": "updaterId", "name": "更新人" }, // { "prop": "updaterId", "name": "" },
{ "prop": "updaterName", "name": "更新人姓名" }, // { "prop": "updaterName", "name": "" },
{ "prop": "updateTime", "name": "更新时间" }, // { "prop": "updateTime", "name": "" },
{ "prop": "version", "name": "版本号" }, // { "prop": "version", "name": "" },
{ "prop": "externalCode", "name": "外部系统编码" }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } // { prop: 'externalCode', name: '' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
data() { data() {
return {tableConfigs, return {
tableConfigs,
dataForm: { dataForm: {
key: '' key: ''
}, },
@ -94,7 +96,8 @@ export default {
} }
}, },
components: { components: {
AddOrUpdate,BaseTable AddOrUpdate,
BaseTable
}, },
activated() { activated() {
this.getDataList() this.getDataList()

View File

@ -34,7 +34,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> --> </el-table> -->
<base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" /> <base-table :data="dataList" :table-head-configs="tableConfigs" :max-height="500" />
<el-pagination <el-pagination
@size-change="sizeChangeHandle" @size-change="sizeChangeHandle"
@current-change="currentChangeHandle" @current-change="currentChangeHandle"
@ -69,12 +69,14 @@ const tableConfigs = [
{ prop: 'updaterId', name: '更新人' }, { prop: 'updaterId', name: '更新人' },
{ prop: 'updaterName', name: '更新人姓名' }, { prop: 'updaterName', name: '更新人姓名' },
{ prop: 'updateTime', name: '更新时间' }, { prop: 'updateTime', name: '更新时间' },
{ prop: 'version', name: '版本号' }, { prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] } { prop: 'version', name: '版本号' },
{ prop: 'operations', name: '操作', fixed: 'right', width: 180, subcomponent: TableOperateComponent, options: ['edit', 'delete'] }
] ]
export default { export default {
data() { data() {
return {tableConfigs, return {
tableConfigs,
dataForm: { dataForm: {
key: '' key: ''
}, },
@ -88,7 +90,8 @@ export default {
} }
}, },
components: { components: {
AddOrUpdate,BaseTable AddOrUpdate,
BaseTable
}, },
activated() { activated() {
this.getDataList() this.getDataList()