From cbb6a9dfc70b942ea8163685f247111dbd88380d 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, 22 Oct 2024 09:25:09 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99=20?=
=?UTF-8?q?=E5=87=BA=E5=B7=AE=E5=8D=95=20=E4=BF=AE=E6=94=B9=E5=87=BA?=
=?UTF-8?q?=E5=B7=AE=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
=?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A0=8F=E5=BD=95=E5=85=A5=E4=BA=BA=E5=BD=95?=
=?UTF-8?q?=E5=85=A5=E6=97=B6=E9=97=B4=E6=94=B9=E4=B8=BA=E7=94=B3=E8=AF=B7?=
=?UTF-8?q?=E4=BA=BA=E3=80=81=E7=94=B3=E8=AF=B7=E6=97=B6=E9=97=B4=EF=BC=9B?=
=?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E4=BA=BA=E4=BA=8B=E8=A1=8C=E6=94=BF?=
=?UTF-8?q?=E5=87=BA=E8=A1=8C=E8=B4=B9=E7=94=A8=E3=80=81=E6=A0=B8=E5=87=86?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=E3=80=81=E6=96=B0=E5=A2=9E=E4=BD=9C=E5=BA=9F?=
=?UTF-8?q?=E5=92=8C=E6=81=A2=E5=A4=8D=E6=8C=89=E9=92=AE=E5=8F=8A=E5=85=B6?=
=?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=96=B9=E6=B3=95=EF=BC=9B=20=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E5=87=BA=E5=B7=AE=E7=BB=8F=E7=90=86=E3=80=81=E4=B8=BB?=
=?UTF-8?q?=E7=AE=A1=E3=80=81=E5=89=AF=E6=80=BB=E7=BB=8F=E7=90=86=E3=80=81?=
=?UTF-8?q?=E7=A0=94=E5=8F=91=E6=80=BB=E7=9B=91=E3=80=81=E6=80=BB=E7=BB=8F?=
=?UTF-8?q?=E7=90=86=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E=E4=BD=9C=E5=BA=9F=E7=90=86=E7=94=B1=E5=92=8C=E6=89=B9?=
=?UTF-8?q?=E6=B3=A8=EF=BC=9B=20=E6=96=B0=E5=A2=9E=E4=BD=9C=E5=BA=9F?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=92=8C=E4=BA=BA=E4=BA=8B=E6=A0=B8=E5=87=86?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../baseEvectionForm/baseEvectionForm.html | 67 ++++++-
.../system/baseEvectionForm/cancel.html | 32 ++++
.../system/baseEvectionForm/hrApprove.html | 181 ++++++++++++++++++
.../system/baseEvectionForm/hrRecord.html | 44 +----
.../baseEvectionForm/taskCcjlVerify.html | 18 ++
.../baseEvectionForm/taskCczgVerify.html | 40 ++--
.../baseEvectionForm/taskFzjlVerify.html | 40 ++--
.../baseEvectionForm/taskModifyApply.html | 24 ++-
.../baseEvectionForm/taskYfzjVerify.html | 40 ++--
.../baseEvectionForm/taskZjlVerify.html | 40 ++--
10 files changed, 428 insertions(+), 98 deletions(-)
create mode 100644 ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/cancel.html
create mode 100644 ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/hrApprove.html
diff --git a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html
index b00bdbb3..672d69d1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html
+++ b/ruoyi-admin/src/main/resources/templates/system/baseEvectionForm/baseEvectionForm.html
@@ -29,14 +29,14 @@
-
-
+
+
-
-
+
+
-
-
+
搜索
@@ -64,6 +64,8 @@
var removeFlag = [[${@permission.hasPermi('system:baseEvectionForm:remove')}]];
var cancelFlag = [[${@permission.hasPermi('system:baseEvectionForm:cancel')}]];
var restoreFlag = [[${@permission.hasPermi('system:baseEvectionForm:restore')}]];
+ var hrRecordFlag = [[${@permission.hasPermi('system:baseEvectionForm:hrRecord')}]];
+ var hrApproveFlag = [[${@permission.hasPermi('system:baseEvectionForm:hrApprove')}]];
var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
var useStatusDatas = [[${@dict.getType('useStatus')}]];
var administrationStatusDatas = [[${@dict.getType('administration_status')}]];
@@ -118,6 +120,9 @@
{ title: '当前状态',field: 'taskStatus',
align: 'center',
formatter: function(value, row, index) {
+ if(value == "未启动" || value == "审核拒绝"){
+ return '' + value + '';
+ }
return '' + value + '';
}
},
@@ -138,7 +143,7 @@
}
},
{title: '出差单编号',field: 'evectionCode',align: 'center',},
- {title: '出差人',field: 'evectionBy',align: 'center',},
+ {title: '出差人',field: 'evectionBy',align: 'center',visible: false,},
{title: '同行人',field: 'partnerBy',align: 'center',},
{title: '出差地',field: 'evectionAddr',align: 'center',},
{title: '出差详细地址',field: 'evectionDetailAddr',align: 'center',},
@@ -161,10 +166,24 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- // 审核状态-审核通过
- if(row.auditStatus=="1"){
+ // 审核状态-审核通过 使用状态是
+ if(row.auditStatus=="1"&&row.useStatus == "1"&&row.personnelAdministration == "0"){
// 编辑
// actions.push(' 编辑 ');
+ actions.push(' 出行费用 ');
+ }
+ if(row.auditStatus=="1"&&row.useStatus == "1"&&row.personnelAdministration == "1"){
+ // 核准
+ actions.push(' 核准 ');
+ }
+ if(row.auditStatus == "1"&& row.useStatus == "1"){
+ // 作废
+ actions.push(' 作废');
+ }
+ // 已作废
+ if(row.useStatus=="2" && !row.restoreInstanceId){
+ // 恢复
+ actions.push(' 恢复 ');
}
// 有流程实例id
if (row.instanceId) {
@@ -197,7 +216,39 @@
}
};
$.table.init(options);
+ selectUserAll();
});
+
+ function cancel(id) {
+ $.modal.confirm("确定作废该出差单信息吗？", function() {
+ var url = prefix + "/cancel/" + id;
+ $.modal.open("作废", url);
+ })
+ }
+ function selectUserAll(){
+ $.ajax({
+ url: ctx +'system/baseExpense/getExpenseUser',
+ type: 'post',
+ async: false,
+ success: function (result) {
+ userList = result.data;
+ var selectUser = $("select[name='applyUser']");
+ var selectHtml = '';
+ userList.forEach(function (user) {
+ selectHtml += '';
+ });
+ selectUser.html(selectHtml);
+ }
+ });
+ }
+
+ function hrRecord(evectionId){
+ $.modal.open("出行费用",prefix + "/hrRecord/" + evectionId);
+ }
+
+ function hrApprove(evectionId){
+ $.modal.open("核准",prefix + "/hrApprove/" + evectionId);
+ }