From 27010fad7908cb1acdd7b6cd815912b1561c2a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Tue, 15 Oct 2024 13:55:50 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=20?=
=?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=20=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E5=88=97=E8=A1=A8=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E6=A0=8F?=
=?UTF-8?q?=E5=AE=9A=E4=B9=89=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC?=
=?UTF-8?q?=E5=AE=9A=E4=B9=89=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=A1=8C=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=BD=93=E5=89=8D=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AF=BC?=
=?UTF-8?q?=E5=87=BA=E6=96=B9=E6=B3=95=EF=BC=9B=20=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=A2=86=E6=96=99=E8=AF=A6=E6=83=85=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=EF=BC=8C=E8=B0=83=E6=95=B4=E8=A1=A8=E6=A0=BC=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E6=A0=B7=E5=BC=8F=EF=BC=9B=20=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BB=8F=E7=90=86=E5=92=8C=E7=94=9F=E4=BA=A7?=
=?UTF-8?q?=E4=B8=BB=E7=AE=A1=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2=E8=A1=A8?=
=?UTF-8?q?=E6=A0=BC=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/makeorderpick/detail.html | 10 +-
.../system/makeorderpick/makeorderpick.html | 170 ++++++++++++++----
.../system/makeorderpick/taskScjlVerify.html | 8 +-
.../system/makeorderpick/taskSczgVerify.html | 8 +-
4 files changed, 149 insertions(+), 47 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/detail.html b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/detail.html
index cd9d7c72..5670bb39 100644
--- a/ruoyi-admin/src/main/resources/templates/system/makeorderpick/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/makeorderpick/detail.html
@@ -33,12 +33,14 @@
-
-
@@ -67,6 +74,22 @@
var prefix = ctx + "system/makeorderpick";
$(function() {
+ $.ajax({
+ url: prefix + '/getBinessMembers',
+ type: 'get',
+ success: function (res) {
+ console.log(res)
+ if (res.rows.length > 0) {
+ var usertData = res.rows;
+ for (let i in usertData) {
+ $("select[name='applyUser']").append(
+ "");
+ }
+ } else {
+ $.modal.msgError(res.msg);
+ }
+ }
+ });
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
@@ -91,96 +114,138 @@
{
field: 'instanceId',
title: '流程实例ID',
+ align: 'center',
visible: false
},
{
field: 'submitInstanceId',
title: '流程提交实例ID',
+ align: 'center',
visible: false
},
{
field: 'cancelInstanceId',
title: '流程作废实例ID',
+ align: 'center',
visible: false
},
{
field: 'restoreInstanceId',
title: '流程恢复实例ID',
+ align: 'center',
visible: false
},
{
field: 'instanceTypeName',
title: '流程实例类型',
+ align: 'center',
visible: false
},
{
field: 'applyUser',
+ align: 'center',
title: '申请人ID',
visible: false
+ },
+ { title: '当前状态',field: 'taskStatus',align: 'center',width: 120,
+ formatter: function(value, row, index) {
+ if(row.auditStatus!="1"&&value != "未启动"){
+ return '' + value + '';
+ }
+ if(value === "未启动"){
+ return '' + value + '';
+ }
+ return '' + value + '';
+ }
+ },
+ {
+ title: '生产领料单号',
+ align: 'center',
+ field: 'pickNo',
},
{
- field: 'applyUserName',
- title: '申请人',
+ title: '生产订单号',
+ align: 'center',
+ field: 'makeNo',
+ },
+ {
+ title: '关联销售订单号',
+ align: 'center',
+ field: 'saleNo',
+ },
+ {
+ title: '领料状态',
+ align: 'center',
+ field: 'pickStatus',
formatter: function(value, row, index) {
- return '' + (value ? value : "-") + '';
+ return $.table.selectDictLabel(pickStatusDatas, value);
}
},
+ {
+ title: '领料员',
+ align: 'center',
+ field: 'pickUser',
+ visible: false,
+ },
+ {
+ title: '物料合计',
+ align: 'center',
+ field: 'materialSum',
+ },
+ {
+ title: '数量合计',
+ align: 'center',
+ field: 'enterpriseSum',
+ },
+ {
+ field: 'applyUserName',
+ align: 'center',
+ title: '申请人',
+ // title: '申请人',
+ // formatter: function(value, row, index) {
+ // return '' + (value ? value : "-") + '';
+ // }
+ },
{
field: 'applyTime',
+ align: 'center',
title: '申请时间'
},
{
field: 'taskId',
title: '当前任务ID',
+ align: 'center',
visible: false
},
{
field: 'todoUserId',
title: '待办用户ID',
+ align: 'center',
visible: false
},
{
field: 'taskName',
title: '当前任务名称',
align: 'center',
+ visible: false,
formatter: function(value, row, index) {
return '' + value + '';
}
},
{
- title: '生产订单号',
- field: 'makeNo',
- },
- {
- title: '关联销售订单号',
- field: 'saleNo',
- },
- {
- title: '生产领料单号',
- field: 'pickNo',
- },
- {
- title: '领料状态',
- field: 'pickStatus',
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(pickStatusDatas, value);
- }
- },
- {
- title: '领料员',
- field: 'pickUser',
- },
- {
- title: '物料合计',
- field: 'materialSum',
+ field: 'createTime',
+ align: 'center',
+ title: '录入时间',
},
{
- title: '数量合计',
- field: 'enterpriseSum',
+ field: 'updateTime',
+ align: 'center',
+ title: '上次更新时间',
},
{
title: '审核状态',
field: 'auditStatus',
+ visible: false,
formatter: function(value, row, index) {
return $.table.selectDictLabel(auditStatusDatas, value);
}
@@ -214,10 +279,41 @@
actions.push(' 详情 ');
return actions.join('');
}
- }]
+ }],
+ rowStyle: function (row, index) {
+ if (row.auditStatus=="0") {
+ // 如果审核状态为待审核,则设置为红色
+ return {css:{"color":"red"}};
+ }
+ // 否则使用默认样式
+ return {};
+ }
};
$.table.init(options);
});
+
+ // 导出
+ function exportExcel() {
+ var ids = $.table.selectColumns("pickNo");
+ var dataParam = $("#formId").serializeArray();
+
+ let tipMsg = "确定导出当前所有数据吗?";
+ if ($.common.isNotEmpty(ids)) {
+ tipMsg = `确定导出 ${ids} 数据吗?`;
+ dataParam.push({ "name": "ids", "value": ids });
+ }
+ $.modal.confirm(tipMsg, function () {
+ $.modal.loading("正在导出数据,请稍后...");
+ $.post( prefix + "/export", dataParam, function (result) {
+ if (result.code === web_status.SUCCESS) {
+ window.location.href = ctx + "common/download?fileName="+ encodeURI(result.msg) + "&delete=" + true;
+ } else {
+ $.modal.alertError(result.msg);
+ }
+ $.modal.closeLoading();
+ });
+ });
+ }