Commit 33b8bb69 by wuchengwu

设备管理,隶属单位展示变更

parent 206092db
......@@ -191,13 +191,13 @@
<sql id="Base_Column_List2" >
ID, VID, PID, SCBZ, LRSJ,GXSJ,IP,MAC,IFYTHCJY,
ZWCJY_NAME as ZWCJYNAME,ZWCJY_CODE as ZWCJYCODE,
EDZYDQ_NAME as EDZYDQNAME,EDZYDQ_CODE as EDZYDQCODE,SGTZZCCJY_NAME as sftzzzcjyname,SGTZZCCJY_CODE as sftzzzcjycode,
SJCJY_NAME as SJCJYNAME,SJCJY_CODE as SJCJYCODE,ZJCJY_NAME as ZJCJYNAME,ZJCJY_CODE as ZJCJYCODE,
HMCJY_NAME as HMCJYNAME,HMCJY_CODE as HMCJYCODE,SWCJY_NAME as SWCJYNAME,SWCJY_CODE as SWCJYCODE,
BJCJY_NAME as BJCJYNAME,BJCJY_CODE as BJCJYCODE,GPY_NAME as GPYNAME,GPY_CODE as GPYCODE,
YHKCJY_NAME as YHKCJYNAME,YHKCJY_CODE as YHKCJYCODE,DNABQDYJ_NAME as DNABQDYJNAME,DNABQDYJ_CODE as DNABQDYJCODE,
SSDW_CODE as SSDWCODE,SSDW_NAME as SSDWNAME,
ZWCJY_NAME as zwcjyname,ZWCJY_CODE as zwcjycode,
EDZYDQ_NAME as edzydqname,EDZYDQ_CODE as edzydqcode,SGTZZCCJY_NAME as sftzzzcjyname,SGTZZCCJY_CODE as sftzzzcjycode,
SJCJY_NAME as sjcjyname,SJCJY_CODE as sjcjycode,ZJCJY_NAME as zjcjyname,ZJCJY_CODE as zjcjycode,
HMCJY_NAME as hmcjyname,HMCJY_CODE as hmcjycode,SWCJY_NAME as swcjyname,SWCJY_CODE as swcjycode,
BJCJY_NAME as bjcjyname,BJCJY_CODE as bjcjycode,GPY_NAME as gpyname,GPY_CODE as gpycode,
YHKCJY_NAME as yhkcjyname,YHKCJY_CODE as yhkcjycode,DNABQDYJ_NAME as dnabqdyjname,DNABQDYJ_CODE as dnabqdyjcode,
SSDW_CODE as ssdwcode,SSDW_NAME as ssdwname,
ZRMJJH,ZRMJLXDH,SPZT,CJSBLX_CODE,CJSBLX_NAME,IFZWCJY,IFEDZYDQ,IFSGTZZCCJY as ifsftzzzcjy,
IFSJCJY,IFZJCJY,IFHMCJY,IFSWCJY,IFBJCJY,IFGPY,IFYHKCJY,IFDNABQDYJ,ZRMJNAME,SBZTSTR,spsj,
to_char(lrsj,'yyyy-mm-dd') lrsjstr,to_char(spsj,'yyyy-mm-dd') spsjstr,
......@@ -294,7 +294,7 @@
</sql>
<!-- 通过条件分页查询,返回数据集 -->
<select id="selectPageList" parameterType="com.founder.model.SysClientVp" resultMap="BaseResultMap">
<select id="selectPageList" parameterType="com.founder.model.SysClientVp" resultType="com.founder.model.SysClientVp">
SELECT * FROM
(select B.*, ROWNUM RN from (
SELECT A.*
......
......@@ -84,7 +84,7 @@ layui.use('table', function () {
var index = layer.open({
type: 2,
title: '设备审批',
area: ['80%', '75%'],
area: ['80%', '80%'],
cornerRadius: 9,
fix: false,
resize: false,
......
......@@ -62,7 +62,7 @@
}
</style>
<body>
<form class="layui-form" action="" method="post" style="overflow: hidden;padding-top:10px;height: 582px!important;">
<form class="layui-form" action="" method="post" style="overflow: hidden;padding-top:10px;height: 622px!important;">
<input hidden id="ifythcjy" name="ifythcjy"/>
<div>
<div class="layui-form-item">
......
......@@ -24,16 +24,16 @@
<div class="xztitle">查询条件</div>
<form class="layui-form" action="" method="post" style="display: table;width: 100%;padding-top:10px;">
<input type="hidden" name="ssdwcode" id="ssdwcode" th:value="${session.User.getUnitcode()}" class="layui-input">
<input type="hidden" id="sfmq" value="0" class="layui-input">
<input type="hidden" name="sbid" id="sbid" class="layui-input">
<input type="hidden" name="ip" id="ipStr" class="layui-input">
<input type="hidden" name="mac" id="macStr" class="layui-input">
<input type="hidden" name="lrsj" id="lrsj" class="layui-input">
<input type="hidden" name="ssdwname" id="ssdwname" class="layui-input">
<input type="hidden" name="zrmjname" id="zrmjname" class="layui-input">
<input type="hidden" name="sfyj" id="sfyj" class="layui-input">
<input type="hidden" name="dqsjStr" id="dqsjStr" class="layui-input">
<input type="hidden" name="bz" id="bz" class="layui-input">
<input type="hidden" id="sfmq" value="1" class="layui-input">
<input type="hidden" value="" name="sbid" id="sbid" class="layui-input">
<input type="hidden" value="" name="ip" id="ipStr" class="layui-input">
<input type="hidden" value="" name="mac" id="macStr" class="layui-input">
<input type="hidden" value="" name="lrsj" id="lrsj" class="layui-input">
<input type="hidden" value="" name="ssdwname" id="ssdwname" class="layui-input">
<input type="hidden" value="" name="zrmjname" id="zrmjname" class="layui-input">
<input type="hidden" value="" name="sfyj" id="sfyj" class="layui-input">
<input type="hidden" value="" name="dqsjStr" id="dqsjStr" class="layui-input">
<input type="hidden" value="" name="bz" id="bz" class="layui-input">
<input hidden id="ifzwcjy" name="ifzwcjy"/>
<input hidden id="ifedzydq" name="ifedzydq"/>
......@@ -48,18 +48,31 @@
<input hidden id="ifdnabqdyj" name="ifdnabqdyj"/>
<input hidden id="ifythcjy" name="ifythcjy"/>
<input hidden id="zwxsf" name="ifzwcjy"/>
<input hidden id="edzxsf" name="ifedzydq"/>
<input hidden id="sgtzxsf" name="ifsftzzzcjy"/>
<input hidden id="sjxsf" name="ifsjcjy"/>
<input hidden id="zjxsf" name="ifzjcjy"/>
<input hidden id="hmxsf" name="ifhmcjy"/>
<input hidden id="swxsf" name="ifswcjy"/>
<input hidden id="bjxsf" name="ifbjcjy"/>
<input hidden id="gpyxsf" name="ifgpy"/>
<input hidden id="yhkxsf" name="ifyhkcjy"/>
<input hidden id="dnaxsf" name="ifdnabqdyj"/>
<input hidden id="ythcjxsf" name="ifythcjy"/>
<input hidden id="zwxsf" name="zwxsf"/>
<input hidden id="edzxsf" name="edzxsf"/>
<input hidden id="sgtzxsf" name="sgtzxsf"/>
<input hidden id="sjxsf" name="sjxsf"/>
<input hidden id="zjxsf" name="zjxsf"/>
<input hidden id="hmxsf" name="hmxsf"/>
<input hidden id="swxsf" name="swxsf"/>
<input hidden id="bjxsf" name="bjxsf"/>
<input hidden id="gpyxsf" name="gpyxsf"/>
<input hidden id="yhkxsf" name="yhkxsf"/>
<input hidden id="dnaxsf" name="dnaxsf"/>
<input hidden id="ythcjxsf" name="ythcjxsf"/>
<input hidden id="zwxsfLxdh" name="zwxsfLxdh"/>
<input hidden id="edzxsfLxdh" name="edzxsfLxdh"/>
<input hidden id="sgtzxsfLxdh" name="sgtzxsfLxdh"/>
<input hidden id="sjxsfLxdh" name="sjxsfLxdh"/>
<input hidden id="zjxsfLxdh" name="zjxsfLxdh"/>
<input hidden id="hmxsfLxdh" name="hmxsfLxdh"/>
<input hidden id="swxsfLxdh" name="swxsfLxdh"/>
<input hidden id="bjxsfLxdh" name="bjxsfLxdh"/>
<input hidden id="gpyxsfLxdh" name="gpyxsfLxdh"/>
<input hidden id="yhkxsfLxdh" name="yhkxsfLxdh"/>
<input hidden id="dnaxsfLxdh" name="dnaxsfLxdh"/>
<input hidden id="ythcjxsfLxdh" name="ythcjxsfLxdh"/>
<div class="layui-form-item">
<label class="layui-form-label">IP:</label>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment