Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectFilingBatch/service/ProjectFilingBatchService.java

@@ -466,7 +466,7 @@ public class ProjectFilingBatchService extends CrudService<ProjectFilingBatchDao
                     workActivityProcess.setId("");
                 }
                 // 审核环节
-                if ("xxgdydyhu".equals(taskDefKey) && "1".equals(count)) {
+                if ("bggdgly".equals(taskDefKey) && "1".equals(count)) {
                     taskCount = count;
                     if ("yes".equals(projectFilingBatch.getAct().getFlag())) {
                         workActivityProcess.setIsApproval("1");

src/main/java/com/jeeplus/modules/projectFilingBatch/web/ProjectFilingBatchController.java

@@ -264,8 +264,24 @@ public class ProjectFilingBatchController extends BaseController {
         }
         return "redirect:" + Global.getAdminPath() + "/projectFilingBatch/projectFilingBatchInfo/?repage";
     }
-
-
+    /**
+     * 撤回
+     * @param projectFilingBatch
+     * @param redirectAttributes
+     * @return
+     */
+    @RequestMapping(value = "delete")
+    public String delete(ProjectFilingBatch projectFilingBatch, RedirectAttributes redirectAttributes) {
+        int status = projectFilingBatch.getFilingStatus();
+        if(status== ProjectStatusEnum.TSTORE.getValue()||status== ProjectStatusEnum.REJECTED.getValue()||status== ProjectStatusEnum.RECALL.getValue()){
+            projectFilingBatchService.delete(projectFilingBatch);
+            addMessage(redirectAttributes, "归档作废成功");
+            return "redirect:"+Global.getAdminPath()+"/projectFilingBatch/projectFilingBatchInfo/?repage";
+        }else {
+            addMessage(redirectAttributes, "归档作废失败，只有“暂存”、“驳回”、“撤回”状态的项目才能作废");
+        }
+        return "redirect:" + Global.getAdminPath() + "/projectFilingBatch/projectFilingBatchInfo/?repage";
+    }
     /**
      * 线下归档员进行归档审批——项目审批
      * 修改

src/main/java/com/jeeplus/modules/workcontractinfo/web/WorkContractInfoController.java

@@ -178,11 +178,11 @@ public class WorkContractInfoController extends BaseController {
                 }
                 if(user.getRoleList().size()>0){
                     //判断是否为归档员
-                    if ("htgly".equals(user.getRoleList().get(0).getEnname())){
-                        info.setOpinion("1");
-                    }else{
-                        info.setOpinion("0");
-                    }
+//                    if ("htgly".equals(user.getRoleList().get(0).getEnname())){
+//                        info.setOpinion("1");
+//                    }else{
+//                        info.setOpinion("0");
+//                    }
                     //判断是否为admin
                     if (UserUtils.isManager()){
                         info.setFlagAdmin("1");

src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2707,7 +2707,7 @@ public class WorkProjectNotifyController extends BaseController {
 					if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
 						return "modules/projectFilingBatch/projectFilingBatchView";
 					} else if (workProjectNotify.getRemarks().contains("待审批") && !"1".equals(workProjectNotify.getStatus())) {
-						return "modules/projectFilingBatch/projectFilingBatchAudit";
+						return "modules/projectFilingBatch/projectFilingBachAuditre";
 					} else if (workProjectNotify.getRemarks().contains("重新申请") && !"1".equals(workProjectNotify.getStatus())) {
 						return "modules/projectFilingBatch/projectFilingBatchApply";
 					} else {

src/main/resources/mappings/modules/projectGuidang/ProjectFilingBatchDao.xml

@@ -116,4 +116,9 @@
 		WHERE a.id = #{id}
 		order by a.create_date desc
 	</select>
+	<delete id="delete">
+		UPDATE project_filingbatch SET
+			filing_status= 7
+		WHERE id = #{id}
+	</delete>
 </mapper>

src/main/webapp/WEB-INF/tags/sys/iconselect.tag

@@ -3,12 +3,11 @@
 <%@ attribute name="id" type="java.lang.String" required="true" description="编号"%>
 <%@ attribute name="name" type="java.lang.String" required="true" description="输入框名称"%>
 <%@ attribute name="value" type="java.lang.String" required="true" description="输入框值"%>
-<i id="${id}Icon" class="icon-${not empty value?value:' hide'}"></i>&nbsp;<span id="${id}IconLabel">${not empty value?value:'无'}</span>&nbsp;
-<input id="${id}" name="${name}" type="hidden" value="${value}"/><a id="${id}Button" href="javascript:" class="btn btn-primary">选择</a>&nbsp;&nbsp;
-<input id="${id}clear" class="btn btn-default" type="button" value="清除" onclick="clear()"/>
+<div style="float: left;padding: 10px;"><i id="${id}Icon" class="icon-${not empty value?value:' hide'}"></i>&nbsp;<span id="${id}IconLabel">${not empty value?value:'无'}</span>&nbsp;</div>
+<input id="${id}" name="${name}" type="hidden" value="${value}"/><a id="${id}Button" href="javascript:" class="btn btn-primary" style="float: left;margin:0px 10px;">选择</a>&nbsp;&nbsp;
+<input id="${id}clear"  style="float: left;" class="btn btn-default" type="button" value="清除" onclick="clear()"/>
 <script type="text/javascript">
 	$("#${id}Button").click(function(){
-	
 		top.layer.open({
 			type: 2, 
 			title:"选择图标",
@@ -27,9 +26,8 @@
 		});
 	});
 	$("#${id}clear").click(function(){
-		 $("#${id}Icon").attr("class", "icon- hide");
+		 $("#${id}Icon").attr("class", "icon-hide");
          $("#${id}IconLabel").text("无");
          $("#${id}").val("");
-
 	});
 </script>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBachAuditre.jsp

@@ -506,23 +506,22 @@
                         <c:forEach items="${projectFilingBatch.project}" var="project" varStatus="index">
                             <tr>
                                 <td>
-                                    <input name="" type="text" readonly value="${project.projectId}" class="form-control isPhone"/>
+                                    <input name="projectId" type="text" readonly value="${project.projectId}" class="form-control isPhone"/>
                                 </td>
                                 <td>
-                                    <input name="" type="text" readonly value="${project.projectName}" class="form-control isPhone"/>
+                                    <input name="projectName" type="text" readonly value="${project.projectName}" class="form-control isPhone"/>
                                 </td>
                                 <td>
-                                    <input name="" type="text" readonly value="${project.projectReportNumber}" class="form-control isPhone"/>
+                                    <input name="projectReportNumber" type="text" readonly value="${project.projectReportNumber}" class="form-control isPhone"/>
                                 </td>
-                                <td><input name="" type="text" value="" class="form-control isPhone"/></td>
-                                <td><input id=""
-                                           name=" " type="text"
-                                           value="" class="form-control isTel"/></td>
+                                <td><input id="boxNum" type="text" value="${projectFilingBatch.boxNum}" class="form-control isPhone"/></td>
+                                <td><input id="reboxNum" onchange="upcase(this)" type="text" class="form-control isTel"/></td>
                                 <td>
-                                    <select path="" id="clientType" class="form-control simple-select required">
-                                        <option value="" label="--请选择--"/>
-                                        <options valer="通过" itemLabel="label" itemValue="value" htmlEscape="false"/>
-                                        <options valer="驳回" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                                    <input type="hidden" id="getProId" value="${project.id}"/>
+                                    <select onchange="proType(this)" id="clientType" class="form-control simple-select required">
+                                        <option value="" label="--是否通过--"/>
+                                        <option value="5" itemLabel="label">通过</option>
+                                        <option value="4" itemLabel="label">驳回</option>
                                     </select>
                                 </td>
 
@@ -530,114 +529,68 @@
                         </c:forEach>
                         </tbody>
                     </table>
-                    <script type="text/javascript">
-                        var workClientLinkmanRowIdx = 0,
-                            workClientLinkmanTpl = $("#workClientLinkmanTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
-                        var workClientBankRowIdx = 0,
-                            workClientBankTpl = $("#workClientBankTpl").html().replace(/(\/\/\<!\-\-)|(\/\/\-\->)/g, "");
-                        $(document).ready(function () {
-                            var data = ${fns:toJson(workClientInfo.workClientLinkmanList)};
-                            for (var i = 0; i < data.length; i++) {
-                                addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanTpl, data[i]);
-                                workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                            }
-                            var dataBank = ${fns:toJson(workClientInfo.workClientBankList)};
-                            for (var i = 0; i < dataBank.length; i++) {
-                                addRow('#workClientBankList', workClientBankRowIdx, workClientBankTpl, dataBank[i]);
-                                workClientBankRowIdx = workClientBankRowIdx + 1;
-                            }
-                        });
-
-                    </script>
                 </div>
             </div>
             <div class="form-group layui-row page-end"></div>
         </form:form>
+        <div class="form-group layui-row">
+            <div class="form-group-label"><h2>审批流程</h2></div>
+            <div class="layui-item layui-col-xs12 form-table-container" >
+                <act:flowChart procInsId="${projectFilingBatch.processinstanceId}"/>
+                <act:histoicFlow procInsId="${projectFilingBatch.processinstanceId}"/>
+            </div>
+        </div>
     </div>
 </div>
-<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>
+<%--<script src="${ctxStatic}/layer-v2.3/layui/layui.all.js" charset="utf-8"></script>--%>
 <script>
-    function contentDetailTypeShow() {
-        $.ajax({
-            type:'post',
-            url:'${ctx}/workclientinfo/workClientInfo/getJobType',
-            data:{
-                "type":2
-            },
-            success:function(data){
-                if(data.success) {
-                    var data = data.body.list;
-                    var newDataList = data;
-                    var showList = [];
-                    $.ajax({
-                        type:'post',
-                        url:'${ctx}/workclientinfo/workClientInfo/getJobTypeById',
-                        data:{
-                            "id":$("#id").val()
-                        },
-                        success:function(dataListById){
-
-                            if(dataListById.success) {
-                                var showDataList = dataListById.body.list;
-                                var lists = [];
-                                for (i in newDataList) {
-                                    for (j in showDataList) {
-                                        if (newDataList[i].value == showDataList[j].value) {
-                                            var newData = {
-                                                "name": newDataList[i].name,
-                                                "value": newDataList[i].value,
-                                                "selected": true
-
-                                            }
-                                            lists.push(newDataList[i].value);
-                                            showList.push(newData);
-                                            data.splice(i,1,newData);
-                                        }
-                                    }
-                                }
-                                if(0 == showDataList.length){
-                                    var newData = {
-                                        "name": newDataList[0].name,
-                                        "value": newDataList[0].value,
-                                        "selected": true
-
-                                    }
-                                    lists.push(newDataList[0].value);
-                                    showList.push(newData);
-                                    data.splice(0,1,newData);
-                                }
-
-                                $("#jobTypeStr").val(lists);
-                                xmSelect.render({
-                                    el: '#jobType',
-                                    language: 'zn',
-                                    data:data
-                                })
-                            }
-                        }
-                    })
+    function upcase(obj) {
+        var tr=obj.parentNode.parentNode;
+        var boxNum=jQuery(tr).find("#boxNum").val()
+        var reboxNum=jQuery(tr).find("#reboxNum").val()
+        if (boxNum!=""){
+            if (reboxNum!=""){
+                if(boxNum!=reboxNum){
+                    layer.msg("确认盒号与盒号不匹配", { icon: 2, offset: "error", time:2000 });
                 }
+            }else{
+                layer.msg("请输入再次确认盒号", { icon: 2, offset: "error", time:2000 });
             }
-        })
+        }else{
+            layer.msg("请输入盒号", { icon: 2, offset: "error", time:2000 });
+        }
     }
+    function proType(obj) {
+        var tr=obj.parentNode.parentNode;
+        var boxNum=jQuery(tr).find("#boxNum").val()
+        var reboxNum=jQuery(tr).find("#reboxNum").val()
+        var pass=jQuery(tr).find("#clientType").val();
+        var proId=jQuery(tr).find("#getProId").val();
+        if (boxNum!=""){
+            if (reboxNum!=""){
+                if(boxNum!=reboxNum){
+                }else{
+                    //修改项目状态
+                    $.ajax({
+                        type : "POST",
+                        url : "${ctx}/projectFilingBatch/projectFilingBatchInfo/updateProjectPass",
+                        data : {
+                            'status':pass,
+                            'proId':proId,
+                            "boxNum":boxNum,
+                            "reboxNum":reboxNum
+                        },
+                        //请求成功
+                        success : function(result) {
+                            layer.msg("项目状态修改成功", { icon: 1, offset: "auto", time:2000 });
+                        },
 
-    var jobType = xmSelect.render({
-        el: '#jobType',
-        language: 'zn',
-        data: [
-        ]
-    })
-
-
-    document.getElementById('jobType').onblur=function(){
-        var list = [];
-        //获取当前多选选中的值
-        var selectArr = jobType.getValue();
-        for (var i in selectArr){
-            list.push(selectArr[i].value);
+                    });
+                }
+            }else{
+                layer.msg("请输入再次确认盒号", { icon: 2, offset: "error", time:2000 });
+            }
         }
-        $("#jobTypeStr").val(list);
-        console.log(list);
     }
 </script>
 </body>

src/main/webapp/webpage/modules/projectFilingBatch/projectFilingBatchList.jsp

@@ -271,7 +271,7 @@
                         }
                         if(d.candel != undefined && d.candel =="1")
                         {
-                            xml+="<a href=\"${ctx}/project/projectRecords/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
+                            xml+="<a href=\"${ctx}/projectFilingBatch/projectFilingBatchInfo/delete?id=" + d.id + "\" onclick=\"return confirmx('确认要删除该项目信息吗？', this.href)\" class=\"op-btn op-btn-delete\"><i class=\"fa fa-trash\"></i> 删除</a>";
                         }
                         if(d.cancancel != undefined && d.cancancel =="1")
                         {

src/main/webapp/webpage/modules/sys/menuForm.jsp

@@ -43,24 +43,27 @@
 		   <tbody>
 		      <tr>
 		         <td  class="width-15 active"><label class="pull-right">上级菜单:</label></td>
-		         <td class="width-35" ><sys:treeselect id="menu" name="parent.id" value="${menu.parent.id}" labelName="parent.name" labelValue="${menu.parent.name}"
-					title="菜单" url="/sys/menu/treeData" extId="${menu.id}" cssClass="form-control required"/></td>
+		         <td class="width-35" >
+					 <sys:treeselect id="menu" name="parent.id" value="${menu.parent.id}" labelName="parent.name" labelValue="${menu.parent.name}"
+									 title="菜单" url="/sys/menu/treeData" extId="${menu.id}" cssClass="form-control layui-input required" notAllowSelectParent="false"/>
 		         <td  class="width-15 active"><label class="pull-right"><font color="red">*</font> 名称:</label></td>
-		         <td  class="width-35" ><form:input path="name" htmlEscape="false" maxlength="50" class="required form-control "/></td>
+		         <td  class="width-35" >
+					 <form:input path="name" htmlEscape="false" maxlength="50" class="form-control layui-input required"/>
+				 </td>
 		      </tr>
 		      <tr>
 		         <td  class="width-15 active"><label class="pull-right">链接:</label></td>
-		         <td class="width-35" ><form:input path="href" htmlEscape="false" maxlength="2000" class="form-control "/>
+		         <td class="width-35" ><form:input path="href" htmlEscape="false" maxlength="2000" class="form-control layui-input"/>
 					<span class="help-inline">点击菜单跳转的页面</span></td>
 		         <td  class="width-15 active"><label class="pull-right">目标:</label></td>
-		         <td  class="width-35" ><form:input path="target" htmlEscape="false" maxlength="10" class="form-control "/>
+		         <td  class="width-35" ><form:input path="target" htmlEscape="false" maxlength="10" class="form-control layui-input"/>
 					<span class="help-inline">链接打开的目标窗口，默认：mainFrame</span></td>
 		      </tr>
 		      <tr>
 		         <td  class="width-15 active"><label class="pull-right">图标:</label></td>
 		         <td class="width-35" ><sys:iconselect id="icon" name="icon" value="${menu.icon}"/></td>
 		         <td  class="width-15 active"><label class="pull-right">排序:</label></td>
-		         <td  class="width-35" ><form:input path="sort" htmlEscape="false" maxlength="50" class="required digits form-control "/>
+		         <td  class="width-35" ><form:input path="sort" htmlEscape="false" maxlength="50" class="form-control layui-input"/>
 					<span class="help-inline">排列顺序，升序。</span></td>
 		      </tr>
 		      <tr>
@@ -68,12 +71,12 @@
 		         <td class="width-35" ><form:radiobuttons path="isShow" items="${fns:getDictList('show_hide')}" itemLabel="label" itemValue="value" htmlEscape="false" class="required i-checks "/>
 					<span class="help-inline">该菜单或操作是否显示到系统菜单中</span></td>
 		         <td  class="width-15 active"><label class="pull-right">权限标识:</label></td>
-		         <td  class="width-35" ><form:input path="permission" htmlEscape="false" maxlength="100" class="form-control "/>
+		         <td  class="width-35" ><form:input path="permission" htmlEscape="false" maxlength="100" class="form-control layui-input"/>
 					<span class="help-inline">控制器中定义的权限标识，如：@RequiresPermissions("权限标识")</span></td>
 		      </tr>
 		      <tr>
 		         <td  class="width-15 active"><label class="pull-right">备注:</label></td>
-		         <td class="width-35" ><form:textarea path="remarks" htmlEscape="false" rows="3" maxlength="200" class="form-control "/></td>
+		         <td class="width-35" ><form:textarea path="remarks" htmlEscape="false" rows="3" class="form-control layui-input "/></td>
 		         <td  class="width-15 active"><label class="pull-right"></label></td>
 		         <td  class="width-35" ></td>
 		      </tr>

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -806,16 +806,12 @@
 							<c:when test="${(workContractInfo.borrowStatus == '1' or workContractInfo.borrowStatus == '3' or workContractInfo.borrowStatus == '4')}">,"candeleteBorrow":"1"</c:when>
 						</c:choose>
 					</c:if>
-					<c:if test="${'1' == workContractInfo.opinion}">
-						<c:choose>
-							<c:when test="${workContractInfo.borrowStatus == '5' && workContractInfo.giveStatus != '5'}">,"giveBorrow":"1"</c:when>
-						</c:choose>
-					</c:if>
 					<c:if test="${'1' == workContractInfo.flagAdmin}">
 						<c:choose>
 							<c:when test="${workContractInfo.contractState == 5 }">,"updateAdmin":"1"</c:when>
 						</c:choose>
 					</c:if>
+					<shiro:hasPermission name="workcontractrecord:workContractRecord:revert">,"giveBorrow":	<c:choose><c:when test="${workContractInfo.borrowStatus == '5' && workContractInfo.giveStatus != '5'}">"1"</c:when><c:otherwise>"0"</c:otherwise></c:choose></shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>