From f8b58565e1d782ec6eb4377b0c3b7337d19b24eb Mon Sep 17 00:00:00 2001
From: liupengpeng <276665548@qq.com>
Date: 星期二, 14 二月 2023 19:04:11 +0800
Subject: [PATCH] 入库
---
src/views/userManage/orgManage.vue | 2 +-
src/views/maintenance/userManagement.vue | 3 ---
src/views/datamanage/dataUpdata.vue | 54 ++++++++++++++++++++++++++----------------------------
3 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/src/views/datamanage/dataUpdata.vue b/src/views/datamanage/dataUpdata.vue
index 06db611..e499b45 100644
--- a/src/views/datamanage/dataUpdata.vue
+++ b/src/views/datamanage/dataUpdata.vue
@@ -367,13 +367,13 @@
:model="formWarehousing"
class="demo-form-inline"
>
- <el-form-item :label="$t('dataManage.dataUpObj.describe')">
+ <el-form-item :label="$t('dataManage.dataUpObj.describe')" >
<el-input
v-model="formWarehousing.name"
placeholder="璇疯緭鍏ュ唴瀹�"
></el-input>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float: right;">
<el-button
@click="setWarehouseSearch"
icon="el-icon-upload"
@@ -396,13 +396,13 @@
size="small"
>{{ $t('common.delete') }}</el-button>
</el-form-item>
- <el-form-item>
+ <el-form-item style="float: right;">
<el-button
v-if="menuStatus.upload"
:disabled="multipleDelete.length == 0 ? true : false"
@click="setEnclosure"
icon="el-icon-folder-opened"
- type="warning"
+ type="success"
size="small"
>{{ $t('common.enclosure') }}</el-button>
</el-form-item>
@@ -410,17 +410,15 @@
</div>
<div
class="subpage_Content subpage_Div"
- style="min-height:330px"
+ style="min-height:480px"
>
- <div class="contentTable">
- <el-table
- ref="multipleTable"
- :data="waretableData"
- tooltip-effect="dark"
- style="width: 100%"
- @selection-change="handleDelteChange"
- >
- <el-table-column
+ <div style="height: 450px">
+ <el-table
+ ref="filterTable"
+ :data="waretableData"
+ style="width: 100%"
+ height="99%">
+ <el-table-column
type="selection"
width="55"
>
@@ -498,20 +496,20 @@
:formatter="changetimeFile"
width="100"
/>
- </el-table>
- </div>
- <div>
- <el-pagination
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="listData.pageIndex"
- :page-sizes="[10, 20, 50, 100]"
- :page-size="listData.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="count"
- >
- </el-pagination>
- </div>
+ </el-table>
+ <div class="pagination_box">
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="listData.pageIndex"
+ :page-sizes="[10, 20, 50, 100]"
+ :page-size="listData.pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="count"
+ >
+ </el-pagination>
+ </div>
+ </div>
</div>
</el-tab-pane>
</el-tabs>
diff --git a/src/views/maintenance/userManagement.vue b/src/views/maintenance/userManagement.vue
index 7044423..0e8bd4c 100644
--- a/src/views/maintenance/userManagement.vue
+++ b/src/views/maintenance/userManagement.vue
@@ -102,7 +102,6 @@
type="index"
:label="$t('common.index')"
width="70px"
- fixed
/>
<el-table-column
@@ -110,7 +109,6 @@
prop="uname"
width="150px"
:label="$t('userManage.userInfoObj.uname')"
- fixed
/>
<el-table-column
align="center"
@@ -213,7 +211,6 @@
<el-table-column
:label="$t('common.operate')"
width="80px"
- fixed="right"
v-if="menuStatus.update"
>
<template slot-scope="scope">
diff --git a/src/views/userManage/orgManage.vue b/src/views/userManage/orgManage.vue
index a83913d..ddf632c 100644
--- a/src/views/userManage/orgManage.vue
+++ b/src/views/userManage/orgManage.vue
@@ -46,7 +46,7 @@
icon="el-icon-plus"
size="small"
>鏂板瀛愮骇</el-button>
- <el-button
+ <el-button
v-if="menuStatus.delete"
@click="setDelNode()"
:disabled="itemdetail.pid == null ? true : false"
--
Gitblit v1.9.3