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

feat(客户管理): 新增税号字段并优化客户信息展示

Browse Source 
feat(订单管理): 增加宽度和厚度公差字段，优化销售员选择方式

feat(合同管理): 新增合同管理模块及相关API接口

refactor(文件列表): 重构文件列表组件样式和布局

fix(QRCode): 修复内容为空时仍触发生成的bug

perf(线圈管理): 优化用户列表加载条件，减少不必要请求

style(代码): 移除多余的空行和注释代码
This commit is contained in:
砂糖
2026-03-31 11:16:48 +08:00
parent b7d8463198
commit aca10bcd45
13 changed files with 793 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
klp-ui/src/api/crm/contract.js Normal file
View File

@@ -0,0 +1,52 @@
import request from '@/utils/request'
// 查询合同信息列表
export function listContract(query) {
return request({
url: '/crm/contract/list',
method: 'get',
params: query
})
}
// 查询合同信息详细
export function getContract(contractId) {
return request({
url: '/crm/contract/' + contractId,
method: 'get'
})
}
// 新增合同信息
export function addContract(data) {
return request({
url: '/crm/contract',
method: 'post',
data: data
})
}
// 修改合同信息
export function updateContract(data) {
return request({
url: '/crm/contract',
method: 'put',
data: data
})
}
// 删除合同信息
export function delContract(contractId) {
return request({
url: '/crm/contract/' + contractId,
method: 'delete'
})
}
// 查询合同下的所有订单异议和收款记录
export function listContractOrderObjection(contractId) {
return request({
url: '/crm/orderItem/contractFinance/' + contractId,
method: 'get',
})
}

113
klp-ui/src/components/FileList/index.vue
View File

@@ -1,44 +1,31 @@
<template>
<div class="file-list-container">
<el-table
:data="fileList"
border
size="small"
v-loading="loading"
style="width: 100%;"
>
<el-table-column
label="文件名"
prop="originalName"
min-width="200"
>
<template slot-scope="scope">
<i class="el-icon-document" style="margin-right: 8px;"></i>
{{ scope.row.originalName }}
</template>
</el-table-column>
<el-table-column
label="操作"
width="100"
align="center"
>
<template slot-scope="scope">
<el-button
type="text"
icon="el-icon-download"
@click="downloadFile(scope.row)"
size="small"
>
下载
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 空数据提示 -->
<div v-if="fileList.length === 0 && !loading" class="empty-tip">
<el-empty description="暂无文件数据"></el-empty>
</div>
<!-- 自定义文件列表 -->
<div v-else class="file-list" v-loading="loading">
<div
v-for="file in fileList"
:key="file.ossId"
class="file-item"
>
<div class="file-info">
<i class="el-icon-document"></i>
<span class="file-name">{{ file.originalName }}</span>
</div>
<el-button
type="text"
icon="el-icon-download"
@click="downloadFile(file)"
size="small"
class="download-btn"
>
下载
</el-button>
</div>
</div>
</div>
</template>
@@ -112,8 +99,58 @@ export default {
height: 200px;
}
::v-deep .el-table {
--el-table-header-text-color: #606266;
--el-table-row-hover-bg-color: #f5f7fa;
.file-list {
width: 100%;
border: 1px solid #ebeef5;
border-radius: 4px;
overflow: hidden;
}
.file-item {
display: flex;
justify-content: space-between;
align-items: center;
padding: 12px 16px;
border-bottom: 1px solid #ebeef5;
transition: background-color 0.3s;
}
.file-item:last-child {
border-bottom: none;
}
.file-item:hover {
background-color: #f5f7fa;
}
.file-info {
display: flex;
align-items: center;
flex: 1;
}
.file-info .el-icon-document {
margin-right: 8px;
color: #409eff;
font-size: 16px;
}
.file-name {
font-size: 14px;
color: #606266;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
flex: 1;
}
.download-btn {
margin: 0;
font-size: 14px;
color: #409eff;
}
.download-btn:hover {
color: #66b1ff;
}
</style>

2
klp-ui/src/components/QRCode/index.vue
View File

@@ -25,7 +25,7 @@ export default {
watch: {
content: {
handler(newVal, oldVal) {
if (newVal !== oldVal) {
if (newVal && newVal !== oldVal) {
this.generateQRCode();
}
},

9
klp-ui/src/views/crm/components/CustomerEdit.vue
View File

@@ -50,6 +50,15 @@
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="税号" prop="taxNumber">
<el-input
v-model="customer.taxNumber"
placeholder="请输入税号"
@input="handleInputChange"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="客户行业" prop="industry">
<el-select

1
klp-ui/src/views/crm/components/CustomerInfo.vue
View File

@@ -16,6 +16,7 @@
<el-descriptions-item label="客户等级">
<dict-tag :value="customer.customerLevel" :options="dict.type.customer_level"></dict-tag>
</el-descriptions-item>
<el-descriptions-item label="税号">{{ customer.taxNumber || '-' }}</el-descriptions-item>
<el-descriptions-item label="客户地址" v-hasPermi="['crm:customer:address']">
{{ formattedAddress || '-' }}
</el-descriptions-item>

10
klp-ui/src/views/crm/components/OrderDetail.vue
View File

@@ -7,7 +7,7 @@
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-if="editable">新增</el-button>
<el-button type="primary" plain icon="el-icon-printer" size="mini" @click="handlePrint">打印</el-button>
<!-- <el-button type="primary" plain icon="el-icon-printer" size="mini" @click="handlePrint">打印</el-button> -->
<el-button type="primary" plain icon="el-icon-refresh" size="mini" @click="getList">刷新</el-button>
</el-col>
</el-row>
@@ -15,6 +15,8 @@
<el-table v-loading="loading" :data="orderItemList">
<el-table-column label="产品类型" align="center" prop="productType" />
<el-table-column label="原料规格" align="center" prop="rawMaterialSpec" />
<el-table-column label="宽度公差" align="center" prop="widthTolerance" />
<el-table-column label="厚度公差" align="center" prop="thicknessTolerance" />
<el-table-column label="成品规格" align="center" prop="finishedProductSpec" />
<el-table-column label="材质" align="center" prop="material" />
<el-table-column label="等级" align="center" prop="grade" />
@@ -62,6 +64,12 @@
<el-form-item label="成品规格" prop="finishedProductSpec">
<el-input v-model="form.finishedProductSpec" placeholder="请输入成品规格" />
</el-form-item>
<el-form-item label="宽度公差" prop="widthTolerance">
<el-input v-model="form.widthTolerance" placeholder="请输入宽度公差" />
</el-form-item>
<el-form-item label="厚度公差" prop="thicknessTolerance">
<el-input v-model="form.thicknessTolerance" placeholder="请输入厚度公差" />
</el-form-item>
<el-form-item label="材质" prop="material">
<el-input v-model="form.material" placeholder="请输入材质" />
</el-form-item>

41
klp-ui/src/views/crm/components/OrderEdit.vue
View File

@@ -27,7 +27,10 @@
<el-col :span="12">
<el-form-item label="销售员" prop="salesman">
<el-input v-model="form.salesman" placeholder="请输入销售员"></el-input>
<el-select v-model="form.salesman" placeholder="请选择销售员">
<el-option v-for="item in dict.type.wip_pack_saleman" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
</el-col>
@@ -50,7 +53,17 @@
<el-col :span="12">
<el-form-item label="合同号" prop="contractCode">
<el-input v-model="form.contractCode" placeholder="请输入合同号"></el-input>
<el-select v-model="form.contractId" placeholder="请选择合同号" filterable clearable @change="handleContractChange">
<el-option v-for="item in contractList" :key="item.contractId" :label="item.contractNo"
:value="item.contractId"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="附件" prop="annexFiles">
<file-upload v-model="form.annexFiles" />
</el-form-item>
</el-col>
@@ -65,6 +78,7 @@
</template>
<script>
import { listContract } from '@/api/crm/contract';
import { ORDER_STATUS } from '../js/enum'
export default {
@@ -79,6 +93,7 @@ export default {
default: () => []
}
},
dicts: ['wip_pack_saleman'],
data() {
return {
ORDER_STATUS,
@@ -86,7 +101,8 @@ export default {
...this.initValue
},
// 防抖计时器标识
debounceTimer: null
debounceTimer: null,
contractList: []
}
},
watch: {
@@ -105,6 +121,10 @@ export default {
}
}
},
mounted() {
// 初始化时获取合同列表
this.getContractList()
},
beforeDestroy() {
// 组件销毁时清除计时器，防止内存泄漏
if (this.debounceTimer) {
@@ -118,6 +138,21 @@ export default {
clearTimeout(this.debounceTimer);
}
this.$emit('save', { ...this.form });
},
// 处理合同号选择变化
handleContractChange(contractId) {
// 当合同号选择变化时，更新合同金额
const contract = this.contractList.find(item => item.contractId === contractId)
if (contract) {
this.form.contractCode = contract.contractNo
}
},
// 获取合同列表
getContractList() {
listContract({ pageSize: 1000, pageNum: 1 }).then(res => {
this.contractList = res.rows || []
})
}
}
}

27
klp-ui/src/views/crm/components/ReceiveTable.vue
View File

@@ -1,22 +1,5 @@
<template>
<div>
<!-- <el-form v-if="searchable" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="客户名称" prop="customerId">
<CustomerSelect v-model="queryParams.customerId" />
</el-form-item>
<el-form-item label="到期日" prop="dueDate">
<el-date-picker clearable
v-model="queryParams.dueDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择到期日">
</el-date-picker>
</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> -->
<el-descriptions :column="3" title="财务状态" border>
<el-descriptions-item label="订单总金额">{{ order.orderAmount }}</el-descriptions-item>
<el-descriptions-item label="已收款金额">{{ receivedAmount }}</el-descriptions-item>
@@ -128,12 +111,6 @@
<el-form-item label="收款金额" prop="amount">
<el-input-number :controls=false v-model="form.amount" :step="1.00" :precision="2" placeholder="请输入应收金额" :min="0" :max="unreceivedAmount" style="width: 100%;"/>
</el-form-item>
<!-- <el-form-item label="已收金额" prop="paidAmount">
<el-input v-model="form.paidAmount" disabled placeholder="请输入已收金额" />
</el-form-item> -->
<!-- <el-form-item label="未收金额" prop="balanceAmount">
<el-input v-model="form.balanceAmount" placeholder="请输入未收金额" />
</el-form-item> -->
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
@@ -161,13 +138,9 @@
<script>
import { listReceivable, getReceivable, delReceivable, addReceivable, updateReceivable, updatePaidAmount } from "@/api/finance/receivable";
import { updateOrder } from "@/api/crm/order";
// import CustomerSelect from '@/components/KLPService/CustomerSelect/index.vue';
export default {
name: "Receivable",
// components: {
// CustomerSelect
// },
props: {
searchable: {
type: Boolean,

514
klp-ui/src/views/crm/contract/index.vue Normal file
View File

@@ -0,0 +1,514 @@
<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="contractName">
<el-input v-model="queryParams.contractName" placeholder="请输入合同名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="合同编号" prop="contractNo">
<el-input v-model="queryParams.contractNo" placeholder="请输入合同编号" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="供方" prop="supplier">
<el-input v-model="queryParams.supplier" placeholder="请输入供方" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="需方" prop="customer">
<el-input v-model="queryParams.customer" placeholder="请输入需方" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="签订时间" prop="signTime">
<el-date-picker clearable v-model="queryParams.signTime" type="date" value-format="yyyy-MM-dd"
placeholder="请选择签订时间">
</el-date-picker>
</el-form-item>
<el-form-item label="签订地点" prop="signLocation">
<el-input v-model="queryParams.signLocation" placeholder="请输入签订地点" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="合同状态" prop="contractStatus">
<el-select v-model="queryParams.contractStatus" placeholder="请选择合同状态">
<el-option label="草稿" value="0" />
<el-option label="已生效" value="1" />
<el-option label="已作废" value="2" />
<el-option label="已完成" value="3" />
</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>
<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-table v-loading="loading" :data="contractList" @selection-change="handleSelectionChange"
@row-click="handleRowClick">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="合同名称" align="center" prop="contractName" />
<el-table-column label="合同编号" align="center" prop="contractNo" />
<el-table-column label="供方" align="center" prop="supplier" />
<el-table-column label="需方" align="center" prop="customer" />
<el-table-column label="签订时间" align="center" prop="signTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.signTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="签订地点" align="center" prop="signLocation" />
<el-table-column label="合同状态" align="center" prop="status">
<template slot-scope="scope">
<span-tag
:type="scope.row.status == 0 ? 'info' : scope.row.status == 1 ? 'success' : scope.row.status == 2 ? 'danger' : 'primary'">
{{ scope.row.status == 0 ? '草稿' : scope.row.status == 1 ? '已生效' : scope.row.status == 2 ? '已作废' : '已完成' }}
</span-tag>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click.stop="handleUpdate(scope.row)">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click.stop="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改合同信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<!-- 前四个字段占一排 -->
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="合同名称" prop="contractName">
<el-input v-model="form.contractName" placeholder="请输入合同名称" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="合同编号" prop="contractNo">
<el-input v-model="form.contractNo" placeholder="请输入合同编号" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="签订时间" prop="signTime">
<el-date-picker clearable v-model="form.signTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择签订时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="签订地点" prop="signLocation">
<el-input v-model="form.signLocation" placeholder="请输入签订地点" />
</el-form-item>
</el-col>
</el-row>
<el-form-item label="产品内容">
<editor v-model="form.productContent" :min-height="192" />
</el-form-item>
<el-form-item label="合同内容">
<editor v-model="form.contractContent" :min-height="192" />
</el-form-item>
<!-- 供方和需方左右布局 -->
<el-row :gutter="20">
<!-- 供方信息 -->
<el-col :span="12">
<el-form-item label="供方" prop="supplier">
<el-input v-model="form.supplier" placeholder="请输入供方" />
</el-form-item>
<el-form-item label="供方地址" prop="supplierAddress">
<el-input v-model="form.supplierAddress" placeholder="请输入供方地址" />
</el-form-item>
<el-form-item label="供方电话" prop="supplierPhone">
<el-input v-model="form.supplierPhone" placeholder="请输入供方电话" />
</el-form-item>
<el-form-item label="供方开户行" prop="supplierBank">
<el-input v-model="form.supplierBank" placeholder="请输入供方开户行" />
</el-form-item>
<el-form-item label="供方账号" prop="supplierAccount">
<el-input v-model="form.supplierAccount" placeholder="请输入供方账号" />
</el-form-item>
<el-form-item label="供方税号" prop="supplierTaxNo">
<el-input v-model="form.supplierTaxNo" placeholder="请输入供方税号" />
</el-form-item>
</el-col>
<!-- 需方信息 -->
<el-col :span="12">
<el-form-item label="需方" prop="customer">
<el-input v-model="form.customer" placeholder="请输入需方" />
</el-form-item>
<el-form-item label="需方地址" prop="customerAddress">
<el-input v-model="form.customerAddress" placeholder="请输入需方地址" />
</el-form-item>
<el-form-item label="需方电话" prop="customerPhone">
<el-input v-model="form.customerPhone" placeholder="请输入需方电话" />
</el-form-item>
<el-form-item label="需方开户行" prop="customerBank">
<el-input v-model="form.customerBank" placeholder="请输入需方开户行" />
</el-form-item>
<el-form-item label="需方账号" prop="customerAccount">
<el-input v-model="form.customerAccount" placeholder="请输入需方账号" />
</el-form-item>
<el-form-item label="需方税号" prop="customerTaxNo">
<el-input v-model="form.customerTaxNo" placeholder="请输入需方税号" />
</el-form-item>
</el-col>
</el-row>
<!-- 最下方的附件和备注等信息保持原样 -->
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="技术附件" prop="techAnnex">
<file-upload v-model="form.techAnnex"></file-upload>
</el-form-item>
<el-form-item label="商务附件" prop="businessAnnex">
<file-upload v-model="form.businessAnnex"></file-upload>
</el-form-item>
<el-form-item label="排产函" prop="productionSchedule">
<file-upload v-model="form.productionSchedule"></file-upload>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog title="合同详情" :visible.sync="dialogOpen" fullscreen>
<el-tabs v-model="activeTab" type="card">
<el-tab-pane label="合同信息" name="first">
合同信息
</el-tab-pane>
<el-tab-pane label="下发订单" name="second">
<OrderPage v-if="activeTab === 'second'" />
</el-tab-pane>
<el-tab-pane label="收款记录" name="third">
<KLPTable v-loading="loading" :data="financeList">
<el-table-column label="应收ID" align="center" prop="receivableId" v-if="false" />
<!-- <el-table-column label="客户" align="center" prop="customerName" /> -->
<el-table-column label="收款日期" align="center" prop="dueDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.dueDate, '{y}-{m}-{d}') }}</span>
<!-- <el-tag v-if="new Date(scope.row.dueDate) < new Date()" type="danger">过期</el-tag>
<el-tag v-else-if="new Date(scope.row.dueDate) > new Date()" type="success">还剩{{ parseInt((new Date(scope.row.dueDate) - new Date()) / (1000 * 60 * 60 * 24)) }}天</el-tag> -->
</template>
</el-table-column>
<el-table-column label="收款金额" align="center" prop="amount" />
<!-- <el-table-column label="已收金额" align="center" prop="paidAmount" /> -->
<!-- <el-table-column label="未收金额" align="center" prop="balanceAmount" /> -->
<!-- <el-table-column label="状态" align="center" prop="status" /> -->
<el-table-column label="备注" align="center" prop="remark" />
</KLPTable>
</el-tab-pane>
<el-tab-pane label="订单异议" name="fourth">
<el-table v-loading="loading" :data="objectionList">
<el-table-column label="编号" align="center" prop="objectionCode" />
<el-table-column label="状态" align="center" prop="objectionStatus">
<template slot-scope="scope">
<el-tag v-if="scope.row.objectionStatus === 0" type="danger">待处理</el-tag>
<el-tag v-else-if="scope.row.objectionStatus === 1" type="success">已处理</el-tag>
<el-tag v-else-if="scope.row.objectionStatus === 2" type="info">已关闭</el-tag>
</template>
</el-table-column>
<el-table-column label="处理人" align="center" prop="handleUser" />
<el-table-column label="处理时间" align="center" prop="handleTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.handleTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"></el-button>
<el-button size="mini" type="text" icon="el-icon-check" @click="handleDo(scope.row)"
v-if="scope.row.objectionStatus == 0"></el-button>
<el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
v-if="scope.row.objectionStatus == 1"></el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"></el-button>
</template>
</el-table-column> -->
</el-table>
</el-tab-pane>
</el-tabs>
</el-dialog>
</div>
</template>
<script>
import { listContract, getContract, delContract, addContract, updateContract, listContractOrderObjection } from "@/api/crm/contract";
import OrderPage from "@/views/crm/order/index.vue";
export default {
name: "Contract",
components: {
OrderPage,
},
data() {
return {
// 活动tab
activeTab: "first",
// 按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 合同信息表格数据
contractList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 是否显示详情弹出层
dialogOpen: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
contractName: undefined,
contractNo: undefined,
supplier: undefined,
customer: undefined,
signTime: undefined,
signLocation: undefined,
status: undefined,
},
// 表单参数
form: {},
// 表单校验
rules: {
contractId: [
{ required: true, message: "合同主键ID不能为空", trigger: "blur" }
],
contractName: [
{ required: true, message: "合同名称不能为空", trigger: "blur" }
],
contractNo: [
{ required: true, message: "合同编号不能为空", trigger: "blur" }
],
supplier: [
{ required: true, message: "供方不能为空", trigger: "blur" }
],
customer: [
{ required: true, message: "需方不能为空", trigger: "blur" }
],
signTime: [
{ required: true, message: "签订时间不能为空", trigger: "blur" }
],
signLocation: [
{ required: true, message: "签订地点不能为空", trigger: "blur" }
],
productContent: [
{ required: true, message: "产品内容不能为空", trigger: "blur" }
],
contractContent: [
{ required: true, message: "合同内容不能为空", trigger: "blur" }
],
supplierAddress: [
{ required: true, message: "供方地址不能为空", trigger: "blur" }
],
supplierPhone: [
{ required: true, message: "供方电话不能为空", trigger: "blur" }
],
supplierBank: [
{ required: true, message: "供方开户行不能为空", trigger: "blur" }
],
supplierAccount: [
{ required: true, message: "供方账号不能为空", trigger: "blur" }
],
supplierTaxNo: [
{ required: true, message: "供方税号不能为空", trigger: "blur" }
],
customerAddress: [
{ required: true, message: "需方地址不能为空", trigger: "blur" }
],
customerPhone: [
{ required: true, message: "需方电话不能为空", trigger: "blur" }
],
customerBank: [
{ required: true, message: "需方开户行不能为空", trigger: "blur" }
],
customerAccount: [
{ required: true, message: "需方账号不能为空", trigger: "blur" }
],
customerTaxNo: [
{ required: true, message: "需方税号不能为空", trigger: "blur" }
],
status: [
{ required: true, message: "合同状态不能为空", trigger: "change" }
],
financeList: [],
oobjectionList: [],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询合同信息列表 */
getList() {
this.loading = true;
listContract(this.queryParams).then(response => {
this.contractList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 行点击事件
handleRowClick(row) {
this.form = row;
this.dialogOpen = true;
listContractOrderObjection(row.contractId).then(response => {
this.form.financeList = response.data.financeList || [];
this.form.oobjectionList = response.data.oobjectionList || [];
})
},
// 表单重置
reset() {
this.form = {
contractId: undefined,
contractName: undefined,
contractNo: undefined,
supplier: undefined,
customer: undefined,
signTime: undefined,
signLocation: undefined,
productContent: undefined,
contractContent: undefined,
supplierAddress: undefined,
supplierPhone: undefined,
supplierBank: undefined,
supplierAccount: undefined,
supplierTaxNo: undefined,
customerAddress: undefined,
customerPhone: undefined,
customerBank: undefined,
customerAccount: undefined,
customerTaxNo: undefined,
techAnnex: undefined,
businessAnnex: undefined,
productionSchedule: undefined,
status: 0,
remark: undefined,
createBy: undefined,
createTime: undefined,
updateBy: undefined,
updateTime: undefined,
delFlag: undefined
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.contractId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加合同信息";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const contractId = row.contractId || this.ids
getContract(contractId).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
this.title = "修改合同信息";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
if (this.form.contractId != null) {
updateContract(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
} else {
addContract(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
}).finally(() => {
this.buttonLoading = false;
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const contractIds = row.contractId || this.ids;
this.$modal.confirm('是否确认删除合同信息编号为"' + contractIds + '"的数据项？').then(() => {
this.loading = true;
return delContract(contractIds);
}).then(() => {
this.loading = false;
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {
}).finally(() => {
this.loading = false;
});
},
/** 导出按钮操作 */
handleExport() {
this.download('crm/contract/export', {
...this.queryParams
}, `contract_${new Date().getTime()}.xlsx`)
}
}
};
</script>

121
klp-ui/src/views/crm/customer/index.vue
View File

@@ -6,65 +6,45 @@
<div style="font-weight: 900;">客户列表</div>
<!-- 搜索区域 -->
<div style="display: flex; align-items: center; gap: 5px; margin-top: 10px;">
<el-input
style="flex: 1;"
prefix-icon="el-icon-search"
placeholder="输入客户编码搜索"
v-model="queryParams.customerCode"
@change="getCustomerList"
clearable
></el-input>
<el-input style="flex: 1;" prefix-icon="el-icon-search" placeholder="输入客户编码搜索"
v-model="queryParams.customerCode" @change="getCustomerList" clearable></el-input>
<el-button icon="el-icon-search" @click="toggleQuery"></el-button>
<el-button type="primary" icon="el-icon-plus" style="margin-left: 0;" @click="handleAdd"></el-button>
</div>
<!-- 高级查询区域 -->
<div v-show="showQuery" style="display: flex; align-items: center; gap: 5px; margin-top: 10px;">
<el-select
style="width: 100px;"
v-model="queryParams.industry"
placeholder="客户行业"
clearable
@change="getCustomerList"
>
<el-option
v-for="item in dict.type.customer_industry"
:key="item.value"
:label="item.label"
:value="item.value"
/>
<div v-show="showQuery"
style="display: flex; align-items: center; gap: 5px; margin-top: 10px; flex-wrap: wrap;">
<el-select style="width: 100px;" v-model="queryParams.industry" placeholder="客户行业" clearable
@change="getCustomerList">
<el-option v-for="item in dict.type.customer_industry" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
<el-select
style="width: 100px;"
v-model="queryParams.customerLevel"
placeholder="客户等级"
clearable
@change="getCustomerList"
>
<el-option
v-for="item in dict.type.customer_level"
:key="item.value"
:label="item.label"
:value="item.value"
/>
<el-select style="width: 100px;" v-model="queryParams.customerLevel" placeholder="客户等级" clearable
@change="getCustomerList">
<el-option v-for="item in dict.type.customer_level" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
<el-input style="width: 100px;" v-model="queryParams.contactPerson" placeholder="联系人" clearable
@change="getCustomerList" />
<el-input style="width: 180px;" v-model="queryParams.address" placeholder="客户地址" clearable
@change="getCustomerList" />
<el-input style="width: 180px;" v-model="queryParams.companyName" placeholder="客户公司" clearable
@change="getCustomerList" />
<el-input style="width: 180px;" v-model="queryParams.taxNumber" placeholder="税号" clearable
@change="getCustomerList" />
</div>
<!-- 客户列表 -->
<div>
<KLPList
:listData="customerList"
listKey="customerId"
:loading="customerLoading"
field1="customerCode"
field2="companyName"
field4="contactPerson"
field5="contactWay"
@item-click="handleItemClick"
>
<KLPList :listData="customerList" listKey="customerId" :loading="customerLoading" field1="customerCode"
field2="companyName" field4="contactPerson" field5="contactWay" @item-click="handleItemClick">
<template slot="actions" slot-scope="{ item }">
<el-button type="danger" size="mini" @click="handleDelete(item)" icon="el-icon-delete"></el-button>
</template>
</KLPList>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getCustomerList" />
</el-col>
<!-- 右侧内容区域 -->
@@ -72,28 +52,17 @@
<el-tabs v-model="activeTab" type="border-card" v-if="currentCustomer && currentCustomer.customerId">
<!-- 客户详情标签页 -->
<el-tab-pane label="客户详情" name="detail">
<CustomerDetail
:customer="currentCustomer"
:dict="dict"
/>
<CustomerDetail :customer="currentCustomer" :dict="dict" />
</el-tab-pane>
<!-- 客户编辑标签页 -->
<el-tab-pane label="信息编辑" name="edit">
<CustomerEdit
:customer="currentCustomer"
:dict="dict"
:update-loading="updateLoading"
@detail-change="handleDetailChange"
@save-change="handleSaveChange"
/>
<CustomerEdit :customer="currentCustomer" :dict="dict" :update-loading="updateLoading"
@detail-change="handleDetailChange" @save-change="handleSaveChange" />
</el-tab-pane>
<!-- 历史订单标签页 -->
<el-tab-pane label="历史订单" name="transaction">
<div>
<CustomerOrder
:customer="currentCustomer"
:dict="dict"
/>
<CustomerOrder :customer="currentCustomer" :dict="dict" />
</div>
</el-tab-pane>
</el-tabs>
@@ -116,40 +85,30 @@
<el-form-item label="联系方式" prop="contactWay">
<el-input v-model="form.contactWay" placeholder="请输入联系方式" />
</el-form-item>
<el-form-item label="税号" prop="taxNumber">
<el-input v-model="form.taxNumber" placeholder="请输入税号" />
</el-form-item>
<el-form-item label="所属行业" prop="industry">
<el-select v-model="form.industry" placeholder="请选择所属行业" clearable>
<el-option
v-for="item in dict.type.customer_industry"
:key="item.value"
:label="item.label"
:value="item.value"
/>
<el-option v-for="item in dict.type.customer_industry" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="客户等级" prop="customerLevel">
<el-select v-model="form.customerLevel" placeholder="请选择客户等级" clearable>
<el-option
v-for="item in dict.type.customer_level"
:key="item.value"
:label="item.label"
:value="item.value"
/>
<el-option v-for="item in dict.type.customer_level" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="客户地址" prop="address">
<ChinaAreaSelect
v-model="form.address"
placeholder="请选择客户地址"
/>
<ChinaAreaSelect v-model="form.address" placeholder="请选择客户地址" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="银行信息" prop="transactionRecords">
<JSONTableInput
v-model="form.bankInfo"
:columns="[{ prop: 'bankName', label: '银行名称' }, { prop: 'bankAccount', label: '银行账号' }]"
/>
<JSONTableInput v-model="form.bankInfo"
:columns="[{ prop: 'bankName', label: '银行名称' }, { prop: 'bankAccount', label: '银行账号' }]" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -190,7 +149,7 @@ export default {
customerLevel: '',
customerCode: '',
pageNum: 1,
pageSize: 1000
pageSize: 10
},
total: 0,
activeTab: 'detail',

64
klp-ui/src/views/crm/order/index.vue
View File

@@ -15,18 +15,13 @@
style="display: flex; align-items: center; gap: 5px; margin-top: 10px; flex-wrap: wrap;">
<!-- 查询区，通过上方的查询按钮控制显示隐藏 -->
<!-- 客户行业和客户等级的下拉选 -->
<!-- <el-select style="width: 100px;" v-model="queryParams.customerId" placeholder="客户" clearable>
<el-option v-for="item in dict.type.customer_industry" :key="item.value" :label="item.label"
<el-select style="width: 100px;" v-model="queryParams.salesman" placeholder="销售员" clearable>
<el-option v-for="item in dict.type.wip_pack_saleman" :key="item.value" :label="item.label"
:value="item.value" />
</el-select> -->
<el-input style="width: 100px;" v-model="queryParams.salesman" placeholder="销售员" clearable />
</el-select>
<el-select style="width: 100px;" v-model="queryParams.orderStatus" placeholder="订单状态" clearable>
<el-option v-for="(value, key) in ORDER_STATUS" :key="value" :label="key" :value="value" />
</el-select>
<!-- <el-select style="width: 100px;" v-model="queryParams.financeStatus" placeholder="财务状态" clearable>
<el-option v-for="item in dict.type.finance_status" :key="item.value" :label="item.label"
:value="item.value" />
</el-select> -->
</div>
<div>
<!-- 列表区域 -->
@@ -38,6 +33,9 @@
</template>
</KLPList>
</div>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getOrderList" />
</el-col>
<el-col :span="19">
@@ -55,6 +53,9 @@
<el-descriptions-item label="联系人">{{ form.contactPerson }}</el-descriptions-item>
<el-descriptions-item label="联系电话">{{ form.contactWay }}</el-descriptions-item>
<el-descriptions-item label="备注" :span="2">{{ form.remark }}</el-descriptions-item>
<el-descriptions-item label="附件" :span="2">
<file-list :ossIds="form.annexFiles" />
</el-descriptions-item>
</el-descriptions>
<el-descriptions :border="true" title="订单明细" />
@@ -111,16 +112,28 @@
<el-input v-model="form.orderAmount" placeholder="请输入订单总金额" />
</el-form-item>
<el-form-item label="销售员" prop="salesman">
<el-input v-model="form.salesman" placeholder="请输入销售员" />
<el-select v-model="form.salesman" placeholder="请选择销售员">
<el-option v-for="item in dict.type.wip_pack_saleman" :key="item.value" :label="item.label"
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="合同号" prop="contractCode">
<el-input v-model="form.contractCode" placeholder="请输入合同号" />
<el-form-item label="合同号" prop="contractId">
<el-select v-model="form.contractId" placeholder="请选择合同号" filterable clearable @change="handleContractChange">
<el-option v-for="item in contractList" :key="item.contractId" :label="item.contractNo"
:value="item.contractId" />
</el-select>
</el-form-item>
<!-- <el-form-item label="合同号" prop="contractCode">
<el-input v-model="form.contractCode" placeholder="请输入合同号" disabled />
</el-form-item> -->
<el-form-item label="交货日期" prop="deliveryDate">
<el-date-picker clearable v-model="form.deliveryDate" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择交货日期">
</el-date-picker>
</el-form-item>
<el-form-item label="附件" prop="annexFiles">
<file-upload v-model="form.annexFiles" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
@@ -144,6 +157,8 @@ import OrderEdit from '../components/OrderEdit.vue';
import OrderObjection from '../components/OrderObjection.vue';
import ReceiveTable from '../components/ReceiveTable.vue';
import OrderRecord from '../components/OrderRecord.vue';
import FileList from '@/components/FileList';
import { listContract } from "@/api/crm/contract";
export default {
name: 'OrderPage',
@@ -153,9 +168,10 @@ export default {
OrderEdit,
OrderObjection,
ReceiveTable,
OrderRecord
OrderRecord,
FileList
},
dicts: ['customer_level', 'customer_industry'],
dicts: ['customer_level', 'customer_industry', 'wip_pack_saleman'],
data() {
return {
ORDER_STATUS,
@@ -167,8 +183,11 @@ export default {
salesman: '',
orderStatus: '',
orderType: ORDER_TYPE['正式订单'],
financeStatus: ''
financeStatus: '',
pageNum: 1,
pageSize: 10,
},
total: 0,
activeTab: 'detail',
currentOrder: {},
buttonLoading: false,
@@ -181,11 +200,13 @@ export default {
},
open: false,
customerList: [],
contractList: [],
}
},
created() {
this.getList()
this.getCustomerList()
this.getContractList()
},
methods: {
toggleQuery() {
@@ -197,6 +218,20 @@ export default {
this.customerList = response.rows;
});
},
/** 查询合同列表 */
getContractList() {
listContract({ pageNum: 1, pageSize: 1000 }).then(response => {
this.contractList = response.rows || [];
});
},
/** 合同号改变事件 */
handleContractChange(contractId) {
const contract = this.contractList.find(item => item.contractId === contractId)
if (contract) {
this.form.contractCode = contract.contractNo
}
},
/** 订单列表项点击事件 */
handleOrderClick(order) {
this.currentOrder = order;
@@ -211,6 +246,7 @@ export default {
this.orderLoading = true;
listOrder(this.queryParams).then(response => {
this.orderList = response.rows || [];
this.total = response.total;
this.orderLoading = false;
}).catch(error => {
console.error('获取正式订单主列表失败:', error)

1
klp-ui/src/views/wms/coil/abnormalCoil.vue
View File

@@ -68,6 +68,7 @@
<el-table-column label="开始位置" align="center" prop="startPosition" />
<el-table-column label="结束位置" align="center" prop="endPosition" />
<el-table-column label="缺陷长度" align="center" prop="length" />
<el-table-column label="产线" align="center" prop="productionLine" />
<el-table-column label="缺陷代码" align="center" prop="defectCode">
<template slot-scope="scope">
<dict-tag :options="dict.type.coil_abnormal_code" :value="scope.row.defectCode" />

6
klp-ui/src/views/wms/coil/panels/base.vue
View File

@@ -515,8 +515,6 @@ import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint';
import DragResizeBox from '@/components/DragResizeBox/index.vue';
import ProcessFlow from '../components/ProcessFlow.vue';
export default {
name: "MaterialCoil",
components: {
@@ -839,7 +837,9 @@ export default {
},
created() {
this.getList();
this.getUserList();
if (this.showExportTime) {
this.getUserList();
}
},
methods: {
// 处理行点击事件