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

Merge remote-tracking branch 'origin/main' 

# Conflicts:
#	index.html
#	js/demandPlan/child/apply_plan_detail.js
#	js/demandPlan/child/apply_plan_form.js
#	js/demandPlan/child/choose_tool_type_list.js
#	js/public.js
#	page/demandPlan/child/apply_plan_edit_form.html
#	page/demandPlan/child/apply_plan_form.html
This commit is contained in:
jiang 2025-10-28 09:24:37 +08:00
parent 6fdb30008c 2ddd165f63
commit acde9df8a1
13 changed files with 147 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/accessory/child/accessory_apply_add.js
View File

@ -301,6 +301,7 @@ function getBaseTableData() {
let tableData = [];
$('#baseTable tbody tr').each(function (index, item) {
let needNum = $(this).find('td').eq(7).find('input[name="needNum"]').val();
let remark = $(this).find('td').eq(8).find('input[name="remarks"]').val();
tableData.push({
partId: $(this).attr('id'),
partName: $(this).find('td').eq(2).html(),
@ -308,6 +309,7 @@ function getBaseTableData() {
partUnit:$(this).find('td').eq(5).html(),
partType:$(this).find('td').eq(6).html(),
applyNum: needNum ? needNum : 0,
remark:remark
})
})
return tableData;
@ -389,6 +391,7 @@ function setTableData(results) {
html += "<td style='display:none;'>" + l.unit + "</td>";
html += "<td style='display:none;'>" + l.type + "</td>";
html += "<td>" + setFormInput(l.needNum, 1) + "</td>";
html += "<td>" + setFormInput(l.remarks, 3) + "</td>";
html += "</tr>";
}
} else {
@ -402,6 +405,8 @@ function setFormInput(value, type) {
let html = '<form class="layui-form layuimini-form"><div class="layui-inline">';
if (type === 1) { // 本次申请量
html += '<input class="layui-input" name="needNum" onblur="checkValue(this,1,\'本次申请量\')" value="' + setNullNumValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
}else if (type === 3) { // 备注
html += '<input class="layui-input" placeholder="请输入备注" id="remarks" name="remarks" value="' + setNullValue(value) + '" maxLength="60" lay-affix="clear"></input>';
}
html += '</div></form>';
return html;
@ -536,4 +541,4 @@ function closePage(type) {
window.parent.reloadData();
}
parent.layer.close(index); // 再执行关闭
}
}

31
js/accessory/child/accessory_apply_detail.js
View File

@ -101,6 +101,7 @@ function getPlanDetailsList(obj) {
obj.type = item.partType;
obj.needNum=item.applyNum;
obj.num=item.num;
obj.remark=item.remark;
jjDataArr.push(obj);
detailIdArr.push(item.id);
})
@ -348,12 +349,23 @@ function chooseFitType() {
// 查询
function search() {
let keyWord = $('#name').val();
let model = $('#model').val();
if (keyWord) {
let dataList = jjDataArr.filter(item => {
return item.name.indexOf(keyWord) > -1;
})
if(model){
dataList = dataList.filter(item => {
return item.model.indexOf(model) > -1;
})
}
setTableData(dataList);
} else {
}else if(model){
let dataList = jjDataArr.filter(item => {
return item.model.indexOf(model) > -1;
})
setTableData(dataList);
}else {
setTableData(jjDataArr);
}
}
@ -361,6 +373,7 @@ function search() {
// 重置
function resetSearch() {
$('#name').val('');
$('#model').val('');
setTableData(jjDataArr);
}
@ -404,6 +417,16 @@ function setTableData(results) {
if (results && results.length > 0) {
for (var i = 0; i < results.length; i++) {
var l = results[i];
var remark = "";
if(l.remark!=null && l.remark!=""){
if (l.remark.length > 60) {
remark = l.remark.substring(0, 60) + '...'
} else {
remark = l.remark.substring(0, 60)
}
}
html += "<tr id='" + l.id + "'>";
html += '<td><input onclick="sel(this.checked,this,' + l.id + ')" name="check" type="checkbox"></td>';
html += "<td style='vertical-align:middle;' class='center hidden-480'>"
@ -413,11 +436,13 @@ function setTableData(results) {
html += "<td>" + l.num + "</td>";
html += "<td style='display:none;'>" + l.unit + "</td>";
html += "<td style='display:none;'>" + l.type + "</td>";
html += "<td style='display:none;'>" + remark + "</td>";
html += "<td>" + setFormInput(l.needNum, 1) + "</td>";
html += "<td>" + remark + "</td>";
html += "</tr>";
}
} else {
html += "<tr><td colspan='8' class='center'>没有相关数据</td></tr>";
html += "<tr><td colspan='7' class='center'>没有相关数据</td></tr>";
}
$("#baseTable tbody").empty().append(html);
layui.form.render();
@ -561,4 +586,4 @@ function closePage(type) {
window.parent.reloadData();
}
parent.layer.close(index); // 再执行关闭
}
}

25
js/accessory/child/accessory_apply_edit.js
View File

@ -93,6 +93,7 @@ function getPlanDetails() {
// 安全工器具明细
function getPlanDetailsList(obj) {
$.each(obj, function (index, item) {
console.log("item",item);
let obj = Object.assign({}, item);
obj.partId = item.partId;
obj.name = item.partName;
@ -101,6 +102,7 @@ function getPlanDetailsList(obj) {
obj.type = item.partType;
obj.needNum=item.applyNum;
obj.num=item.num;
obj.remark=item.remark;
jjDataArr.push(obj);
detailIdArr.push(item.id);
})
@ -303,6 +305,7 @@ function getBaseTableData() {
let tableData = [];
$('#baseTable tbody tr').each(function (index, item) {
let needNum = $(this).find('td').eq(7).find('input[name="needNum"]').val();
let remark = $(this).find('td').eq(8).find('input[name="remarks"]').val();
tableData.push({
partId: $(this).attr('id'),
partName: $(this).find('td').eq(2).html(),
@ -310,6 +313,7 @@ function getBaseTableData() {
partUnit:$(this).find('td').eq(5).html(),
partType:$(this).find('td').eq(6).html(),
applyNum: needNum ? needNum : 0,
remark:remark
})
})
return tableData;
@ -325,12 +329,23 @@ function chooseFitType() {
// 查询
function search() {
let keyWord = $('#name').val();
let model = $('#model').val();
if (keyWord) {
let dataList = jjDataArr.filter(item => {
return item.name.indexOf(keyWord) > -1;
})
if(model){
dataList = dataList.filter(item => {
return item.model.indexOf(model) > -1;
})
}
setTableData(dataList);
} else {
} else if(model){
let dataList = jjDataArr.filter(item => {
return item.model.indexOf(model) > -1;
})
setTableData(dataList);
}else {
setTableData(jjDataArr);
}
}
@ -338,6 +353,7 @@ function search() {
// 重置
function resetSearch() {
$('#name').val('');
$('#model').val('');
setTableData(jjDataArr);
}
@ -391,10 +407,11 @@ function setTableData(results) {
html += "<td style='display:none;'>" + l.unit + "</td>";
html += "<td style='display:none;'>" + l.type + "</td>";
html += "<td>" + setFormInput(l.needNum, 1) + "</td>";
html += "<td>" + setFormInput(l.remark, 3) + "</td>";
html += "</tr>";
}
} else {
html += "<tr><td colspan='8' class='center'>没有相关数据</td></tr>";
html += "<tr><td colspan='7' class='center'>没有相关数据</td></tr>";
}
$("#baseTable tbody").empty().append(html);
layui.form.render();
@ -404,6 +421,8 @@ function setFormInput(value, type) {
let html = '<form class="layui-form layuimini-form"><div class="layui-inline">';
if (type === 1) { // 本次申请量
html += '<input class="layui-input" name="needNum" onblur="checkValue(this,1,\'本次申请量\')" value="' + setNullNumValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
}else if (type === 3) { // 备注
html += '<input class="layui-input" placeholder="请输入备注" id="remarks" name="remarks" value="' + setNullValue(value) + '" maxLength="60" lay-affix="clear"></input>';
}
html += '</div></form>';
return html;
@ -538,4 +557,4 @@ function closePage(type) {
window.parent.reloadData();
}
parent.layer.close(index); // 再执行关闭
}
}

20
js/accessory/child/accessory_store_form.js
View File

@ -1,4 +1,4 @@
let idParam, objParam, fileList = new Array(), imgListUp = new Array();
let idParam, objParam, fileList = new Array(), imgListUp = new Array(),userName;
let form, laydate, layer, upload, table, util;
let pageNum = 1, tableIns; // 定义分页
let jjDataArr = []; // 入库配件数据
@ -13,8 +13,24 @@ function setParams(obj) {
upload = layui.upload;
table = layui.table;
util = layui.util;
var userData = JSON.parse(sessionStorage.getItem("us"));
$('#inputUser').val(userData.username);
var userId = userData.id;
let params = {
encryptedData: JSON.stringify({
'userId': userId
})
};
let url = dataUrl + 'backstage/partInput/getUserName';
ajaxRequest(url, "POST", params, false, function () {
}, function (result) {
if (result.code === 200) {
$('#inputUser').val(result.data.userName);
}
}, function (xhr, status, error) {
errorFn(xhr, status, error)
}, null);
// $('#inputUser').val(userData.username);
laydate.render({
elem: '#inputDay'
});

32
js/accessory/child/choose_part_type_list.js
View File

@ -31,8 +31,16 @@ function queryTable(type) {
let flag2 = checkValue(name);
if (flag2) {
$('#name').val('');
return layer.msg('配件查询包含特殊字符，请重新输入', { icon: 2 });
}
let model = $('#model').val();
let flag3 = checkValue(model);
if (flag3) {
$('#model').val('');
return layer.msg('规格查询包含特殊字符，请重新输入', { icon: 2 });
}
reloadTable(1);
} else if (type === 2) {
$('#pName').val('');
@ -52,6 +60,7 @@ function reloadTable(pageNum) {
// encryptedData: JSON.stringify({
// 'pName': $('#pName').val(),
'name': $('#name').val(),
'model':$('#model').val()
// }),
},
},
@ -73,6 +82,7 @@ function initTable() {
// encryptedData: JSON.stringify({
// 'pName': $('#pName').val(),
'name': $('#name').val(),
'model': $('#model').val(),
// }),
},
request: {
@ -106,7 +116,7 @@ function initTable() {
[
{ type: 'checkbox', width: '5%' },
{
width: '15%',
width: '10%',
title: "序号",
align: "center",
templet: function (d) {
@ -115,7 +125,7 @@ function initTable() {
},
{
field: "name",
width: '20%',
width: '15%',
title: "配件名称",
unresize: true,
align: "center",
@ -123,7 +133,7 @@ function initTable() {
},
{
field: "model",
width: '20%',
width: '15%',
title: "规格",
unresize: true,
align: "center",
@ -132,7 +142,7 @@ function initTable() {
{
field: "num",
title: "库存量",
width: '20%',
width: '15%',
unresize: true,
align: "center",
sort:true,
@ -146,7 +156,15 @@ function initTable() {
edit: 'text',
style: 'outline: 1px solid #e6e6e6;outline-offset: -5px;'
},
{
field: "remarks",
width: '18.9%',
title: "备注",
unresize: true,
align: "center",
edit: 'textarea',
style: 'outline: 1px solid #e6e6e6;outline-offset: -5px;'
},
],
],
limits: [10, 15, 20, 25, 50, 100],
@ -240,7 +258,7 @@ function initTable() {
});
}
// 根据id 判断对象数组的对象是否存在 如果存在则替换，不存在则添加
// 根据id 判断对象数组的对象是否存在 如果存在则替换，不存在则添加
function updateOrAddObject(id, newObject) {
const index = jjDetailArr.findIndex(obj => obj.id === id);
if (index !== -1) {
@ -311,4 +329,4 @@ function closePage(type, params) {
window.parent.addFitDatas(params);
}
parent.layer.close(index); // 再执行关闭
}
}

20
js/demandPlan/child/apply_plan_edit_form.js
View File

@ -156,7 +156,7 @@ function submitApply(data) {
console.error(detailIdArr2);
let delDetailArr = getMinus(detailIdArr2, detailIdArr);
console.error(delDetailArr);
if (delDetailArr && delDetailArr.length > 0) {
data.field.delIds = delDetailArr;
}
@ -213,7 +213,8 @@ function getBaseTableData() {
module: $(this).find('td').eq(4).html(),
unit: $(this).find('td').eq(5).html(),
needNum: needNum ? needNum : 0,
times: times ? times : 0,
// times: times ? times : 0,
backDate: times,
remarks: $(this).find('td').eq(8).find('input[name="remarks"]').val(),
})
})
@ -307,7 +308,7 @@ function setTableData(results) {
html += "<td>" + l.name + "</td>";
html += "<td>" + l.unit + "</td>";
html += "<td>" + setFormInput(l.needNum, 1) + "</td>";
html += "<td>" + setFormInput(l.times == null ? 0 : l.times, 2) + "</td>";
html += "<td>" + setFormInput(l.backDate == null ? 0 : l.backDate, 2) + "</td>";
html += "<td>" + setFormInput(l.remarks, 3) + "</td>";
html += "</tr>";
}
@ -315,6 +316,12 @@ function setTableData(results) {
html += "<tr><td colspan='9' class='center'>没有相关数据</td></tr>";
}
$("#baseTable tbody").empty().append(html);
$('.refund-date').each(function(){
laydate.render({
elem: this, // 指定元素
type: 'date' // 可选，指定为日期类型，默认即是'date'
});
});
layui.form.render();
}
@ -323,7 +330,8 @@ function setFormInput(value, type) {
if (type === 1) { // 需用量
html += '<input class="layui-input" name="needNum" onblur="checkValue(this,1,\'需用量\')" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
} else if (type === 2) { // 需用天数
html += '<input class="layui-input" name="times" onblur="checkValue(this,2,\'需用天数\')" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
// html += '<input class="layui-input" name="times" onblur="checkValue(this,2,\'需用天数\')" value="' + setNullValue(value) + '" autocomplete="off" lay-verify="required" maxlength="9">';
html += '<input class="layui-input refund-date" readonly name="times" id="refundDate" value="' + setNullValue(value) + '" autocomplete="off">';
} else if (type === 3) { // 备注
html += '<input class="layui-input" placeholder="请输入备注" id="remarks" name="remarks" value="' + setNullValue(value) + '" maxLength="60" lay-affix="clear"></input>';
}
@ -382,7 +390,7 @@ function delFitType() {
}
}
}
if (jjDataArr.length === 0) {
$('#no_data_title').removeAttr('style');
$('#search-info').css({ 'display': 'none' });
@ -462,4 +470,4 @@ function closePage(type) {
window.parent.reloadData();
}
parent.layer.close(index); // 再执行关闭
}
}

3
page/accessory/child/accessory_apply_add.html
View File

@ -109,6 +109,7 @@
<th style="width: 10%" class="center">规格</th>
<th style="width: 10%" class="center">库存量</th>
<th style="width: 15%" class="center"><span style="color: red;">*</span>本次申请量</th>
<th style="width: 15%" class="center">备注</th>
</tr>
</thead>
<tbody></tbody>
@ -127,4 +128,4 @@
<script src="../../../js/accessory/child/accessory_apply_add.js" charset="utf-8"></script>
<script src="../../../js/openIframe.js" charset="utf-8"></script>
</html>
</html>

11
page/accessory/child/accessory_apply_detail.html
View File

@ -85,6 +85,14 @@
lay-affix="clear" placeholder="输入配件名称" maxlength="30">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline" style="width: 250px;">
<input type="text" name="model" id="model" autocomplete="off"
class="layui-input" lay-affix="clear" placeholder="输入规格名称" maxlength="30">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-bg-blue" onclick="search()"><i class="layui-icon"></i> 搜
索</button>
@ -109,6 +117,7 @@
<th style="width: 10%" class="center">规格</th>
<th style="width: 10%" class="center">库存量</th>
<th style="width: 15%" class="center"><span style="color: red;">*</span>本次申请量</th>
<th style="width: 10%" class="center">备注</th>
</tr>
</thead>
<tbody></tbody>
@ -127,4 +136,4 @@
<script src="../../../js/accessory/child/accessory_apply_detail.js" charset="utf-8"></script>
<script src="../../../js/openIframe.js" charset="utf-8"></script>
</html>
</html>

11
page/accessory/child/accessory_apply_edit.html
View File

@ -85,6 +85,14 @@
lay-affix="clear" placeholder="输入配件名称" maxlength="30">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline" style="width: 250px;">
<input type="text" name="model" id="model" autocomplete="off"
class="layui-input" lay-affix="clear" placeholder="输入规格名称" maxlength="30">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-bg-blue" onclick="search()"><i class="layui-icon"></i> 搜
索</button>
@ -109,6 +117,7 @@
<th style="width: 10%" class="center">规格</th>
<th style="width: 10%" class="center">库存量</th>
<th style="width: 15%" class="center"><span style="color: red;">*</span>本次申请量</th>
<th style="width: 15%" class="center">备注</th>
</tr>
</thead>
<tbody></tbody>
@ -127,4 +136,4 @@
<script src="../../../js/accessory/child/accessory_apply_edit.js" charset="utf-8"></script>
<script src="../../../js/openIframe.js" charset="utf-8"></script>
</html>
</html>

2
page/accessory/child/accessory_store_detail.html
View File

@ -87,7 +87,7 @@
<div id="file-box">
<div class="title layout">
<span style="font-weight:700;text-decoration:none;color:#409EFF;">▋</span>
<p>附件文档</p>
<p>供货方货单文档</p>
</div>
<div id="file-table-box">
<table class="classTable" id="file-table">

2
page/accessory/child/accessory_store_edit_form.html
View File

@ -45,7 +45,7 @@
</form>
<div class="layui-upload" style="padding: 0 39px;">
<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;width: auto;border: none;">
<p>附件证明<span class="required">*</span></p>
<p>供货方货单<span class="required">*</span></p>
<div class="layui-upload-list uploader-list" style="overflow: auto;" id="uploader-list"></div>
<div id="test2" style="margin-left: 10px;">
<img src="../../../images/add.png">

2
page/accessory/child/accessory_store_form.html
View File

@ -44,7 +44,7 @@
</form>
<div class="layui-upload" style="padding: 0 39px;">
<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;width: auto;border: none;">
<p>附件证明<span class="required">*</span></p>
<p>供货方货单<span class="required">*</span></p>
<div class="layui-upload-list uploader-list" style="overflow: auto;" id="uploader-list"></div>
<div id="test2" style="margin-left: 10px;">
<img src="../../../images/add.png">

10
page/accessory/child/choose_part_type_list.html
View File

@ -47,6 +47,14 @@
class="layui-input" lay-affix="clear" placeholder="输入配件名称" maxlength="30">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline" style="width: 250px;">
<input type="text" name="model" id="model" autocomplete="off"
class="layui-input" lay-affix="clear" placeholder="输入规格名称" maxlength="30">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-bg-blue" onclick="queryTable(1)"><i
class="layui-icon"></i> 搜 索</button>
@ -75,4 +83,4 @@
<script src="../../../js/accessory/child/choose_part_type_list.js" charset="utf-8"></script>
<script src="../../../js/openIframe.js" charset="utf-8"></script>
</html>
</html>