From a0a3cb2a1ab48e54cd5a914dfb5de151079db2c4 Mon Sep 17 00:00:00 2001 From: dshclm <3321914460@qq.com> Date: Mon, 19 May 2025 16:27:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E6=9B=BF=E6=8D=A2=E6=B6=88=E6=81=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/system/newdev/apply/add.html | 80 ++++++++-------- .../system/newdev/apply/applyList.html | 18 +++- .../templates/system/newdev/apply/edit.html | 56 +++++++---- .../system/newdev/apply/editFile.html | 77 ++++++++++----- .../system/newdev/audit/editAudit.html | 93 +++---------------- 5 files changed, 163 insertions(+), 161 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/add.html b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/add.html index 114a7c49..25b81fdf 100644 --- a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/add.html @@ -5,6 +5,7 @@ + @@ -292,6 +293,7 @@ + diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html index 25522b19..84ef888d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html @@ -126,10 +126,17 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('材料提交 '); - actions.push('编辑 '); - actions.push('删除'); - return actions.join(''); + if (row.applyStatus == 3) { + actions.push('材料提交 '); + actions.push('退回原因 '); + actions.push('编辑 '); + actions.push('删除'); + }else{ + actions.push('材料提交 '); + actions.push('编辑 '); + actions.push('删除'); + } + return actions.join(''); } }] }; @@ -139,6 +146,9 @@ table.set(); $.modal.openTab("材料提交", $.operate.detailUrl(id)); } + function openMsg(row){ + alert(row); + } diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html index 731ec90f..47d05b15 100644 --- a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/edit.html @@ -1,10 +1,10 @@ - - + + @@ -292,6 +292,7 @@ + - + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/editFile.html b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/editFile.html index 683527fa..a4c67f0a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/editFile.html +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/editFile.html @@ -4,6 +4,7 @@ + @@ -411,6 +412,7 @@ + @@ -124,7 +125,7 @@

JPG, PNG (最大 2MB) @@ -297,9 +298,6 @@ - @@ -364,6 +362,7 @@ +