添加数据上报 检查站查获人员详情上报
luyya
parent
494a0ee7d6
commit
61e376d42c
|
|
@ -258,8 +258,9 @@ public class ShiroConfig
|
|||
@Bean
|
||||
public RedisManager redisManager(RedisProperties redisProperties) {
|
||||
RedisManager redisManager = new RedisManager();
|
||||
redisManager.setHost("127.0.0.1:6379");
|
||||
// redisManager.setHost("53.1.252.179:6389");
|
||||
// redisManager.setHost("127.0.0.1:6379");
|
||||
// redisManager.setPassword("ruoyi123");
|
||||
redisManager.setHost("53.1.252.179:6389");
|
||||
/*redisManager.setPort(6389);
|
||||
redisManager.setHost("53.1.252.179");*/
|
||||
//redisManager.setPassword(redisProperties.getPassword());
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ public interface TbChryxxbMapper
|
|||
* @param ids 需要删除的数据ID
|
||||
* @return 结果
|
||||
*/
|
||||
public int deleteTbChryxxbByIds(Integer[] ids);
|
||||
public int deleteTbChryxxbByIds(String[] ids);
|
||||
|
||||
/**
|
||||
* 从人车物核查表及卡点表获取查货人员信息
|
||||
|
|
|
|||
|
|
@ -24,12 +24,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</sql>
|
||||
|
||||
<select id="selectTbChryxxbList" parameterType="basepro.manager.pojo.TbChryxxb" resultMap="TbChryxxbResult">
|
||||
<include refid="selectTbChryxxbVo"/>
|
||||
select d.id, HCRYBH, XZQHDM, XZQHMC, GAJGDM, GAJGMC, JCZDM, JCZMC, jcsj, DATE_FORMAT(jcsj, '%Y-%m-%d %H:%i:%s') AS jcsjStr, ZJHM, HCRYLB from tb_chryxxb d
|
||||
left join sys_dept s on d.GAJGDM = s.dept_id
|
||||
<where>
|
||||
<if test="id != null and id != 0"> and id = #{id}</if>
|
||||
<if test="XZQHDM != null and XZQHDM != ''"> and XZQHDM = #{XZQHDM}</if>
|
||||
<if test="XZQHMC != null and XZQHMC != ''"> and XZQHMC like concat('%',#{XZQHMC},'%')</if>
|
||||
<if test="GAJGDM != null and GAJGDM != ''"> and GAJGDM = #{GAJGDM}</if>
|
||||
<if test="GAJGDM != null and GAJGDM != ''">
|
||||
and (d.GAJGDM = #{GAJGDM} OR d.GAJGDM IN ( SELECT t.dept_id FROM sys_dept t WHERE FIND_IN_SET (#{GAJGDM},ancestors) ))
|
||||
</if>
|
||||
<if test="GAJGMC != null and GAJGMC != ''"> and GAJGMC like concat('%',#{GAJGMC},'%')</if>
|
||||
<if test="JCZDM != null and JCZDM != ''"> and JCZDM = #{JCZDM}</if>
|
||||
<if test="JCZMC != null and JCZMC != ''"> and JCZMC like concat('%',#{JCZMC},'%')</if>
|
||||
|
|
@ -42,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="ZJHM != null and ZJHM != ''"> and ZJHM = #{ZJHM}</if>
|
||||
<if test="HCRYLB != null and HCRYLB != ''"> and HCRYLB = #{HCRYLB}</if>
|
||||
</where>
|
||||
order by jcsj desc
|
||||
</select>
|
||||
|
||||
<select id="selectTbChryxxbByHcrybh" parameterType="String" resultMap="TbChryxxbResult">
|
||||
|
|
@ -123,8 +127,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<delete id="deleteTbChryxxbByHcrybh" parameterType="String">
|
||||
delete from tb_chryxxb where HCRYBH = #{HCRYBH}
|
||||
</delete>
|
||||
<delete id="deleteTbChryxxbById" parameterType="Integer">
|
||||
delete from tb_chryxxb where HCRYBH = #{HCRYBH}
|
||||
<delete id="deleteTbChryxxbById" parameterType="string">
|
||||
delete from tb_chryxxb where id = #{id}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteTbChryxxbByHcrybhs" parameterType="String">
|
||||
|
|
@ -133,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
#{HCRYBH}
|
||||
</foreach>
|
||||
</delete>
|
||||
<delete id="deleteTbChryxxbByIds" parameterType="Integer">
|
||||
<delete id="deleteTbChryxxbByIds" parameterType="String">
|
||||
delete from tb_chryxxb where id in
|
||||
<foreach item="id" collection="array" open="(" separator="," close=")">
|
||||
#{id}
|
||||
|
|
|
|||
|
|
@ -48,17 +48,9 @@ public class TbChryxxb extends BaseEntity
|
|||
private String JCZMC;
|
||||
|
||||
/** 检查时间 */
|
||||
@Excel(name = "检查时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date jcsj;
|
||||
private String jcsj;
|
||||
|
||||
public String getJcsjStr() {
|
||||
return jcsjStr;
|
||||
}
|
||||
|
||||
public void setJcsjStr(String jcsjStr) {
|
||||
this.jcsjStr = jcsjStr;
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查时间字符串
|
||||
|
|
@ -144,15 +136,16 @@ public class TbChryxxb extends BaseEntity
|
|||
{
|
||||
return JCZMC;
|
||||
}
|
||||
public void setJcsj(Date jcsj)
|
||||
{
|
||||
|
||||
|
||||
public String getJcsj() {
|
||||
return jcsj;
|
||||
}
|
||||
|
||||
public void setJcsj(String jcsj) {
|
||||
this.jcsj = jcsj;
|
||||
}
|
||||
|
||||
public Date getJcsj()
|
||||
{
|
||||
return jcsj;
|
||||
}
|
||||
public void setZJHM(String ZJHM)
|
||||
{
|
||||
this.ZJHM = ZJHM;
|
||||
|
|
@ -172,6 +165,14 @@ public class TbChryxxb extends BaseEntity
|
|||
return HCRYLB;
|
||||
}
|
||||
|
||||
public String getJcsjStr() {
|
||||
return jcsjStr;
|
||||
}
|
||||
|
||||
public void setJcsjStr(String jcsjStr) {
|
||||
this.jcsjStr = jcsjStr;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
|
|
|
|||
|
|
@ -6,8 +6,10 @@ import java.util.List;
|
|||
import basepro.manager.config.DataSourceUtil;
|
||||
import basepro.manager.mapper.SysDeptXzqhMapper;
|
||||
import basepro.manager.mapper.TbChryxxbMapper;
|
||||
import basepro.manager.mapper.TbStuckMapper;
|
||||
import basepro.manager.pojo.SysDeptXzqh;
|
||||
import basepro.manager.pojo.TbChryxxb;
|
||||
import basepro.manager.pojo.TbStuck;
|
||||
import basepro.manager.service.ITbChryxxbService;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import guo.ping.e3mall.common.page.TableDataInfo;
|
||||
|
|
@ -32,6 +34,9 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
|
|||
@Autowired
|
||||
private SysDeptXzqhMapper xzqhMapper;
|
||||
|
||||
@Autowired
|
||||
private TbStuckMapper stuckMapper;
|
||||
|
||||
/**
|
||||
* 查询检查站查获人员信息
|
||||
*
|
||||
|
|
@ -71,6 +76,9 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
|
|||
public TableDataInfo selectTbChryxxbList(TbChryxxb tbChryxxb, Integer pageNum, Integer pageSize)
|
||||
{
|
||||
PageHelper.startPage(pageNum,pageSize);
|
||||
if ("340000000000".equals(tbChryxxb.getGAJGDM())){
|
||||
tbChryxxb.setGAJGDM("");
|
||||
}
|
||||
List<TbChryxxb> chryxxbList = tbChryxxbMapper.selectTbChryxxbList(tbChryxxb);
|
||||
return getDataTable(chryxxbList);
|
||||
}
|
||||
|
|
@ -84,6 +92,18 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
|
|||
@Override
|
||||
public int insertTbChryxxb(TbChryxxb tbChryxxb)
|
||||
{
|
||||
TbStuck stuck = stuckMapper.selectTbStuckById(Long.valueOf(tbChryxxb.getJCZDM()));
|
||||
if (null != stuck){
|
||||
tbChryxxb.setJCZMC(stuck.getDeptName()+"-"+stuck.getName());
|
||||
tbChryxxb.setJCZDM("JCZ"+stuck.getDeptId().substring(0,6)+(stuck.getId()+1000));
|
||||
tbChryxxb.setGAJGDM(stuck.getDeptId());
|
||||
tbChryxxb.setGAJGMC(stuck.getDeptName());
|
||||
SysDeptXzqh xzqh = xzqhMapper.selectSysDeptXzqhById(stuck.getDeptId());
|
||||
if (null != xzqh){
|
||||
tbChryxxb.setXZQHDM(xzqh.getXzqhdm());
|
||||
tbChryxxb.setXZQHMC(xzqh.getXzqhmc());
|
||||
}
|
||||
}
|
||||
|
||||
return tbChryxxbMapper.insertTbChryxxb(tbChryxxb);
|
||||
}
|
||||
|
|
@ -170,7 +190,7 @@ public class TbChryxxbServiceImpl implements ITbChryxxbService
|
|||
* @return 结果
|
||||
*/
|
||||
public int deleteTbChryxxbByIds(String ids){
|
||||
return tbChryxxbMapper.deleteTbChryxxbByIds(Convert.toIntArray(ids));
|
||||
return tbChryxxbMapper.deleteTbChryxxbByIds(Convert.toStrArray(ids));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ spring:
|
|||
timeout: 50000
|
||||
host: 127.0.0.1
|
||||
port: 6379
|
||||
password: ruoyi123
|
||||
|
||||
activemq:
|
||||
user: admin
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
spring:
|
||||
profiles:
|
||||
active: dev
|
||||
active: prod
|
||||
|
||||
#spring:
|
||||
# datasource:
|
||||
|
|
|
|||
|
|
@ -8,8 +8,12 @@ import java.util.List;
|
|||
import java.util.UUID;
|
||||
|
||||
import basepro.manager.common.utils.poi.ExcelUtil;
|
||||
import basepro.manager.framework.util.ShiroUtils;
|
||||
import basepro.manager.pojo.SysUser;
|
||||
import basepro.manager.pojo.TbChryxxb;
|
||||
import basepro.manager.pojo.TbStuck;
|
||||
import basepro.manager.service.ITbChryxxbService;
|
||||
import basepro.manager.service.ITbStuckService;
|
||||
import com.alibaba.dubbo.config.annotation.Reference;
|
||||
import guo.ping.e3mall.common.annotation.Log;
|
||||
import guo.ping.e3mall.common.controller.BaseController;
|
||||
|
|
@ -18,6 +22,7 @@ import guo.ping.e3mall.common.page.PageDomain;
|
|||
import guo.ping.e3mall.common.page.TableDataInfo;
|
||||
import guo.ping.e3mall.common.page.TableSupport;
|
||||
import guo.ping.e3mall.common.pojo.AjaxResult;
|
||||
import guo.ping.e3mall.common.utils.DateUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
|
|
@ -41,6 +46,10 @@ public class TbChryxxbController extends BaseController
|
|||
|
||||
@Reference
|
||||
private ITbChryxxbService tbChryxxbService;
|
||||
|
||||
@Reference
|
||||
private ITbStuckService stuckService;
|
||||
|
||||
@RequiresPermissions("system:chryxxb:view")
|
||||
@GetMapping()
|
||||
public String chryxxb()
|
||||
|
|
@ -56,10 +65,14 @@ public class TbChryxxbController extends BaseController
|
|||
@ResponseBody
|
||||
public TableDataInfo list(TbChryxxb tbChryxxb)
|
||||
{
|
||||
SysUser user = ShiroUtils.getSysUser();
|
||||
startPage();
|
||||
PageDomain pageDomain = TableSupport.buildPageRequest();
|
||||
Integer pageNum = pageDomain.getPageNum();
|
||||
Integer pageSize = pageDomain.getPageSize();
|
||||
if (null == tbChryxxb.getGAJGDM() || "".equals(tbChryxxb.getGAJGDM())){
|
||||
tbChryxxb.setGAJGDM(user.getManageDeptId());
|
||||
}
|
||||
TableDataInfo list = tbChryxxbService.selectTbChryxxbList(tbChryxxb,pageNum,pageSize);
|
||||
return list;
|
||||
}
|
||||
|
|
@ -81,8 +94,14 @@ public class TbChryxxbController extends BaseController
|
|||
* 新增检查站查获人员信息
|
||||
*/
|
||||
@GetMapping("/add")
|
||||
public String add()
|
||||
public String add(ModelMap mmap)
|
||||
{
|
||||
SysUser user = ShiroUtils.getSysUser();
|
||||
TbStuck stuck = new TbStuck();
|
||||
String deptId = user.getManageDeptId().substring(0,4)+"00000000";
|
||||
stuck.setDeptId(deptId);
|
||||
List<TbStuck> stuckList = stuckService.selectTbStuckList(stuck);
|
||||
mmap.put("stucks",stuckList);
|
||||
return prefix + "/add";
|
||||
}
|
||||
|
||||
|
|
@ -100,15 +119,10 @@ public class TbChryxxbController extends BaseController
|
|||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
Calendar today = Calendar.getInstance();
|
||||
today.add(Calendar.DATE,-1);
|
||||
Date jcsj = today.getTime();
|
||||
try {
|
||||
jcsj = format.parse(tbChryxxb.getJcsjStr());
|
||||
} catch (ParseException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
String jcsj = tbChryxxb.getJcsj();
|
||||
tbChryxxb.setJcsj(jcsj);
|
||||
int insertTbChryxxb = tbChryxxbService.insertTbChryxxb(tbChryxxb);
|
||||
tbChryxxbService.insertTbChryxxbGs(tbChryxxb);
|
||||
// tbChryxxbService.insertTbChryxxbGs(tbChryxxb);
|
||||
return toAjax(insertTbChryxxb);
|
||||
}
|
||||
|
||||
|
|
@ -146,12 +160,7 @@ public class TbChryxxbController extends BaseController
|
|||
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
Calendar today = Calendar.getInstance();
|
||||
today.add(Calendar.DATE,-1);
|
||||
Date jcsj = today.getTime();
|
||||
try {
|
||||
jcsj = format.parse(tbChryxxb.getJcsjStr());
|
||||
} catch (ParseException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
String jcsj = tbChryxxb.getJcsj();
|
||||
tbChryxxb.setJcsj(jcsj);
|
||||
tbChryxxbService.updateTbChryxxbGs(tbChryxxb);
|
||||
return toAjax(tbChryxxbService.updateTbChryxxb(tbChryxxb));
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ spring:
|
|||
|
||||
expire : 1800
|
||||
# Redis服务器连接密码（默认为空）
|
||||
password :
|
||||
password : ruoyi123
|
||||
# 连接池最大连接数（使用负值表示没有限制）
|
||||
jedis:
|
||||
pool:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
spring:
|
||||
profiles:
|
||||
active: dev
|
||||
active: prod
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -8,21 +8,21 @@
|
|||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
<form class="form-horizontal m" id="form-chryxxb-add">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">核查人员编号：</label>
|
||||
<div class="col-sm-7">
|
||||
<label class="col-sm-4 control-label is-required">核查人员身份证：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="HCRYBH" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">查获人员身份证号码：</label>
|
||||
<div class="col-sm-7">
|
||||
<div class="col-sm-8">
|
||||
<input name="ZJHM" class="form-control" id="ZJHM" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">查获人员类别：</label>
|
||||
<div class="col-sm-7">
|
||||
<div class="col-sm-8">
|
||||
<select name="HCRYLB" class="form-control m-b" th:with="type=${@dict.getType('t_dict_chrylb')}" required>
|
||||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||
</select>
|
||||
|
|
@ -30,20 +30,16 @@
|
|||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">检查站代码：</label>
|
||||
<div class="col-sm-7">
|
||||
<input name="JCZDM" class="form-control" type="text" placeholder="'JCZ'+6位地区代码+4位序列号">
|
||||
<label class="col-sm-4 control-label is-required">查获检查站：</label>
|
||||
<div class="col-sm-8">
|
||||
<select name="JCZDM" class="form-control m-b" required>
|
||||
<option th:each="stuck:${stucks}" th:value="${stuck.id}" th:text="${stuck.name}"></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">检查站名称：</label>
|
||||
<div class="col-sm-7">
|
||||
<input name="JCZMC" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<!--<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">检查站所属行政区划代码：</label>
|
||||
<div class="col-sm-7">
|
||||
<div class="col-sm-8">
|
||||
<input name="XZQHDM" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -52,27 +48,24 @@
|
|||
<div class="col-sm-7">
|
||||
<input name="XZQHMC" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
<!--<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">检查站所属公安机关代码：</label>
|
||||
<div class="col-sm-7">
|
||||
<input name="GAJGDM" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>-->
|
||||
<div class="form-group">
|
||||
<!--<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">检查站所属公安机关：</label>
|
||||
<div class="col-sm-7">
|
||||
<input type="hidden" name="GAJGDM" id="treeId"/>
|
||||
<input type="text" name="GAJGMC" onclick="selectDeptTree()" id="treeName" placeholder="请选择归属机构" class="form-control"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">检查时间：</label>
|
||||
<div class="col-sm-7">
|
||||
<div class="input-group date">
|
||||
<span class="input-group-addon"><i class="fa fa-calendar"></i></span>
|
||||
<input name="jcsjStr" class="form-control" placeholder="检查时间" type="text" required>
|
||||
</div>
|
||||
<div class="col-sm-8">
|
||||
<input name="jcsj" class="form-control" placeholder="检查时间" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
@ -81,6 +74,8 @@
|
|||
<th:block th:include="include :: datetimepicker-js" />
|
||||
<script type="text/javascript">
|
||||
var prefix = ctx + "system/chryxxb"
|
||||
|
||||
var today = new Date();
|
||||
$("#form-chryxxb-add").validate({
|
||||
focusCleanup: true
|
||||
});
|
||||
|
|
@ -94,9 +89,11 @@
|
|||
}
|
||||
}
|
||||
|
||||
$("input[name='jcsjStr']").datetimepicker({
|
||||
$("input[name='jcsj']").datetimepicker({
|
||||
format: "yyyy-mm-dd hh:ii:ss",
|
||||
minView: 0,
|
||||
initialDate:new Date(),
|
||||
endDate: today,
|
||||
autoclose: true
|
||||
});
|
||||
function selectDeptTree() {
|
||||
|
|
|
|||
|
|
@ -25,18 +25,6 @@
|
|||
<p>检查站所属行政区划代码：</p>
|
||||
<input type="text" name="XZQHDM"/>
|
||||
</li>-->
|
||||
<li>
|
||||
<p>查获人员身份证号码：</p>
|
||||
<input type="text" name="ZJHM" placeholder="请输入正确的身份证号码查询"/>
|
||||
</li>
|
||||
<li>
|
||||
<p>检查站名称：</p>
|
||||
<input type="text" name="JCZMC"/>
|
||||
</li>
|
||||
<li>
|
||||
<p>检查站所属行政区划名称：</p>
|
||||
<input type="text" name="XZQHMC"/>
|
||||
</li>
|
||||
<li>
|
||||
<p>检查站所属公安机关：</p>
|
||||
<input type="hidden" name="GAJGDM" id="treeId"/>
|
||||
|
|
@ -57,12 +45,6 @@
|
|||
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
|
||||
</select>
|
||||
</li>
|
||||
<li class="select-time">
|
||||
<p>检查时间：</p>
|
||||
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginJcsj]"/>
|
||||
<span>-</span>
|
||||
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endJcsj]"/>
|
||||
</li>
|
||||
<li>
|
||||
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
||||
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">登记日期：</label>
|
||||
<div class="col-sm-8">
|
||||
<input name="zafkrqStr" id="zafkrqStr" th:value="*{xjxd.zafkrqStr}" readonly class="form-control" type="text" required>
|
||||
<input name="zafkrqStr" id="zafkrqStr" th:value="*{xjxd.zafkrqStr}" class="form-control" type="text" required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -445,7 +445,7 @@
|
|||
|
||||
}
|
||||
|
||||
/*$("input[name='zafkrqStr']").datetimepicker({
|
||||
$("input[name='zafkrqStr']").datetimepicker({
|
||||
format: "yyyy-mm-dd",
|
||||
minView: 2,
|
||||
autoclose: true,
|
||||
|
|
@ -484,7 +484,6 @@
|
|||
}
|
||||
})
|
||||
});
|
||||
*/
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">登记日期：</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="zafkrqStr" th:field="*{zafkrqStr}" class="form-control" readonly type="text" readonly required>
|
||||
<input id="zafkrqStr" th:field="*{zafkrqStr}" class="form-control" type="text" readonly required>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -305,10 +305,14 @@
|
|||
class: 'table-cell-nowrap',
|
||||
formatter: function(value, row, index) {
|
||||
var actions = [];
|
||||
if ((row.sfdj == '已上报' && row.ZAFKRQ == getdate())){
|
||||
if ((row.sfdj == '已上报' )){
|
||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
||||
}
|
||||
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
|
||||
}
|
||||
/*if ((row.sfdj == '已上报' && row.ZAFKRQ == getdate())){
|
||||
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editFull(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
|
||||
}*/
|
||||
|
||||
return actions.join('');
|
||||
}
|
||||
}]
|
||||
|
|
|
|||
Loading…
Reference in New Issue