From afd41650075e5f67a1f74194b96e347ba1acfa70 Mon Sep 17 00:00:00 2001 From: jhd <1684074631@qq.com> Date: Mon, 29 Jun 2026 16:48:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E8=AF=B7=E8=B4=AD=E5=8D=95?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ErpPurchaseRequisitionServiceImpl.java | 5 + .../views/erp/purchaseRequisition/index.vue | 775 +++++++++++------- 2 files changed, 490 insertions(+), 290 deletions(-) diff --git a/klp-erp/src/main/java/com/klp/erp/service/impl/ErpPurchaseRequisitionServiceImpl.java b/klp-erp/src/main/java/com/klp/erp/service/impl/ErpPurchaseRequisitionServiceImpl.java index e13ee85ff..c6a0ee473 100644 --- a/klp-erp/src/main/java/com/klp/erp/service/impl/ErpPurchaseRequisitionServiceImpl.java +++ b/klp-erp/src/main/java/com/klp/erp/service/impl/ErpPurchaseRequisitionServiceImpl.java @@ -103,11 +103,16 @@ public class ErpPurchaseRequisitionServiceImpl implements IErpPurchaseRequisitio if (items == null || items.isEmpty()) { return; } + int seq = 1; for (ErpPurchaseRequisitionItemBo itemBo : items) { ErpPurchaseRequisitionItem item = BeanUtil.toBean(itemBo, ErpPurchaseRequisitionItem.class); item.setItemId(null); item.setReqId(reqId); + if (StringUtils.isBlank(item.getSeq())) { + item.setSeq(String.valueOf(seq)); + } itemMapper.insert(item); + seq++; } } diff --git a/klp-ui/src/views/erp/purchaseRequisition/index.vue b/klp-ui/src/views/erp/purchaseRequisition/index.vue index 3fafa54fc..4d94fce08 100644 --- a/klp-ui/src/views/erp/purchaseRequisition/index.vue +++ b/klp-ui/src/views/erp/purchaseRequisition/index.vue @@ -41,7 +41,7 @@ - + @@ -70,197 +70,167 @@ - - - -
请购信息
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +
+ +
+
请购部门
+
品　名
+
规　格
+
单位
+
请购量
+
+ +
+
+
+
+
+
+
+ +
+
用途类别
+
+ + 原料物料 + 设备增添 + 工程劳务 + 其它用途 + +
+
需求日期
+
+
+ +
+
用途说明
+
+
使用部门
+
+
+
-
采购处理
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ +
请购明细 加行 - 共 {{ form.items.length }} 项 + 共 {{ form.items.length }} 项
- + - + - + - - + + - + - + - + -
审批签名
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
+ +
+
品检条件
+
+ + 1.一般规格/目视检验 + 2.品保检验品 + 3.工程、劳务/特殊规格品 + 4.试用 + + + 试用 天后验收 + +
+
前期采购记录
+
+
+ +
+
采购拟办
+
+
付款条件
+
+
+ +
+
采购金额(人民币)
+
+
+
+ + +
审批签名
+
+
+
采购单位
+
请购单位
+
+
+
董事长
+
部长/厂长
+
主任
+
经办
+
生产总经理
+
厂长
+
主任
+
经办
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
※物品进厂
指定卸货位
+
+
置于
+
+
+
+ +
+
+
状态
+
+ - - + + - - - - - - +
+
备　注
+
+
+
取 消 @@ -269,83 +239,123 @@ - +
-
请购信息
- - {{ viewForm.reqDept || '—' }} - {{ viewForm.itemName || '—' }} - {{ viewForm.specification || '—' }} - - - {{ viewForm.unit || '—' }} - {{ viewForm.quantity || '—' }} - {{ viewForm.category || '—' }} - - - {{ viewForm.requiredDate || '—' }} - {{ viewForm.useDept || '—' }} - - - {{ viewForm.purposeDesc || '—' }} - +
+ +
+
请购部门
+
品　名
+
规　格
+
单位
+
请购量
+
+ +
+
{{ viewForm.reqDept || '—' }}
+
{{ viewForm.itemName || '—' }}
+
{{ viewForm.specification || '—' }}
+
{{ viewForm.unit || '—' }}
+
{{ viewForm.quantity || '—' }}
+
+ +
+
用途类别
+
{{ viewForm.category || '—' }}
+
需求日期
+
{{ viewForm.requiredDate || '—' }}
+
+ +
+
用途说明
+
{{ viewForm.purposeDesc || '—' }}
+
使用部门
+
{{ viewForm.useDept || '—' }}
+
+
-
采购处理
- - {{ viewForm.inspectionCondition || '—' }} - {{ viewForm.trialDays || '—' }} - {{ viewForm.paymentTerms || '—' }} - - - {{ viewForm.prevPurchaseRecord || '—' }} - {{ viewForm.totalAmount || '—' }} - - - {{ viewForm.purchaseProposal || '—' }} - - -
请购明细
- + +
请购明细
+ - - + + -
审批签名
- - {{ viewForm.signRequestHandler || '—' }} - {{ viewForm.signRequestDirector || '—' }} - {{ viewForm.signRequestFactoryMgr || '—' }} - - - {{ viewForm.signRequestGm || '—' }} - {{ viewForm.signPurchaseHandler || '—' }} - {{ viewForm.signPurchaseDirector || '—' }} - - - {{ viewForm.signPurchaseManager || '—' }} - {{ viewForm.signPurchaseChairman || '—' }} - {{ viewForm.unloadLocation || '—' }} - - - {{ viewForm.unloadOther || '—' }} - {{ statusText(viewForm.formStatus) }} - - - {{ viewForm.remark || '—' }} - + +
+
+
品检条件
+
{{ formatInsp(viewForm.inspectionCondition, viewForm.trialDays) }}
+
前期采购记录
+
{{ viewForm.prevPurchaseRecord || '—' }}
+
+
+
采购拟办
+
{{ viewForm.purchaseProposal || '—' }}
+
付款条件
+
{{ viewForm.paymentTerms || '—' }}
+
+
+
采购金额(人民币)
+
{{ viewForm.totalAmount || '—' }}
+
+
+ + +
审批签名
+
+
+
采购单位
+
请购单位
+
+
+
董事长
+
部长/厂长
+
主任
+
经办
+
生产总经理
+
厂长
+
主任
+
经办
+
+
+
{{ viewForm.signPurchaseChairman || '—' }}
+
{{ viewForm.signPurchaseManager || '—' }}
+
{{ viewForm.signPurchaseDirector || '—' }}
+
{{ viewForm.signPurchaseHandler || '—' }}
+
{{ viewForm.signRequestGm || '—' }}
+
{{ viewForm.signRequestFactoryMgr || '—' }}
+
{{ viewForm.signRequestDirector || '—' }}
+
{{ viewForm.signRequestHandler || '—' }}
+
+
+ + +
+
+
※物品进厂
指定卸货位
+
{{ viewForm.unloadLocation || '—' }}
+
置于
+
{{ viewForm.unloadOther || '—' }}
+
+
+
状态
+
+ {{ statusText(viewForm.formStatus) }} +
+
备　注
+
{{ viewForm.remark || '—' }}
+
+
- 关 闭 -
-
- 导出PDF - 关 闭 + 导出PDF
@@ -357,36 +367,40 @@ + - - - - - - - - - - - - + + + + + + - - + + + + + + + + + - - - - + + + + + - +
请购部门{{ printData.reqDept || '' }}品　名{{ printData.itemName || '' }}规　格{{ printData.specification || '' }}单位{{ printData.unit || '' }}请购量{{ printData.quantity || '' }}用途{{ printData.category || '' }}请购部门品　名规　格单位请购量
类　别 + {{ printData.reqDept || '' }}{{ printData.itemName || '' }}{{ printData.specification || '' }}{{ printData.unit || '' }}{{ printData.quantity || '' }}
用途类别 □原料物料 □设备增添 □工程劳务 □其它用途
需求日期 {{ printData.requiredDate || '' }}用途说明{{ printData.purposeDesc || '' }}
用途说明{{ printData.purposeDesc || '' }} 使用部门{{ printData.useDept || '' }}{{ printData.useDept || '' }}
@@ -426,28 +440,26 @@ - - + - - - - + + - + + + - - - @@ -531,6 +543,7 @@ export default { }, form: {}, viewForm: {}, + inspectionChecks: [], printData: {}, rules: {} } @@ -578,6 +591,7 @@ export default { unloadLocation: '', unloadOther: '', formStatus: '0', remark: '', items: [] } + this.inspectionChecks = [] this.open = true }, // 修改 @@ -604,6 +618,7 @@ export default { formStatus: d.formStatus, remark: d.remark, items: d.items || [] } + this.inspectionChecks = d.inspectionCondition ? d.inspectionCondition.split(',').filter(s => s.trim()) : [] this.open = true }).finally(() => { this.buttonLoading = false }) }, @@ -621,6 +636,7 @@ export default { submitForm() { this.$refs['form'].validate(valid => { if (!valid) return + this.form.inspectionCondition = this.inspectionChecks.join(',') this.buttonLoading = true const api = this.form.reqId ? updatePurchaseRequisition : addPurchaseRequisition api(this.form).then(() => { @@ -701,9 +717,9 @@ export default { }, // 明细操作 addItem() { - const last = this.form.items[this.form.items.length - 1] + const seq = this.form.items.length + 1 this.form.items.push({ - itemName: '', specification: '', unit: '', quantity: '' + seq: String(seq), itemName: '', specification: '', unit: '', quantity: '' }) }, removeItem(index) { @@ -718,7 +734,34 @@ export default { const map = { '0': 'info', '1': 'warning', '2': 'success', '3': 'warning', '4': 'success', '5': 'danger' } return map[s] || 'info' }, - // PDF 复选框 + // 品检条件 — 数字代码 -> 可读描述（查看弹窗用） + formatInsp(val, trialDays) { + if (!val) return '—' + const map = { '1': '1.一般规格/目视检验', '2': '2.品保检验品', '3': '3.工程、劳务/特殊规格品', '4': '4.试用' } + const parts = val.split(',').map(s => s.trim()) + // 数字代码格式 + if (/^\d+$/.test(parts[0])) { + const labels = parts.map(c => map[c] || c) + if (parts.includes('4') && trialDays) { + const idx = parts.indexOf('4') + labels[idx] = '4.试用 ' + trialDays + ' 天后验收' + } + return labels.join('、') + } + // 旧文本格式直接返回 + return val + }, + // 品检条件 — 检查是否选中了某个选项（同时兼容数字代码和旧文本格式） + hasInsp(code) { + if (!this.printData.inspectionCondition) return false + const val = this.printData.inspectionCondition + // 数字代码格式 "1,2,4" + if (val.split(',').map(s => s.trim()).includes(String(code))) return true + // 旧文本格式 "一般规格/目视检验,品保检验品" 回退 + const keywords = { 1: '一般', 2: '品保', 3: '工程', 4: '试用' } + return val.includes(keywords[code]) + }, + // PDF 复选框样式 ppCheck(cond) { return cond ? 'pp-chk pp-on' : 'pp-chk' } @@ -730,14 +773,114 @@ export default { $accent: #5b8db8; $sub: #909399; -.pr-section { +.pr-dialog { + ::v-deep .el-dialog__body { + padding-top: 10px; + } +} + +/* ===== 新增/修改表单 — 纸质单表格排版 ===== */ +.pf-dialog { + ::v-deep .el-dialog__body { + padding: 14px 16px 6px; + } + ::v-deep .el-dialog { + /* 保持980px宽度 */ + } +} + +.pf-form { + /* form-item 样式委托给 .pf-td.pf-val 处理 */ + .el-form-item__error { + position: static; + padding-top: 0; + line-height: 1.2; + } +} + +/* 表单表格（CSS Grid 版，避免 Vue2 HTML table 组件兼容问题） */ +.pf-tb { + width: 100%; + margin-bottom: 8px; + border: 1px solid #dcdfe6; + border-bottom: none; + box-sizing: border-box; +} + +.pf-tr { + display: grid; + width: 100%; +} + +.pf-td { + border-right: 1px solid #dcdfe6; + border-bottom: 1px solid #dcdfe6; + padding: 3px 5px; + min-height: 28px; + box-sizing: border-box; + display: flex; + align-items: center; +} + +.pf-td:last-child { + border-right: none; +} + +.pf-td.pf-lbl { + background: #f5f7fa; + font-size: 12px; + color: #606266; + text-align: center; + font-weight: 600; + white-space: nowrap; + justify-content: center; + min-width: 56px; +} + +.pf-td.pf-val { + padding: 2px 4px; + .el-form-item { + margin-bottom: 0; + width: 100%; + } + ::v-deep .el-form-item__content { + margin-left: 0 !important; + width: 100%; + } + .el-input--mini, + .el-select--mini { + width: 100%; + } +} + +.pf-td.pf-chk-group { + text-align: left; + padding: 4px 8px; + flex-wrap: wrap; + .el-checkbox, + .el-radio { + margin-right: 14px; + .el-checkbox__label, + .el-radio__label { + font-size: 12px; + } + } +} + +/* 表之间的间距 */ +.pf-tb + .pf-tb { + margin-top: -5px; +} + +/* 明细 */ +.pf-sec { font-size: 13px; font-weight: 600; color: #303133; border-left: 3px solid $accent; padding-left: 8px; - margin: 16px 0 12px; - .pr-section-hint { + margin: 14px 0 8px; + .pf-sec-hint { float: right; font-weight: 400; color: $sub; @@ -745,40 +888,92 @@ $sub: #909399; } } -.pr-del { +.pf-it-tb { + margin-bottom: 12px; + .el-input--mini { + width: 100%; + } +} + +/* 采购处理表 — 品检条件行内试用天数 */ +.pf-pt .pf-chk-group { + line-height: 26px; +} + +/* 签名区 */ +.pf-sig .pf-td.pf-lbl { + font-weight: 600; + min-width: 0; +} + +/* 删除图标 */ +.pf-del { color: #c45656; cursor: pointer; } +.pr-view-dialog ::v-deep .el-dialog__body { + padding: 16px 20px 6px; +} + +/* 查看弹窗卡片式布局 */ .pr-view { - padding: 0 4px; - .pr-view-section { + .pv-section { + margin-bottom: 16px; + &:last-child { margin-bottom: 0; } + } + .pv-section-title { font-size: 13px; font-weight: 600; - color: #303133; - border-left: 3px solid $accent; - padding-left: 8px; - margin: 14px 0 10px; - &:first-child { margin-top: 0; } + color: $accent; + padding-bottom: 6px; + margin-bottom: 10px; + border-bottom: 1px solid #ebeef5; } - .pr-view-row { - margin-bottom: 8px; + .pv-grid { + display: flex; + flex-wrap: wrap; + gap: 0; + } + .pv-item { + width: 33.33%; + padding: 4px 8px 4px 0; + box-sizing: border-box; + display: flex; + align-items: flex-start; label { - display: block; font-size: 12px; color: $sub; - margin-bottom: 2px; + white-space: nowrap; + flex-shrink: 0; + min-width: 72px; + line-height: 22px; } span { font-size: 13px; color: #303133; + line-height: 22px; + word-break: break-all; + } + &.pv-full { + width: 100%; } } -} - -.pr-dialog { - ::v-deep .el-dialog__body { - padding-top: 10px; + .pv-status { + display: inline-block; + font-size: 12px; + padding: 0 8px; + border-radius: 2px; + line-height: 20px; + border: 1px solid #dcdfe6; + color: $sub; + background: #fafafa; + &.s0 { color: $sub; } + &.s1 { color: #d6a256; border-color: #ecd4a6; background: #fdf6ec; } + &.s2 { color: $accent; border-color: #b9d2e6; background: #eef3f8; } + &.s3 { color: #d6a256; border-color: #ecd4a6; background: #fdf6ec; } + &.s4 { color: $accent; border-color: #b9d2e6; background: #eef3f8; } + &.s5 { color: #c45656; border-color: #e6c4c4; background: #fbf0f0; } } }
品检条件 - □1.一般规格/目视检验 - □2.品保检验品 - □3.工程、劳务/特殊规格品 - □4.试用 + 品检条件 + {{ hasInsp(1) ? '☑' : '□' }}1.一般规格/目视检验 + {{ hasInsp(2) ? '☑' : '□' }}2.品保检验品 + {{ hasInsp(3) ? '☑' : '□' }}3.工程、劳务/特殊规格品 + {{ hasInsp(4) ? '☑' : '□' }}4.试用 {{ printData.trialDays || '____' }} 天后验收
前期采购记录{{ printData.prevPurchaseRecord || '' }}前期采购记录{{ printData.prevPurchaseRecord || '' }}
采购拟办{{ printData.purchaseProposal || '' }}{{ printData.purchaseProposal || '' }}付款条件{{ printData.paymentTerms || '' }}
付款条件{{ printData.paymentTerms || '' }} 采购金额(人民币) + ￥ {{ printData.totalAmount || '' }}