From 063897e1192a3c24b2c421a7dd69ff9261bc2c2e Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Mon, 27 May 2024 19:05:54 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=E5=AF=B9=E4=BA=8E=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=88=86=E9=A1=B5=E6=A0=B7=E5=BC=8F=E8=BF=9B=E8=A1=8C=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=EF=BC=8C=E8=B0=83=E6=95=B4=E4=B8=BA=E8=A1=A8=E6=A0=BC?=
=?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=9D=E5=A7=8B=E5=8C=96=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/resources/templates/erp/bom/bom.html | 33 ++-
.../developModifyOrder.html | 1 +
.../templates/erp/material/material.html | 4 +-
.../templates/sales/EstimateChild/edit.html | 212 ++++++++++++++++++
.../empRequisiteOrder/empRequisiteOrder.html | 6 +
5 files changed, 242 insertions(+), 14 deletions(-)
create mode 100644 ruoyi-admin/src/main/resources/templates/sales/EstimateChild/edit.html
diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
index b80f7b3d..f9f98d71 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html
@@ -135,7 +135,9 @@
importUrl: prefix + "/importData",
importTemplateUrl: prefix + "/importTemplate",
pageList: [5, 10, 25, 50],
- pageSize: 5,
+ pageSize: 10,
+ sortable: true, // 是否启用排序
+ sortStable: true, // 设置为 true 将获得稳定的排序
modalName: "bom",
detailView: true,
fixedColumns: true, // 启用冻结列
@@ -175,17 +177,19 @@
},
{
field: 'applyTime',
- title: '申请时间'
+ title: '申请时间',
+ sortable: true,
},
{
field: 'taskId',
title: '当前任务ID',
- visible: false
+ visible: false,
+
},
{
field: 'todoUserId',
title: '待办用户ID',
- visible: false
+ visible: false,
},
{
field: 'taskName',
@@ -198,6 +202,7 @@
{
field: 'auditStatus',
title: '审核状态',
+ sortable: true,
formatter: function(value, row, index) {
return $.table.selectDictLabel(auditStatusDatas, value);
}
@@ -205,13 +210,14 @@
{
field: 'useStatus',
title: '使用状态',
+ sortable: true,
formatter: function(value, row, index) {
return $.table.selectDictLabel(useStatusDatas, value);
}
},
- {title: '工程员',field: 'businessMembers'},
- {title: 'bom号',field: 'bomNo',},
- {title: '关联料号',field: 'materialNo'},
+ {title: '工程员',field: 'businessMembers', sortable: true,},
+ {title: 'bom号',field: 'bomNo', sortable: true,},
+ {title: '关联料号',field: 'materialNo', sortable: true,},
{
field: 'photoUrl',
title: '图片',
@@ -219,10 +225,11 @@
return $.table.imageView(value);
}
},
- { title: '物料名称',field: 'materialName'},
+ { title: '物料名称',field: 'materialName', sortable: true,},
{
field: 'materialType',
title: '物料类型',
+ sortable: true,
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
@@ -230,6 +237,7 @@
{
field: 'processMethod',
title: '半成品类型',
+ sortable: true,
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
@@ -237,11 +245,12 @@
{
field: 'unit',
title: '单位',
+ sortable: true,
},
- { title: '品牌',field: 'brand'},
- {title: '描述',field: 'describe'},
- {title: '用量',field: 'useNum'},
- {title: '损耗率',field: 'lossRate',
+ { title: '品牌',field: 'brand', sortable: true,},
+ {title: '描述',field: 'describe', sortable: true,},
+ {title: '用量',field: 'useNum', sortable: true,},
+ {title: '损耗率',field: 'lossRate', sortable: true,
formatter:function (value,row,index){
if (value == null || value == ''){
return '/';
diff --git a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
index e50747f1..e7452ac0 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/developModifyOrder.html
@@ -100,6 +100,7 @@
cancelUrl: prefix + "/cancel/{id}",
restoreUrl: prefix + "/restore/{id}",
exportUrl: prefix + "/export",
+ pageSize: 10,
modalName: "开发修改单",
columns: [{
checkbox: true
diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/material.html b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
index 0a7661c1..a23b3a85 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/material.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/material.html
@@ -167,8 +167,8 @@
cancelUrl: prefix + "/cancel/{id}",
restoreUrl: prefix + "/restore/{id}",
detailUrl: prefix + "/detail/{id}",
- pageList: [5, 10, 25, 50],
- pageSize: 5,
+ pageList: [10, 25, 50],
+ pageSize: 10,
modalName: "物料信息",
fixedColumns: true, // 启用冻结列
fixedRightNumber: 1, // 冻结右列个数
diff --git a/ruoyi-admin/src/main/resources/templates/sales/EstimateChild/edit.html b/ruoyi-admin/src/main/resources/templates/sales/EstimateChild/edit.html
new file mode 100644
index 00000000..405fef89
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/sales/EstimateChild/edit.html
@@ -0,0 +1,212 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 b8f668b9..f1cfc336 100644
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
@@ -70,6 +70,12 @@
cancelUrl: prefix + "/cancel/{id}",
restoreUrl: prefix + "/restore/{id}",
exportUrl: prefix + "/export",
+ pagination: true,
+ pageNumber: 1, //初始化加载第一页，默认第一页
+ pageSize: 10, //每页的记录行数（*）
+ pageList: [10, 25, 50],
+ sortable: true, // 是否启用排序
+ sortStable: true,
modalName: "员工领料单",
columns: [
{checkbox: true},