bonus
/
GZMachinesWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jsk

This commit is contained in:
jiask 2026-02-06 15:08:19 +08:00
parent 9a536a4ddb
commit bbc5634ed9
4 changed files with 140 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WebContent/WEB-INF/views/equipment/equipmentProportionDetail.jsp
View File

@ -63,12 +63,12 @@
<%-- </div>--%>
<div class="layui-inline">
<div class="layui-input-inline">
<input type="text" name="maName" class="layui-input" placeholder="请输入机具名称">
<input type="text" name="maName" class="layui-input" placeholder="请输入规格型号">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<input type="text" name="maType" class="layui-input" placeholder="请输入规格型号">
<input type="text" name="maType" class="layui-input" placeholder="请输入机具名称">
</div>
</div>
<div class="layui-inline">
@ -91,11 +91,11 @@
<a class="layui-btn layui-btn-xs" lay-event="detail">明细</a>
</script>
<script>
var typed=5;
layui.use(['table', 'form'], function(){
var table = layui.table;
var form = layui.form;
var type=1;
var typed=5;
var urld='${bonuspath}/backstage/indexHomeDetails/getNewlyStored';
var colsd=[[
{type: 'numbers', title: '序号', width: 100},
@ -268,6 +268,7 @@
// 监听搜索表单提交
form.on('submit(equipmentTypesSearch)', function(data){
console.log(data.field);
data.field.type=typed;
table.reload('equipmentTypesTable', {
where: data.field
});

7
WebContent/WEB-INF/views/equipment/equipmentTypeDetail.jsp
View File

@ -63,12 +63,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<input type="text" name="maName" class="layui-input" placeholder="请输入机具名称">
<input type="text" name="maName" class="layui-input" placeholder="请输入规格型号">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<input type="text" name="maType" class="layui-input" placeholder="请输入规格型号">
<input type="text" name="maType" class="layui-input" placeholder="请输入机具名称">
</div>
</div>
<div class="layui-inline">
@ -91,11 +91,11 @@
<a class="layui-btn layui-btn-xs" lay-event="detail">明细</a>
</script>
<script>
var isCount=1;
layui.use(['table', 'form'], function(){
var table = layui.table;
var form = layui.form;
var type=1;
var isCount=1;
// 渲染表单
form.render('select');
type=$("#type").html();
@ -232,6 +232,7 @@
// 监听搜索表单提交
form.on('submit(equipmentTypesSearch)', function(data){
console.log(data.field);
data.field.isCount=isCount;
table.reload('equipmentTypesTable', {
where: data.field
});

28
WebContent/static/js/index/indexHome.js
View File

@ -870,19 +870,19 @@ $(function() {
localStorage.setItem('calendarDate', selectedDate);
localStorage.setItem('calendarDayData', JSON.stringify(dayData));
let layerIndex = layer.open({
type: 2,
title: "机具日历详情",
// btn:['保存','取消'],
shade: [0],
area: ['80%', '80%'],
scrollbar: true,
move:false,
anim: 2,
yes:function(index,layero){
},
content: [bonuspath +'/backstage/indexHome/calendarDetail'],
success: function (layero, index) {
},
type: 2,
title: "机具日历详情",
// btn:['保存','取消'],
shade: [0],
area: ['80%', '80%'],
scrollbar: true,
move:false,
anim: 2,
yes:function(index,layero){
},
content: [bonuspath +'/backstage/indexHome/calendarDetail'],
success: function (layero, index) {
},
});
// 当用户点击日期时触发
/*layer.open({
@ -1300,7 +1300,7 @@ $(function() {
// 修改 innerHTML 为字符串拼接
const iconClass = func.rsIcon || 'layui-icon-app';
functionItem.innerHTML = '<i class="' + iconClass + '"></i>' +
'<span>' + func.rsName + '</span>';
'<span>' + func.rsName + '</span>';
functionList.appendChild(functionItem);
});

12
resources/mybatis/index/IndexHomeDetailsMapper.xml
View File

@ -1604,6 +1604,12 @@
left join mm_type mt on wir.MODEL_ID = mt.ID
left join mm_type mt2 on mt.PARENT_ID = mt2.ID
where wir.TYPE = #{type}
<if test="maType != null and maType != ''">
and mt2.NAME like concat('%', #{maType}, '%')
</if>
<if test="maName != null and maName != ''">
and mt.NAME like concat('%', #{maName}, '%')
</if>
</select>
<select id="getInventoryStored" resultType="com.bonus.index.beans.IndexStorageWarnBean">
select mt2.NAME as maType,
@ -1614,5 +1620,11 @@
left join mm_type mt on wir.MODEL_ID = mt.ID
left join mm_type mt2 on mt.PARENT_ID = mt2.ID
where wir.INVENTORY_TYPE = "盘盈"
<if test="maType != null and maType != ''">
and mt2.NAME like concat('%', #{maType}, '%')
</if>
<if test="maName != null and maName != ''">
and mt.NAME like concat('%', #{maName}, '%')
</if>
</select>
</mapper>