root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改：采购报价修改物料为多选

dev
zhangsiqi 4 weeks ago
parent
348b4066eb
commit
c089d07208
2 changed files with 84 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 65
      ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html
  2. 26
      ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html

65
ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html
View File

@ -160,8 +160,31 @@
}, },
{title: '最新报价',field: 'materialSole',align: 'center',}, {title: '最新报价',field: 'materialSole',align: 'center',},
{title: '物料的数量', field: 'materialNum',align: 'center',editable: true,visible: false}, {title: '物料的数量', field: 'materialNum',align: 'center',editable: true,visible: false},
{title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',editable: true}, {title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',
{title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',editable: true}, editable:{
type: 'text',
validate: function(v) {
if (!v) return '输入不能为空';
if (isNaN(v)) return '输入错误';
if (v < 0) return '单价可以为0';
//正则金额保留两位小数
if (!/^\d+(\.\d{1,2})?$/.test(v)) return '金额保留两位小数';
}
}
},
{title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',
editable:{
type: 'text',
validate: function(v) {
if (!v) return '输入不能为空';
if (isNaN(v)) return '输入错误';
if (v < 0) return '单价可以为0';
//正则金额保留两位小数
if (!/^\d+(\.\d{1,2})?$/.test(v)) return '金额保留两位小数';
}
}
},
{title: '录入人',field: 'createBy',align: 'center',visible: false}, {title: '录入人',field: 'createBy',align: 'center',visible: false},
{title: '录入时间',field: 'createTime',align: 'center',visible: false }, {title: '录入时间',field: 'createTime',align: 'center',visible: false },
{title: '更新人',field: 'updateBy',align: 'center',visible: false}, {title: '更新人',field: 'updateBy',align: 'center',visible: false},
@ -213,29 +236,34 @@
}); });
function doSubmit(index, layero,uniqueId){ function doSubmit(index, layero,uniqueId){
var iframeWin = window[layero.find('iframe')[0]['name']]; var iframeWin = window[layero.find('iframe')[0]['name']];
var rowData = iframeWin.$('#bootstrap-select-table').bootstrapTable('getSelections')[0]; var rowData = iframeWin.$('#bootstrap-select-table').bootstrapTable('getSelections');
var rows = $("#bootstrap-sub-table-1").bootstrapTable('getData').length; var rows = $("#bootstrap-sub-table-1").bootstrapTable('getData').length;
for(var i=0;i<rows;i++){ for(var j=0;i<rows;j++){
var data = $("#bootstrap-sub-table-1").bootstrapTable('getData')[i]; var data = $("#bootstrap-sub-table-1").bootstrapTable('getData');
if(data.materialNo==rowData.materialNo){ for (var i = 0;i<data.length;i++){
$.modal.alertError("不能选择已添加过的相同料号"); if(data[i].materialNo==rowData[j].materialNo){
//如果是物料料号的相同，则从rowData清除相同的料号物料
rowData.splice(j,1);
$.modal.alertError("不能选择已添加过的相同料号" + rowData[j].materialNo);
return; return;
} }
} }
}
console.log("rowData: "+rowData); console.log("rowData: "+rowData);
for(var i=0;i<rowData.length;i++){
$("#bootstrap-sub-table-purchaseQuoteChild").bootstrapTable('insertRow', { $("#bootstrap-sub-table-purchaseQuoteChild").bootstrapTable('insertRow', {
index:1, index: i,
row: { row: {
materialId:rowData.id, materialId:rowData[i].id,
materialCode: rowData.materialNo, materialCode: rowData[i].materialNo,
materialName: rowData.materialName, materialName: rowData[i].materialName,
materialType: rowData.materialType, materialType: rowData[i].materialType,
describe: rowData.describe, describe: rowData[i].describe,
brand: rowData.brand, brand: rowData[i].brand,
unit: rowData.unit, unit: rowData[i].unit,
processMethod: rowData.processMethod, processMethod: rowData[i].processMethod,
materialSole: '', materialSole: '',
photoUrl: rowData.photoUrl, photoUrl: rowData[i].photoUrl,
materialNum: 1, materialNum: 1,
materialRmb: "", materialRmb: "",
materialNoRmb: "", materialNoRmb: "",
@ -244,6 +272,7 @@
remark: "" remark: ""
} }
}) })
}
layer.close(index); layer.close(index);
} }
function insertRow() { function insertRow() {
@ -344,7 +373,7 @@
}); });
/* 删除指定表格行 */ /* 删除指定表格行 */
function removeRow(materialCode){ function removeRow(materialCode){
$("#bootstrap-sub-table-requisitionChild").bootstrapTable('remove', { $("#bootstrap-sub-table-purchaseQuoteChild").bootstrapTable('remove', {
field: 'materialCode', field: 'materialCode',
values: materialCode values: materialCode
}) })

26
ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html
View File

@ -212,8 +212,30 @@
}, },
{title:'最新报价',field: 'materialSole',align: 'center',}, {title:'最新报价',field: 'materialSole',align: 'center',},
{title: '物料的数量', field: 'materialNum',align: 'center',editable: true,visible: false}, {title: '物料的数量', field: 'materialNum',align: 'center',editable: true,visible: false},
{title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',editable: true,}, {title: '物料的不含税单价(RMB)',field: 'materialNoRmb',align: 'center',
{title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',editable: true,}, editable: {
type: 'text',
validate: function (v) {
if (!v) return '输入不能为空';
if (isNaN(v)) return '输入错误';
if (v < 0) return '单价可以为0';
//正则金额保留两位小数
if (!/^\d+(\.\d{1,2})?$/.test(v)) return '金额保留两位小数';
}
}
},
{title: '物料的含税单价(RMB)',field: 'materialRmb',align: 'center',
editable:{
type: 'text',
validate: function(v) {
if (!v) return '输入不能为空';
if (isNaN(v)) return '输入错误';
if (v < 0) return '单价可以为0';
//正则金额保留两位小数
if (!/^\d+(\.\d{1,2})?$/.test(v)) return '金额保留两位小数';
}
}
},
{title: '录入人',field: 'createBy',align: 'center',visible: false}, {title: '录入人',field: 'createBy',align: 'center',visible: false},
{title: '录入时间',field: 'createTime',align: 'center',visible: false }, {title: '录入时间',field: 'createTime',align: 'center',visible: false },
{title: '更新人',field: 'updateBy',align: 'center',visible: false}, {title: '更新人',field: 'updateBy',align: 'center',visible: false},

Write Preview
Loading…
Cancel
Save