|
@@ -342,7 +342,7 @@ $(document).ready(() => {
|
|
|
const isCheck = $(this).hasClass('table-success') ? true : false;
|
|
|
const data_bwmx = $(this).attr('data-bwmx').split('$#$');
|
|
|
const isDeal = $(this).data('gcl') !== undefined ? true : false;
|
|
|
- let codeHtml = '<tr quantity="'+ $(this).children('td').eq(5).text() +'"><td colspan="7" class="colspan_1"> </td><td class="colspan_2"><input type="checkbox"></td></tr>';
|
|
|
+ let codeHtml = '<tr quantity="'+ $(this).children('td').eq(6).text() +'"><td colspan="7" class="colspan_1"> </td><td class="colspan_2"><input type="checkbox"></td></tr>';
|
|
|
if (isDeal) {
|
|
|
const lid = $(this).data('lid');
|
|
|
let gcl = _.find(gclGatherData, function (item) {
|
|
@@ -357,17 +357,17 @@ $(document).ready(() => {
|
|
|
const bwmx = leaf.bwmx !== undefined ? leaf.bwmx : '';
|
|
|
const isChecked = data_bwmx.indexOf(leaf.code + '_' + (bwmx !== '' ? bwmx : leaf.jldy ? leaf.jldy : '') + ';' + quantity) !== -1 && isCheck ? 'checked' : '';
|
|
|
codeHtml += '<tr quantity="' + quantity + '"><td>' + leaf.code + '</td>' +
|
|
|
- '<td>' + bwmx + '</td>' +
|
|
|
- '<td>' + (leaf.dwgc ? leaf.dwgc : '') + '</td>' +
|
|
|
- '<td>' + (leaf.fbgc ? leaf.fbgc : '') + '</td>' +
|
|
|
- '<td>' + (leaf.fxgc ? leaf.fxgc : '') + '</td>' +
|
|
|
- '<td>' + (leaf.jldy ? leaf.jldy: '') + '</td>' +
|
|
|
+ '<td>' + (leaf.jldy ? leaf.jldy: '') + '</td>' +
|
|
|
+ '<td>' + (leaf.dwgc ? leaf.dwgc : '') + '</td>' +
|
|
|
+ '<td>' + (leaf.fbgc ? leaf.fbgc : '') + '</td>' +
|
|
|
+ '<td>' + (leaf.fxgc ? leaf.fxgc : '') + '</td>' +
|
|
|
+ '<td>' + bwmx + '</td>' +
|
|
|
'<td class="text-right">' + roundnum(quantity, findDecimal(gcl.unit)) + '</td>' +
|
|
|
'<td class="text-center"><input type="checkbox"' + isChecked +
|
|
|
'></td></tr>';
|
|
|
}
|
|
|
} else if (!isDeal && isCheck) {
|
|
|
- codeHtml = '<tr quantity="'+ $(this).children('td').eq(5).text() +'"><td colspan="7" class="colspan_1"> </td><td class="colspan_2"><input type="checkbox" checked></td></tr>';
|
|
|
+ codeHtml = '<tr quantity="'+ $(this).children('td').eq(6).text() +'"><td colspan="7" class="colspan_1"> </td><td class="colspan_2"><input type="checkbox" checked></td></tr>';
|
|
|
}
|
|
|
$('#code-list').attr('data-index', $(this).children('td').eq(0).text());
|
|
|
$('#code-input').val('');
|
|
@@ -389,7 +389,7 @@ $(document).ready(() => {
|
|
|
$('#code-list input:checked').each(function () {
|
|
|
const tr = $(this).parents('tr');
|
|
|
const length = tr.children('td').length;
|
|
|
- const bwmx = length === 8 ? tr.children('td').eq(0).text() + '_' + (tr.children('td').eq(2).text() !== '' ? tr.children('td').eq(2).text() : tr.children('td').eq(1).text()) : '0';
|
|
|
+ const bwmx = length === 8 ? tr.children('td').eq(0).text() + '_' + (tr.children('td').eq(5).text() !== '' ? tr.children('td').eq(5).text() : tr.children('td').eq(1).text()) : '0';
|
|
|
const quantity = tr.attr('quantity');
|
|
|
const de_qu = bwmx + ';' + quantity;
|
|
|
data_bwmx.push(de_qu);
|
|
@@ -404,7 +404,7 @@ $(document).ready(() => {
|
|
|
$('#code-list input:checked').each(function () {
|
|
|
const tr = $(this).parents('tr');
|
|
|
const length = tr.children('td').length;
|
|
|
- const bwmx = length === 8 ? tr.children('td').eq(0).text() + '_' + (tr.children('td').eq(2).text() !== '' ? tr.children('td').eq(2).text() : tr.children('td').eq(1).text()) : '0';
|
|
|
+ const bwmx = length === 8 ? tr.children('td').eq(0).text() + '_' + (tr.children('td').eq(5).text() !== '' ? tr.children('td').eq(5).text() : tr.children('td').eq(1).text()) : '0';
|
|
|
const quantity = tr.attr('quantity');
|
|
|
const de_qu = bwmx + ';' + quantity;
|
|
|
data_bwmx.push(de_qu);
|