diff --git a/WebContent/WEB-INF/views/newInput/newInputAuditinglist.jsp b/WebContent/WEB-INF/views/newInput/newInputAuditinglist.jsp index 0fc7548..80ed3e6 100644 --- a/WebContent/WEB-INF/views/newInput/newInputAuditinglist.jsp +++ b/WebContent/WEB-INF/views/newInput/newInputAuditinglist.jsp @@ -18,772 +18,64 @@ - - -
-
- -
-

新入库审核列表

-
- - -
-
- - -
- - -
- - - -
-
- - -
-
- - - - - - - - - - - - - - - - - - -
- - 序号机具名称规格型号检验数量入库数量检验人入库人审核状态审核人审核时间操作
-
-
- - -
-
-
    -
    -
    -
    - - - <%@include file="../dialog.jsp" %> -
    - - - - +
    +
    +
    +
    +
    +
    + + + +
    +
    + + +
    + + + + + + + + + + + + + + + + + + +
    + + 序号机具名称规格规格检验数量入库数量检验人入库人是否审核审核人审核时间操作
    +
    +
    +
    +
    + +
    +
      +
      +
      +
      + + <%-- <%@include file="outstorageinspectionlist.jsp" %> --%> + + <%@include file="../dialog.jsp" %> +
      +
      +
      + \ No newline at end of file diff --git a/WebContent/WEB-INF/views/rm/unFinishWorkList-mobile.jsp b/WebContent/WEB-INF/views/rm/unFinishWorkList-mobile.jsp index 8526c22..0acbcef 100644 --- a/WebContent/WEB-INF/views/rm/unFinishWorkList-mobile.jsp +++ b/WebContent/WEB-INF/views/rm/unFinishWorkList-mobile.jsp @@ -306,6 +306,10 @@ +
      + + +
      @@ -374,6 +378,16 @@ updateSelectedCount(); loadTasks(currentPage); }); + + // 车辆计划 + $('#carPlan1').on('click', function() { + gotoCarPlan(1); + }); + + // 车辆计划 + $('#carPlan2').on('click', function() { + gotoCarPlan(2); + }); // 回车搜索 $('#keyword').on('keydown', function(e) { @@ -441,6 +455,39 @@ } }); } + //派车 + function gotoCarPlan(type) { + var uname = localStorage.getItem("uname"); + var pwd = localStorage.getItem("pwd"); + $.ajax({ + type: "post", + url: CAR_IP+"/gz-car/login/userLogin", + data: { + username: uname, + password: pwd + }, + success: function(data) { + if(data.code == "200") { + localStorage.setItem("token", data.token); + localStorage.setItem("name", name); + //需求计划 + if(type=='1' || type==1){ + window.open(CAR_HTML_IP+"page/car_demand_plan/H5/demand_plan_apply/index.html?token="+data.token,"gzcar") + }else if(type=='2' || type==2){//紧急用车 + window.open(CAR_HTML_IP+"page/car_demand_plan/H5/emergency_plan_apply/index.html?token="+data.token,"jjcar") + } + } else { + alert("没有权限！"); + + } + + }, + error: function(XMLHttpRequest, textStatus, errorThrown) { + alert("未连接到服务器，请检查网络！"+XMLHttpRequest.status); + } + }); + + } // 加载任务列表 function loadTasks(page) { diff --git a/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp b/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp index 097949c..8b03261 100644 --- a/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp +++ b/WebContent/WEB-INF/views/rm/unFinishWorkList.jsp @@ -35,6 +35,8 @@ + + @@ -150,6 +152,41 @@ content: '流程图' }); } + //派车 + function gotoCarPlan(type) { + var uname = localStorage.getItem("uname"); + var pwd = localStorage.getItem("pwd"); + $.ajax({ + type: "post", + url: CAR_IP+"/gz-car/login/userLogin", + data: { + username: uname, + password: pwd + }, + success: function(data) { + if(data.code == "200") { + localStorage.setItem("token", data.token); + localStorage.setItem("name", name); + //需求计划 + if(type=='1' || type==1){ + window.open(CAR_HTML_IP+"page/car_demand_plan/H5/demand_plan_apply/index.html?token="+data.token,"gzcar") + }else if(type=='2' || type==2){//紧急用车 + window.open(CAR_HTML_IP+"page/car_demand_plan/H5/emergency_plan_apply/index.html?token="+data.token,"jjcar") + } + } else { + alert("没有权限！"); + + } + + }, + error: function(XMLHttpRequest, textStatus, errorThrown) { + alert("未连接到服务器，请检查网络！"+XMLHttpRequest.status); + } + }); + + } + + $(function() { // 页面加载完成后立即获取待办列表 diff --git a/WebContent/static/js/bm/ip_utils.js b/WebContent/static/js/bm/ip_utils.js index 3f89f80..e16271e 100644 --- a/WebContent/static/js/bm/ip_utils.js +++ b/WebContent/static/js/bm/ip_utils.js @@ -1,14 +1,14 @@ //local -本地 //安全工器具 后端请求ip -let AQGQJ_IP='http://10.1.0.142:1999'; +let AQGQJ_IP='http://192.168.0.14:1999'; //安全工器具 -跳转页面地址 -let AQGQJ_HTML_IP='http://10.1.0.142:1999/gz-aqgqj/'; +let AQGQJ_HTML_IP='http://192.168.0.14:1999/gz-aqgqj/'; //车辆 后端请求IP -let CAR_IP='http://127.0.0.1:21522'; +let CAR_IP='http://192.168.0.14:1999'; //车辆 跳转页面IP -let CAR_HTML_IP='http://127.0.0.1:8848/gz_car_ui/'; +let CAR_HTML_IP='http://192.168.0.14:1999/gz-web/gz-car/'; // dev -生产 diff --git a/WebContent/static/js/newInput/newInputAuditing.js b/WebContent/static/js/newInput/newInputAuditing.js index ffc33ff..83a2925 100644 --- a/WebContent/static/js/newInput/newInputAuditing.js +++ b/WebContent/static/js/newInput/newInputAuditing.js @@ -90,6 +90,8 @@ function getbaseList(init) { }else{ html += "已审核"; } + html += ""+ JY.Object.notEmpty(l.auditUser) + ""; + html += ""+ JY.Object.notEmpty(l.auditTime) + ""; html += rowFunction(l.id,l.isExamine,l.checkNum,l.nums); html += ""; }