From 54ead5484b459063d9f675429ae81da762ade0da Mon Sep 17 00:00:00 2001 From: zhangsiqi <2825463979@qq.com> Date: Mon, 20 May 2024 18:40:02 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=9A=E5=91=98=E5=B7=A5=E9=A2=86=E6=96=99=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A2=86=E6=96=99=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/domain/BaseEmpRequisiteOrder.java | 15 ++- .../IBaseEmpRequisiteOrderService.java | 2 + .../system/empRequisiteOrder/edit.html | 2 +- .../empRequisiteOrder/empRequisiteOrder.html | 118 ++++++------------ 4 files changed, 54 insertions(+), 83 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEmpRequisiteOrder.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEmpRequisiteOrder.java index 32f0ca33..2ec09eae 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEmpRequisiteOrder.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/BaseEmpRequisiteOrder.java @@ -1,6 +1,8 @@ package com.ruoyi.system.domain; import java.math.BigDecimal; +import java.util.List; + import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -59,7 +61,18 @@ public class BaseEmpRequisiteOrder extends BaseEntity @Excel(name = "使用状态") private String useStatus; - public void setRequisiteId(Long requisiteId) + private List baseEmpRequisiteOrderChildList; + + + public List getBaseEmpRequisiteOrderChildList() { + return baseEmpRequisiteOrderChildList; + } + + public void setBaseEmpRequisiteOrderChildList(List baseEmpRequisiteOrderChildList) { + this.baseEmpRequisiteOrderChildList = baseEmpRequisiteOrderChildList; + } + + public void setRequisiteId(Long requisiteId) { this.requisiteId = requisiteId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEmpRequisiteOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEmpRequisiteOrderService.java index e3f853d3..3197ff7c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEmpRequisiteOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseEmpRequisiteOrderService.java @@ -72,4 +72,6 @@ public interface IBaseEmpRequisiteOrderService * @return */ int restoreBaseEmpRequisiteOrderById(Long requisiteId); + + Object getId(); } diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html index 4aab6d11..bc2a1de5 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html @@ -88,7 +88,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '加工方式',field: 'processMethod',align: 'center', + {title: '半成品类型',field: 'processMethod',align: 'center', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html index 0188759f..10d756f5 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html @@ -19,7 +19,7 @@
  • - +
  • @@ -41,12 +41,6 @@ 添加 - - 修改 - - - 删除 - 导出 @@ -77,82 +71,44 @@ restoreUrl: prefix + "/restore/{id}", exportUrl: prefix + "/export", modalName: "员工领料单", - columns: [{ - checkbox: true - }, - { - title: '员工号领料单索引id', - field: 'requisiteId', - visible: false - }, - { - title: '审核状态', - field: 'auditStatus', - formatter: function(value, row, index) { - return $.table.selectDictLabel(auditStatusDatas, value); - } - }, - { - title: '领料状态', - field: 'requisitieStatus', - formatter: function(value, row, index) { - return $.table.selectDictLabel(requisitieStatusDatas, value); - } - }, - { - title: '领料单编号', - field: 'requisitieCode', - }, - { - title: '关联销售订单号', - field: 'correlationCode', - }, - { - title: '物料合计', - field: 'materialAmount', - }, - { - title: '数量总计', - field: 'materialSum', - }, - { - title: '不含税总价(RMB)', - field: 'noRmbSum', - }, - { - title: '含税总价(RMB)', - field: 'rmbSum', - }, - { - title: '申请人', - field: 'applyUser', - }, - { - title: '备注', - field: 'remark', - }, - { - title: '使用状态', - field: 'useStatus', - formatter: function(value, row, index) { - return $.table.selectDictLabel(useStatusDatas, value); - } - }, - { - title: '操作', - align: 'center', - formatter: function(value, row, index) { - var actions = []; - actions.push('编辑 '); - actions.push('删除 '); - if(row.delFlag == '0'){ - actions.push('作废 '); - }else{ - actions.push('恢复 '); + columns: [ + {checkbox: true}, + {title: '员工号领料单索引id',field: 'requisiteId',visible: false}, + {title: '审核状态',field: 'auditStatus', + formatter: function(value, row, index) {return $.table.selectDictLabel(auditStatusDatas, value);} + }, + {title: '领料状态',field: 'requisitieStatus', + formatter: function(value, row, index) {return $.table.selectDictLabel(requisitieStatusDatas, value);} + }, + {title: '领料单编号',field: 'requisitieCode',}, + {title: '领料人',field: 'createBy',}, + {title: '关联销售订单号',field: 'correlationCode',}, + {title: '物料合计',field: 'materialAmount', }, + {title: '数量总计',field: 'materialSum',}, + {title: '不含税总价(RMB)',field: 'noRmbSum',}, + {title: '含税总价(RMB)',field: 'rmbSum',}, + {title: '申请人',field: 'applyUser',visible: false}, + {title: '录入时间',field: 'createTime',}, + {title: '备注',field: 'remark'}, + {title: '使用状态',field: 'useStatus', + formatter: function(value, row, index) {return $.table.selectDictLabel(useStatusDatas, value);} + }, + { + title: '操作', + align: 'center', + formatter: function(value, row, index) { + var actions = []; + actions.push('编辑 '); + actions.push('详情 '); + if(row.delFlag == '0'){ + actions.push('作废 '); + }else{ + actions.push('恢复 '); + } + return actions.join(''); } - return actions.join(''); } - }] + ] }; $.table.init(options); });