瀏覽代碼

变更令,选择当前新增部位/清单相关

MaiXinRong 1 年之前
父節點
當前提交
f8499f2f44
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      app/public/js/change_information_set.js
  2. 1 1
      app/view/change/information_modal.ejs

+ 2 - 2
app/public/js/change_information_set.js

@@ -986,6 +986,7 @@ $(document).ready(() => {
         const data_charu = $(this).attr('data-charu') ? $(this).attr('data-charu').split('$#$') : [];
         const isDeal = $(this).data('gcl') !== undefined ? true : false;
         let codeHtml = '<tr quantity="'+ $(this).children('td').eq(5).text() +'" gcl_id="" mx_id=""><td class="text-center">1</td><td colspan="7" class="colspan_1">&nbsp;</td><td class="colspan_2 text-center"><input type="checkbox"></td></tr>';
+        console.log(isDeal, isCheck);
         if (isDeal) {
             const lid = $(this).data('lid');
             let gcl = _.find(gclGatherData, function (item) {
@@ -1465,8 +1466,7 @@ $(document).ready(() => {
             let hasNew = false;
             for (const [index, leaf] of gcl.leafXmjs.entries()) {
                 if (!leaf.cid || leaf.ccid !== window.location.pathname.split('/')[4]) continue;
-
-                const bwmx = [leaf.code, leaf.jldy || '', leaf.dwgc || '', leaf.fbgc || '', leaf.fxgc || '', leaf.gcl_id, leaf.mx_id, leaf.jldy || ''];
+                const bwmx = [leaf.code, leaf.jldy || '', leaf.dwgc || '', leaf.fbgc || '', leaf.fxgc || '', leaf.gcl_id, leaf.mx_id, leaf.bwmx || leaf.jldy || ''];
                 const de_qu = bwmx.join(infoSpr) + qtySpr + (leaf.quantity || 0);
                 if (data_bwmx.indexOf(de_qu) < 0) data_bwmx.push(de_qu);
                 hasNew = true;

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

@@ -207,7 +207,7 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-sm btn-primary" id="select-all-revise">选择所有新增部位/清单</button>
+                    <button type="button" class="btn btn-sm btn-primary" id="select-all-revise">选择当前新增部位/清单</button>
                     <!--<button type="button" class="add-list-btn btn btn-sm btn-outline-primary">添加空白清单</button>-->
                     <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal" id="cancel-list-btn">取消</button>
                     <button type="button" class="add-list-btn btn btn-primary btn-sm">添加</button>