refactor(ui): 优化界面布局和交互体验
- 移除body的overflow:hidden样式以支持页面滚动 - 调整标签渲染页面的按钮位置和样式 - 将缺陷列表从表格改为卡片式布局 - 移除仓库类型相关代码 - 修改按钮文本从"预览标签"改为"导出标签"
This commit is contained in:
@@ -20,7 +20,7 @@ body {
|
|||||||
background-color: #f1f1f1;
|
background-color: #f1f1f1;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
overflow: hidden;
|
// overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
a {
|
a {
|
||||||
|
|||||||
@@ -57,28 +57,75 @@
|
|||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<KLPTable v-loading="loading" :data="commonDefectList" @selection-change="handleSelectionChange">
|
<!-- 卡片式展示区域 -->
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<div v-loading="loading" class="card-container">
|
||||||
<el-table-column label="主键" align="center" prop="defectId" v-if="true"/>
|
<el-row :gutter="20">
|
||||||
<el-table-column label="缺陷名称" align="center" prop="defectName" />
|
<!-- 循环生成卡片 -->
|
||||||
<el-table-column label="备注" align="center" prop="remark" />
|
<el-col
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
:xs="24"
|
||||||
<template slot-scope="scope">
|
:sm="12"
|
||||||
<el-button
|
:md="8"
|
||||||
size="mini"
|
:lg="6"
|
||||||
type="text"
|
:xl="4"
|
||||||
icon="el-icon-edit"
|
v-for="(item, index) in commonDefectList"
|
||||||
@click="handleUpdate(scope.row)"
|
:key="item.defectId"
|
||||||
>修改</el-button>
|
class="card-item"
|
||||||
<el-button
|
>
|
||||||
size="mini"
|
<el-card class="defect-card">
|
||||||
type="text"
|
<!-- 选择框 -->
|
||||||
icon="el-icon-delete"
|
<div slot="header" class="card-header">
|
||||||
@click="handleDelete(scope.row)"
|
<el-checkbox
|
||||||
>删除</el-button>
|
v-model="selectedIds[item.defectId]"
|
||||||
</template>
|
@change="handleCheckChange(item, $event)"
|
||||||
</el-table-column>
|
class="card-checkbox"
|
||||||
</KLPTable>
|
></el-checkbox>
|
||||||
|
<span class="card-title">缺陷信息</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="card-body">
|
||||||
|
<!-- 主键(根据原逻辑保留显示) -->
|
||||||
|
<div v-if="false" class="card-info">
|
||||||
|
<span class="info-label">主键:</span>
|
||||||
|
<span class="info-value">{{ item.defectId }}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 缺陷名称 -->
|
||||||
|
<div class="card-info">
|
||||||
|
<span class="info-label">缺陷名称:</span>
|
||||||
|
<span class="info-value">{{ item.defectName }}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 备注 -->
|
||||||
|
<div class="card-info">
|
||||||
|
<span class="info-label">备注:</span>
|
||||||
|
<span class="info-value">{{ item.remark || '无' }}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- 操作按钮 -->
|
||||||
|
<div class="card-actions">
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-edit"
|
||||||
|
@click="handleUpdate(item)"
|
||||||
|
>修改</el-button>
|
||||||
|
<el-button
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-delete"
|
||||||
|
@click="handleDelete(item)"
|
||||||
|
>删除</el-button>
|
||||||
|
</div>
|
||||||
|
</el-card>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
|
<!-- 空状态提示 -->
|
||||||
|
<div v-if="commonDefectList.length === 0 && !loading" class="empty-state">
|
||||||
|
<el-empty description="暂无缺陷数据"></el-empty>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<pagination
|
<pagination
|
||||||
v-show="total>0"
|
v-show="total>0"
|
||||||
@@ -119,6 +166,8 @@ export default {
|
|||||||
loading: true,
|
loading: true,
|
||||||
// 选中数组
|
// 选中数组
|
||||||
ids: [],
|
ids: [],
|
||||||
|
// 选中状态映射(用于卡片复选框)
|
||||||
|
selectedIds: {},
|
||||||
// 非单个禁用
|
// 非单个禁用
|
||||||
single: true,
|
single: true,
|
||||||
// 非多个禁用
|
// 非多个禁用
|
||||||
@@ -127,7 +176,7 @@ export default {
|
|||||||
showSearch: true,
|
showSearch: true,
|
||||||
// 总条数
|
// 总条数
|
||||||
total: 0,
|
total: 0,
|
||||||
// 常见缺陷表格数据
|
// 常见缺陷数据列表
|
||||||
commonDefectList: [],
|
commonDefectList: [],
|
||||||
// 弹出层标题
|
// 弹出层标题
|
||||||
title: "",
|
title: "",
|
||||||
@@ -156,9 +205,34 @@ export default {
|
|||||||
listCommonDefect(this.queryParams).then(response => {
|
listCommonDefect(this.queryParams).then(response => {
|
||||||
this.commonDefectList = response.rows;
|
this.commonDefectList = response.rows;
|
||||||
this.total = response.total;
|
this.total = response.total;
|
||||||
|
// 重置选中状态
|
||||||
|
this.selectedIds = {};
|
||||||
|
this.ids = [];
|
||||||
|
this.updateSelectionStatus();
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/** 处理复选框变化 */
|
||||||
|
handleCheckChange(item, checked) {
|
||||||
|
if (checked) {
|
||||||
|
// 选中时添加到数组
|
||||||
|
this.ids.push(item.defectId);
|
||||||
|
this.selectedIds[item.defectId] = true;
|
||||||
|
} else {
|
||||||
|
// 取消选中时从数组移除
|
||||||
|
this.ids = this.ids.filter(id => id !== item.defectId);
|
||||||
|
this.selectedIds[item.defectId] = false;
|
||||||
|
}
|
||||||
|
this.updateSelectionStatus();
|
||||||
|
},
|
||||||
|
|
||||||
|
/** 更新选择状态(单个/多个) */
|
||||||
|
updateSelectionStatus() {
|
||||||
|
this.single = this.ids.length !== 1;
|
||||||
|
this.multiple = this.ids.length === 0;
|
||||||
|
},
|
||||||
|
|
||||||
// 取消按钮
|
// 取消按钮
|
||||||
cancel() {
|
cancel() {
|
||||||
this.open = false;
|
this.open = false;
|
||||||
@@ -188,12 +262,6 @@ export default {
|
|||||||
this.resetForm("queryForm");
|
this.resetForm("queryForm");
|
||||||
this.handleQuery();
|
this.handleQuery();
|
||||||
},
|
},
|
||||||
// 多选框选中数据
|
|
||||||
handleSelectionChange(selection) {
|
|
||||||
this.ids = selection.map(item => item.defectId)
|
|
||||||
this.single = selection.length!==1
|
|
||||||
this.multiple = !selection.length
|
|
||||||
},
|
|
||||||
/** 新增按钮操作 */
|
/** 新增按钮操作 */
|
||||||
handleAdd() {
|
handleAdd() {
|
||||||
this.reset();
|
this.reset();
|
||||||
@@ -204,7 +272,7 @@ export default {
|
|||||||
handleUpdate(row) {
|
handleUpdate(row) {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
this.reset();
|
this.reset();
|
||||||
const defectId = row.defectId || this.ids
|
const defectId = row.defectId || this.ids[0]; // 取第一个选中项
|
||||||
getCommonDefect(defectId).then(response => {
|
getCommonDefect(defectId).then(response => {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
this.form = response.data;
|
this.form = response.data;
|
||||||
@@ -239,8 +307,8 @@ export default {
|
|||||||
},
|
},
|
||||||
/** 删除按钮操作 */
|
/** 删除按钮操作 */
|
||||||
handleDelete(row) {
|
handleDelete(row) {
|
||||||
const defectIds = row.defectId || this.ids;
|
const defectIds = row ? [row.defectId] : this.ids;
|
||||||
this.$modal.confirm('是否确认删除常见缺陷编号为"' + defectIds + '"的数据项?').then(() => {
|
this.$modal.confirm(`是否确认删除选中的${defectIds.length}条常见缺陷数据?`).then(() => {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
return delCommonDefect(defectIds);
|
return delCommonDefect(defectIds);
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
@@ -261,3 +329,66 @@ export default {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.card-container {
|
||||||
|
padding: 10px 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-item {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.defect-card {
|
||||||
|
height: 100%;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
padding: 10px 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-checkbox {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-title {
|
||||||
|
font-weight: 500;
|
||||||
|
color: #606266;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-body {
|
||||||
|
padding: 15px;
|
||||||
|
flex: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-info {
|
||||||
|
margin-bottom: 12px;
|
||||||
|
line-height: 1.5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.info-label {
|
||||||
|
color: #909399;
|
||||||
|
display: inline-block;
|
||||||
|
width: 70px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.info-value {
|
||||||
|
color: #303133;
|
||||||
|
}
|
||||||
|
|
||||||
|
.card-actions {
|
||||||
|
border-top: 1px solid #eee;
|
||||||
|
padding: 10px 15px;
|
||||||
|
text-align: right;
|
||||||
|
}
|
||||||
|
|
||||||
|
.empty-state {
|
||||||
|
margin: 50px 0;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -1,10 +1,7 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="label-render-container">
|
<div class="label-render-container">
|
||||||
<!-- 操作按钮 -->
|
<!-- 操作按钮 -->
|
||||||
<div class="action-buttons">
|
|
||||||
<el-button type="primary" @click="downloadLabelAsImage">下载标签图片</el-button>
|
|
||||||
<el-button type="primary" @click="printLabel" style="margin-left: 10px;">打印标签</el-button>
|
|
||||||
</div>
|
|
||||||
<!-- 标签预览容器 -->
|
<!-- 标签预览容器 -->
|
||||||
<div class="preview-container" id="label-preview-container" ref="labelRef">
|
<div class="preview-container" id="label-preview-container" ref="labelRef">
|
||||||
<ProductionTagPreview v-if="labelType === '2'" :content="content" />
|
<ProductionTagPreview v-if="labelType === '2'" :content="content" />
|
||||||
@@ -13,6 +10,10 @@
|
|||||||
<ForgeTagPreview v-if="labelType === '5'" :content="content" />
|
<ForgeTagPreview v-if="labelType === '5'" :content="content" />
|
||||||
<SaltSprayTagPreview v-if="labelType === '6'" :content="content" />
|
<SaltSprayTagPreview v-if="labelType === '6'" :content="content" />
|
||||||
</div>
|
</div>
|
||||||
|
<div class="action-buttons">
|
||||||
|
<el-button type="primary" @click="downloadLabelAsImage">下载标签图片</el-button>
|
||||||
|
<el-button type="primary" @click="printLabel" style="margin-left: 10px;">打印标签</el-button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -105,18 +106,17 @@ export default {
|
|||||||
<style scoped>
|
<style scoped>
|
||||||
.label-render-container {
|
.label-render-container {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: calc(100vh - 200px);
|
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
/* 按钮与预览垂直排列 */
|
/* 按钮与预览垂直排列 */
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 2rem;
|
padding: 1rem;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
.action-buttons {
|
.action-buttons {
|
||||||
margin-bottom: 1rem;
|
margin-top: 1rem;
|
||||||
/* 按钮与预览区的间距 */
|
/* 按钮与预览区的间距 */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -87,12 +87,12 @@
|
|||||||
<el-table-column label="备注" align="center" prop="remark" />
|
<el-table-column label="备注" align="center" prop="remark" />
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button size="mini" type="text" icon="el-icon-download" @click="handleDownloadQRCode(scope.row)"
|
<!-- <el-button size="mini" type="text" icon="el-icon-download" @click="handleDownloadQRCode(scope.row)"
|
||||||
v-if="qrcode">
|
v-if="qrcode">
|
||||||
下载二维码
|
下载二维码
|
||||||
</el-button>
|
</el-button> -->
|
||||||
<el-button size="mini" type="text" icon="el-icon-view" @click="handlePreviewLabel(scope.row)">
|
<el-button size="mini" type="text" icon="el-icon-view" @click="handlePreviewLabel(scope.row)">
|
||||||
预览标签
|
导出标签
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)">修正</el-button>
|
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleCheck(scope.row)">修正</el-button>
|
||||||
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
|
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="仓库类型" prop="warehouseType">
|
<!-- <el-form-item label="仓库类型" prop="warehouseType">
|
||||||
<el-select v-model="queryParams.warehouseType" placeholder="请选择仓库类型" clearable>
|
<el-select v-model="queryParams.warehouseType" placeholder="请选择仓库类型" clearable>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in dict.type.warehouse_type"
|
v-for="dict in dict.type.warehouse_type"
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
:value="dict.value"
|
:value="dict.value"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item label="启用状态" prop="isEnabled">
|
<el-form-item label="启用状态" prop="isEnabled">
|
||||||
<el-select v-model="queryParams.isEnabled" placeholder="请选择启用状态" clearable>
|
<el-select v-model="queryParams.isEnabled" placeholder="请选择启用状态" clearable>
|
||||||
<el-option label="启用" :value="1" />
|
<el-option label="启用" :value="1" />
|
||||||
@@ -73,11 +73,11 @@
|
|||||||
<!-- <el-table-column label="上级节点" prop="parentId" /> -->
|
<!-- <el-table-column label="上级节点" prop="parentId" /> -->
|
||||||
<el-table-column label="仓库编码" align="center" prop="warehouseCode" />
|
<el-table-column label="仓库编码" align="center" prop="warehouseCode" />
|
||||||
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
|
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
|
||||||
<el-table-column label="仓库类型" align="center" prop="warehouseType">
|
<!-- <el-table-column label="仓库类型" align="center" prop="warehouseType">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<dict-tag :options="dict.type.warehouse_type" :value="scope.row.warehouseType"/>
|
<dict-tag :options="dict.type.warehouse_type" :value="scope.row.warehouseType"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column> -->
|
||||||
<el-table-column label="排序号" align="center" prop="sortNo" />
|
<el-table-column label="排序号" align="center" prop="sortNo" />
|
||||||
<el-table-column label="启用状态" align="center" prop="isEnabled">
|
<el-table-column label="启用状态" align="center" prop="isEnabled">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@@ -121,7 +121,7 @@
|
|||||||
<el-form-item label="仓库名称" prop="warehouseName">
|
<el-form-item label="仓库名称" prop="warehouseName">
|
||||||
<el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
|
<el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="仓库类型" prop="warehouseType">
|
<!-- <el-form-item label="仓库类型" prop="warehouseType">
|
||||||
<el-select v-model="form.warehouseType" placeholder="请选择仓库类型">
|
<el-select v-model="form.warehouseType" placeholder="请选择仓库类型">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in dict.type.warehouse_type"
|
v-for="dict in dict.type.warehouse_type"
|
||||||
@@ -130,7 +130,7 @@
|
|||||||
:value="parseInt(dict.value)"
|
:value="parseInt(dict.value)"
|
||||||
></el-option>
|
></el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<el-form-item label="排序号" prop="sortNo">
|
<el-form-item label="排序号" prop="sortNo">
|
||||||
<el-input v-model="form.sortNo" placeholder="请输入排序号" />
|
<el-input v-model="form.sortNo" placeholder="请输入排序号" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -160,7 +160,7 @@ import WarehouseSelect from '@/components/WarehouseSelect';
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Warehouse",
|
name: "Warehouse",
|
||||||
dicts: ['warehouse_type'],
|
// dicts: ['warehouse_type'],
|
||||||
components: {
|
components: {
|
||||||
Treeselect,
|
Treeselect,
|
||||||
WarehouseSelect
|
WarehouseSelect
|
||||||
@@ -190,7 +190,7 @@ export default {
|
|||||||
parentId: undefined,
|
parentId: undefined,
|
||||||
warehouseCode: undefined,
|
warehouseCode: undefined,
|
||||||
warehouseName: undefined,
|
warehouseName: undefined,
|
||||||
warehouseType: undefined,
|
warehouseType: 1,
|
||||||
sortNo: undefined,
|
sortNo: undefined,
|
||||||
isEnabled: undefined,
|
isEnabled: undefined,
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user