DeXun/klp-oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(wms): 新增原料材质与钢卷类型不匹配查询及修复功能

Browse Source 
refactor(crm): 重构销售员管理界面为左右分栏布局

style(wms): 优化钢卷发货状态显示为单选按钮组

chore: 新增考勤请求工具类文件
This commit is contained in:
砂糖
2026-04-21 15:44:38 +08:00
parent e44235abd8
commit a8e667a69b
5 changed files with 248 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

308
klp-ui/src/views/crm/saleman/index.vue
View File

@@ -1,164 +1,91 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="销售员名称" prop="dictLabel">
<el-input
v-model="queryParams.dictLabel"
placeholder="请输入销售员名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="数据状态" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<div>
<DragResizePanel direction="horizontal" :initialSize="400" :minSize="300" style="height: calc(100vh - 84px);">
<template #panelA>
<div style="height: calc(100vh - 84px); padding: 10px; display: flex; flex-direction: column;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="40px">
<el-form-item label="名称" prop="dictLabel">
<el-input v-model="queryParams.dictLabel" placeholder="请输入销售员名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="数据状态" clearable @change="handleQuery">
<el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-refresh" size="mini" @click="handleQuery">刷新</el-button>
</el-col>
</el-row>
<div v-loading="loading" class="card-container">
<el-card
v-for="item in dataList"
:key="item.dictCode"
class="saleman-card"
shadow="hover"
>
<div class="card-header">
<div class="card-title">
<span v-if="item.listClass == '' || item.listClass == 'default'">{{item.dictLabel}}</span>
<el-tag v-else :type="item.listClass == 'primary' ? '' : item.listClass">{{item.dictLabel}}</el-tag>
</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 v-loading="loading" class="card-container">
<div v-for="item in dataList" :key="item.dictCode"
class="saleman-card"
:class="{ 'saleman-card-selected': selectedItem && selectedItem.dictCode === item.dictCode }"
@click="selectedItem = item"
shadow="hover">
<div class="card-header">
<div class="card-title">
<dict-tag :options="dict.type.sys_normal_disable" :value="item.status" />
<div>{{ item.dictLabel }}</div>
</div>
<div class="card-actions">
<el-button size="mini" type="text" icon="el-icon-edit" @click.stop="handleUpdate(item)">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click.stop="handleDelete(item)">删除</el-button>
</div>
</div>
</div>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
</div>
<div class="card-body">
<div class="card-info">
<span class="info-label">销售员编码：</span>
<span class="info-value">{{item.dictCode}}</span>
</div>
<div class="card-info">
<span class="info-label">排序：</span>
<span class="info-value">{{item.dictSort}}</span>
</div>
<div class="card-info">
<span class="info-label">状态：</span>
<span class="info-value"><dict-tag :options="dict.type.sys_normal_disable" :value="item.status"/></span>
</div>
<div class="card-info" v-if="item.remark">
<span class="info-label">备注：</span>
<span class="info-value">{{item.remark}}</span>
</div>
<div class="card-info">
<span class="info-label">创建时间：</span>
<span class="info-value">{{ parseTime(item.createTime) }}</span>
</div>
</div>
</el-card>
</div>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</template>
<template #panelB>
<div v-if="selectedItem" class="right-panel">
<el-tabs v-model="activeTab" type="border-card">
<el-tab-pane label="跟进客户" name="customer">
客户
</el-tab-pane>
<el-tab-pane label="跟进合同" name="contract">
合同
</el-tab-pane>
<el-tab-pane label="发货单据" name="delivery">
<DeliveryTable :data="waybillList" />
</el-tab-pane>
<el-tab-pane label="生产成果" name="production">
<CoilTable :data="productList || []" />
</el-tab-pane>
<el-tab-pane label="计划发货" name="planDelivery">
<CoilTable :data="deliveryList || []" />
</el-tab-pane>
</el-tabs>
</div>
<div v-else class="right-panel">
<el-empty description="选择左侧的销售员查看相关信息" />
</div>
</template>
</DragResizePanel>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="销售员类型">
<el-input v-model="form.dictType" :disabled="true" />
</el-form-item>
<el-form-item label="销售员名称" prop="dictLabel">
<el-input v-model="form.dictLabel" placeholder="请输入销售员名称" />
</el-form-item>
<el-form-item label="样式属性" prop="cssClass">
<el-input v-model="form.cssClass" placeholder="请输入样式属性" />
</el-form-item>
<el-form-item label="显示排序" prop="dictSort">
<el-input-number :controls=false controls-position="right" v-model="form.dictSort" :min="0" />
</el-form-item>
<el-form-item label="回显样式" prop="listClass">
<el-select v-model="form.listClass">
<el-option
v-for="item in listClassOptions"
:key="item.value"
:label="item.label + '(' + item.value + ')'"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
@@ -174,11 +101,15 @@
</template>
<script>
import DragResizePanel from "@/components/DragResizePanel";
import { listData, getData, delData, addData, updateData } from "@/api/system/dict/data";
import { optionselect as getDictOptionselect, getType } from "@/api/system/dict/type";
import CoilTable from "../components/CoilTable.vue";
import DeliveryTable from "../components/DeliveryTable.vue";
export default {
name: "Data",
components: { DragResizePanel, CoilTable, DeliveryTable },
dicts: ['sys_normal_disable'],
data() {
return {
@@ -202,6 +133,8 @@ export default {
title: "",
// 是否显示弹出层
open: false,
// 当前选中的销售员
selectedItem: null,
// 数据标签回显样式
listClassOptions: [
{
@@ -241,6 +174,14 @@ export default {
},
// 表单参数
form: {},
// 当前激活的标签页
activeTab: 'customer',
// 生产成果列表
productList: [],
// 计划发货列表
deliveryList: [],
// 发货单据列表
waybillList: [],
// 表单校验
rules: {
dictLabel: [
@@ -251,7 +192,7 @@ export default {
],
dictSort: [
{ required: true, message: "数据顺序不能为空", trigger: "blur" }
]
],
}
};
},
@@ -329,7 +270,7 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.dictCode)
this.single = selection.length!=1
this.single = selection.length != 1
this.multiple = !selection.length
},
/** 修改按钮操作 */
@@ -343,7 +284,7 @@ export default {
});
},
/** 提交按钮 */
submitForm: function() {
submitForm () {
this.$refs["form"].validate(valid => {
if (valid) {
// 确保dictLabel和dictValue保持一致
@@ -369,13 +310,13 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const dictCodes = row.dictCode || this.ids;
this.$modal.confirm('是否确认删除销售员编码为"' + dictCodes + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除销售员编码为"' + dictCodes + '"的数据项？').then(function () {
return delData(dictCodes);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
this.$store.dispatch('dict/removeDict', this.queryParams.dictType);
}).catch(() => {});
}).catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
@@ -383,71 +324,58 @@ export default {
...this.queryParams
}, `data_${new Date().getTime()}.xlsx`)
},
/** 复制按钮操作 */
// handleCopy() {
// // 复制销售员进入系统剪切板，数据结构：{dictName: '', dictType: '', data: [
// //
// // ], status: '0', remark: ''}
// this.reset();
// this.open = true;
// this.title = "复制销售员数据";
// this.form.dictType = this.queryParams.dictType;
// }
}
};
</script>
<style scoped>
.card-container {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
gap: 20px;
margin-top: 20px;
flex: 1;
overflow-y: scroll;
overflow-x: hidden;
}
.saleman-card {
background: #fff;
border-radius: 8px;
padding: 16px;
margin-bottom: 12px;
transition: all 0.3s ease;
}
.saleman-card:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15) !important;
.saleman-card-selected {
background-color: #ecf5ff;
border: 1px solid #409eff;
}
.card-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 15px;
width: 100%;
}
.card-title {
font-size: 16px;
font-weight: bold;
display: flex;
align-items: center;
gap: 10px;
font-size: 15px;
font-weight: 600;
color: #303133;
flex: 1;
}
.card-title dict-tag {
flex-shrink: 0;
}
.card-actions {
display: flex;
gap: 10px;
gap: 8px;
}
.card-body {
padding-top: 10px;
}
.card-info {
display: flex;
margin-bottom: 8px;
font-size: 14px;
}
.info-label {
width: 100px;
color: #606266;
}
.info-value {
flex: 1;
color: #303133;
.right-panel {
height: 100%;
background-color: #fafafa;
}
</style>