diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 272c9e8..00d5c51 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -264,7 +264,7 @@ - + @@ -616,7 +616,8 @@ - 解决方案协同: + 解决方案协同: <#if projectBudget.resolvePlanSynergy??> @@ -3287,8 +3288,10 @@
${node.taskComment} +<#-- <#if node.fileUrl! !=""> +<#-- target="_blank">下载会签单--> <#if node.fileUrl! !="">下载会签单 + target="_blank">特批报备记录
@@ -3811,6 +3814,28 @@
+
flex <#else> none ;"> +
+ 特批报备记录 +
+
+ + + + + +
+
+
@@ -3904,6 +3929,11 @@ + + + + + @@ -3982,6 +4012,8 @@ var completeTask = function (projectId) { var message = $("#doc-vld-ta-2").val(); var approvetype = $("#type").val(); + var fileUrl = $("#file_upload_image_check").attr('fileUrl'); + if (message == '') { layer.alert("请填写审核意见"); return; @@ -3990,7 +4022,8 @@ var type = $("input[name='docVlGender']:checked").val(); var params = { type: type, - message: message + message: message, + fileUrl }; $.ajax({ url: '${base}/project/completeTask/' + projectId + "/" + approvetype, @@ -4146,7 +4179,11 @@ if (url) location.href = url } - + function downFile3() { + var url = $('#file_upload_image_check').attr('fileUrl') + if (url) + location.href = url + } function closeEmpty() { $('.tr-budget-plan-empty').css('display', 'none'); $('.openEmpty').css('display', 'inline-block'); @@ -4182,4 +4219,31 @@ }) } }) + + var generateFileupload3 = function (name) { + + $("#file_upload_image").fileupload({ + url: "${base}/file/upload", + dataType: 'json', + maxFileSize: 50 * 1024 * 1024, + maxNumberOfFiles: 1, + start: function (e) { + }, + done: function (e, data) { + console.log(data); + //设置服务器返回的url + $("#fileUrl_image").val(data.result.data.url); + $("#file_upload_image_check").text(data.result.data.newName).attr('fileUrl', data.result.data.url); + }, + progressall: function (e, data) { + }, + error: function (jqXHR2, textStatus, errorThrown) { + }, + fail: function (jqXHR2, textStatus) { + }, + processfail: function (e, data) { + } + }); + }; + generateFileupload3() \ No newline at end of file diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index f112c57..ef82753 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -2503,7 +2503,6 @@ }, error: function (data, status, e) { console.log("--------error---------" + data) - layer.alert("-----------------" + data); // if ($('#modal')) { // $('#modal').modal('close'); // }