refactor(index): 页面优化

duizhaopin_ui
duan 2 years ago
parent 861ec38bd4
commit dc1bfae427

@ -0,0 +1,31 @@
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20">
<defs>
<style>
.cls-1 {
fill: #fff;
}
.cls-2, .cls-3 {
fill: none;
stroke: #409eff;
stroke-width: 1.2px;
}
.cls-2 {
stroke-linejoin: round;
}
</style>
</defs>
<g id="环境管理" transform="translate(-4 -4)">
<rect id="矩形_973" data-name="矩形 973" class="cls-1" width="20" height="20" transform="translate(4 4)"/>
<path id="路径_384" data-name="路径 384" class="cls-2" d="M24,4V20.582" transform="translate(-10 1.709)"/>
<path id="路径_385" data-name="路径 385" class="cls-2" d="M6.725,14l14.36,8.291" transform="translate(0.113 -4.146)"/>
<path id="路径_386" data-name="路径 386" class="cls-2" d="M6.719,22.295l14.328-8.272" transform="translate(0.117 -4.159)"/>
<path id="路径_387" data-name="路径 387" class="cls-3" d="M8.487,10l1.244,3.731L6,14.56" transform="translate(0.538 -1.804)"/>
<path id="路径_388" data-name="路径 388" class="cls-3" d="M6,27l3.731.829L8.487,31.56" transform="translate(0.538 -11.756)"/>
<path id="路径_389" data-name="路径 389" class="cls-3" d="M34.244,10,33,13.731l3.731.829" transform="translate(-15.269 -1.804)"/>
<path id="路径_390" data-name="路径 390" class="cls-3" d="M36.731,27,33,27.829l1.244,3.731" transform="translate(-15.269 -11.756)"/>
<path id="路径_391" data-name="路径 391" class="cls-3" d="M18,7l2.487,2.487L22.975,7" transform="translate(-6.487 -0.047)"/>
<path id="路径_392" data-name="路径 392" class="cls-3" d="M18,37.487,20.487,35l2.487,2.487" transform="translate(-6.487 -16.44)"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

@ -0,0 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1660203571447" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2750" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M506.67 520h-33.26c-0.99 0-1.79-0.8-1.79-1.79V125.79c0-0.99 0.8-1.79 1.79-1.79h33.26c0.99 0 1.79 0.8 1.79 1.79v392.42c0 0.99-0.8 1.79-1.79 1.79z" fill="#1296db" p-id="2751"></path><path d="M503.24 293.27l-23.52 23.52c-0.7 0.7-1.83 0.7-2.53 0L375.53 215.12c-0.7-0.7-0.7-1.83 0-2.53l23.52-23.52c0.7-0.7 1.83-0.7 2.53 0l101.66 101.66c0.7 0.71 0.7 1.84 0 2.54z" fill="#1296db" p-id="2752"></path><path d="M476.84 293.27l23.52 23.52c0.7 0.7 1.83 0.7 2.53 0l101.66-101.66c0.7-0.7 0.7-1.83 0-2.53l-23.52-23.52c-0.7-0.7-1.83-0.7-2.53 0L476.84 290.74c-0.7 0.7-0.7 1.83 0 2.53zM498.35 505.6l-16.63 28.8c-0.49 0.86-1.59 1.15-2.45 0.66L139.43 338.85a1.796 1.796 0 0 1-0.66-2.45l16.63-28.8c0.49-0.86 1.59-1.15 2.45-0.66L497.7 503.15c0.85 0.5 1.15 1.59 0.65 2.45z" fill="#1296db" p-id="2753"></path><path d="M300.28 395.2l8.61 32.12c0.26 0.96-0.31 1.94-1.27 2.19l-138.87 37.21c-0.96 0.26-1.94-0.31-2.19-1.27l-8.61-32.12c-0.26-0.96 0.31-1.94 1.27-2.19l138.87-37.21c0.96-0.25 1.94 0.32 2.19 1.27z" fill="#1296db" p-id="2754"></path><path d="M287.08 418.07l32.12-8.61c0.96-0.26 1.52-1.24 1.27-2.19L283.26 268.4a1.795 1.795 0 0 0-2.19-1.27l-32.12 8.61c-0.96 0.26-1.52 1.24-1.27 2.19l37.21 138.87a1.79 1.79 0 0 0 2.19 1.27z" fill="#1296db" p-id="2755"></path><path d="M481.72 505.6l16.63 28.8c0.49 0.86 0.2 1.95-0.66 2.45L157.85 733.06c-0.86 0.49-1.95 0.2-2.45-0.66l-16.63-28.8c-0.49-0.86-0.2-1.95 0.66-2.45l339.84-196.21c0.87-0.49 1.96-0.2 2.45 0.66z" fill="#1296db" p-id="2756"></path><path d="M287.08 621.93l32.12 8.61c0.96 0.26 1.52 1.24 1.27 2.19L283.26 771.6c-0.26 0.96-1.24 1.52-2.19 1.27l-32.12-8.61a1.795 1.795 0 0 1-1.27-2.19l37.21-138.87a1.79 1.79 0 0 1 2.19-1.27z" fill="#1296db" p-id="2757"></path><path d="M300.28 644.8l8.61-32.12c0.26-0.96-0.31-1.94-1.27-2.19l-138.87-37.21c-0.96-0.26-1.94 0.31-2.19 1.27l-8.61 32.12c-0.26 0.96 0.31 1.94 1.27 2.19l138.87 37.21c0.96 0.25 1.94-0.32 2.19-1.27z" fill="#1296db" p-id="2758"></path><path d="M473.41 520h33.26c0.99 0 1.79 0.8 1.79 1.79v392.42c0 0.99-0.8 1.79-1.79 1.79h-33.26c-0.99 0-1.79-0.8-1.79-1.79V521.79c0-0.99 0.8-1.79 1.79-1.79z" fill="#1296db" p-id="2759"></path><path d="M476.84 746.73l23.52-23.52c0.7-0.7 1.83-0.7 2.53 0l101.66 101.66c0.7 0.7 0.7 1.83 0 2.53l-23.52 23.52c-0.7 0.7-1.83 0.7-2.53 0L476.84 749.26c-0.7-0.7-0.7-1.83 0-2.53z" fill="#1296db" p-id="2760"></path><path d="M503.24 746.73l-23.52-23.52c-0.7-0.7-1.83-0.7-2.53 0L375.53 824.88c-0.7 0.7-0.7 1.83 0 2.53l23.52 23.52c0.7 0.7 1.83 0.7 2.53 0l101.66-101.66c0.7-0.71 0.7-1.84 0-2.54z" fill="#1296db" p-id="2761"></path><path d="M481.72 534.4l16.63-28.8c0.49-0.86 1.59-1.15 2.45-0.66l339.84 196.21c0.86 0.49 1.15 1.59 0.66 2.45l-16.63 28.8c-0.49 0.86-1.59 1.15-2.45 0.66L482.38 536.85c-0.86-0.5-1.15-1.59-0.66-2.45z" fill="#1296db" p-id="2762"></path><path d="M679.79 644.8l-8.61-32.12c-0.26-0.96 0.31-1.94 1.27-2.19l138.87-37.21c0.96-0.26 1.94 0.31 2.19 1.27l8.61 32.12c0.26 0.96-0.31 1.94-1.27 2.19l-138.87 37.21c-0.95 0.25-1.93-0.32-2.19-1.27z" fill="#1296db" p-id="2763"></path><path d="M693 621.93l-32.12 8.61c-0.96 0.26-1.52 1.24-1.27 2.19l37.21 138.87c0.26 0.96 1.24 1.52 2.19 1.27l32.12-8.61c0.96-0.26 1.52-1.24 1.27-2.19L695.19 623.2a1.795 1.795 0 0 0-2.19-1.27z" fill="#1296db" p-id="2764"></path><path d="M498.35 534.4l-16.63-28.8c-0.49-0.86-0.2-1.95 0.66-2.45l339.84-196.21c0.86-0.49 1.95-0.2 2.45 0.66l16.63 28.8c0.49 0.86 0.2 1.95-0.66 2.45L500.8 535.06c-0.86 0.49-1.95 0.2-2.45-0.66z" fill="#1296db" p-id="2765"></path><path d="M693 418.07l-32.12-8.61a1.795 1.795 0 0 1-1.27-2.19l37.21-138.87c0.26-0.96 1.24-1.52 2.19-1.27l32.12 8.61c0.96 0.26 1.52 1.24 1.27 2.19L695.19 416.8c-0.26 0.96-1.24 1.52-2.19 1.27z" fill="#1296db" p-id="2766"></path><path d="M679.79 395.2l-8.61 32.12c-0.26 0.96 0.31 1.94 1.27 2.19l138.87 37.21c0.96 0.26 1.94-0.31 2.19-1.27l8.61-32.12c0.26-0.96-0.31-1.94-1.27-2.19l-138.87-37.21c-0.95-0.25-1.93 0.32-2.19 1.27z" fill="#1296db" p-id="2767"></path></svg>

After

Width:  |  Height:  |  Size: 4.5 KiB

@ -87,7 +87,7 @@ export default {
.user-role{ .user-role{
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
color: #DCDFE6; color: #AAAAAA;
} }
} }

@ -200,6 +200,19 @@ const reagentRouter = [
} }
] ]
}, },
{
path: '/reagent/envrecord',
component: Layout,
meta: { classification: 'reagent' },
children: [
{
path: 'index',
name: 'EnvRecord',
component: () => import('@/views/reagent/envrecord/index'),
meta: { title: '环境记录', icon: '雪花', classification: 'reagent' }
}
]
},
{ {
path: '/reagent/buy', path: '/reagent/buy',
component: Layout, component: Layout,

@ -1,10 +1,7 @@
import { logout } from '@/api/user/user'
import { getToken, removeToken } from '@/utils/auth'
import { resetRouter } from '@/router'
const getDefaultState = () => { const getDefaultState = () => {
return { return {
token: getToken(), token: '',
name: '', name: '',
avatar: '', avatar: '',
classification: '' classification: ''
@ -69,27 +66,27 @@ const actions = {
// }, // },
// userinfo logout // userinfo logout
logout({ commit, state }) { // logout({ commit, state }) {
return new Promise((resolve, reject) => { // return new Promise((resolve, reject) => {
logout(state.token).then(() => { // logout(state.token).then(() => {
removeToken() // must remove token first // removeToken() // must remove token first
resetRouter() // resetRouter()
commit('RESET_STATE') // commit('RESET_STATE')
resolve() // resolve()
}).catch(error => { // }).catch(error => {
reject(error) // reject(error)
}) // })
}) // })
}, // },
// remove token // remove token
resetToken({ commit }) { // resetToken({ commit }) {
return new Promise(resolve => { // return new Promise(resolve => {
removeToken() // must remove token first // removeToken() // must remove token first
commit('RESET_STATE') // commit('RESET_STATE')
resolve() // resolve()
}) // })
} // }
} }
export default { export default {

@ -89,3 +89,7 @@ div:focus {
border-radius: 20px; border-radius: 20px;
} }
.my-pagination{
margin-top: 1rem;
}

@ -1,15 +0,0 @@
import Cookies from 'js-cookie'
const TokenKey = 'vue_admin_template_token'
export function getToken() {
return Cookies.get(TokenKey)
}
export function setToken(token) {
return Cookies.set(TokenKey, token)
}
export function removeToken() {
return Cookies.remove(TokenKey)
}

@ -91,7 +91,7 @@ export default {
// } // }
return { return {
backgrounddiv: { backgrounddiv: {
'background-image': 'url(' + require('@/assets/login/login_background.png') + ')' 'background-image': 'url(' + require('@/assets/login/login.png') + ')'
}, },
loginForm: { loginForm: {
user_name: '', user_name: '',

@ -2,7 +2,7 @@
<div class="main-container-text"> <div class="main-container-text">
<div class="title">柜体管理</div> <div class="title">柜体管理</div>
<div class="header"> <div class="header">
<el-input v-model="name" placeholder="请输入试剂名称" /> <el-input v-model="name" clearable placeholder="请输入试剂名称" />
<el-button type="primary" icon="el-icon-search" @click="getList"></el-button> <el-button type="primary" icon="el-icon-search" @click="getList"></el-button>
<el-button type="primary" plain icon="el-icon-plus" @click="handleFormOpen('add')"></el-button> <el-button type="primary" plain icon="el-icon-plus" @click="handleFormOpen('add')"></el-button>
<el-button icon="el-icon-unlock" @click="handleLock">/</el-button> <el-button icon="el-icon-unlock" @click="handleLock">/</el-button>
@ -19,7 +19,7 @@
:data="tableData" :data="tableData"
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
height="71vh" height="69vh"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column <el-table-column
@ -85,14 +85,13 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
:current-page.sync="page" :current-page.sync="page"
:total="total" :total="total"
:page-size.sync="page_size" :page-size.sync="page_size"
hide-on-single-page
:disabled="loading" :disabled="loading"
@current-change="pageChange" @current-change="pageChange"
/> />
@ -212,13 +211,12 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
:current-page.sync="user_draw_page" :current-page.sync="user_draw_page"
:total="user_draw_total" :total="user_draw_total"
hide-on-single-page
:page-size.sync="user_draw_page_size" :page-size.sync="user_draw_page_size"
:disabled="loadingDraw" :disabled="loadingDraw"
@current-change="userDrawPageChange" @current-change="userDrawPageChange"
@ -227,7 +225,7 @@
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogUserVisible" width="60%" title="分配禁用用户"> <el-dialog :visible.sync="dialogUserVisible" width="60%" title="分配禁用用户">
<div class="user-header"> <div class="user-header">
<el-input v-model="seach_user" placeholder="请输入内容" /> <el-input v-model="seach_user" clearable placeholder="请输入内容" />
<el-button type="primary" icon="el-icon-search" @click="getUserList"></el-button> <el-button type="primary" icon="el-icon-search" @click="getUserList"></el-button>
<el-button plain type="danger" @click="handleDisUser"><svg-icon icon-class="" /> 确认禁用</el-button> <el-button plain type="danger" @click="handleDisUser"><svg-icon icon-class="" /> 确认禁用</el-button>
<el-button plain type="success" @click="handleEnUser"><svg-icon icon-class="" /> 解除禁用</el-button> <el-button plain type="success" @click="handleEnUser"><svg-icon icon-class="" /> 解除禁用</el-button>
@ -255,13 +253,12 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
:current-page.sync="user_page" :current-page.sync="user_page"
:total="user_total" :total="user_total"
hide-on-single-page
:page-size.sync="user_page_size" :page-size.sync="user_page_size"
:disabled="loadingUser" :disabled="loadingUser"
@current-change="userPageChange" @current-change="userPageChange"
@ -683,11 +680,11 @@ export default {
.user-header { .user-header {
margin-bottom: 1rem; margin-bottom: 1rem;
.el-input{ .el-input{
width: 150px; width: 12.5rem;
margin-right: 1rem; margin-right: 1rem;
} }
.el-select{ .el-select{
width: 150px; width: 12.5rem;
margin-right: 1rem; margin-right: 1rem;
} }
} }

@ -3,7 +3,7 @@
<div v-if="show" class="main-container-text"> <div v-if="show" class="main-container-text">
<div class="title">{{ $route.fullPath.indexOf('msds') !== -1 ? 'MSDS数据库' : '危化品数据库' }}</div> <div class="title">{{ $route.fullPath.indexOf('msds') !== -1 ? 'MSDS数据库' : '危化品数据库' }}</div>
<div class="header"> <div class="header">
<el-input v-model="value" placeholder="请输入内容" /> <el-input v-model="value" clearable placeholder="请输入内容" />
<el-button type="primary" icon="el-icon-search" @click="handleSearch"></el-button> <el-button type="primary" icon="el-icon-search" @click="handleSearch"></el-button>
</div> </div>
<div class="kws-title">最近搜索</div> <div class="kws-title">最近搜索</div>

@ -18,9 +18,10 @@
</div> </div>
</div> </div>
<el-table <el-table
stripe
:data="tableData" :data="tableData"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
height="71vh" height="69vh"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column <el-table-column
@ -66,14 +67,13 @@
align="center" align="center"
/> />
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
:current-page.sync="page" :current-page.sync="page"
:total="total" :total="total"
:page-size.sync="page_size" :page-size.sync="page_size"
hide-on-single-page
@current-change="pageChange" @current-change="pageChange"
/> />
</div> </div>
@ -139,7 +139,7 @@
<el-table-column align="center" property="create_user_name" label="操作人员" /> <el-table-column align="center" property="create_user_name" label="操作人员" />
<el-table-column align="center" property="client_id" label="所属终端" /> <el-table-column align="center" property="client_id" label="所属终端" />
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
@ -268,7 +268,4 @@ export default {
.add-item{ .add-item{
margin-bottom: 1rem; margin-bottom: 1rem;
} }
.header-select{
margin-left: 1rem;
}
</style> </style>

@ -79,7 +79,8 @@
<el-table <el-table
v-loading="rloading" v-loading="rloading"
:data="remainingData" :data="remainingData"
height="38vh" height="34vh"
stripe
style="width: calc(100% - 1.25rem)" style="width: calc(100% - 1.25rem)"
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
> >
@ -94,7 +95,7 @@
label="余量" label="余量"
/> />
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
@ -102,7 +103,6 @@
:disabled="rloading" :disabled="rloading"
:current-page.sync="rpage" :current-page.sync="rpage"
:page-size.sync="rpage_size" :page-size.sync="rpage_size"
hide-on-single-page
@current-change="remainingPageChange" @current-change="remainingPageChange"
/> />
</div> </div>
@ -121,6 +121,7 @@
</div> </div>
<div class="content" style="overflow: auto"> <div class="content" style="overflow: auto">
<el-table <el-table
stripe
:data="tableData" :data="tableData"
> >
<el-table-column <el-table-column
@ -181,22 +182,22 @@
</div> </div>
<!-- // --> <!-- // -->
<el-dialog title="预警信息" width="70%" :visible.sync="dialogTableVisible"> <el-dialog title="预警信息" width="70%" :visible.sync="dialogTableVisible">
<div class="header"> <div class="header-custom">
<el-date-picker <el-date-picker
v-model="start_time" v-model="start_time"
clearable
type="datetime" type="datetime"
placeholder="选择生产日期" placeholder="选择生产日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
/> />
<el-date-picker <el-date-picker
v-model="end_time" v-model="end_time"
clearable
type="datetime" type="datetime"
placeholder="选择过期日期" placeholder="选择过期日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
/> />
<el-select v-model="object_type" placeholder="请选择预警信息类型"> <el-select v-model="object_type" clearable placeholder="请选择预警信息类型">
<el-option <el-option
v-for="(item,index) in warning_data_map" v-for="(item,index) in warning_data_map"
:key="index" :key="index"
@ -204,12 +205,13 @@
:value="index + 1" :value="index + 1"
/> />
</el-select> </el-select>
<el-input v-model="seach_word" placeholder="请输入搜索试剂名称" /> <el-input v-model="seach_word" clearable placeholder="请输入搜索试剂名称" />
<el-button :disabled="loadingReagent" type="primary" icon="el-icon-search" @click="searchData"></el-button> <el-button :disabled="loadingReagent" type="primary" icon="el-icon-search" @click="searchData"></el-button>
</div> </div>
<el-table <el-table
v-loading="loadingReagent" v-loading="loadingReagent"
:data="gridData" :data="gridData"
stripe
height="400" height="400"
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
@ -260,11 +262,10 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
hide-on-single-page
:disabled="loadingReagent" :disabled="loadingReagent"
:current-page.sync="page" :current-page.sync="page"
:total="total" :total="total"
@ -393,6 +394,7 @@ export default {
res => { res => {
this.clientOptions = res.data.data_list this.clientOptions = res.data.data_list
this.client_id = this.clientOptions[0].client_id this.client_id = this.clientOptions[0].client_id
this.rclient_id = this.client_id
resolve() resolve()
} }
) )
@ -681,4 +683,14 @@ export default {
width: 65rem; width: 65rem;
height: 15.25rem; height: 15.25rem;
} }
.header-custom{
margin-bottom: 1rem;
.el-input{
width: 12.5rem;
margin-right: 1rem;
}
.el-select{
margin-right: 1rem;
}
}
</style> </style>

@ -2,7 +2,7 @@
<div class="main-container-text"> <div class="main-container-text">
<div class="title">试剂管理</div> <div class="title">试剂管理</div>
<div class="header"> <div class="header">
<el-select v-model="client_id" placeholder="请选择柜体"> <el-select v-model="client_id" clearable placeholder="请选择柜体">
<el-option <el-option
v-for="item in clientOptions" v-for="item in clientOptions"
:key="item.id" :key="item.id"
@ -10,7 +10,7 @@
:value="item.client_id" :value="item.client_id"
/> />
</el-select> </el-select>
<el-input v-model="name" placeholder="请输入试剂名称" /> <el-input v-model="name" clearable placeholder="请输入试剂名称" />
<el-button type="primary" icon="el-icon-search" @click="getList"></el-button> <el-button type="primary" icon="el-icon-search" @click="getList"></el-button>
<el-button type="primary" plain @click="handleSetEmpty"><svg-icon icon-class="cup" /> 设为空瓶</el-button> <el-button type="primary" plain @click="handleSetEmpty"><svg-icon icon-class="cup" /> 设为空瓶</el-button>
<el-button icon="el-icon-edit" @click="handleEdit"></el-button> <el-button icon="el-icon-edit" @click="handleEdit"></el-button>
@ -24,9 +24,10 @@
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="tableData" :data="tableData"
stripe
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
height="71vh" height="69vh"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column <el-table-column
@ -39,12 +40,14 @@
show-overflow-tooltip show-overflow-tooltip
label="试剂名称" label="试剂名称"
align="center" align="center"
width="100"
/> />
<el-table-column <el-table-column
prop="english_name" prop="english_name"
show-overflow-tooltip show-overflow-tooltip
label="英文名称" label="英文名称"
align="center" align="center"
width="100"
/> />
<el-table-column <el-table-column
prop="bar_code" prop="bar_code"
@ -71,22 +74,26 @@
prop="purity" prop="purity"
label="纯度" label="纯度"
align="center" align="center"
width="100"
show-overflow-tooltip
/> />
<el-table-column <el-table-column
prop="production_date" prop="production_date"
label="生产日期" label="生产日期"
align="center" align="center"
width="130"
/> />
<el-table-column <el-table-column
prop="put_in_date" prop="put_in_date"
label="入库时间" label="入库时间"
align="center" align="center"
width="130"
/> />
<el-table-column <!-- <el-table-column-->
prop="is_supervise" <!-- prop="is_supervise"-->
label="是否监管" <!-- label="是否监管"-->
align="center" <!-- align="center"-->
/> <!-- />-->
<el-table-column <el-table-column
prop="status" prop="status"
label="状态" label="状态"
@ -102,33 +109,37 @@
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ clientOptions.find(item => item.client_id === scope.row.client_id).client_name }} <div v-if="clientOptions.find(item => item.client_id === scope.row.client_id)">
{{ clientOptions.find(item => item.client_id === scope.row.client_id).client_name }}
</div>
<div v-else>
{{ scope.row.client_id }}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <!-- <el-table-column-->
prop="inventory_warning_value" <!-- prop="inventory_warning_value"-->
label="预警量(瓶)" <!-- label="预警量(瓶)"-->
align="center" <!-- align="center"-->
/> <!-- />-->
<el-table-column <!-- <el-table-column-->
prop="use_days_warning_value" <!-- prop="use_days_warning_value"-->
label="提前预警(天)" <!-- label="提前预警(天)"-->
align="center" <!-- align="center"-->
/> <!-- />-->
<el-table-column <el-table-column
prop="by_user_name" prop="by_user_name"
label="最后使用人" label="最后使用人"
align="center" align="center"
/> />
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
:current-page.sync="page" :current-page.sync="page"
:total="total" :total="total"
:page-size.sync="page_size" :page-size.sync="page_size"
hide-on-single-page
:disabled="loading" :disabled="loading"
@current-change="pageChange" @current-change="pageChange"
/> />
@ -141,24 +152,30 @@
:data="historyData" :data="historyData"
height="420" height="420"
> >
<el-table-column align="center" type="index" width="50" label="序号" />
<el-table-column align="center" property="name" label="试剂名称" /> <el-table-column align="center" property="name" label="试剂名称" />
<el-table-column align="center" property="bar_code" label="试剂编码" /> <el-table-column align="center" property="bar_code" label="试剂编码" width="100" show-overflow-tooltip />
<el-table-column align="center" property="cas_number" label="CAS码" /> <el-table-column align="center" property="cas_number" label="CAS码" />
<el-table-column align="center" property="purity" label="纯度" /> <el-table-column align="center" property="purity" label="纯度" width="100" show-overflow-tooltip />
<el-table-column align="center" property="client_id" label="所属终端"> <el-table-column align="center" property="client_id" label="所属终端">
<template slot-scope="scope"> <template slot-scope="scope">
{{ clientOptions.find(item => item.client_id === scope.row.client_id).client_name }} <div v-if="clientOptions.find(item => item.client_id === scope.row.client_id)">
{{ clientOptions.find(item => item.client_id === scope.row.client_id).client_name }}
</div>
<div v-else>
{{ scope.row.client_id }}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" property="status" label="操作类型"> <el-table-column align="center" property="status" label="操作类型">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="statusColorMap[scope.row.status-1]">{{ statusMap[scope.row.status-1] }}</el-tag> <el-tag :type="statusColorMap[scope.row.status-1]">{{ recodeStatusMap[scope.row.status-1] }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" property="create_date" label="操作时间" /> <el-table-column align="center" property="create_date" label="操作时间" width="130" />
<el-table-column align="center" property="create_user_name" label="操作人员" /> <el-table-column align="center" property="create_user_name" label="操作人员" />
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
@ -166,14 +183,13 @@
:total="history_total" :total="history_total"
:page-size.sync="history_page_size" :page-size.sync="history_page_size"
:disabled="loadingHistory" :disabled="loadingHistory"
hide-on-single-page
@current-change="HistoryPageChange" @current-change="HistoryPageChange"
/> />
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogUserVisible" width="60%" title="分配禁用用户"> <el-dialog :visible.sync="dialogUserVisible" width="60%" title="分配禁用用户">
<div class="user-header"> <div class="user-header">
<el-input v-model="seach_user" placeholder="请输入内容" /> <el-input v-model="seach_user" clearable placeholder="请输入内容" />
<el-button type="primary" icon="el-icon-search" @click="getUserList"></el-button> <el-button type="primary" icon="el-icon-search" @click="getUserList"></el-button>
<el-button plain type="danger" @click="handleDisUser"><svg-icon icon-class="" /> 确认禁用</el-button> <el-button plain type="danger" @click="handleDisUser"><svg-icon icon-class="" /> 确认禁用</el-button>
<el-button plain type="success" @click="handleEnUser"><svg-icon icon-class="" /> 解除禁用</el-button> <el-button plain type="success" @click="handleEnUser"><svg-icon icon-class="" /> 解除禁用</el-button>
@ -184,6 +200,7 @@
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
:data="userData" :data="userData"
height="420" height="420"
stripe
@selection-change="handleUserSelectionChange" @selection-change="handleUserSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
@ -201,13 +218,12 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
:current-page.sync="user_page" :current-page.sync="user_page"
:total="user_total" :total="user_total"
hide-on-single-page
:page-size.sync="user_page_size" :page-size.sync="user_page_size"
:disabled="loadingUser" :disabled="loadingUser"
@current-change="userPageChange" @current-change="userPageChange"
@ -270,31 +286,31 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item label="出库预警天数" prop="use_days_warning_value"> <!-- <el-form-item label="出库预警天数" prop="use_days_warning_value">-->
<el-input <!-- <el-input-->
v-model="formData.use_days_warning_value" <!-- v-model="formData.use_days_warning_value"-->
placeholder="请输入出库预警天数" <!-- placeholder="请输入出库预警天数"-->
clearable <!-- clearable-->
:style="{width: '100%'}" <!-- :style="{width: '100%'}"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item label="保质期预警天数" prop="shelf_life_warning_value"> <!-- <el-form-item label="保质期预警天数" prop="shelf_life_warning_value">-->
<el-input <!-- <el-input-->
v-model="formData.shelf_life_warning_value" <!-- v-model="formData.shelf_life_warning_value"-->
placeholder="请输入保质期预警天数" <!-- placeholder="请输入保质期预警天数"-->
clearable <!-- clearable-->
:style="{width: '100%'}" <!-- :style="{width: '100%'}"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item label="预警量" prop="inventory_warning_value"> <!-- <el-form-item label="预警量" prop="inventory_warning_value">-->
<el-input v-model="formData.inventory_warning_value" placeholder="请输入预警量" clearable :style="{width: '100%'}" /> <!-- <el-input v-model="formData.inventory_warning_value" placeholder="请输入预警量" clearable :style="{width: '100%'}" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="规格" prop="speci"> <el-form-item label="规格" prop="speci">
<el-input v-model="formData.speci" placeholder="请输入规格" clearable :style="{width: '100%'}" /> <el-input v-model="formData.speci" placeholder="请输入规格" clearable :style="{width: '100%'}" />
@ -315,16 +331,16 @@
<!-- <el-input v-model="formData.field115" placeholder="请输入说明" clearable :style="{width: '100%'}" />--> <!-- <el-input v-model="formData.field115" placeholder="请输入说明" clearable :style="{width: '100%'}" />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="6"> <!-- <el-col :span="6">-->
<el-form-item label="是否监管" prop="is_supervise"> <!-- <el-form-item label="是否监管" prop="is_supervise">-->
<el-switch v-model="formData.is_supervise" /> <!-- <el-switch v-model="formData.is_supervise" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="4"> <!-- <el-col :span="4">-->
<el-form-item label="是否称重" prop="is_weigh"> <!-- <el-form-item label="是否称重" prop="is_weigh">-->
<el-switch v-model="formData.is_weigh" /> <!-- <el-switch v-model="formData.is_weigh" />-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-form> </el-form>
</el-row> </el-row>
<div style="text-align: center"> <div style="text-align: center">
@ -356,6 +372,7 @@ export default {
page: 1, page: 1,
page_size: 15, page_size: 15,
total: 0, total: 0,
recodeStatusMap: ['入库', '领用', '归还'],
statusMap: ['在库', '出库', '空瓶'], statusMap: ['在库', '出库', '空瓶'],
statusColorMap: ['success', '', 'warning'], statusColorMap: ['success', '', 'warning'],
headerStyle: { 'background': '#E6E6E6' }, headerStyle: { 'background': '#E6E6E6' },
@ -391,15 +408,15 @@ export default {
shelf_life: undefined, shelf_life: undefined,
production_date: '14:09:53', production_date: '14:09:53',
expiration_date: null, expiration_date: null,
use_days_warning_value: undefined, // use_days_warning_value: undefined,
shelf_life_warning_value: undefined, // shelf_life_warning_value: undefined,
inventory_warning_value: undefined, // inventory_warning_value: undefined,
speci: undefined, speci: undefined,
net_weight_unit: undefined, net_weight_unit: undefined,
net_weight: undefined, net_weight: undefined
// field115: undefined, // field115: undefined,
is_supervise: undefined, // is_supervise: undefined,
is_weigh: undefined // is_weigh: undefined
}, },
rules: { rules: {
name: [{ name: [{
@ -434,27 +451,27 @@ export default {
message: '请选择过期日期', message: '请选择过期日期',
trigger: 'change' trigger: 'change'
}], }],
use_days_warning_value: [{ // use_days_warning_value: [{
required: true, // required: true,
message: '请输入出库预警天数', // message: '',
trigger: 'blur' // trigger: 'blur'
}], // }],
shelf_life_warning_value: [{ // shelf_life_warning_value: [{
required: true, // required: true,
message: '请输入保质期预警天数', // message: '',
trigger: 'blur' // trigger: 'blur'
}], // }],
inventory_warning_value: [{ // inventory_warning_value: [{
required: true, // required: true,
message: '请输入预警量', // message: '',
trigger: 'blur' // trigger: 'blur'
}], // }],
speci: [], speci: [],
net_weight_unit: [], net_weight_unit: [],
net_weight: [], net_weight: []
// field115: [], // field115: [],
is_supervise: [], // is_supervise: [],
is_weigh: [] // is_weigh: []
}, },
dialogEditVisible: false dialogEditVisible: false
} }
@ -483,7 +500,8 @@ export default {
this.loadingHistory = true this.loadingHistory = true
const data = { const data = {
page: this.history_page, page: this.history_page,
page_size: this.history_page_size page_size: this.history_page_size,
medicament_id: this.multipleSelection[0].medicament_id
} }
get_durg_record(stringify(data)).then(res => { get_durg_record(stringify(data)).then(res => {
this.historyData = res.data.data_list this.historyData = res.data.data_list
@ -492,6 +510,10 @@ export default {
}, },
// click // click
showHistory() { showHistory() {
if (this.multipleSelection.length !== 1) {
this.$message.warning('请选择一个试剂!')
return
}
this.dialogHistoryVisible = true this.dialogHistoryVisible = true
this.getHistoryList() this.getHistoryList()
}, },
@ -660,7 +682,7 @@ export default {
.header{ .header{
margin: 1rem 0 1rem 0; margin: 1rem 0 1rem 0;
.el-input{ .el-input{
width: 9.375rem; width: 12.5rem;
margin-right: 1rem; margin-right: 1rem;
} }
.el-select { .el-select {

@ -14,10 +14,11 @@
<div class="show-data"> <div class="show-data">
<el-table <el-table
v-loading="loading" v-loading="loading"
stripe
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
height="78vh" height="76vh"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
> >
<el-table-column <el-table-column
@ -42,12 +43,11 @@
/> />
</el-table> </el-table>
</div> </div>
<div class="page"> <div class="page my-pagination">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="total"
hide-on-single-page
:disabled="loading" :disabled="loading"
:current-page.sync="page" :current-page.sync="page"
:page-size.sync="page_size" :page-size.sync="page_size"

@ -4,23 +4,25 @@
<div class="header"> <div class="header">
<div class="header-left"> <div class="header-left">
<el-button @click="$router.push('/reagent/report/index')"></el-button> <el-button @click="$router.push('/reagent/report/index')"></el-button>
<el-input v-model="selectReagentValue" placeholder="请输入搜索试剂名称" /> <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索试剂名称" />
<el-date-picker <el-date-picker
v-model="start_time" v-model="start_time"
type="datetime" type="datetime"
placeholder="选择生产日期" placeholder="选择生产日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
clearable
/> />
<el-date-picker <el-date-picker
v-model="end_time" v-model="end_time"
type="datetime" type="datetime"
placeholder="选择过期日期" placeholder="选择过期日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
clearable
/> />
<el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button> <el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button>
</div> </div>
<div class="header-right"> <div class="header-right">
<el-button>导出报告</el-button> <el-button type="primary" plain icon="el-icon-download">导出报告</el-button>
<el-button icon="el-icon-refresh" circle @click="getStoreInfo" /> <el-button icon="el-icon-refresh" circle @click="getStoreInfo" />
</div> </div>
</div> </div>
@ -29,10 +31,11 @@
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
:data="reagentData" :data="reagentData"
height="71vh" height="69vh"
stripe
> >
<el-table-column align="center" property="name" label="试剂名称" /> <el-table-column align="center" property="name" label="试剂名称" width="150" show-overflow-tooltip />
<el-table-column align="center" property="purity" label="纯度" /> <el-table-column align="center" property="purity" label="纯度" width="100" show-overflow-tooltip />
<el-table-column align="center" property="cas_number" label="CAS码" /> <el-table-column align="center" property="cas_number" label="CAS码" />
<!-- <el-table-column align="center" property="remain" label="重点监控" />--> <!-- <el-table-column align="center" property="remain" label="重点监控" />-->
<el-table-column align="center" property="enter_stock" label="入库数量" /> <el-table-column align="center" property="enter_stock" label="入库数量" />
@ -41,7 +44,7 @@
<el-table-column align="center" property="up_stock" label="当前借出数量" /> <el-table-column align="center" property="up_stock" label="当前借出数量" />
<el-table-column align="center" property="no_stock" label="消耗数量" /> <el-table-column align="center" property="no_stock" label="消耗数量" />
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
@ -122,8 +125,11 @@ export default {
justify-content: space-between; justify-content: space-between;
margin-bottom: 1rem; margin-bottom: 1rem;
.header-left{ .header-left{
.el-date-editor{
width: 12.5rem;
}
.el-input{ .el-input{
width:170px; width:12.5rem;
margin-right: 1rem; margin-right: 1rem;
margin-left: 1rem; margin-left: 1rem;
} }

@ -4,23 +4,25 @@
<div class="header"> <div class="header">
<div class="header-left"> <div class="header-left">
<el-button @click="$router.push('/reagent/report/index')"></el-button> <el-button @click="$router.push('/reagent/report/index')"></el-button>
<el-input v-model="selectReagentValue" placeholder="请输入搜索试剂名称" /> <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索试剂名称" />
<el-date-picker <el-date-picker
v-model="start_time" v-model="start_time"
type="datetime" type="datetime"
placeholder="选择生产日期" placeholder="选择生产日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
clearable
/> />
<el-date-picker <el-date-picker
v-model="end_time" v-model="end_time"
type="datetime" type="datetime"
placeholder="选择过期日期" placeholder="选择过期日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
clearable
/> />
<el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button> <el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button>
</div> </div>
<div class="header-right"> <div class="header-right">
<el-button>导出报告</el-button> <el-button type="primary" plain icon="el-icon-download">导出报告</el-button>
<el-button icon="el-icon-refresh" circle @click="getStoreInfo" /> <el-button icon="el-icon-refresh" circle @click="getStoreInfo" />
</div> </div>
</div> </div>
@ -29,22 +31,23 @@
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
:data="reagentData" :data="reagentData"
height="71vh" height="69vh"
stripe
> >
<el-table-column align="center" property="name" label="试剂名称" /> <el-table-column align="center" property="name" label="试剂名称" width="150" show-overflow-tooltip />
<el-table-column align="center" property="purity" label="纯度" /> <el-table-column align="center" property="purity" label="纯度" width="100" show-overflow-tooltip />
<el-table-column align="center" property="cas_number" label="CAS码" /> <el-table-column align="center" property="cas_number" label="CAS码" />
<el-table-column align="center" property="speci" label="规格" /> <el-table-column align="center" property="speci" label="规格" />
<el-table-column align="center" property="on_in" label="库存量(瓶)" /> <el-table-column align="center" property="on_in" label="库存量(瓶)" />
<el-table-column align="center" property="use_num" label="使用次数" /> <el-table-column align="center" property="use_num" label="使用次数" />
<el-table-column align="center" property="use_level" label="总用量(g)" /> <el-table-column align="center" property="use_level" label="总用量(g)" />
<el-table-column width="150" align="center" property="ratio" label="占用百分比(%)"> <el-table-column width="180" align="center" property="ratio" label="占用百分比(%)">
<template slot-scope="scope"> <template slot-scope="scope">
<el-progress :percentage="parseInt(scope.row.ratio.slice(0,-1))" /> <el-progress :percentage="parseInt(scope.row.ratio.slice(0,-1))" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
@ -125,8 +128,11 @@ export default {
justify-content: space-between; justify-content: space-between;
margin-bottom: 1rem; margin-bottom: 1rem;
.header-left{ .header-left{
.el-date-editor{
width: 12.5rem;
}
.el-input{ .el-input{
width:170px; width:12.5rem;
margin-right: 1rem; margin-right: 1rem;
margin-left: 1rem; margin-left: 1rem;
} }

@ -4,7 +4,7 @@
<div class="header"> <div class="header">
<div class="header-left"> <div class="header-left">
<el-button @click="$router.push('/reagent/report/index')"></el-button> <el-button @click="$router.push('/reagent/report/index')"></el-button>
<el-select v-model="client_id" placeholder="请选择柜体"> <el-select v-model="client_id" clearable placeholder="请选择柜体">
<el-option <el-option
v-for="item in clientOptions" v-for="item in clientOptions"
:key="item.id" :key="item.id"
@ -12,11 +12,11 @@
:value="item.client_id" :value="item.client_id"
/> />
</el-select> </el-select>
<el-input v-model="selectReagentValue" placeholder="请输入搜索试剂名称" /> <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索试剂名称" />
<el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button> <el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button>
</div> </div>
<div class="header-right"> <div class="header-right">
<el-button>导出报告</el-button> <el-button type="primary" plain icon="el-icon-download">导出报告</el-button>
<el-button icon="el-icon-refresh" circle @click="getStoreInfo" /> <el-button icon="el-icon-refresh" circle @click="getStoreInfo" />
</div> </div>
</div> </div>
@ -25,24 +25,29 @@
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
:data="reagentData" :data="reagentData"
height="71vh" height="69vh"
stripe
> >
<el-table-column align="center" property="name" label="试剂名称" /> <el-table-column align="center" property="name" label="试剂名称" width="100" show-overflow-tooltip />
<el-table-column align="center" property="english_name" label="英文名称" /> <el-table-column align="center" property="english_name" label="英文名称" width="100" show-overflow-tooltip />
<el-table-column align="center" property="bar_code" label="试剂编码" /> <el-table-column align="center" property="bar_code" label="试剂编码" show-overflow-tooltip />
<el-table-column align="center" property="speci" label="规格" /> <el-table-column align="center" property="speci" label="规格" />
<el-table-column align="center" property="remain" label="余量(g)" /> <el-table-column align="center" property="remain" label="余量(g)" />
<el-table-column align="center" property="purity" label="纯度" /> <el-table-column align="center" property="purity" label="纯度" width="100" show-overflow-tooltip />
<el-table-column align="center" property="production_date" label="生产日期" /> <el-table-column align="center" property="production_date" label="生产日期" width="130" />
<el-table-column align="center" property="put_in_date" label="入库日期" /> <el-table-column align="center" property="put_in_date" label="入库日期" width="130" />
<!-- <el-table-column align="center" property="net_weight_unit" label="开瓶日期" />--> <!-- <el-table-column align="center" property="net_weight_unit" label="开瓶日期" />-->
<el-table-column align="center" property="put_in_user_name" label="试剂管理人" /> <el-table-column align="center" property="put_in_user_name" label="试剂管理人" />
<el-table-column align="center" property="is_supervise" label="是否监管" /> <!-- <el-table-column align="center" property="is_supervise" label="是否监管" />-->
<el-table-column align="center" property="status" label="状态" /> <el-table-column align="center" property="status" label="状态">
<template slot-scope="scope">
<el-tag :type="statusColorMap[scope.row.status-1]">{{ statusMap[scope.row.status-1] }}</el-tag>
</template>
</el-table-column>
<el-table-column align="center" property="by_user_name" label="最后使用人" /> <el-table-column align="center" property="by_user_name" label="最后使用人" />
<el-table-column align="center" property="client_id" label="所属终端" /> <el-table-column align="center" property="client_id" label="所属终端" />
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
@ -72,7 +77,9 @@ export default {
page_size: 15, page_size: 15,
total: 0, total: 0,
reagentData: [], reagentData: [],
loadingReagent: false loadingReagent: false,
statusMap: ['在库', '出库', '空瓶'],
statusColorMap: ['success', '', 'warning']
} }
}, },
created() { created() {
@ -127,7 +134,7 @@ export default {
margin-left: 1rem; margin-left: 1rem;
} }
.el-input{ .el-input{
width:170px; width:200px;
margin-right: 1rem; margin-right: 1rem;
margin-left: 1rem; margin-left: 1rem;
} }

@ -4,7 +4,7 @@
<div class="header"> <div class="header">
<div class="header-left"> <div class="header-left">
<el-button @click="$router.push('/reagent/report/index')"></el-button> <el-button @click="$router.push('/reagent/report/index')"></el-button>
<el-select v-model="client_id" placeholder="请选择柜体"> <el-select v-model="client_id" clearable placeholder="请选择柜体">
<el-option <el-option
v-for="item in clientOptions" v-for="item in clientOptions"
:key="item.id" :key="item.id"
@ -12,7 +12,7 @@
:value="item.client_id" :value="item.client_id"
/> />
</el-select> </el-select>
<el-select v-model="select_status" placeholder="请选择状态"> <el-select v-model="select_status" class="select-status" clearable placeholder="请选择状态">
<el-option <el-option
v-for="(item,index) in statusMap" v-for="(item,index) in statusMap"
:key="index" :key="index"
@ -20,26 +20,28 @@
:value="index" :value="index"
/> />
</el-select> </el-select>
<el-input v-model="user_name" placeholder="请输入操作人员" /> <el-input v-model="user_name" clearable placeholder="请输入操作人员" />
<el-input v-model="selectReagentValue" placeholder="请输入搜索试剂名称" /> <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索试剂名称" />
<div class="search"> <div class="search">
<el-date-picker <el-date-picker
v-model="start_time" v-model="start_time"
type="datetime" type="datetime"
placeholder="选择生产日期" placeholder="选择生产日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
clearable
/> />
<el-date-picker <el-date-picker
v-model="end_time" v-model="end_time"
type="datetime" type="datetime"
placeholder="选择过期日期" placeholder="选择过期日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
clearable
/> />
<el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button> <el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button>
</div> </div>
</div> </div>
<div class="header-right"> <div class="header-right">
<el-button>导出报告</el-button> <el-button type="primary" plain icon="el-icon-download">导出报告</el-button>
<el-button icon="el-icon-refresh" circle @click="getStoreInfo" /> <el-button icon="el-icon-refresh" circle @click="getStoreInfo" />
</div> </div>
</div> </div>
@ -48,12 +50,13 @@
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
:data="reagentData" :data="reagentData"
height="65vh" height="63vh"
stripe
> >
<el-table-column align="center" property="name" label="试剂名称" /> <el-table-column align="center" property="name" label="试剂名称" width="150" show-overflow-tooltip />
<el-table-column align="center" property="english_name" label="英文名称" /> <el-table-column align="center" property="english_name" label="英文名称" width="150" show-overflow-tooltip />
<el-table-column align="center" property="bar_code" label="试剂编码" /> <el-table-column align="center" property="bar_code" label="试剂编码" />
<el-table-column align="center" property="purity" label="纯度" /> <el-table-column align="center" property="purity" label="纯度" width="100" show-overflow-tooltip />
<el-table-column align="center" property="cas_number" label="CAS码" /> <el-table-column align="center" property="cas_number" label="CAS码" />
<el-table-column align="center" property="use_quantity" label="用量" /> <el-table-column align="center" property="use_quantity" label="用量" />
<el-table-column align="center" property="status" label="状态"> <el-table-column align="center" property="status" label="状态">
@ -61,15 +64,20 @@
<el-tag :type="statusColorMap[scope.row.status-1]">{{ statusMap[scope.row.status-1] }}</el-tag> <el-tag :type="statusColorMap[scope.row.status-1]">{{ statusMap[scope.row.status-1] }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" property="create_date" label="归还时间" /> <el-table-column align="center" property="create_date" label="归还时间" width="130" />
<el-table-column align="center" property="create_user_name" label="操作人员" /> <el-table-column align="center" property="create_user_name" label="操作人员" />
<el-table-column align="center" property="client_id" label="所属终端"> <el-table-column align="center" property="client_id" label="所属终端">
<template slot-scope="scope"> <template slot-scope="scope">
{{ clientOptions.find(item => item.client_id === scope.row.client_id).client_name }} <div v-if="clientOptions.find(item => item.client_id === scope.row.client_id)">
{{ clientOptions.find(item => item.client_id === scope.row.client_id).client_name }}
</div>
<div v-else>
{{ scope.row.client_id }}
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
@ -172,21 +180,25 @@ export default {
margin-bottom: 1rem; margin-bottom: 1rem;
.header-left{ .header-left{
.el-select{ .el-select{
width:200px;
margin-left: 1rem; margin-left: 1rem;
} }
.el-input{ .el-input{
width:170px; width:200px;
margin-right: 1rem; margin-right: 1rem;
margin-left: 1rem;
} }
.search{ .search{
margin-top:1rem ; margin-top:1rem ;
.el-date-editor{ .el-date-editor{
margin-left: 0rem; width:200px;
margin-left: 0;
} }
} }
} }
} }
} }
.select-status{
margin-right: 1rem;
}
</style> </style>

@ -4,11 +4,11 @@
<div class="header"> <div class="header">
<div class="header-left"> <div class="header-left">
<el-button @click="$router.push('/reagent/report/index')"></el-button> <el-button @click="$router.push('/reagent/report/index')"></el-button>
<el-input v-model="selectReagentValue" placeholder="请输入搜索试剂名称" /> <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索试剂名称" />
<el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button> <el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button>
</div> </div>
<div class="header-right"> <div class="header-right">
<el-button>导出报告</el-button> <el-button type="primary" plain icon="el-icon-download">导出报告</el-button>
<el-button icon="el-icon-refresh" circle @click="getStoreInfo" /> <el-button icon="el-icon-refresh" circle @click="getStoreInfo" />
</div> </div>
</div> </div>
@ -17,16 +17,26 @@
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
:data="reagentData" :data="reagentData"
height="71vh" height="69vh"
stripe
> >
<el-table-column align="center" property="name" label="试剂名称" /> <el-table-column align="center" property="name" label="试剂名称" width="150" show-overflow-tooltip />
<el-table-column align="center" property="cas_number" label="CAS码" /> <el-table-column align="center" property="cas_number" label="CAS码" />
<el-table-column align="center" property="net_weight_unit" label="规格" /> <el-table-column align="center" property="net_weight_unit" label="规格" />
<el-table-column align="center" property="count_number" label="在库剩余数量(瓶)" /> <el-table-column align="center" property="count_number" label="在库剩余数量(瓶)" />
<el-table-column align="center" property="sum_remain" label="在库剩余总质量(g)" /> <el-table-column align="center" property="sum_remain" label="在库剩余总质量(g)" />
<el-table-column align="center" property="client_id" label="所属终端" /> <el-table-column align="center" property="client_id" label="所属终端" show-overflow-tooltip>
<template slot-scope="scope">
<div v-if="clientOptions.find(item => item.client_id === scope.row.client_id)">
{{ clientOptions.find(item => item.client_id === scope.row.client_id).client_name }}
</div>
<div v-else>
{{ scope.row.client_id }}
</div>
</template>
</el-table-column>
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
@ -42,9 +52,10 @@
<script> <script>
import { stock_data_info } from '@/api/reagent/report' import { stock_data_info } from '@/api/reagent/report'
import stringify from '@/utils/stringify' import stringify from '@/utils/stringify'
import { getClients } from '@/views/reagent/mixin/getClients'
export default { export default {
name: 'StoreInfo', name: 'StoreInfo',
mixins: [getClients],
data() { data() {
return { return {
selectReagentValue: '', selectReagentValue: '',
@ -104,7 +115,7 @@ export default {
margin-bottom: 1rem; margin-bottom: 1rem;
.header-left{ .header-left{
.el-input{ .el-input{
width:170px; width:200px;
margin-right: 1rem; margin-right: 1rem;
margin-left: 1rem; margin-left: 1rem;
} }

@ -4,7 +4,7 @@
<div class="header"> <div class="header">
<div class="header-left"> <div class="header-left">
<el-button @click="$router.push('/reagent/report/index')"></el-button> <el-button @click="$router.push('/reagent/report/index')"></el-button>
<el-select v-model="client_id" placeholder="请选择柜体"> <el-select v-model="client_id" clearable placeholder="请选择柜体">
<el-option <el-option
v-for="item in clientOptions" v-for="item in clientOptions"
:key="item.id" :key="item.id"
@ -12,23 +12,25 @@
:value="item.client_id" :value="item.client_id"
/> />
</el-select> </el-select>
<el-input v-model="selectReagentValue" placeholder="请输入搜索试剂名称" /> <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索试剂名称" />
<el-date-picker <el-date-picker
v-model="start_time" v-model="start_time"
type="datetime" type="datetime"
placeholder="选择生产日期" placeholder="选择生产日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
clearable
/> />
<el-date-picker <el-date-picker
v-model="end_time" v-model="end_time"
type="datetime" type="datetime"
placeholder="选择过期日期" placeholder="选择过期日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
clearable
/> />
<el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button> <el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button>
</div> </div>
<div class="header-right"> <div class="header-right">
<el-button>导出报告</el-button> <el-button type="primary" plain icon="el-icon-download">导出报告</el-button>
<el-button icon="el-icon-refresh" circle @click="getStoreInfo" /> <el-button icon="el-icon-refresh" circle @click="getStoreInfo" />
</div> </div>
</div> </div>
@ -37,10 +39,11 @@
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
:data="reagentData" :data="reagentData"
height="71vh" height="69vh"
stripe
> >
<el-table-column align="center" property="name" label="试剂名称" /> <el-table-column align="center" property="name" label="试剂名称" width="150" show-overflow-tooltip />
<el-table-column align="center" property="purity" label="纯度" /> <el-table-column align="center" property="purity" label="纯度" width="100" show-overflow-tooltip />
<el-table-column align="center" property="cas_number" label="CAS码" /> <el-table-column align="center" property="cas_number" label="CAS码" />
<el-table-column align="center" property="speci" label="规格" /> <el-table-column align="center" property="speci" label="规格" />
<el-table-column align="center" property="new_on" label="当前库存总量" /> <el-table-column align="center" property="new_on" label="当前库存总量" />
@ -50,11 +53,16 @@
<el-table-column align="center" property="sum_tp3" label="归还次数" /> <el-table-column align="center" property="sum_tp3" label="归还次数" />
<el-table-column align="center" property="client_id" label="所属终端"> <el-table-column align="center" property="client_id" label="所属终端">
<template slot-scope="scope"> <template slot-scope="scope">
{{ clientOptions.find(item => item.client_id === scope.row.client_id).client_name }} <div v-if="clientOptions.find(item => item.client_id === scope.row.client_id)">
{{ clientOptions.find(item => item.client_id === scope.row.client_id).client_name }}
</div>
<div v-else>
{{ scope.row.client_id }}
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
@ -93,6 +101,9 @@ export default {
this.getStoreInfo() this.getStoreInfo()
}, },
methods: { methods: {
getName(op, id) {
},
// //
searchReagent() { searchReagent() {
this.pageChange(1) this.pageChange(1)
@ -140,10 +151,11 @@ export default {
margin-bottom: 1rem; margin-bottom: 1rem;
.header-left{ .header-left{
.el-select{ .el-select{
width: 12.5rem;
margin-left: 1rem; margin-left: 1rem;
} }
.el-input{ .el-input{
width:170px; width:12.5rem;
margin-right: 1rem; margin-right: 1rem;
margin-left: 1rem; margin-left: 1rem;
} }

@ -5,23 +5,25 @@
<div class="header-left"> <div class="header-left">
<el-button @click="$router.push('/reagent/report/index')"></el-button> <el-button @click="$router.push('/reagent/report/index')"></el-button>
<!-- <el-input v-model="selectReagentValue" placeholder="请输入搜索试剂名称" />--> <!-- <el-input v-model="selectReagentValue" placeholder="请输入搜索试剂名称" />-->
<el-input v-model="seachUser" placeholder="请输入用户名称" /> <el-input v-model="seachUser" clearable placeholder="请输入用户名称" />
<el-date-picker <el-date-picker
v-model="start_time" v-model="start_time"
type="datetime" type="datetime"
placeholder="选择生产日期" placeholder="选择生产日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
clearable
/> />
<el-date-picker <el-date-picker
v-model="end_time" v-model="end_time"
type="datetime" type="datetime"
placeholder="选择过期日期" placeholder="选择过期日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
clearable
/> />
<el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button> <el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button>
</div> </div>
<div class="header-right"> <div class="header-right">
<el-button>导出报告</el-button> <el-button type="primary" plain icon="el-icon-download">导出报告</el-button>
<el-button icon="el-icon-refresh" circle @click="getStoreInfo" /> <el-button icon="el-icon-refresh" circle @click="getStoreInfo" />
</div> </div>
</div> </div>
@ -30,7 +32,8 @@
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
:data="reagentData" :data="reagentData"
height="71vh" height="69vh"
stripe
> >
<el-table-column align="center" property="name" label="用户头像" /> <el-table-column align="center" property="name" label="用户头像" />
<el-table-column align="center" property="create_user_name" label="用户名称" /> <el-table-column align="center" property="create_user_name" label="用户名称" />
@ -44,7 +47,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
@ -127,8 +130,11 @@ export default {
justify-content: space-between; justify-content: space-between;
margin-bottom: 1rem; margin-bottom: 1rem;
.header-left{ .header-left{
.el-date-editor{
width: 12.5rem;
}
.el-input{ .el-input{
width:170px; width:12.5rem;
margin-right: 1rem; margin-right: 1rem;
margin-left: 1rem; margin-left: 1rem;
} }

@ -4,24 +4,26 @@
<div class="header"> <div class="header">
<div class="header-left"> <div class="header-left">
<el-button @click="$router.push('/reagent/report/index')"></el-button> <el-button @click="$router.push('/reagent/report/index')"></el-button>
<el-input v-model="selectReagentValue" placeholder="请输入搜索试剂名称" /> <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索试剂名称" />
<el-input v-model="value" placeholder="请输入搜索生产厂商名称" /> <el-input v-model="value" clearable placeholder="请输入搜索生产厂商名称" />
<el-date-picker <el-date-picker
v-model="start_time" v-model="start_time"
type="datetime" type="datetime"
placeholder="选择生产日期" placeholder="选择生产日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
clearable
/> />
<el-date-picker <el-date-picker
v-model="end_time" v-model="end_time"
type="datetime" type="datetime"
placeholder="选择过期日期" placeholder="选择过期日期"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
clearable
/> />
<el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button> <el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button>
</div> </div>
<div class="header-right"> <div class="header-right">
<el-button>导出报告</el-button> <el-button type="primary" plain icon="el-icon-download">导出报告</el-button>
<el-button icon="el-icon-refresh" circle @click="getStoreInfo" /> <el-button icon="el-icon-refresh" circle @click="getStoreInfo" />
</div> </div>
</div> </div>
@ -30,19 +32,20 @@
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
:data="reagentData" :data="reagentData"
height="71vh" height="69vh"
stripe
> >
<el-table-column align="center" property="name" label="试剂名称" /> <el-table-column align="center" property="name" label="试剂名称" width="150" show-overflow-tooltip />
<el-table-column align="center" property="manufacturer" label="生产厂家" /> <el-table-column align="center" property="manufacturer" label="生产厂家" width="150" show-overflow-tooltip />
<el-table-column align="center" property="speci" label="规格" /> <el-table-column align="center" property="speci" label="规格" />
<el-table-column align="center" property="remain" label="余量" /> <el-table-column align="center" property="remain" label="余量" />
<el-table-column align="center" property="production_date" label="生产日期" /> <el-table-column align="center" property="production_date" label="生产日期" width="130" />
<el-table-column align="center" property="expiration_date" label="过期日期" /> <el-table-column align="center" property="expiration_date" label="过期日期" width="130" />
<el-table-column align="center" property="shelf_life" label="保质期(天)" /> <el-table-column align="center" property="shelf_life" label="保质期(天)" />
<el-table-column align="center" property="put_in_user_name" label="入库操作人" /> <el-table-column align="center" property="put_in_user_name" label="入库操作人" />
<el-table-column align="center" property="put_in_date" label="入库时间" /> <el-table-column align="center" property="put_in_date" label="入库时间" width="130" />
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
@ -126,7 +129,7 @@ export default {
margin-bottom: 1rem; margin-bottom: 1rem;
.header-left{ .header-left{
.el-input{ .el-input{
width:170px; width:210px;
margin-right: 1rem; margin-right: 1rem;
margin-left: 1rem; margin-left: 1rem;
} }

@ -3,8 +3,8 @@
<div class="header"> <div class="header">
<div class="title">试剂入库</div> <div class="title">试剂入库</div>
<div class="header-select"> <div class="header-select">
<el-button>返回上一级</el-button> <!-- <el-button>返回上一级</el-button>-->
<el-select v-model="client_id" placeholder="请选择柜体"> <el-select v-model="client_id" clearable placeholder="请选择柜体">
<el-option <el-option
v-for="item in clientOptions" v-for="item in clientOptions"
:key="item.id" :key="item.id"
@ -33,6 +33,7 @@
:data="tableData" :data="tableData"
style="width: 100%" style="width: 100%"
size="medium" size="medium"
stripe
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column <el-table-column
@ -76,7 +77,7 @@
/> />
</el-table> </el-table>
</div> </div>
<div class="page"> <div class="page my-pagination">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
@ -89,7 +90,7 @@
<!-- 选择试剂入库 弹框 --> <!-- 选择试剂入库 弹框 -->
<el-dialog title="选择试剂入库" width="70%" :visible.sync="dialogTableVisible" @close="handleSelectClose"> <el-dialog title="选择试剂入库" width="70%" :visible.sync="dialogTableVisible" @close="handleSelectClose">
<div class="search-header"> <div class="search-header">
<el-input v-model="selectReagentValue" placeholder="请输入搜索试剂名称" /> <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索试剂名称" />
<el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button> <el-button type="primary" icon="el-icon-search" @click="searchReagent"></el-button>
</div> </div>
<el-table <el-table
@ -97,6 +98,7 @@
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
:data="reagentData" :data="reagentData"
stripe
height="400" height="400"
> >
<el-table-column align="center" property="name" label="试剂名称" /> <el-table-column align="center" property="name" label="试剂名称" />
@ -115,7 +117,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="text-align: right"> <div class="my-pagination" style="text-align: right">
<el-pagination <el-pagination
background background
layout="total, prev, pager, next" layout="total, prev, pager, next"
@ -569,6 +571,9 @@ export default {
} }
.header-select{ .header-select{
margin-top: 1rem; margin-top: 1rem;
.el-select{
margin-left: 0;
}
.right{ .right{
float: right; float: right;
} }

@ -2,9 +2,9 @@
<div class="main-container-text"> <div class="main-container-text">
<div class="title">用户管理</div> <div class="title">用户管理</div>
<div class="header"> <div class="header">
<el-input v-model="user_code" placeholder="请输入工号" /> <el-input v-model="user_code" clearable placeholder="请输入工号" />
<el-input v-model="real_name" placeholder="请输入姓名" /> <el-input v-model="real_name" clearable placeholder="请输入姓名" />
<el-select v-model="role_id" placeholder="请输入角色" :value="manageer"> <el-select v-model="role_id" clearable placeholder="请输入角色" :value="manageer">
<el-option <el-option
v-for="item in roleData" v-for="item in roleData"
:key="item.role_id" :key="item.role_id"
@ -12,7 +12,7 @@
:value="item.role_id" :value="item.role_id"
/> />
</el-select> </el-select>
<el-select v-model="is_enabled" placeholder="账号状态" :value="manageer"> <el-select v-model="is_enabled" clearable placeholder="账号状态" :value="manageer">
<el-option label="启用" :value="1" /> <el-option label="启用" :value="1" />
<el-option label="未启用" :value="0" /> <el-option label="未启用" :value="0" />
</el-select> </el-select>
@ -28,7 +28,7 @@
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:data="tableData" :data="tableData"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
height="71vh" height="69vh"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column <el-table-column
@ -103,14 +103,13 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
:current-page.sync="page" :current-page.sync="page"
:total="total" :total="total"
:page-size.sync="page_size" :page-size.sync="page_size"
hide-on-single-page
@current-change="pageChange" @current-change="pageChange"
/> />
</div> </div>
@ -424,10 +423,11 @@ export default {
.header{ .header{
margin: 1rem 0 1rem 0; margin: 1rem 0 1rem 0;
.el-input{ .el-input{
width: 9.375rem; width: 12.5rem;
margin-right: 1rem; margin-right: 1rem;
} }
.el-select { .el-select {
width: 12.5rem;
margin-right: 1rem; margin-right: 1rem;
} }
.header-right{ .header-right{

@ -13,7 +13,7 @@
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
:data="tableData" :data="tableData"
:header-cell-style="headerStyle" :header-cell-style="headerStyle"
height="71vh" height="69vh"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column <el-table-column
@ -51,14 +51,13 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div style="text-align: center"> <div class="my-pagination" style="text-align: center">
<el-pagination <el-pagination
background background
layout="prev, pager, next" layout="prev, pager, next"
:current-page.sync="page" :current-page.sync="page"
:total="total" :total="total"
:page-size.sync="page_size" :page-size.sync="page_size"
hide-on-single-page
@current-change="pageChange" @current-change="pageChange"
/> />
</div> </div>

Loading…
Cancel
Save