xins
/
HwJyHbMes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改表格抖动

Browse Source
master
夜笙歌 1 month ago
parent 51cd51f4df
commit 164975af1e
4 changed files with 75 additions and 64 deletions
Show Stats Download Patch File Download Diff File

32
hw-ui/src/assets/styles/sidebar.scss
Unescape Escape View File

@ -7,15 +7,21 @@
position: relative; position: relative;
} }
.main-container::-webkit-scrollbar {
display: none !important;
height: 0 !important;
width: 0 !important;
}
.sidebarHide { .sidebarHide {
margin-left: 0!important; margin-left: 0 !important;
} }
.sidebar-container { .sidebar-container {
-webkit-transition: width .28s; -webkit-transition: width .28s;
transition: width 0.28s; transition: width 0.28s;
//width: $base-sidebar-width !important; //width: $base-sidebar-width !important;
width: $base-sidebar-width ; width: $base-sidebar-width;
background-color: $base-menu-background; background-color: $base-menu-background;
height: 100%; height: 100%;
position: fixed; position: fixed;
@ -25,8 +31,8 @@
left: 0; left: 0;
z-index: 1001; z-index: 1001;
overflow: hidden; overflow: hidden;
-webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35); -webkit-box-shadow: 2px 0 6px rgba(0, 21, 41, .35);
box-shadow: 2px 0 6px rgba(0,21,41,.35); box-shadow: 2px 0 6px rgba(0, 21, 41, .35);
// reset element-ui css // reset element-ui css
.horizontal-collapse-transition { .horizontal-collapse-transition {
@ -89,7 +95,7 @@
color: $base-menu-color-active !important; color: $base-menu-color-active !important;
} }
& .nest-menu .el-submenu>.el-submenu__title, & .nest-menu .el-submenu > .el-submenu__title,
& .el-submenu .el-menu-item { & .el-submenu .el-menu-item {
min-width: $base-sidebar-width !important; min-width: $base-sidebar-width !important;
@ -98,7 +104,7 @@
} }
} }
& .theme-dark .nest-menu .el-submenu>.el-submenu__title, & .theme-dark .nest-menu .el-submenu > .el-submenu__title,
& .theme-dark .el-submenu .el-menu-item { & .theme-dark .el-submenu .el-menu-item {
background-color: $base-sub-menu-background !important; background-color: $base-sub-menu-background !important;
@ -133,7 +139,7 @@
.el-submenu { .el-submenu {
overflow: hidden; overflow: hidden;
&>.el-submenu__title { & > .el-submenu__title {
padding: 0 !important; padding: 0 !important;
.svg-icon { .svg-icon {
@ -145,8 +151,8 @@
.el-menu--collapse { .el-menu--collapse {
.el-submenu { .el-submenu {
&>.el-submenu__title { & > .el-submenu__title {
&>span { & > span {
height: 0; height: 0;
width: 0; width: 0;
overflow: hidden; overflow: hidden;
@ -170,7 +176,7 @@
.sidebar-container { .sidebar-container {
transition: transform .28s; transition: transform .28s;
width: $base-sidebar-width ; width: $base-sidebar-width;
//width: $base-sidebar-width !important; //width: $base-sidebar-width !important;
} }
@ -194,13 +200,13 @@
// when menu collapsed // when menu collapsed
.el-menu--vertical { .el-menu--vertical {
&>.el-menu { & > .el-menu {
.svg-icon { .svg-icon {
margin-right: 16px; margin-right: 16px;
} }
} }
.nest-menu .el-submenu>.el-submenu__title, .nest-menu .el-submenu > .el-submenu__title,
.el-menu-item { .el-menu-item {
&:hover { &:hover {
// you can use $subMenuHover // you can use $subMenuHover
@ -209,7 +215,7 @@
} }
// the scroll bar appears when the subMenu is too long // the scroll bar appears when the subMenu is too long
>.el-menu--popup { > .el-menu--popup {
max-height: 100vh; max-height: 100vh;
overflow-y: auto; overflow-y: auto;

4
hw-ui/src/layout/components/AppMain.vue
Unescape Escape View File

@ -60,8 +60,8 @@ export default {
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 16px; //width: 16px;
height: 16px; //height: 16px;
} }
::-webkit-scrollbar-track { ::-webkit-scrollbar-track {

73
hw-ui/src/views/wms/info/rawoutstock/index.vue
Unescape Escape View File

@ -9,16 +9,16 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">--> <!-- <el-form-item label="仓库" prop="warehouseId">-->
<!-- <el-select v-model="queryParams.warehouseId">--> <!-- <el-select v-model="queryParams.warehouseId">-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in warehouseOptions"--> <!-- v-for="item in warehouseOptions"-->
<!-- :key="item.warehouseId"--> <!-- :key="item.warehouseId"-->
<!-- :label="item.warehouseName"--> <!-- :label="item.warehouseName"-->
<!-- :value="item.warehouseId"--> <!-- :value="item.warehouseId"-->
<!-- />--> <!-- />-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="计划编号" prop="planCode"> <el-form-item label="计划编号" prop="planCode">
<el-input <el-input
v-model="queryParams.planCode" v-model="queryParams.planCode"
@ -120,34 +120,35 @@
</el-form> </el-form>
<el-table v-loading="loading" :data="rawoutstockList" @selection-change="handleSelectionChange"> <el-table height="500" max-height="500" v-loading="loading" :data="rawoutstockList"
<el-table-column type="selection" width="55" align="center" /> @selection-change="handleSelectionChange">
<el-table-column label="任务编号" align="center" prop="taskCode" /> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="仓库名称" align="center" prop="warehouseName" /> <el-table-column label="任务编号" align="center" prop="taskCode"/>
<el-table-column label="计划编号" align="center" prop="planCode" /> <el-table-column label="仓库名称" align="center" prop="warehouseName"/>
<el-table-column label="明细编号" align="center" prop="planDetailCode" /> <el-table-column label="计划编号" align="center" prop="planCode"/>
<el-table-column label="物料编码" align="center" prop="materialCode" /> <el-table-column label="明细编号" align="center" prop="planDetailCode"/>
<el-table-column label="物料名称" align="center" prop="materialName" /> <el-table-column label="物料编码" align="center" prop="materialCode"/>
<el-table-column label="物料规格" align="center" prop="materialSpec" /> <el-table-column label="物料名称" align="center" prop="materialName"/>
<el-table-column label="单位" align="center" prop="unitName" /> <el-table-column label="物料规格" align="center" prop="materialSpec"/>
<el-table-column label="库位编码" align="center" prop="locationCode" /> <el-table-column label="单位" align="center" prop="unitName"/>
<el-table-column label="出库类型" align="center" prop="auditStatus" > <el-table-column label="库位编码" align="center" prop="locationCode"/>
<el-table-column label="出库类型" align="center" prop="auditStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.wms_raw_outstock_task_type" :value="scope.row.taskType"/> <dict-tag :options="dict.type.wms_raw_outstock_task_type" :value="scope.row.taskType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请数量" align="center" prop="outstockAmount" /> <el-table-column label="申请数量" align="center" prop="outstockAmount"/>
<el-table-column label="出库数量" align="center" prop="realOutstockAmount" /> <el-table-column label="出库数量" align="center" prop="realOutstockAmount"/>
<el-table-column label="申请人" align="center" prop="applyBy" /> <el-table-column label="申请人" align="center" prop="applyBy"/>
<el-table-column label="申请原因" align="center" prop="applyReason" /> <el-table-column label="申请原因" align="center" prop="applyReason"/>
<el-table-column label="申请时间" align="center" prop="applyDate" width="180"> <el-table-column label="申请时间" align="center" prop="applyDate" width="180">
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditStatus" > <el-table-column label="审核状态" align="center" prop="auditStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.wms_audit_status" :value="scope.row.auditStatus"/> <dict-tag :options="dict.type.wms_audit_status" :value="scope.row.auditStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="执行状态" align="center" prop="executeStatus" > <el-table-column label="执行状态" align="center" prop="executeStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.wms_execute_status" :value="scope.row.executeStatus"/> <dict-tag :options="dict.type.wms_execute_status" :value="scope.row.executeStatus"/>
</template> </template>
@ -161,14 +162,16 @@
@click="handleAudit(scope.row)" @click="handleAudit(scope.row)"
v-hasPermi="['wms:rawoutstock:edit']" v-hasPermi="['wms:rawoutstock:edit']"
v-if="scope.row.auditStatus=='0'" v-if="scope.row.auditStatus=='0'"
>审核</el-button> >审核
</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-info" icon="el-icon-info"
@click="handleDetail(scope.row)" @click="handleDetail(scope.row)"
v-hasPermi="['wms:rawoutstock:edit']" v-hasPermi="['wms:rawoutstock:edit']"
>详情</el-button> >详情
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -185,11 +188,11 @@
</template> </template>
<script> <script>
import { listRawoutstock,getWarehouses } from "@/api/wms/rawoutstock"; import {listRawoutstock, getWarehouses} from "@/api/wms/rawoutstock";
export default { export default {
name: "Rawoutstock", name: "Rawoutstock",
dicts: ['wms_audit_status', 'wms_execute_status','wms_raw_outstock_task_type'], dicts: ['wms_audit_status', 'wms_execute_status', 'wms_raw_outstock_task_type'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -334,7 +337,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.rawOutstockId) this.ids = selection.map(item => item.rawOutstockId)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
@ -349,7 +352,7 @@ export default {
const taskCode = row.taskCode const taskCode = row.taskCode
const warehouseName = row.warehouseName; const warehouseName = row.warehouseName;
const params = {pageNum: this.queryParams.pageNum}; const params = {pageNum: this.queryParams.pageNum};
this.$tab.openPage("领料审核[" + taskCode + "]", '/wms/raw-outstock/audit/' + taskCode+'/0/'+warehouseName, params); this.$tab.openPage("领料审核[" + taskCode + "]", '/wms/raw-outstock/audit/' + taskCode + '/0/' + warehouseName, params);
}, },
/** 审核按钮操作 */ /** 审核按钮操作 */
@ -359,7 +362,7 @@ export default {
const rawOutstockId = row.rawOutstockId; const rawOutstockId = row.rawOutstockId;
const warehouseName = row.warehouseName; const warehouseName = row.warehouseName;
const params = {pageNum: this.queryParams.pageNum}; const params = {pageNum: this.queryParams.pageNum};
this.$tab.openPage("出库明细[" + taskCode + "]", '/wms/raw-outstock/detail/' + rawOutstockId+'/1/'+warehouseName, params); this.$tab.openPage("出库明细[" + taskCode + "]", '/wms/raw-outstock/detail/' + rawOutstockId + '/1/' + warehouseName, params);
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */

30
hw-ui/src/views/wms/rawmanagement/rawoutstock/index.vue
Unescape Escape View File

@ -66,25 +66,26 @@
</el-form> </el-form>
<el-table v-loading="loading" :data="rawoutstockList" @selection-change="handleSelectionChange"> <el-table height="500" max-height="500" v-loading="loading" :data="rawoutstockList"
<el-table-column type="selection" width="55" align="center" /> @selection-change="handleSelectionChange">
<el-table-column label="任务编号" align="center" prop="taskCode" /> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="仓库名称" align="center" prop="warehouseName" /> <el-table-column label="任务编号" align="center" prop="taskCode"/>
<el-table-column label="计划编号" align="center" prop="planCode" /> <el-table-column label="仓库名称" align="center" prop="warehouseName"/>
<el-table-column label="计划明细编号" align="center" prop="planDetailCode" /> <el-table-column label="计划编号" align="center" prop="planCode"/>
<el-table-column label="出库类型" align="center" prop="auditStatus" > <el-table-column label="计划明细编号" align="center" prop="planDetailCode"/>
<el-table-column label="出库类型" align="center" prop="auditStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.wms_raw_outstock_task_type" :value="scope.row.taskType"/> <dict-tag :options="dict.type.wms_raw_outstock_task_type" :value="scope.row.taskType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请人" align="center" prop="applyBy" /> <el-table-column label="申请人" align="center" prop="applyBy"/>
<el-table-column label="申请原因" align="center" prop="applyReason" /> <el-table-column label="申请原因" align="center" prop="applyReason"/>
<el-table-column label="申请时间" align="center" prop="applyDate" width="180"> <el-table-column label="申请时间" align="center" prop="applyDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center" prop="auditStatus" > <el-table-column label="审核状态" align="center" prop="auditStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.wms_audit_status" :value="scope.row.auditStatus"/> <dict-tag :options="dict.type.wms_audit_status" :value="scope.row.auditStatus"/>
</template> </template>
@ -98,7 +99,8 @@
@click="handleAudit(scope.row)" @click="handleAudit(scope.row)"
v-hasPermi="['wms:rawoutstock:audit:query']" v-hasPermi="['wms:rawoutstock:audit:query']"
v-if="scope.row.auditStatus=='0'" v-if="scope.row.auditStatus=='0'"
>审核</el-button> >审核
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -115,7 +117,7 @@
</template> </template>
<script> <script>
import { auditListRawoutstock,getWarehouses4Audit } from "@/api/wms/rawoutstock"; import {auditListRawoutstock, getWarehouses4Audit} from "@/api/wms/rawoutstock";
export default { export default {
name: "Rawoutstock", name: "Rawoutstock",
@ -263,7 +265,7 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.rawOutstockId) this.ids = selection.map(item => item.rawOutstockId)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
@ -278,7 +280,7 @@ export default {
const taskCode = row.taskCode const taskCode = row.taskCode
const warehouseName = row.warehouseName; const warehouseName = row.warehouseName;
const params = {pageNum: this.queryParams.pageNum}; const params = {pageNum: this.queryParams.pageNum};
this.$tab.openPage("领料审核[" + taskCode + "]", '/wms/raw-outstock/audit/' + taskCode+'/0/'+warehouseName, params); this.$tab.openPage("领料审核[" + taskCode + "]", '/wms/raw-outstock/audit/' + taskCode + '/0/' + warehouseName, params);
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */

Write Preview
Loading…
Cancel
Save