Browse Source

修复变更bug

ellisran 6 days atrás
parent
commit
4198b8786a
2 changed files with 4 additions and 4 deletions
  1. 3 3
      app/public/js/change_information.js
  2. 1 1
      app/view/change/modal.ejs

+ 3 - 3
app/public/js/change_information.js

@@ -5837,7 +5837,7 @@ $(document).ready(() => {
     if (cca !== null && cca !== undefined) {
         $('#customCheck1').prop('checked', cca !== 'false');
     }
-    changeSpreadSheet.setColumnVisible(6,$('#customCheck1').is(':checked'), GC.Spread.Sheets.SheetArea.viewport);
+    changeSpreadSheet.setColumnVisible(7,$('#customCheck1').is(':checked'), GC.Spread.Sheets.SheetArea.viewport);
     xmjSheet.setColumnVisible(7,$('#customCheck1').is(':checked'), GC.Spread.Sheets.SheetArea.viewport);
     ledgerSheet.setColumnVisible(6,$('#customCheck1').is(':checked'), GC.Spread.Sheets.SheetArea.viewport);
     posSheet.setColumnVisible(2,$('#customCheck1').is(':checked'), GC.Spread.Sheets.SheetArea.viewport);
@@ -5848,7 +5848,7 @@ $(document).ready(() => {
         }
         // // 设置用户项目本地记录展示和隐藏情况
         setLocalCache('change-checkbox-account-'+ accountId, $(this).is(':checked'));
-        changeSpreadSheet.setColumnVisible(6,$(this).is(':checked'), GC.Spread.Sheets.SheetArea.viewport);
+        changeSpreadSheet.setColumnVisible(7,$(this).is(':checked'), GC.Spread.Sheets.SheetArea.viewport);
         xmjSheet.setColumnVisible(7,$(this).is(':checked'), GC.Spread.Sheets.SheetArea.viewport);
         ledgerSheet.setColumnVisible(6,$(this).is(':checked'), GC.Spread.Sheets.SheetArea.viewport);
         posSheet.setColumnVisible(2,$(this).is(':checked'), GC.Spread.Sheets.SheetArea.viewport);
@@ -6628,7 +6628,7 @@ function makePushBwmx(clinfo, listinfo, removeList, updateList, showTips = false
                         oneUpdate[key] = leafInfo[key];
                         clinfo[key] = leafInfo[key];
                         needUpdate = true;
-                    } else if (leafInfo[key] === undefined && leafInfo.jldy !== (clinfo[key] || null)) {
+                    } else if (leafInfo[key] === undefined && leafInfo.jldy !== (clinfo[key] || clinfo.xmj_jldy || null)) {
                         oneUpdate[key] = leafInfo.jldy;
                         clinfo[key] = leafInfo.jldy;
                         needUpdate = true;

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

@@ -1154,7 +1154,7 @@
                                 oneUpdate[key] = leafInfo[key];
                                 // clinfo[key] = leafInfo[key];
                                 needUpdate = true;
-                            } else if (leafInfo[key] === undefined && leafInfo.jldy !== clinfo[key]) {
+                            } else if (leafInfo[key] === undefined && leafInfo.jldy !== (clinfo[key] || clinfo.xmj_jldy || null)) {
                                 oneUpdate[key] = leafInfo.jldy;
                                 // clinfo[key] = leafInfo.jldy;
                                 needUpdate = true;