From 773248c9a381330a7a5db905a63b7e191b8afdc4 Mon Sep 17 00:00:00 2001 From: jiang Date: Thu, 10 Jul 2025 17:58:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=BA=E5=85=B7=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/rm/UnFinishContentList.jsp | 8 +- .../WEB-INF/views/rm/unFinishWorkList.jsp | 288 +++++++++--------- resources/mybatis/wf/TaskRecordMapper.xml | 57 ++-- 3 files changed, 181 insertions(+), 172 deletions(-) diff --git a/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp b/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp index 2e19acf..d8f54a9 100644 --- a/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp +++ b/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp @@ -6,7 +6,7 @@ - + ${(page.pageNum-1)*page.pageSize+index.index+1} <%-- ${ma.unitName} @@ -192,7 +192,7 @@ --%> - ${ma.number} + ${ma.number} ${ma.creatorName} @@ -232,10 +232,10 @@ localStorage.setItem("name", name); //window.open("http://192.168.0.14:21625/gz-gqj/index.html") if(processName === '派车计划'){ - window.open("http://localhost:63343/gz_car_ui/page/car_demand_plan/child/dispatch_car_detail.html?id="+id +"&token="+data.token) + window.open("http://localhost:63342/gz_car_ui/page/car_demand_plan/child/dispatch_car_detail.html?id="+id +"&token="+data.token) }else if(processName === '用车计划'){ - window.open("http://localhost:63343/gz_car_ui/page/car_demand_plan/child/apply_plan_detail.html?id="+id +"&token="+data.token) + window.open("http://localhost:63342/gz_car_ui/page/car_demand_plan/child/apply_plan_detail.html?id="+id +"&token="+data.token) } } else { diff --git a/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp b/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp index a4e9c79..31017c9 100644 --- a/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp +++ b/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp @@ -3,159 +3,171 @@ -<%@include file="../baseset.jsp" %> -<%@include file="../systemset.jsp" %> - - - + <%@include file="../baseset.jsp" %> + <%@include file="../systemset.jsp" %> + + +
-
-
-
-
-
+
+
+ +
+
  任务状态： - - - -
+ + +
- - - - - - - - - - - - - - - - - -
序号任务名称创建时间任务单号创建人任务情况
-
-
-
-
- -
-
    -
    -
    +
    + + + + + + + + + + + + + + + + + +
    序号任务名称创建时间任务单号创建人任务情况
    +
    +
    +
    +
    + +
    +
      +
      +
      <%@include file="unFinishWorkListDetails.jsp" %> - <%@include file="../dialog.jsp" %> -
      + <%@include file="../dialog.jsp" %>
      +
      + $("#keyWord").keydown(function(e) { + keycode = e.which || e.keyCode; + if (keycode == 13) { + search(); + } + }); + }); + + function search(){ + $("#search").trigger("click"); + } + + function getbaseList(init) { + var isFinish =$("#isFinish").val(); + var data = {pageNum:init}; + data = {pageNum:init,pageSize:10 }; + var keyWord = $("#keyWord").val(); + console.log("keyw=",keyWord); + if(JY.Object.notNull(keyWord)){ + data.keyWord = keyWord; + } + data = Object.assign(data,obj); + JY.Model.loading(); + $.ajax({ + type:"POST", + url:bonuspath +'/backstage/rm/taskRecord/findUnFinishContent?isFinish='+isFinish, + data: JSON.stringify(data ), + dataType:"html", + contentType:"application/json", + success:function(data){ + $("#baseTable tbody").html(data); + JY.Model.loadingClose(); + }, + error:function(data){ + console.log("ajax请求错误!"); + } + }) + } + function cleanForm() { + $("#auForm input[id$='unitName']").val(""); + $("#auForm input[id$='projectName']").val(""); + $("#auForm input[id$='taskName']").val(""); + $("#auForm input[id$='agreementCode']").val(""); + + $("#auForm input[id$='personName']").val(""); + $("#auForm input[id$='createTime']").val(""); + $("#auForm input[id$='testLoad']").val(""); + $("#auForm input[id$='holdingTime']").val(""); + $("#auForm input[id$='operaTionName']").val(""); + } + function assignment(data){ + $("#auForm input[id$='unitName']").val(data.unitName); + $("#auForm input[id$='projectName']").val(data.projectName); + $("#auForm input[id$='taskName']").val(data.taskName); + $("#auForm input[id$='agreementCode']").val(data.agreementCode); + + $("#auForm input[id$='personName']").val(data.personName); + $("#auForm input[id$='createTime']").val(data.createTime); + $("#auForm input[id$='testLoad']").val(data.testLoad); + $("#auForm input[id$='holdingTime']").val(data.holdingTime); + $("#auForm input[id$='operaTionName']").val(data.operaTionName); + } + \ No newline at end of file diff --git a/resources/mybatis/wf/TaskRecordMapper.xml b/resources/mybatis/wf/TaskRecordMapper.xml index cdf345b..45262c7 100644 --- a/resources/mybatis/wf/TaskRecordMapper.xml +++ b/resources/mybatis/wf/TaskRecordMapper.xml @@ -113,18 +113,17 @@ WHERE cpa.status = '1' - - AND cpa.status_type = '3' - - - AND cpa.status_type = '4' - - - AND 1 = 0 - + + + AND cpa.status_type = '4' + + + AND cpa.status_type = '3' + + + AND 1 = 0 + + AND pu.NAME LIKE CONCAT('%', #{param.keyWord}, '%') @@ -151,24 +150,22 @@ car_plan_out cpo LEFT JOIN pm_user pu ON pu.id = cpo.creator LEFT JOIN car_plan_apply cpa ON cpo.apply_id = cpa.id - WHERE - 1 = 1 - - AND cpo.status = '0' - - - AND cpo.status = '1' - - - - AND 1 = 0 - - - AND pu.NAME LIKE CONCAT('%', #{param.keyWord}, '%') - + + + + AND cpa.status_type = '0' + + + AND cpo.status = '1' + + + AND 1 = 0 + + + + AND pu.NAME LIKE CONCAT('%', #{param.keyWord}, '%') + + ) ORDER BY id DESC From 61c2a74d6ff64203ad7cc239844196bedf633d0c Mon Sep 17 00:00:00 2001 From: jiang Date: Thu, 10 Jul 2025 18:00:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=BA=E5=85=B7=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=94=B6=E8=97=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/views/rm/UnFinishContentList.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp b/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp index 46aad7b..56bb216 100644 --- a/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp +++ b/WebContent/WEB-INF/views/rm/UnFinishContentList.jsp @@ -6,6 +6,7 @@ + ${(page.pageNum-1)*page.pageSize+index.index+1} <%--