Skip to content

M
mini-wms
Commit 01e24290 by ningjihai
Options

.flex1: overflow-hidden

parent d97a1a17
正在显示 包含 73 行增加 和 72 行删除
ruoyi-admin-vue/src/assets/styles/index.scss
...@@ -164,6 +164,7 @@ aside { ...@@ -164,6 +164,7 @@ aside {
} }
.flex1{ .flex1{
flex: 1; flex: 1;
overflow: hidden;
} }
.card-container { .card-container {
background-color: #fff; background-color: #fff;
......
ruoyi-admin-vue/src/views/inventory/materials/index.vue
...@@ -138,75 +138,75 @@ ...@@ -138,75 +138,75 @@
<!-- 树形数据表格 --> <!-- 树形数据表格 -->
<div style="flex: 1;min-height: 200px;"> <div style="flex: 1;min-height: 200px;">
<el-table v-loading="loading" height="100%" :data="materialsList" @selection-change="handleSelectionChange" :scroll-x="true"> <el-table v-loading="loading" height="100%" :data="materialsList" @selection-change="handleSelectionChange" :scroll-x="true">
<!-- 表格列保持不变 --> <!-- 表格列保持不变 -->
<el-table-column type="selection" width="55" align="center" fixed/> <el-table-column type="selection" width="55" align="center" fixed/>
<el-table-column type="index" label="序号" align="center"/> <el-table-column type="index" label="序号" align="center"/>
<el-table-column label="物料编码" align="center" prop="materialCode" width="120"/> <el-table-column label="物料编码" align="center" prop="materialCode" width="120"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="150"/> <el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
<el-table-column label="SAP物料号" align="center" prop="sapNo" /> <el-table-column label="SAP物料号" align="center" prop="sapNo" />
<el-table-column label="TS Code" align="center" prop="tsCode" /> <el-table-column label="TS Code" align="center" prop="tsCode" />
<el-table-column label="物料分类" align="center" prop="categoryCode" > <el-table-column label="物料分类" align="center" prop="categoryCode" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.displayCategory || categoryMap[scope.row.categoryCode] || scope.row.categoryCode }} {{ scope.row.displayCategory || categoryMap[scope.row.categoryCode] || scope.row.categoryCode }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="危险类别ID" align="center" prop="hazardId" /> <el-table-column label="危险类别ID" align="center" prop="hazardId" />
<el-table-column label="规格型号" align="center" prop="specification" /> <el-table-column label="规格型号" align="center" prop="specification" />
<el-table-column label="计量单位" align="center" prop="materialUnit" /> <el-table-column label="计量单位" align="center" prop="materialUnit" />
<el-table-column label="单位重量" align="center" prop="unitWeight" /> <el-table-column label="单位重量" align="center" prop="unitWeight" />
<el-table-column label="包装重量" align="center" prop="packageWeight" /> <el-table-column label="包装重量" align="center" prop="packageWeight" />
<el-table-column label="总重量" align="center" prop="totalWeight" /> <el-table-column label="总重量" align="center" prop="totalWeight" />
<el-table-column label="体积" align="center" prop="volume" /> <el-table-column label="体积" align="center" prop="volume" />
<el-table-column label="保质期天数" align="center" prop="shelfLifeDays" /> <el-table-column label="保质期天数" align="center" prop="shelfLifeDays" />
<el-table-column label="存储温度要求" align="center" prop="storageTemperature" /> <el-table-column label="存储温度要求" align="center" prop="storageTemperature" />
<el-table-column label="特殊存储要求" align="center" prop="specialRequirements" /> <el-table-column label="特殊存储要求" align="center" prop="specialRequirements" />
<el-table-column label="是否批次管理" align="center" prop="isBatchManaged"> <el-table-column label="是否批次管理" align="center" prop="isBatchManaged">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.isBatchManaged === 1 ? 'success' : 'info'" size="mini">{{ scope.row.isBatchManaged === 1 ? '是' : '否' }}</el-tag> <el-tag :type="scope.row.isBatchManaged === 1 ? 'success' : 'info'" size="mini">{{ scope.row.isBatchManaged === 1 ? '是' : '否' }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否序列号管理" align="center" prop="isSerialManaged"> <el-table-column label="是否序列号管理" align="center" prop="isSerialManaged">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.isSerialManaged === 1 ? 'success' : 'info'" size="mini">{{ scope.row.isSerialManaged === 1 ? '是' : '否' }}</el-tag> <el-tag :type="scope.row.isSerialManaged === 1 ? 'success' : 'info'" size="mini">{{ scope.row.isSerialManaged === 1 ? '是' : '否' }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="最低库存" align="center" prop="minStockLevel" /> <el-table-column label="最低库存" align="center" prop="minStockLevel" />
<el-table-column label="最高库存" align="center" prop="maxStockLevel" /> <el-table-column label="最高库存" align="center" prop="maxStockLevel" />
<el-table-column label="是否激活" align="center" prop="isActive"> <el-table-column label="是否激活" align="center" prop="isActive">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="scope.row.isActive === 1 ? 'success' : 'info'" size="mini">{{ scope.row.isActive === 1 ? '是' : '否' }}</el-tag> <el-tag :type="scope.row.isActive === 1 ? 'success' : 'info'" size="mini">{{ scope.row.isActive === 1 ? '是' : '否' }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="风险等级" align="center" prop="riskLevel" /> <el-table-column label="风险等级" align="center" prop="riskLevel" />
<el-table-column label="排序" align="center" prop="sortNo" /> <el-table-column label="排序" align="center" prop="sortNo" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="修改时间" align="center" prop="updateTime" width="180"> <el-table-column label="修改时间" align="center" prop="updateTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding" fixed="right" width="200"> <el-table-column label="操作" align="center" class-name="small-padding" fixed="right" width="200">
<template v-slot="scope"> <template v-slot="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['inventory:materials:edit']" v-hasPermi="['inventory:materials:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['inventory:materials:remove']" v-hasPermi="['inventory:materials:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
ruoyi-admin-vue/src/views/system/dict/index.vue
...@@ -108,8 +108,8 @@ ...@@ -108,8 +108,8 @@
<el-table v-loading="loading" height="100%" :data="typeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" height="100%" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" fixed/> <el-table-column type="selection" width="55" align="center" fixed/>
<el-table-column label="字典编号" align="center" prop="dictId" /> <el-table-column label="字典编号" align="center" prop="dictId" />
<el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="字典类型" align="center" :show-overflow-tooltip="true"> <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type"> <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
<span>{{ scope.row.dictType }}</span> <span>{{ scope.row.dictType }}</span>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="创建时间" align="center" prop="createTime" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
</template> </template>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论