Browse Source

[fix] 工程管理

修改开发修改单选择采购物料信息列表页面,设置物料添加可以多选;
修改开发修改单添加页面:修改插入方法,实现可以批量插入多选的物料,并且实现过滤掉重复的物料
dev
liuxiaoxu 5 months ago
parent
commit
4a6cf86756
  1. 53
      ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html
  2. 1
      ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/purchaseOrderMaterialSelect.html

53
ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/add.html

@ -627,25 +627,39 @@
},
});
}
function purchaseDoSubmit(index, layero, uniqueId) {
console.log(uniqueId);
var iframeWin = window[layero.find('iframe')[0]['name']];
var rowData = iframeWin.$('#bootstrap-purchaseMaterialSelect-table').bootstrapTable('getSelections')[0];
var selectedRows = iframeWin.$('#bootstrap-purchaseMaterialSelect-table').bootstrapTable('getSelections');
//判断是否重复
var rows = $("#bootstrap-table-purchase").bootstrapTable('getData').length;
for(var i=0;i<rows;i++){
var data = $("#bootstrap-table-purchase").bootstrapTable('getData')[i];
if(data.materialNo==rowData.materialNo){
$.modal.alertError("不能选择已添加过的相同物料");
if (selectedRows.length === 0) {
$.modal.alertError("请选择至少一条物料信息");
return;
}
var existingData = $("#bootstrap-table-purchase").bootstrapTable('getData');
// 存储要插入的新行
var newRows = [];
// 遍历选中的每一行物料信息
for (var i = 0; i < selectedRows.length; i++) {
var rowData = selectedRows[i];
// 检查是否已经存在相同的物料
var isDuplicate = false;
for (var j = 0; j < existingData.length; j++) {
if (existingData[j].materialNo === rowData.materialNo) {
isDuplicate = true;
break;
}
}
console.log("rowData: "+rowData);
$("#bootstrap-table-purchase").bootstrapTable('insertRow', {
index:1,
row: {
if (!isDuplicate) {
// 如果不存在,则准备插入新行
newRows.push({
bomId: rowData.bomId,
materialNo: rowData.materialNo,
materialPhotourl: rowData.materialPhotourl,
@ -657,8 +671,23 @@
materialProcessMethod: rowData.processMethod,
materialNum: '0',
warehouseDept: rowData.warehouseDept
});
} else {
$.modal.alertError("不能选择已添加过的相同物料");
}
})
}
// 批量插入新行
if (newRows.length > 0) {
// 插入第一行
$("#bootstrap-table-purchase").bootstrapTable('insertRow', { index: 1, row: newRows[0] });
// 插入剩余行
for (var k = 1; k < newRows.length; k++) {
$("#bootstrap-table-purchase").bootstrapTable('insertRow', { index: 1, row: newRows[k] });
}
}
layer.close(index);
}

1
ruoyi-admin/src/main/resources/templates/erp/developModifyOrder/purchaseOrderMaterialSelect.html

@ -44,7 +44,6 @@
showRefresh: false,
showToggle: false,
clickToSelect: true, // 点击选中行
singleSelect: true, // 单选
url: prefix + "/getPurchaseMaterialList",
modalName: "物料信息",
columns: [{

Loading…
Cancel
Save