|
|
@@ -10,18 +10,22 @@
|
|
|
<form id="formId">
|
|
|
<div class="select-list">
|
|
|
<ul>
|
|
|
- <li>
|
|
|
+ <li >
|
|
|
<p>商品名称：</p>
|
|
|
<input type="text" name="name"/>
|
|
|
</li>
|
|
|
|
|
|
- <li th:if="${isSys}">
|
|
|
- <p>所属商户id：</p>
|
|
|
- <input type="text" name="companyId"/>
|
|
|
+ <li th:if="${isSystemUser}">
|
|
|
+ <input name="companyId" type="hidden" id="input_companyId">
|
|
|
+ <p >所属商户：</p>
|
|
|
+ <input name="companyName" onclick="selectTree('company')" id="input_companyTreeName" type="text" placeholder="选择商户"
|
|
|
+ class="form-control required" readonly="readonly" required>
|
|
|
</li>
|
|
|
<li>
|
|
|
- <p>所属类型id：</p>
|
|
|
- <input type="text" name="typeId"/>
|
|
|
+ <p>所属类型：</p>
|
|
|
+ <input name="typeId" type="hidden" id="input_typeId">
|
|
|
+ <input name="typeName" onclick="selectTree('type')" id="input_typeTreeName" type="text" placeholder="选择商品分类"
|
|
|
+ class="form-control required" readonly="readonly" required>
|
|
|
</li>
|
|
|
<li>
|
|
|
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
|
|
|
@@ -33,13 +37,9 @@
|
|
|
</div>
|
|
|
|
|
|
<div class="btn-group-sm" id="toolbar" role="group">
|
|
|
- <a class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="goods:info:add">
|
|
|
+ <a th:if="@{!${isSystemUser}}" class="btn btn-success" onclick="$.operate.addFull()" shiro:hasPermission="goods:info:add">
|
|
|
<i class="fa fa-plus"></i> 添加
|
|
|
</a>
|
|
|
- <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="goods:info:remove">
|
|
|
- <i class="fa fa-remove"></i> 删除
|
|
|
- </a>
|
|
|
-
|
|
|
</div>
|
|
|
<div class="col-sm-12 select-table table-striped">
|
|
|
<table id="bootstrap-table"></table>
|
|
|
@@ -52,6 +52,7 @@
|
|
|
var putawayFlag = [[${@permission.hasPermi('goods:info:putaway')}]];
|
|
|
var removeFlag = [[${@permission.hasPermi('goods:info:remove')}]];
|
|
|
var putawayDict = [[${@dict.getType('goods_putaway')}]];
|
|
|
+ var isSystemUser = [[${isSystemUser}]];
|
|
|
var prefix = ctx + "goods/info";
|
|
|
|
|
|
$(function() {
|
|
|
@@ -126,12 +127,18 @@
|
|
|
align: 'center',
|
|
|
formatter: function(value, row, index) {
|
|
|
var actions = [];
|
|
|
- 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.putawayFlag=="0"){
|
|
|
- actions.push('<a class="btn btn-primary btn-xs ' + putawayFlag + '" onclick="putaway('+row.id+',1)" shiro:hasPermission="goods:info:putaway"><i class="fa fa-edit"></i> 上架</a>');
|
|
|
- }else if(row.putawayFlag=="1"){
|
|
|
- actions.push('<a class="btn btn-warning btn-xs ' + putawayFlag + '" onclick="putaway('+row.id+',0)" shiro:hasPermission="goods:info:putaway"><i class="fa fa-download"></i> 下架</a>');
|
|
|
+
|
|
|
+ if(!isSystemUser){
|
|
|
+ if(row.putawayFlag=="0"){
|
|
|
+ actions.push('<a class="btn btn-success btn-xs ' + putawayFlag + '" onclick="putaway('+row.id+',1)" shiro:hasPermission="goods:info:putaway"><i class="fa fa-edit"></i> 上架</a> ');
|
|
|
+ }else if(row.putawayFlag=="1"){
|
|
|
+ actions.push('<a class="btn btn-warning btn-xs ' + putawayFlag + '" onclick="putaway('+row.id+',0)" shiro:hasPermission="goods:info:putaway"><i class="fa fa-download"></i> 下架</a> ');
|
|
|
+ }
|
|
|
+ if(row.putawayFlag!=1){
|
|
|
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" onclick="$.operate.remove(\'' + row.id + '\')" shiro:hasPermission="goods:info:remove"><i class="fa fa-remove"></i>删除</a> ');
|
|
|
+ }
|
|
|
}
|
|
|
+ actions.push('<a class="btn btn-primary btn-xs " shiro:hasPermission="goods:info:putaway"><i class="fa fa-edit"></i>查看详情</a> ');
|
|
|
return actions.join('');
|
|
|
}
|
|
|
}]
|
|
|
@@ -160,6 +167,41 @@
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
+ /***************选择商户******************/
|
|
|
+ function selectTree(name) {
|
|
|
+ var url
|
|
|
+ var cb;
|
|
|
+ if(name=="type"){
|
|
|
+ cb = selectType
|
|
|
+ url = ctx + "goods/type/selectTypeTree/0";
|
|
|
+ }else if(name=="company"){
|
|
|
+ cb= selectCompany
|
|
|
+ url = ctx + "company/tree";
|
|
|
+ }
|
|
|
+
|
|
|
+ var options2 = {
|
|
|
+ title: '请选择',
|
|
|
+ width: "800",
|
|
|
+ url: url,
|
|
|
+ callBack: cb
|
|
|
+ };
|
|
|
+ $.modal.openOptions(options2);
|
|
|
+ }
|
|
|
+ function selectCompany(index, layero){
|
|
|
+ var body = layer.getChildFrame('body', index);
|
|
|
+ $("#input_companyId").val(body.find('#treeId').val());
|
|
|
+ $("#input_companyTreeName").val(body.find('#treeName').val());
|
|
|
+ layer.close(index);
|
|
|
+ $.table.search()
|
|
|
+ }
|
|
|
+ function selectType(index, layero){
|
|
|
+ var body = layer.getChildFrame('body', index);
|
|
|
+ $("#input_typeId").val(body.find('#treeId').val());
|
|
|
+ $("#input_typeTreeName").val(body.find('#treeName').val());
|
|
|
+ layer.close(index);
|
|
|
+ $.table.search()
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
</script>
|
|
|
</body>
|
