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

feat(wms): 添加备注列并优化产品信息显示

Browse Source 
refactor(表单控件): 将输入框替换为下拉选择框优化用户体验
This commit is contained in:
砂糖
2026-01-10 09:57:44 +08:00
parent 50add1e8b5
commit d4e5f7fbc7
11 changed files with 198 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-ui/src/components/KLPService/Renderer/ProductInfo.vue
View File

@@ -36,7 +36,7 @@
<!-- 触发元素（原产品名称文本） --> <!-- 触发元素（原产品名称文本） -->
<span slot="reference" class="product-name"> <span slot="reference" class="product-name">
<slot name="default" :product="productFull"> <slot name="default" :product="productFull">
{{ productFull.productName || '未知' }}[{{ productFull.specification || '无规格' }}] - (材质：{{ productFull.material || '无材质' }}) {{ productFull.productName || '未知' }}[{{ productFull.specification || '无规格' }}]({{ productFull.material || '无材质' }})-{{ productFull.manufacturer || '无厂家' }}
</slot> </slot>
</span> </span>
</el-popover> </el-popover>

2
klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue
View File

@@ -23,7 +23,7 @@
<!-- 触发元素（原材料名称文本） --> <!-- 触发元素（原材料名称文本） -->
<span slot="reference" class="material-name"> <span slot="reference" class="material-name">
<slot name="default" :material="materialFull"> <slot name="default" :material="materialFull">
{{ materialFull.rawMaterialName || '未知' }}[{{ materialFull.specification || '无规格' }}] - (材质：{{ materialFull.material || '无材质' }}) {{ materialFull.rawMaterialName || '未知' }}[{{ materialFull.specification || '无规格' }}]({{ materialFull.material || '无材质' }})-{{ materialFull.manufacturer || '无厂家' }}
</slot> </slot>
</span> </span>
</el-popover> </el-popover>

38
klp-ui/src/views/wms/coil/do/packing.vue
View File

@@ -76,14 +76,27 @@
<el-row v-if="form.materialType === '成品'"> <el-row v-if="form.materialType === '成品'">
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus"> <el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus">
<el-input v-model="form.qualityStatus" placeholder="请输入质量状态" :disabled="readonly"> <el-select v-model="form.qualityStatus" placeholder="请选择质量状态" style="width: 100%"
</el-input> :disabled="readonly">
<el-option label="A+" value="A+" />
<el-option label="A" value="A" />
<el-option label="A-" value="A-" />
<el-option label="B+" value="B+" />
<el-option label="B" value="B" />
<el-option label="B-" value="B-" />
<el-option label="C+" value="C+" />
<el-option label="C" value="C" />
<el-option label="C-" value="C-" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement"> <el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
<el-input v-model="form.trimmingRequirement" placeholder="请输入切边要求" :disabled="readonly"> <el-select v-model="form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%"
</el-input> :disabled="readonly">
<el-option label="净边料" value="净边料" />
<el-option label="毛边料" value="毛边料" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -94,8 +107,12 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement"> <el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement">
<el-input v-model="form.packagingRequirement" placeholder="请输入包装要求" :disabled="readonly"> <el-select v-model="form.packagingRequirement" placeholder="请选择包装要求" style="width: 100%"
</el-input> :disabled="readonly">
<el-option label="裸包" value="裸包" />
<el-option label="普包" value="普包" />
<el-option label="简包" value="简包" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -123,25 +140,26 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="质量状态" prop="qualityStatus"> <el-form-item label="质量状态" prop="qualityStatus">
<memo-input v-model="form.qualityStatus" placeholder="请输入质量状态" storageKey="qualityStatus" > <memo-input v-model="form.qualityStatus" placeholder="请输入质量状态" storageKey="qualityStatus">
</memo-input> </memo-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="切边要求" prop="trimmingRequirement"> <el-form-item label="切边要求" prop="trimmingRequirement">
<memo-input v-model="form.trimmingRequirement" placeholder="请输入切边要求" storageKey="trimmingRequirement" > <memo-input v-model="form.trimmingRequirement" placeholder="请输入切边要求" storageKey="trimmingRequirement">
</memo-input> </memo-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="打包状态" prop="packingStatus"> <el-form-item label="打包状态" prop="packingStatus">
<memo-input v-model="form.packingStatus" placeholder="请输入打包状态" storageKey="packingStatus" > <memo-input v-model="form.packingStatus" placeholder="请输入打包状态" storageKey="packingStatus">
</memo-input> </memo-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="包装要求" prop="packagingRequirement"> <el-form-item label="包装要求" prop="packagingRequirement">
<memo-input v-model="form.packagingRequirement" placeholder="请输入包装要求" storageKey="packagingRequirement" > <memo-input v-model="form.packagingRequirement" placeholder="请输入包装要求"
storageKey="packagingRequirement">
</memo-input> </memo-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

207
klp-ui/src/views/wms/coil/do/search.vue
View File

@@ -1,8 +1,8 @@
<template> <template>
<div class="app-container acid-do-container"> <div class="app-container acid-do-container">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<div class="section-card"> <div class="section-card">
<!-- 入库 --> <!-- 入库 -->
<div class="section-header"> <div class="section-header">
<h3 class="section-title">查询钢卷</h3> <h3 class="section-title">查询钢卷</h3>
@@ -44,7 +44,7 @@
<el-input v-model="form.team" placeholder="请输入班组" /> <el-input v-model="form.team" placeholder="请输入班组" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="长度" prop="length"> <el-form-item label="长度" prop="length">
<el-input v-model="form.length" placeholder="请输入长度" /> <el-input v-model="form.length" placeholder="请输入长度" />
</el-form-item> </el-form-item>
@@ -73,14 +73,27 @@
<el-row v-if="form.materialType === '成品'"> <el-row v-if="form.materialType === '成品'">
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus"> <el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus">
<el-input v-model="form.qualityStatus" placeholder="请输入质量状态"> <el-select v-model="form.qualityStatus" placeholder="请选择质量状态" style="width: 100%"
</el-input> :disabled="readonly">
<el-option label="A+" value="A+" />
<el-option label="A" value="A" />
<el-option label="A-" value="A-" />
<el-option label="B+" value="B+" />
<el-option label="B" value="B" />
<el-option label="B-" value="B-" />
<el-option label="C+" value="C+" />
<el-option label="C" value="C" />
<el-option label="C-" value="C-" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement"> <el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
<el-input v-model="form.trimmingRequirement" placeholder="请输入切边要求"> <el-select v-model="form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%"
</el-input> :disabled="readonly">
<el-option label="净边料" value="净边料" />
<el-option label="毛边料" value="毛边料" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -91,8 +104,12 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement"> <el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement">
<el-input v-model="form.packagingRequirement" placeholder="请输入包装要求"> <el-select v-model="form.packagingRequirement" placeholder="请选择包装要求" style="width: 100%"
</el-input> :disabled="readonly">
<el-option label="裸包" value="裸包" />
<el-option label="普包" value="普包" />
<el-option label="简包" value="简包" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -136,25 +153,17 @@
<i class="el-icon-box"></i> <i class="el-icon-box"></i>
<p>未找到钢卷</p> <p>未找到钢卷</p>
</div> </div>
<div <div v-for="(item, index) in materialCoilList" :key="item.coilId || index" class="material-card">
v-for="(item, index) in materialCoilList"
:key="item.coilId || index"
class="material-card"
>
<div class="card-header"> <div class="card-header">
<div class="header-left"> <div class="header-left">
<el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag> <el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
<span class="material-type">{{ item.materialType || '原料' }}</span> <span class="material-type">{{ item.materialType || '原料' }}</span>
<el-popover <el-popover v-if="item.rawMaterial || item.product" placement="top" width="280" trigger="hover"
v-if="item.rawMaterial || item.product" popper-class="material-params-popover">
placement="top"
width="280"
trigger="hover"
popper-class="material-params-popover"
>
<div class="material-params-content"> <div class="material-params-content">
<div class="params-title"> <div class="params-title">
{{ item.itemType === 'raw_material' ? (item.rawMaterial && item.rawMaterial.rawMaterialName || '—') : (item.product && item.product.productName || '—') }} {{ item.itemType === 'raw_material' ? (item.rawMaterial && item.rawMaterial.rawMaterialName ||
'—') : (item.product && item.product.productName || '—') }}
</div> </div>
<div class="params-list"> <div class="params-list">
<div class="param-item" v-if="item.itemType === 'raw_material' && item.rawMaterial"> <div class="param-item" v-if="item.itemType === 'raw_material' && item.rawMaterial">
@@ -227,7 +236,7 @@
</el-popover> </el-popover>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="info-list"> <div class="info-list">
<div class="info-item"> <div class="info-item">
@@ -244,7 +253,8 @@
</div> </div>
<div class="info-item"> <div class="info-item">
<span class="info-label">库区：</span> <span class="info-label">库区：</span>
<span class="info-value" :title="item.actualWarehouseName">{{ item.actualWarehouseName || '—' }}</span> <span class="info-value" :title="item.actualWarehouseName">{{ item.actualWarehouseName || '—'
}}</span>
</div> </div>
<div class="info-item"> <div class="info-item">
<span class="info-label">重量：</span> <span class="info-label">重量：</span>
@@ -252,28 +262,17 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card-footer"> <div class="card-footer">
<el-button <el-button type="primary" icon="el-icon-check" size="mini" @click="handlePickMaterial(item)"
type="primary" :loading="item.picking" class="action-btn">领料</el-button>
icon="el-icon-check"
size="mini"
@click="handlePickMaterial(item)"
:loading="item.picking"
class="action-btn"
>领料</el-button>
</div> </div>
</div> </div>
</div> </div>
<!-- 分页 --> <!-- 分页 -->
<pagination <pagination v-show="materialTotal > 0" :total="materialTotal" :page.sync="materialQueryParams.pageNum"
v-show="materialTotal > 0" :limit.sync="materialQueryParams.pageSize" @pagination="getMaterialCoil" />
:total="materialTotal"
:page.sync="materialQueryParams.pageNum"
:limit.sync="materialQueryParams.pageSize"
@pagination="getMaterialCoil"
/>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@@ -316,7 +315,7 @@ export default {
enterCoilNo: null, enterCoilNo: null,
currentCoilNo: null currentCoilNo: null
}, },
// 表单参数 // 表单参数
form: { form: {
materialType: null, materialType: null,
enterCoilNo: null, enterCoilNo: null,
@@ -332,7 +331,7 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}, },
// 待操作列表相关 // 待操作列表相关
actionLoading: false, actionLoading: false,
pendingActionList: [], pendingActionList: [],
@@ -356,7 +355,7 @@ export default {
}) })
return acidAction ? parseInt(acidAction.value) : null return acidAction ? parseInt(acidAction.value) : null
}, },
// 动态显示标签 // 动态显示标签
getItemLabel() { getItemLabel() {
if (this.form.materialType === '成品') { if (this.form.materialType === '成品') {
return '产品类型'; return '产品类型';
@@ -381,7 +380,7 @@ export default {
created() { created() {
// 立即加载物料列表（不依赖字典） // 立即加载物料列表（不依赖字典）
// this.getMaterialCoil() // this.getMaterialCoil()
// 尝试加载待操作列表（如果字典已加载） // 尝试加载待操作列表（如果字典已加载）
// this.$nextTick(() => { // this.$nextTick(() => {
// if (this.acidRollingActionType) { // if (this.acidRollingActionType) {
@@ -406,14 +405,14 @@ export default {
this.getMaterialCoil() this.getMaterialCoil()
}, },
// 取消操作 // 取消操作
cancel() { cancel() {
this.form = {}; this.form = {};
this.$refs.form.resetFields(); this.$refs.form.resetFields();
this.buttonLoading = false; this.buttonLoading = false;
}, },
// 处理材料类型变化 // 处理材料类型变化
handleMaterialTypeChange(value) { handleMaterialTypeChange(value) {
// 清空物品选择 // 清空物品选择
this.form.itemId = null; this.form.itemId = null;
@@ -424,7 +423,7 @@ export default {
this.form.itemType = 'raw_material'; this.form.itemType = 'raw_material';
} }
}, },
// ========== 物料列表相关方法 ========== // ========== 物料列表相关方法 ==========
/** 查询物料列表 */ /** 查询物料列表 */
getMaterialCoil() { getMaterialCoil() {
@@ -455,9 +454,9 @@ export default {
this.$message.error('未找到酸连轧工序操作类型，请检查字典配置') this.$message.error('未找到酸连轧工序操作类型，请检查字典配置')
return return
} }
this.$set(row, 'picking', true) this.$set(row, 'picking', true)
const pendingData = { const pendingData = {
coilId: row.coilId, coilId: row.coilId,
currentCoilNo: row.currentCoilNo, currentCoilNo: row.currentCoilNo,
@@ -468,7 +467,7 @@ export default {
priority: 0, // 默认普通优先级 priority: 0, // 默认普通优先级
remark: `PC端领料创建-酸连轧工序` remark: `PC端领料创建-酸连轧工序`
} }
addPendingAction(pendingData).then(response => { addPendingAction(pendingData).then(response => {
if (response.code === 200) { if (response.code === 200) {
this.$message.success('领料成功，已创建待操作任务') this.$message.success('领料成功，已创建待操作任务')
@@ -483,7 +482,7 @@ export default {
this.$set(row, 'picking', false) this.$set(row, 'picking', false)
}) })
}, },
// ========== 待操作列表相关方法 ========== // ========== 待操作列表相关方法 ==========
/** 查询待操作列表 */ /** 查询待操作列表 */
getPendingAction() { getPendingAction() {
@@ -495,7 +494,7 @@ export default {
this.actionLoading = false this.actionLoading = false
return return
} }
this.actionLoading = true this.actionLoading = true
// 强制使用酸连轧工序的 actionType，忽略查询参数中的 actionType // 强制使用酸连轧工序的 actionType，忽略查询参数中的 actionType
const queryParams = { const queryParams = {
@@ -533,20 +532,20 @@ export default {
/** 处理操作 - 跳转到对应页面 */ /** 处理操作 - 跳转到对应页面 */
handleProcess(row) { handleProcess(row) {
const actionType = parseInt(row.actionType) const actionType = parseInt(row.actionType)
// 特殊处理：发货和移库操作不需要跳转 // 特殊处理：发货和移库操作不需要跳转
if (actionType >= 400) { if (actionType >= 400) {
this.$message.info('特殊操作序在对应页面完成') this.$message.info('特殊操作序在对应页面完成')
return return
} }
// 根据操作类型跳转到不同页面 // 根据操作类型跳转到不同页面
let path = '' let path = ''
// 分条操作：100-199 // 分条操作：100-199
if (actionType >= 100 && actionType <= 199) { if (actionType >= 100 && actionType <= 199) {
path = '/wms/split' path = '/wms/split'
} }
// 合卷操作：200-299 // 合卷操作：200-299
else if (actionType == 200) { else if (actionType == 200) {
path = '/wms/merge' path = '/wms/merge'
@@ -555,19 +554,19 @@ export default {
else { else {
path = '/wms/typing' path = '/wms/typing'
} }
if (!path) { if (!path) {
this.$message.error('未知的操作类型: ' + row.actionType) this.$message.error('未知的操作类型: ' + row.actionType)
return return
} }
// 更新状态为处理中 // 更新状态为处理中
startProcess(row.actionId).then(response => { startProcess(row.actionId).then(response => {
if (response.code !== 200) { if (response.code !== 200) {
this.$message.error(response.msg || '更新状态失败') this.$message.error(response.msg || '更新状态失败')
return return
} }
// 跳转并传递参数 // 跳转并传递参数
this.$router.push({ this.$router.push({
path: path, path: path,
@@ -592,7 +591,7 @@ export default {
}).then(() => { }).then(() => {
this.$message.success('操作已取消') this.$message.success('操作已取消')
this.getPendingAction() this.getPendingAction()
}).catch(() => {}) }).catch(() => { })
}, },
/** 删除待操作 */ /** 删除待操作 */
handleDeleteAction(row) { handleDeleteAction(row) {
@@ -606,7 +605,7 @@ export default {
}).then(() => { }).then(() => {
this.getPendingAction() this.getPendingAction()
this.$message.success('删除成功') this.$message.success('删除成功')
}).catch(() => {}) }).catch(() => { })
}, },
/** 获取物品名称 */ /** 获取物品名称 */
getItemName(item) { getItemName(item) {
@@ -656,6 +655,7 @@ export default {
.section-header { .section-header {
border-bottom-color: #409eff; border-bottom-color: #409eff;
} }
.section-title { .section-title {
color: #409eff; color: #409eff;
} }
@@ -665,6 +665,7 @@ export default {
.section-header { .section-header {
border-bottom-color: #67c23a; border-bottom-color: #67c23a;
} }
.section-title { .section-title {
color: #67c23a; color: #67c23a;
} }
@@ -686,25 +687,25 @@ export default {
max-height: calc(100vh - 320px); max-height: calc(100vh - 320px);
overflow-y: auto; overflow-y: auto;
padding-right: 4px; padding-right: 4px;
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 6px; width: 6px;
} }
&::-webkit-scrollbar-track { &::-webkit-scrollbar-track {
background: #f1f1f1; background: #f1f1f1;
border-radius: 3px; border-radius: 3px;
} }
&::-webkit-scrollbar-thumb { &::-webkit-scrollbar-thumb {
background: #c1c1c1; background: #c1c1c1;
border-radius: 3px; border-radius: 3px;
&:hover { &:hover {
background: #a8a8a8; background: #a8a8a8;
} }
} }
@media (min-width: 1600px) { @media (min-width: 1600px) {
grid-template-columns: repeat(4, 1fr); grid-template-columns: repeat(4, 1fr);
} }
@@ -715,14 +716,14 @@ export default {
text-align: center; text-align: center;
padding: 60px 20px; padding: 60px 20px;
color: #909399; color: #909399;
i { i {
font-size: 48px; font-size: 48px;
margin-bottom: 16px; margin-bottom: 16px;
display: block; display: block;
color: #c0c4cc; color: #c0c4cc;
} }
p { p {
margin: 0; margin: 0;
font-size: 14px; font-size: 14px;
@@ -738,51 +739,51 @@ export default {
flex-direction: column; flex-direction: column;
transition: all 0.3s ease; transition: all 0.3s ease;
height: 100%; height: 100%;
&:hover { &:hover {
border-color: #409eff; border-color: #409eff;
box-shadow: 0 2px 6px rgba(64, 158, 255, 0.12); box-shadow: 0 2px 6px rgba(64, 158, 255, 0.12);
} }
.card-header { .card-header {
padding: 6px 8px; padding: 6px 8px;
border-bottom: 1px solid #e4e7ed; border-bottom: 1px solid #e4e7ed;
background-color: #fafafa; background-color: #fafafa;
.header-left { .header-left {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 6px; gap: 6px;
} }
.coil-no-tag { .coil-no-tag {
font-weight: 600; font-weight: 600;
font-size: 11px; font-size: 11px;
padding: 2px 6px; padding: 2px 6px;
} }
.material-type { .material-type {
font-size: 11px; font-size: 11px;
color: #606266; color: #606266;
font-weight: 500; font-weight: 500;
} }
.param-icon { .param-icon {
font-size: 13px; font-size: 13px;
color: #909399; color: #909399;
cursor: pointer; cursor: pointer;
transition: color 0.3s; transition: color 0.3s;
&:hover { &:hover {
color: #409eff; color: #409eff;
} }
} }
} }
.card-body { .card-body {
padding: 8px; padding: 8px;
flex: 1; flex: 1;
.info-list { .info-list {
.info-item { .info-item {
display: flex; display: flex;
@@ -790,11 +791,11 @@ export default {
margin-bottom: 4px; margin-bottom: 4px;
font-size: 11px; font-size: 11px;
line-height: 1.4; line-height: 1.4;
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.info-label { .info-label {
color: #909399; color: #909399;
white-space: nowrap; white-space: nowrap;
@@ -802,7 +803,7 @@ export default {
min-width: 40px; min-width: 40px;
font-size: 11px; font-size: 11px;
} }
.info-value { .info-value {
color: #303133; color: #303133;
flex: 1; flex: 1;
@@ -814,14 +815,14 @@ export default {
} }
} }
} }
.card-footer { .card-footer {
padding: 6px 8px; padding: 6px 8px;
border-top: 1px solid #e4e7ed; border-top: 1px solid #e4e7ed;
background-color: #fafafa; background-color: #fafafa;
display: flex; display: flex;
justify-content: center; justify-content: center;
.action-btn { .action-btn {
width: 100%; width: 100%;
padding: 5px 10px; padding: 5px 10px;
@@ -839,32 +840,32 @@ export default {
flex-direction: column; flex-direction: column;
transition: all 0.3s ease; transition: all 0.3s ease;
height: 100%; height: 100%;
&:hover { &:hover {
border-color: #67c23a; border-color: #67c23a;
box-shadow: 0 2px 8px rgba(103, 194, 58, 0.15); box-shadow: 0 2px 8px rgba(103, 194, 58, 0.15);
} }
&.urgent-card { &.urgent-card {
border-left: 4px solid #f56c6c; border-left: 4px solid #f56c6c;
background-color: #fef0f0; background-color: #fef0f0;
&:hover { &:hover {
border-color: #f56c6c; border-color: #f56c6c;
box-shadow: 0 2px 8px rgba(245, 108, 108, 0.2); box-shadow: 0 2px 8px rgba(245, 108, 108, 0.2);
} }
} }
&.important-card { &.important-card {
border-left: 4px solid #e6a23c; border-left: 4px solid #e6a23c;
background-color: #fdf6ec; background-color: #fdf6ec;
&:hover { &:hover {
border-color: #e6a23c; border-color: #e6a23c;
box-shadow: 0 2px 8px rgba(230, 162, 60, 0.2); box-shadow: 0 2px 8px rgba(230, 162, 60, 0.2);
} }
} }
.card-header { .card-header {
padding: 10px 12px; padding: 10px 12px;
border-bottom: 1px solid #e4e7ed; border-bottom: 1px solid #e4e7ed;
@@ -872,41 +873,41 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.coil-no-tag { .coil-no-tag {
font-weight: 600; font-weight: 600;
font-size: 12px; font-size: 12px;
} }
.status-tags { .status-tags {
display: flex; display: flex;
gap: 4px; gap: 4px;
flex-wrap: wrap; flex-wrap: wrap;
} }
} }
.card-body { .card-body {
padding: 12px; padding: 12px;
flex: 1; flex: 1;
.info-list { .info-list {
.info-item { .info-item {
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 8px; margin-bottom: 8px;
font-size: 12px; font-size: 12px;
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.info-label { .info-label {
color: #909399; color: #909399;
white-space: nowrap; white-space: nowrap;
margin-right: 6px; margin-right: 6px;
min-width: 50px; min-width: 50px;
} }
.info-value { .info-value {
color: #303133; color: #303133;
flex: 1; flex: 1;
@@ -914,14 +915,14 @@ export default {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.action-type-tag { .action-type-tag {
font-size: 11px; font-size: 11px;
} }
} }
} }
} }
.card-footer { .card-footer {
padding: 10px 12px; padding: 10px 12px;
border-top: 1px solid #e4e7ed; border-top: 1px solid #e4e7ed;
@@ -929,7 +930,7 @@ export default {
display: flex; display: flex;
justify-content: center; justify-content: center;
gap: 6px; gap: 6px;
.action-btn { .action-btn {
flex: 1; flex: 1;
font-size: 12px; font-size: 12px;
@@ -958,7 +959,7 @@ export default {
padding-bottom: 8px; padding-bottom: 8px;
border-bottom: 1px solid #e4e7ed; border-bottom: 1px solid #e4e7ed;
} }
.params-list { .params-list {
.param-item { .param-item {
.param-row { .param-row {
@@ -966,17 +967,17 @@ export default {
margin-bottom: 6px; margin-bottom: 6px;
font-size: 12px; font-size: 12px;
line-height: 1.5; line-height: 1.5;
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.param-label { .param-label {
color: #909399; color: #909399;
min-width: 70px; min-width: 70px;
margin-right: 8px; margin-right: 8px;
} }
.param-value { .param-value {
color: #303133; color: #303133;
flex: 1; flex: 1;
@@ -984,7 +985,7 @@ export default {
} }
} }
} }
.param-divider { .param-divider {
height: 1px; height: 1px;
background-color: #e4e7ed; background-color: #e4e7ed;

33
klp-ui/src/views/wms/coil/do/warehousing.vue
View File

@@ -80,14 +80,27 @@
<el-row v-if="form.materialType === '成品'"> <el-row v-if="form.materialType === '成品'">
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus"> <el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus">
<el-input v-model="form.qualityStatus" placeholder="请输入质量状态"> <el-select v-model="form.qualityStatus" placeholder="请选择质量状态" style="width: 100%"
</el-input> :disabled="readonly">
<el-option label="A+" value="A+" />
<el-option label="A" value="A" />
<el-option label="A-" value="A-" />
<el-option label="B+" value="B+" />
<el-option label="B" value="B" />
<el-option label="B-" value="B-" />
<el-option label="C+" value="C+" />
<el-option label="C" value="C" />
<el-option label="C-" value="C-" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement"> <el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
<el-input v-model="form.trimmingRequirement" placeholder="请输入切边要求"> <el-select v-model="form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%"
</el-input> :disabled="readonly">
<el-option label="净边料" value="净边料" />
<el-option label="毛边料" value="毛边料" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -98,8 +111,12 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement"> <el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement">
<el-input v-model="form.packagingRequirement" placeholder="请输入包装要求"> <el-select v-model="form.packagingRequirement" placeholder="请选择包装要求" style="width: 100%"
</el-input> :disabled="readonly">
<el-option label="裸包" value="裸包" />
<el-option label="普包" value="普包" />
<el-option label="简包" value="简包" />
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -484,8 +501,8 @@ export default {
itemName: itemName, itemName: itemName,
updateTime: row.updateTime?.split(' ')[0] || '', updateTime: row.updateTime?.split(' ')[0] || '',
}; };
}) })
}, },
handleDelete(row) { handleDelete(row) {
this.$modal.confirm("确认删除吗？", "删除确认", { this.$modal.confirm("确认删除吗？", "删除确认", {

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

@@ -35,8 +35,8 @@
</el-form-item> </el-form-item>
<el-form-item label="厂家" prop="itemManufacturer"> <el-form-item label="厂家" prop="itemManufacturer">
<muti-select v-model="queryParams.itemManufacturer" :options="dict.type.coil_manufacturer" placeholder="请选择厂家" clearable <muti-select v-model="queryParams.itemManufacturer" :options="dict.type.coil_manufacturer" placeholder="请选择厂家"
@keyup.enter.native="handleQuery" /> clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<MaterialSelect :hideType="hideType" :itemId.sync="queryParams.itemIds" :itemType.sync="queryParams.itemType" <MaterialSelect :hideType="hideType" :itemId.sync="queryParams.itemIds" :itemType.sync="queryParams.itemType"
@@ -64,7 +64,8 @@
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportAll">导出</el-button> <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExportAll">导出</el-button>
</el-col> </el-col>
<el-col :span="2"> <el-col :span="2">
<el-button type="info" plain icon="el-icon-printer" size="mini" :disabled="multiple" @click="handleBatchPrintLabel">批量打印标签</el-button> <el-button type="info" plain icon="el-icon-printer" size="mini" :disabled="multiple"
@click="handleBatchPrintLabel">批量打印标签</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@@ -120,8 +121,7 @@
<el-table-column v-if="showGrade" label="质量状态" align="center" prop="qualityStatus"> <el-table-column v-if="showGrade" label="质量状态" align="center" prop="qualityStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.qualityStatus" placeholder="请选择质量状态" @change="handleGradeChange(scope.row)"> <el-select v-model="scope.row.qualityStatus" placeholder="请选择质量状态" @change="handleGradeChange(scope.row)">
<el-option v-for="item in qualityStatusEnum" :key="item.value" :value="item.value" <el-option v-for="item in qualityStatusEnum" :key="item.value" :value="item.value" :label="item.label" />
:label="item.label" />
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
@@ -186,13 +186,24 @@
<div v-else>请先选择材料类型</div> <div v-else>请先选择材料类型</div>
</el-form-item> </el-form-item>
<el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus"> <el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus">
<el-input v-model="form.qualityStatus" placeholder="请输入质量状态" :disabled="readonly"> <el-select v-model="form.qualityStatus" placeholder="请选择质量状态" style="width: 100%" :disabled="readonly">
</el-input> <el-option label="A+" value="A+" />
<el-option label="A" value="A" />
<el-option label="A-" value="A-" />
<el-option label="B+" value="B+" />
<el-option label="B" value="B" />
<el-option label="B-" value="B-" />
<el-option label="C+" value="C+" />
<el-option label="C" value="C" />
<el-option label="C-" value="C-" />
</el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement"> <el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
<el-input v-model="form.trimmingRequirement" placeholder="请输入切边要求" :disabled="readonly"> <el-select v-model="form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%" :disabled="readonly">
</el-input> <el-option label="净边料" value="净边料" />
<el-option label="毛边料" value="毛边料" />
</el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.materialType === '成品'" label="打包状态" prop="packingStatus"> <el-form-item v-if="form.materialType === '成品'" label="打包状态" prop="packingStatus">
@@ -201,8 +212,11 @@
</el-form-item> </el-form-item>
<el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement"> <el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement">
<el-input v-model="form.packagingRequirement" placeholder="请输入包装要求" :disabled="readonly"> <el-select v-model="form.packagingRequirement" placeholder="请选择包装要求" style="width: 100%" :disabled="readonly">
</el-input> <el-option label="裸包" value="裸包" />
<el-option label="普包" value="普包" />
<el-option label="简包" value="简包" />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="毛重" prop="grossWeight"> <el-form-item label="毛重" prop="grossWeight">
<el-input v-model="form.grossWeight" placeholder="请输入毛重" /> <el-input v-model="form.grossWeight" placeholder="请输入毛重" />
@@ -240,7 +254,8 @@
</div> </div>
<div style="text-align:right;"> <div style="text-align:right;">
<el-button size="mini" @click="batchPrint.visible = false">取消</el-button> <el-button size="mini" @click="batchPrint.visible = false">取消</el-button>
<el-button type="primary" size="mini" :loading="batchPrint.loading" @click="handleBatchExportLabelPdf">生成PDF并打开</el-button> <el-button type="primary" size="mini" :loading="batchPrint.loading"
@click="handleBatchExportLabelPdf">生成PDF并打开</el-button>
</div> </div>
<!-- 渲染容器：屏幕隐藏，仅用于截图生成PDF --> <!-- 渲染容器：屏幕隐藏，仅用于截图生成PDF -->
@@ -453,7 +468,7 @@ export default {
{ label: '打包状态', prop: 'packingStatus' }, { label: '打包状态', prop: 'packingStatus' },
{ label: '切边要求', prop: 'edgeRequirement' }, { label: '切边要求', prop: 'edgeRequirement' },
{ label: '包装要求', prop: 'packagingRequirement' }, { label: '包装要求', prop: 'packagingRequirement' },
{ label: '厂家', prop: 'itemManufacturer' }, { label: '厂家', prop: 'itemManufacturer' },
], ],
title: '详细信息' title: '详细信息'
} }

11
klp-ui/src/views/wms/product/index.vue
View File

@@ -321,11 +321,7 @@ export default {
this.buttonLoading = true; this.buttonLoading = true;
if (this.form.productId != null) { if (this.form.productId != null) {
updateProduct({ updateProduct(this.form).then(response => {
...this.form,
productCode: this.form.material + this.form.zincLayer + new Date().getTime(),
}).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@@ -334,7 +330,10 @@ export default {
this.buttonLoading = false; this.buttonLoading = false;
}); });
} else { } else {
addProductWithBom(this.form).then(response => { addProductWithBom({
...this.form,
productCode: this.form.material + this.form.zincLayer + new Date().getTime(),
}).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();

2
klp-ui/src/views/wms/receive/detail/index.vue
View File

@@ -91,6 +91,8 @@
@click="handleReject(scope.row)" v-loading="buttonLoading">拒签</el-button> @click="handleReject(scope.row)" v-loading="buttonLoading">拒签</el-button>
<el-button v-if="scope.row.actionStatus == 3" type="warning" v-loading="buttonLoading" <el-button v-if="scope.row.actionStatus == 3" type="warning" v-loading="buttonLoading"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
<!-- <el-button type="warning" v-loading="buttonLoading"
@click="handleDelete(scope.row)">删除</el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

1
klp-ui/src/views/wms/report/delivery.vue
View File

@@ -74,6 +74,7 @@
</el-table-column> </el-table-column>
<el-table-column label="重量 (吨)" align="center" prop="netWeight" /> <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
<el-table-column label="长度 (米)" align="center" prop="length" /> <el-table-column label="长度 (米)" align="center" prop="length" />
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
<el-table-column label="发货时间" align="center" prop="exportTime" /> <el-table-column label="发货时间" align="center" prop="exportTime" />
<el-table-column label="出库状态" align="center" prop="status"> <el-table-column label="出库状态" align="center" prop="status">
<!-- 0在库，1已出库 --> <!-- 0在库，1已出库 -->

1
klp-ui/src/views/wms/report/receive.vue
View File

@@ -74,6 +74,7 @@
</el-table-column> </el-table-column>
<el-table-column label="重量 (吨)" align="center" prop="netWeight" /> <el-table-column label="重量 (吨)" align="center" prop="netWeight" />
<el-table-column label="长度 (米)" align="center" prop="length" /> <el-table-column label="长度 (米)" align="center" prop="length" />
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
<el-table-column label="出库状态" align="center" prop="status"> <el-table-column label="出库状态" align="center" prop="status">
<!-- 0在库，1已出库 --> <!-- 0在库，1已出库 -->
<template slot-scope="scope"> <template slot-scope="scope">

2
klp-ui/src/views/wms/report/zha.vue
View File

@@ -73,6 +73,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="长度 (米)" align="center" prop="length" /> <el-table-column label="长度 (米)" align="center" prop="length" />
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
<el-table-column label="出库状态" align="center" prop="status"> <el-table-column label="出库状态" align="center" prop="status">
<!-- 0在库，1已出库 --> <!-- 0在库，1已出库 -->
<template slot-scope="scope"> <template slot-scope="scope">