归档批次管理0.2.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/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>