Commit dcbb0e6f authored by 刘宇扬's avatar 刘宇扬

申请4

parent 99b5b95e
...@@ -31,47 +31,52 @@ ...@@ -31,47 +31,52 @@
<div class="placeholder" /> <div class="placeholder" />
<div style="padding:5px 10px"> <div style="padding:5px 10px">
<div class="mb12 font-small-bold">设备申请列表</div> <div class="mb12 font-small-bold">设备申请列表</div>
<el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" border :data="tableData" @selection-change="handleSelectionChange">
<el-table-column type="index" label="序号" width="50" /> <el-table-column type="index" label="序号" width="50" />
<el-table-column label="名称" prop="roleName" :show-overflow-tooltip="true"> <el-table-column
<template slot-scope="scope"> label="设备名称"
{{ scope.row.roleName || '-' }} prop="name">
</template> </el-table-column>
</el-table-column> <el-table-column
label="设备编码"
prop="id">
</el-table-column>
<el-table-column
label="LOT"
prop="lot">
</el-table-column>
<el-table-column label="编码" prop="roleKey"> <el-table-column type="expand" width="30">
<template slot-scope="scope"> <template slot-scope="props">
{{ scope.row.roleKey || '-' }} <el-form label-position="left" inline class="demo-table-expand">
</template> <el-form-item label="设备名称:">
</el-table-column> <span>{{ props.row.name }}</span>
</el-form-item>
<el-form-item label="设备编码:">
<span>{{ props.row.id }}</span>
</el-form-item>
<el-form-item label="LOT:">
<span>{{ props.row.lot }}</span>
</el-form-item>
<el-form-item label="厚度:">
<span>{{ props.row.ply }}</span>
</el-form-item>
<el-form-item label="创建时间:">
<span>{{ props.row.creatTime }}</span>
</el-form-item>
<el-form-item label="位置:">
<span>{{ props.row.loction }}</span>
</el-form-item>
<el-form-item label="创建人:">
<span>{{ props.row.creatMan }}</span>
</el-form-item>
</el-form>
</template>
</el-table-column>
<el-table-column label="LOT" prop="roleSort">
<template slot-scope="scope">
{{ scope.row.roleSort || '-' }}
</template>
</el-table-column>
<!-- <el-table-column label="位置" prop="roleSort">
<template slot-scope="scope">
{{ scope.row.roleSort || '-' }}
</template>
</el-table-column>
<el-table-column label="厚度" prop="roleSort">
<template slot-scope="scope">
{{ scope.row.roleSort || '-' }}
</template>
</el-table-column>
<el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
</template>
</el-table-column>
<el-table-column label="创建人" prop="roleSort">
<template slot-scope="scope">
{{ scope.row.roleSort || '-' }}
</template>
</el-table-column> -->
<el-table-column label="操作" class-name="small-padding fixed-width" width="140px"> <el-table-column label="操作" class-name="small-padding fixed-width" width="140px">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button--> <!-- <el-button-->
...@@ -278,7 +283,24 @@ export default { ...@@ -278,7 +283,24 @@ export default {
{ required: true, message: '请输入设备排序', trigger: 'blur' } { required: true, message: '请输入设备排序', trigger: 'blur' }
] ]
}, },
deptOptions: [] deptOptions: [],
tableData: [{
name: 'XXXXXXX',
id: 'XXXXXXX',
lot: 'XXXXXXXXX',
loction: 'XXXXXXX',
ply: 'XXXXXXX',
creatTime: 'XXXXXXX',
creatMan: 'XXXXXXX'
}, {
name: 'XXXXXXX',
id: 'XXXXXXX',
lot: 'XXXXXXXXX',
loction: 'XXXXXXX',
ply: 'XXXXXXX',
creatTime: 'XXXXXXX',
creatMan: 'XXXXXXX'
}]
} }
}, },
/** 路由离开前存储筛选条件*/ /** 路由离开前存储筛选条件*/
...@@ -654,4 +676,16 @@ export default { ...@@ -654,4 +676,16 @@ export default {
height: 12em; height: 12em;
width: 4px; width: 4px;
} }
.demo-table-expand {
font-size: 0;
}
.demo-table-expand label {
width: 90px;
color: #99a9bf;
}
.demo-table-expand .el-form-item {
margin-right: 0;
margin-bottom: 0;
width: 50%;
}
</style> </style>
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