From 3e2066edc3624628d3e17b4dcca6c96766a58c13 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 23 Oct 2024 15:43:11 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99?=
=?UTF-8?q?=E6=A8=A1=E5=9D=97=20=E6=8C=89=E7=85=A7=E4=B8=87=E6=9D=90?=
=?UTF-8?q?=E8=A6=81=E6=B1=82=EF=BC=9A=E8=B0=83=E6=95=B4=E5=91=98=E5=B7=A5?=
=?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=A4=B4?=
=?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=E5=B8=83=E5=B1=80=20=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E7=89=A9=E6=96=99=E7=9A=84=E6=93=8D=E4=BD=9C=E6=A0=8F?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E5=BC=95=E7=94=A8$.table.dropdownTo?=
=?UTF-8?q?ggle=E6=96=B9=E6=B3=95=20=E7=89=A9=E6=96=99=E5=90=88=E8=AE=A1?=
=?UTF-8?q?=E5=92=8C=E6=95=B0=E9=87=8F=E5=90=88=E8=AE=A1=E8=BF=99=E4=B8=A4?=
=?UTF-8?q?=E6=A0=8F=E6=96=B0=E5=A2=9E=E8=A1=A8=E5=BA=95=20=E6=80=BB?=
=?UTF-8?q?=E5=90=88=E8=AE=A1=20=E4=BF=AE=E6=94=B9=E5=91=98=E5=B7=A5?=
=?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=A2=86?=
=?UTF-8?q?=E6=96=99=E5=8D=95=E5=8F=B7=E5=92=8C=E9=A2=86=E6=96=99=E5=91=98?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=92=8C=E4=B8=8B=E9=9D=A2=E8=A1=A8?=
=?UTF-8?q?=E6=A0=BC=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=20=E8=AF=B7?=
=?UTF-8?q?=E8=B4=AD=E5=8D=95=E5=AD=90=E8=A1=A8=E5=88=97=E8=A1=A8=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8=E7=9A=84=E6=90=9C?=
=?UTF-8?q?=E7=B4=A2=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/empRequisiteOrder/add.html | 1 +
.../empRequisiteOrder/empRequisiteOrder.html | 49 ++++++++++---------
2 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
index aac80f42..71570720 100644
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html
@@ -81,6 +81,7 @@
id:'bootstrap-sub-table-empRequisitionChild',
pagination: false,
sidePagination: "client",
+ showSearch:false,
model: "物料信息",
columns: [
{checkbox: true},
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 4fa21085..848c533c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/empRequisiteOrder.html
@@ -11,11 +11,11 @@
@@ -110,6 +110,16 @@
title: '流程实例类型',
visible: false
},
+ {
+ field: 'taskId',
+ title: '当前任务ID',
+ visible: false
+ },
+ {
+ field: 'todoUserId',
+ title: '待办用户ID',
+ visible: false
+ },
{
field: 'applyUser',
title: '申请人ID',
@@ -120,6 +130,9 @@
title: '当前任务名称',
visible: false
},
+ {title: '审核状态',field: 'auditStatus',visible: false,
+ formatter: function(value, row, index) {return $.table.selectDictLabel(auditStatusDatas, value);}
+ },
{
field: 'taskStatus',
title: '当前状态',
@@ -167,19 +180,6 @@
title: '申请时间',
align: 'center',
},
- {
- field: 'taskId',
- title: '当前任务ID',
- visible: false
- },
- {
- field: 'todoUserId',
- title: '待办用户ID',
- visible: false
- },
- {title: '审核状态',field: 'auditStatus',visible: false,
- formatter: function(value, row, index) {return $.table.selectDictLabel(auditStatusDatas, value);}
- },
{title: '领料员',field: 'createBy',align: 'center',},
{title: '不含税总价(RMB)',field: 'noRmbSum',visible: false},
{title: '含税总价(RMB)',field: 'rmbSum',visible: false},
@@ -203,19 +203,20 @@
var todoUserIdList = row.todoUserId.split(",");
if(todoUserIdList.includes(loginName) || loginName == 'admin'){
var nodeName = row.taskName=='驳回调整'?' 调整申请':' 审批';
- actions.push(' '+nodeName+' ');
+ actions.push(' '+nodeName+' ');
}
}
// 审批历史
- actions.push(' 审批历史 ');
+ actions.push(' 审批历史 ');
// 进度查看
- actions.push(' 进度查看 ');
- }
- else if(row.auditStatus === "2"){
- actions.push('编辑 ');
+ actions.push(' 进度查看 ');
}
- actions.push('详情 ');
- return actions.join('');
+ // else if(row.auditStatus === "2"){
+ // actions.push('编辑 ');
+ // }
+ actions.push('详情 ');
+ var actionLinks = actions.join('');
+ return $.table.dropdownToggle(actionLinks);
}
}
],