mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: mula:842d2fbff00485cdce18d694ba2ebd22a0f925b0
Branches Tags
mula:master
mula:dev_1.0.0
..
compare: mula:e43b87c17a616480113de0fcf2279ff2f932ebf5
Branches Tags
mula:master
mula:dev_1.0.0

No commits in common. "842d2fbff00485cdce18d694ba2ebd22a0f925b0" and "e43b87c17a616480113de0fcf2279ff2f932ebf5" have entirely different histories.
842d2fbff0 ... e43b87c17a

2 changed files with 11 additions and 15 deletions
Show Stats Expand all files Collapse all files

14
ruoyi-admin/src/main/resources/templates/manage/order/add.html
View File

@ -184,8 +184,6 @@
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/add", $('#form-order-add').serialize()); $.operate.save(prefix + "/add", $('#form-order-add').serialize());
}else{
$.modal.alertWarning("请完善表单必填项");
} }
} }
@ -220,7 +218,7 @@
align: 'center', align: 'center',
title: 'BOM编码', title: 'BOM编码',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var html = $.common.sprintf("<input readonly class='form-control' type='text' name='orderListList[%s].productCode' value='%s' required>", index, value); var html = $.common.sprintf("<input readonly class='form-control' type='text' name='orderListList[%s].productCode' value='%s'>", index, value);
return html; return html;
} }
}, },
@ -229,7 +227,7 @@
align: 'center', align: 'center',
title: '产品名称', title: '产品名称',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var html = $.common.sprintf("<input readonly class='form-control' type='text' name='orderListList[%s].productName' value='%s' required>", index, value); var html = $.common.sprintf("<input readonly class='form-control' type='text' name='orderListList[%s].productName' value='%s'>", index, value);
return html; return html;
} }
}, },
@ -238,7 +236,7 @@
align: 'center', align: 'center',
title: '数量', title: '数量',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var html = $.common.sprintf("<input readonly class='form-control quantity' type='number' name='orderListList[%s].quantity' value='%s' required>", index, value); var html = $.common.sprintf("<input readonly class='form-control quantity' type='number' name='orderListList[%s].quantity' value='%s'>", index, value);
return html; return html;
} }
}, },
@ -247,7 +245,7 @@
align: 'center', align: 'center',
title: '单价', title: '单价',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var html = $.common.sprintf("<input readonly class='form-control price' type='number' name='orderListList[%s].price' value='%s' required>", index, value); var html = $.common.sprintf("<input readonly class='form-control price' type='number' name='orderListList[%s].price' value='%s'>", index, value);
return html; return html;
} }
}, },
@ -257,7 +255,7 @@
title: '折扣', title: '折扣',
width: 90, width: 90,
formatter: function (value, row, index) { formatter: function (value, row, index) {
var html = $.common.sprintf("<input readonly class='form-control discount' type='number' name='orderListList[%s].discount' value='%s' step='0.0001' max='1' min='0' required>", index, value); var html = $.common.sprintf("<input readonly class='form-control discount' type='number' name='orderListList[%s].discount' value='%s' step='0.0001' max='1' min='0'>", index, value);
return html; return html;
} }
}, },
@ -266,7 +264,7 @@
align: 'center', align: 'center',
title: '总价', title: '总价',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var html = $.common.sprintf("<input readonly class='form-control amount' type='number' name='orderListList[%s].amount' value='%s' required>", index, value); var html = $.common.sprintf("<input readonly class='form-control amount' type='number' name='orderListList[%s].amount' value='%s'>", index, value);
return html; return html;
} }
}, },

12
ruoyi-admin/src/main/resources/templates/manage/order/edit.html
View File

@ -192,8 +192,6 @@
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$.operate.save(prefix + "/edit", $('#form-order-edit').serialize()); $.operate.save(prefix + "/edit", $('#form-order-edit').serialize());
}else{
$.modal.alertWarning("请完善表单必填项");
} }
} }
@ -274,7 +272,7 @@
return; return;
} }
$('[name="orderPartnerCode"]').val(rows[0].partnerCode); $('[name="orderPartnerCode"]').val(rows[0].partnerCode);
$('[name="orderPartnerName"]').val(rows[0].partnerName); $('[name="orderPartnerName"]').val(rows[0].partnerCode);
$.modal.close(index); $.modal.close(index);
@ -410,7 +408,7 @@
align: 'center', align: 'center',
title: '数量', title: '数量',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var html = $.common.sprintf("<input readonly class='form-control quantity' type='text' name='orderListList[%s].quantity' value='%s' required>", index, value); var html = $.common.sprintf("<input readonly class='form-control quantity' type='text' name='orderListList[%s].quantity' value='%s'>", index, value);
return html; return html;
} }
}, },
@ -419,7 +417,7 @@
align: 'center', align: 'center',
title: '单价', title: '单价',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var html = $.common.sprintf("<input readonly class='form-control price' type='text' name='orderListList[%s].price' value='%s' required>", index, value); var html = $.common.sprintf("<input readonly class='form-control price' type='text' name='orderListList[%s].price' value='%s'>", index, value);
return html; return html;
} }
}, },
@ -429,7 +427,7 @@
title: '折扣', title: '折扣',
width:90, width:90,
formatter: function (value, row, index) { formatter: function (value, row, index) {
var html = $.common.sprintf("<input readonly class='form-control discount' type='number' name='orderListList[%s].discount' value='%s' step='0.0001' max='1' min='0' required>", index, value); var html = $.common.sprintf("<input readonly class='form-control discount' type='number' name='orderListList[%s].discount' value='%s' step='0.0001' max='1' min='0'>", index, value);
return html; return html;
} }
}, },
@ -439,7 +437,7 @@
align: 'center', align: 'center',
title: '总价', title: '总价',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var html = $.common.sprintf("<input readonly class='form-control amount' type='text' name='orderListList[%s].amount' value='%s' required>", index, value); var html = $.common.sprintf("<input readonly class='form-control amount' type='text' name='orderListList[%s].amount' value='%s'>", index, value);
return html; return html;
} }
}, },