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 @@ +