diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/PromiseInfoListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/PromiseInfoListController.java index 0314d455..23a0c112 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/PromiseInfoListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/apply/PromiseInfoListController.java @@ -59,7 +59,7 @@ public class PromiseInfoListController extends BaseController { public String editPromise(@PathVariable("applyId") String applyId, ModelMap mmap) { TdApplyInfoListDTO applyInfoList = applyInfoListManager.getTdApplyInfoList(applyId); mmap.put("applyInfoList", applyInfoList); - return prefix + "/editAudit"; + return prefix + "/editPromise"; } /** 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 bedadbed..313cb04e 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 @@ -358,7 +358,7 @@

PDF生成成功

您的PDF表单已成功填写,可以点击下方按钮下载。

- + 下载PDF + +
+ + - -
-
- -
- + +
+
+
-
-
-
-
- -
- + +
+
+
+

{{ previewingFile.fileName }}

+
-
-
-
-
- -
- +
+ 预览图
-
-
-
-
-
- -
-
-
- +
+
- - +
+ + + + + - - + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/promise/editPromise.html b/ruoyi-admin/src/main/resources/templates/system/newdev/promise/editPromise.html new file mode 100644 index 00000000..8f6c57d9 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/promise/editPromise.html @@ -0,0 +1,410 @@ + + + + + + + + + + + + + + + + +
+
+
+
+ + + +

材料上传

+
+
+
+ +
+
+ + +
+
+ 上传中: {{ currentFileName }} + {{ uploadProgress }}% +
+
+
+
+
+ + +
+
+ +

暂无上传文件

+
+
+
+
+ +
+
+

{{ file.fileName }}

+
+
+ + + +
+
+
+
+
+ +
+
+   + +
+
+
+ +
+
+ + {{ uploadSuccessMessage }} +
+
+ +
+
+
+

{{ previewingFile.fileName }}

+ +
+
+ 预览图 +
+
+ +
+
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/promise/promiseList.html b/ruoyi-admin/src/main/resources/templates/system/newdev/promise/promiseList.html index 4b251ce7..3957bc23 100644 --- a/ruoyi-admin/src/main/resources/templates/system/newdev/promise/promiseList.html +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/promise/promiseList.html @@ -49,7 +49,8 @@ $(function() { var options = { url: prefix + "/list", - modalName: "人员承诺书提交", + modalName: "保密承诺书提交", + detailUrl:prefix + "/editPromise/{id}", type: 0, columns: [ { diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/train/training.html b/ruoyi-admin/src/main/resources/templates/system/newdev/train/training.html index 61094435..753876ea 100644 --- a/ruoyi-admin/src/main/resources/templates/system/newdev/train/training.html +++ b/ruoyi-admin/src/main/resources/templates/system/newdev/train/training.html @@ -199,12 +199,6 @@ 下载培训登记表模板 - - - - - -
@@ -537,10 +531,6 @@ } return ''; }, - downloadTemplate() { - // 从本地下载PDF模板 - window.open(ctx + 'system/file/downloadTemplate?templateCode=train_record', '_blank'); - }, }, mounted() { // 从后端获取数据