Просмотр исходного кода

refactor: 计量台账-清单选择列变更

lanjianrong 5 лет назад
Родитель
Сommit
23fd713fb7
2 измененных файлов с 7 добавлено и 7 удалено
  1. 6 6
      app/public/js/change_set.js
  2. 1 1
      app/view/change/info_modal.ejs

+ 6 - 6
app/public/js/change_set.js

@@ -357,11 +357,11 @@ $(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>' + (leaf.jldy ? leaf.jldy: '') + '</td>' +
-                    '<td>' + bwmx + '</td>' +
-                    '<td>' + (leaf.dwgc ? leaf.dwgc : '') + '</td>' +
-                    '<td>' + (leaf.fbgc ? leaf.fbgc : '') + '</td>' +
-                    '<td>' + (leaf.fxgc ? leaf.fxgc : '') + '</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>' + roundnum(quantity, findDecimal(gcl.unit)) + '</td>' +
                     '<td><input type="checkbox"' + isChecked +
                     '></td></tr>';
@@ -770,7 +770,7 @@ function makeCodeTable(search = '') {
         if (length === 8) {
             const code = $('#code-list tr').eq(i).children('td').eq(0).text();
             const name = $('#code-list tr').eq(i).children('td').eq(1).text();
-            const jldy = $('#code-list tr').eq(i).children('td').eq(2).text();
+            const jldy = $('#code-list tr').eq(i).children('td').eq(5).text();
             console.log(code, name, jldy, search, code.indexOf(search) !== -1 || name.indexOf(search) !== -1 || jldy.indexOf(search) !== -1);
             const isShow = code.indexOf(search) !== -1 || name.indexOf(search) !== -1 || jldy.indexOf(search) !== -1;
             $('#code-list tr').eq(i).css('display', (isShow ? 'table-row' : 'none'));

+ 1 - 1
app/view/change/info_modal.ejs

@@ -129,7 +129,7 @@
                         <div style="overflow-y:auto" class="sjs-biangeng-height">
                             <table class="table table-striped table-bordered table-hover table-sm fixed_headers2">
                                 <thead>
-                                <tr><th width="100">项目节编号</th><th>名称</th><th>计量单元</th><th>单位工程</th><th>分部工程</th><th>分项工程</th><th width="70">数量</th><th width="40">选择</th></tr>
+                                <tr><th width="100">项目节编号</th><th>细目</th><th>单位工程</th><th>分部工程</th><th>分项工程</th><th>计量单元</th><th width="70">数量</th><th width="40">选择</th></tr>
                                 </thead>
                                 <tbody id="code-list" data-index="">
                                 </tbody>