Jelajahi Sumber

去除前端人员限制

yue 5 tahun lalu
induk
melakukan
3e52211720

+ 1 - 0
src/main/java/com/jeeplus/modules/act/web/ActTaskController.java

@@ -920,6 +920,7 @@ public class ActTaskController extends BaseController {
 		j.setMsg("审批成功;已经通知项目经理,施工单位");
 		return j;
 	}
+
 	@ResponseBody
 	@RequestMapping(value = "policiesDealTask")
 	public AjaxJson policiesDealTask(Act act,String fullName,String tuser,Construction construction) {

+ 1 - 1
src/main/java/com/jeeplus/modules/sys/web/FileController.java

@@ -316,7 +316,7 @@ public class FileController extends BaseController {
 		String fileUrl = Global.getAttachmentUrl2()+uploadPath+"/"+year+"/"+month+"/";
 		String fileDir = Global.getAttachmentDir2()+uploadPath+"/"+year+"/"+month+"/";
 		// 判断文件是否为空
-		if (!file.isEmpty()) {
+		if (!file.isEmpty()) {c
 			// 文件保存路径
 			// 转存文件
 			FileUtils.createDirectory(fileDir);

+ 1 - 5
src/main/webapp/webpage/modules/sg/managementcenter/activiti/designUpload.jsp

@@ -12,13 +12,10 @@
 		$(document).ready(function() {
 
 			$("#agree").click(function () {
-				var design = $("#tuserName").val();
 				var currentFileValues = $("input[name='pic']").val();
 				var currentFileValues1 = $("input[name='pic1']").val();
 				var currentFileValues2 = $("input[name='pic2']").val();
-				if (design == "" || design == null) {
-					jp.error("请选择用户");
-				}else if (currentFileValues==""||currentFileValues==null) {
+			 if (currentFileValues==""||currentFileValues==null) {
 					jp.error("请上传变更后图纸");
 				}else if (currentFileValues1==""||currentFileValues1==null) {
 					jp.error("请上传预算书");
@@ -38,7 +35,6 @@
 						"pic":currentFileValues,
 						"pic1":currentFileValues1,
 						"pic2": currentFileValues2,
-						"design":design,
 						"comment":window.encodeURI(message)
 					},
 					function (data) {

+ 0 - 7
src/main/webapp/webpage/modules/sg/managementcenter/activiti/economicsDesignChange.jsp

@@ -10,10 +10,6 @@
 	<script type="text/javascript">
 		$(document).ready(function () {
 			$("#agree").click(function () {
-				var design = $("#tuserName").val();
-				if (design == "" || design == null) {
-					jp.error("请选择用户");
-				} else {
 					jp.prompt("审核", function (message) {
 						jp.post("${ctx}/act/task/economics",
 						{
@@ -22,7 +18,6 @@
 							"taskDefKey":"${construction.act.taskDefKey}",
 							"procInsId":"${construction.act.procInsId}",
 							"procDefId":"${construction.act.procDefId}",
-							"design":design,
 							"flag":"yes",
 							"comment":window.encodeURI(message)
 						},
@@ -33,9 +28,7 @@
 							}
 						})
 					});
-				}
 			});
-
 			$("#no").click(function () {
 				jp.prompt("驳回", function (message) {
 					jp.post("${ctx}/act/task/economics",

+ 22 - 61
src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorDesignChange.jsp

@@ -14,68 +14,29 @@
 				$("#demandUnit2").css("display", "none");
 			}
 			$("#agree").click(function () {
-				var design = $("#tuserName").val();
-				var fabg = $("#fabg").val();
 				var pic = $("#pic").val();
-				var currentFileValues = $("input[name='pic']").val();
-				if (design==""||design==null) {
-					jp.error("请选择用户")
-					return;
-				}else if (fabg == "是") {
-					if (pic == "" || pic == null) {
-						jp.error("请上传方案图");
-						return;
-					} else {
-						jp.prompt("审核意见", function (message) {
-							jp.post("${ctx}/act/task/operator",
-							{
-								"taskId":"${construction.act.taskId}",
-								"taskName":"${construction.act.taskName}",
-								"taskDefKey":"${construction.act.taskDefKey}",
-								"procInsId":"${construction.act.procInsId}",
-								"procDefId":"${construction.act.procDefId}",
-								"flag":"yes",
-								"design":design,
-								"projectName":"${fns:unescapeHtml(construction.projectName)}",
-								"comment":window.encodeURI(message)
-							},
-							function (data) {
-								if(data.success){
-									jp.success(data.msg);
-									jp.go("${ctx}/act/task/todo")
-								}else {
-									jp.error("请选择与需求提出单位对应的人员")
-								}
-							})
-						});
-					}
-				} else {
-					jp.prompt("审核意见", function (message) {
-						jp.post("${ctx}/act/task/operator",
-								{
-									"taskId":"${construction.act.taskId}",
-									"taskName":"${construction.act.taskName}",
-									"taskDefKey":"${construction.act.taskDefKey}",
-									"procInsId":"${construction.act.procInsId}",
-									"procDefId":"${construction.act.procDefId}",
-									"flag":"yes",
-									"pic":currentFileValues,
-									"design":design,
-									"projectName":"${fns:unescapeHtml(construction.projectName)}",
-									"comment":window.encodeURI(message)
-								},
-								function (data) {
-									if(data.success){
-										jp.success(data.msg);
-										jp.go("${ctx}/act/task/todo")
-									}else {
-										jp.error("请选择与需求提出单位对应的人员")
-									}
-								})
-					});
-				}
-				// alert(design);
-
+				jp.prompt("审核意见", function (message) {
+					jp.post("${ctx}/act/task/operator",
+					{
+						"taskId":"${construction.act.taskId}",
+						"taskName":"${construction.act.taskName}",
+						"taskDefKey":"${construction.act.taskDefKey}",
+						"procInsId":"${construction.act.procInsId}",
+						"procDefId":"${construction.act.procDefId}",
+						"flag":"yes",
+						"pic":pic,
+						"projectName":"${fns:unescapeHtml(construction.projectName)}",
+						"comment":window.encodeURI(message)
+					},
+					function (data) {
+						if(data.success){
+							jp.success(data.msg);
+							jp.go("${ctx}/act/task/todo")
+						}else {
+							jp.error("请选择与需求提出单位对应的人员")
+						}
+					})
+				});
 			});
 			$("#no").click(function () {
 				// alert(design);

+ 2 - 9
src/main/webapp/webpage/modules/sg/managementcenter/activiti/operatorUploadList.jsp

@@ -13,11 +13,7 @@
 		$(document).ready(function() {
 
 			$("#agree").click(function () {
-				var design = $("#tuserName").val();
 				var currentFileValues = $("input[name='pic']").val();
-				if (design == "" || design == null) {
-					jp.error("请选择用户");
-				} else {
 					jp.prompt("审核意见", function (message) {
 						jp.post("${ctx}/act/task/operatorUpload",
 						{
@@ -38,11 +34,9 @@
 							}
 						})
 					});
-				}
 				// alert(design);
 			});
 			$("#no").click(function () {
-				var design = $("#tuserName").val();
 				var currentFileValues = $("input[name='pic']").val();
 				jp.prompt("审核意见", function (message) {
 					jp.post("${ctx}/act/task/operatorUpload",
@@ -54,7 +48,6 @@
 							"procDefId":"${uploadImages.act.procDefId}",
 							"flag":"no",
 							"pic":currentFileValues,
-							"design":design,
 							"comment":window.encodeURI(message)
 						},
 						function (data) {
@@ -107,7 +100,7 @@
 				<form:hidden path="act.taskDefKey"/>
 				<form:hidden path="act.procInsId"/>
 				<form:hidden path="act.procDefId"/>
-				<table class="table table-bordered">
+<%--				<table class="table table-bordered">
 					<tbody>
 					<tr>
 						<td class="width-15 active"><label class="pull-right"><font color="red">*</font>配网项目经理:</label></td>
@@ -117,7 +110,7 @@
 						</td>
 					</tr>
 					</tbody>
-				</table>
+				</table>--%>
 				<div class="form-group">
 					<div class="col-lg-3"></div>
 					<div class="col-lg-6">