Commit 1d220fc8 authored by XuYang's avatar XuYang

修改分页

parent f17a97b4
...@@ -11,18 +11,18 @@ ...@@ -11,18 +11,18 @@
style="width: 150px" style="width: 150px"
/> />
</el-form-item> </el-form-item>
<el-form-item label="status" prop="status"> <!-- <el-form-item label="status" prop="status">-->
<el-input <!-- <el-input-->
v-model="queryParams.status" <!-- v-model="queryParams.status"-->
placeholder="请输入status" <!-- placeholder="请输入status"-->
clearable <!-- clearable-->
:maxlength="1" <!-- :maxlength="1"-->
size="small" <!-- size="small"-->
style="width: 150px" <!-- style="width: 150px"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="状态" prop="flag"> <el-form-item label="状态" prop="flag">
<el-select v-model="queryParams.flag" placeholder="请选择状态" clearable size="small"> <el-select v-model="queryParams.status" placeholder="请选择status" clearable size="small">
<el-option <el-option
v-for="dict in statusOptions" v-for="dict in statusOptions"
:key="dict.dictValue" :key="dict.dictValue"
...@@ -78,7 +78,9 @@ ...@@ -78,7 +78,9 @@
</el-table-column> </el-table-column>
<el-table-column label="状态" prop="status" :show-overflow-tooltip="true"> <el-table-column label="状态" prop="status" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status || '-' }} <div v-if="scope.row.status === '1'">已盘点</div>
<div v-if="scope.row.status === '0'">未盘点</div>
<div v-if="scope.row.status === null">-</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" prop="createName" :show-overflow-tooltip="true"> <el-table-column label="创建人" prop="createName" :show-overflow-tooltip="true">
...@@ -244,10 +246,10 @@ ...@@ -244,10 +246,10 @@
/> />
</el-dialog> </el-dialog>
<!-- 导入配置对话框 --> <!-- 导入配置对话框 -->
<el-dialog class="importDialog" :title="importControls.title" :visible="importControls.open" width="700px" append-to-body :close-on-click-modal="false" @close="cancelFileFrom"> <el-dialog class="importDialog" :title="importControls.title" :visible="importControls.open" width="350px" append-to-body :close-on-click-modal="false" @close="cancelFileFrom">
<el-form :model="typeFrom"> <el-form :model="typeFrom">
<el-form-item> <el-form-item>
<el-button class="downloadTemplateDivButton" type="primary" :loading="downloadTemplateLoading" size="small" @click="downloadTemplate">下载模板</el-button> <!-- <el-button class="downloadTemplateDivButton" type="primary" :loading="downloadTemplateLoading" size="small" @click="downloadTemplate">下载模板</el-button>-->
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="importOne"> <div class="importOne">
...@@ -345,14 +347,14 @@ export default { ...@@ -345,14 +347,14 @@ export default {
title: '', title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 状态菜单 // status菜单
statusOptions: [ statusOptions: [
{ {
dictLabel: '启用', dictLabel: '已盘点',
dictValue: '1' dictValue: '1'
}, },
{ {
dictLabel: '停用', dictLabel: '未盘点',
dictValue: '0' dictValue: '0'
} }
], ],
...@@ -654,4 +656,13 @@ export default { ...@@ -654,4 +656,13 @@ export default {
margin-bottom: 10px margin-bottom: 10px
} }
} }
.aboutSingleDetails {
::v-deep .el-dialog {
margin: 0 auto !important;
height: 70%;
.el-dialog__body {
height: 100%;
}
}
}
</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