浏览代码

变更令保存修改no.6 success

laiguoran 5 年之前
父节点
当前提交
434e040216
共有 3 个文件被更改,包括 10 次插入19 次删除
  1. 3 0
      app/public/js/change_detail.js
  2. 6 2
      app/public/js/change_set.js
  3. 1 17
      app/view/change/info.ejs

+ 3 - 0
app/public/js/change_detail.js

@@ -38,6 +38,9 @@ $(document).ready(() => {
         $('.show_title').hide();
         $('#'+ tab +'_title').show();
         if (tab === 'bills' && $('#bills').hasClass('first-bill-pane')) {
+            if (table) {
+                table.destroy();
+            }
             table = $('.table-list').removeAttr('width').DataTable(billsTable);
             $('#bills').removeClass('first-bill-pane');
         }

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

@@ -218,7 +218,7 @@ $(document).ready(() => {
                 $('.title-main').removeClass('bg-warning');
                 $('#back-change-list').val($('#change-list').val());
                 $('#back-change-whitelist').val($('#change-whitelist').val());
-                back_changeInfo = changeInfo;
+                back_changeInfo = Object.assign({}, changeInfo);
             } else {
                 toastr.error(result.msg);
             }
@@ -238,6 +238,9 @@ $(document).ready(() => {
             tableDataRemake(changeListData);
             // 重新绘制table
             maketablelist();
+            if(!$('#bills').hasClass('first-bill-pane') && !$('a[aria-controls="bills"]').hasClass('active')) {
+                $('#bills').addClass('first-bill-pane');
+            }
         }
         toastr.success('已还原到上次保存状态');
     });
@@ -622,7 +625,7 @@ function tableDataRemake(changeListData) {
 }
 
 function changeFormRemake() {
-    changeInfo = back_changeInfo;
+    changeInfo = Object.assign({}, back_changeInfo);
     $('#change_form input[name="code"]').val(changeInfo.code);
     $('#change_form input[name="name"]').val(changeInfo.name);
     $('#change_form input[name="peg"]').val(changeInfo.peg);
@@ -858,6 +861,7 @@ function judgeChange() {
     if ($('#change-whitelist').val() !== $('#back-change-whitelist').val()) {
         change = true;
     }
+    console.log(changeInfo, back_changeInfo);
     if (!isObjEqual(changeInfo, back_changeInfo)) {
         change = true;
     }

+ 1 - 17
app/view/change/info.ejs

@@ -776,23 +776,7 @@
         company: '<%- change.company %>',
         charge: '<%- change.charge %>',
     };
-    let changeInfo = {
-        code: '<%- change.code %>',
-        name: '<%- change.name %>',
-        peg: '<%- change.peg %>',
-        org_name: '<%- change.org_name %>',
-        org_code: '<%- change.org_code %>',
-        new_name: '<%- change.new_name %>',
-        new_code: '<%- change.new_code %>',
-        content: '<%- change.content %>',
-        basis: '<%- change.basis %>',
-        memo: '<%- change.memo %>',
-        type: '<%- change.type %>',
-        class: '<%- change.class %>',
-        quality: '<%- change.quality %>',
-        company: '<%- change.company %>',
-        charge: '<%- change.charge %>',
-    };
+    let changeInfo = Object.assign({}, back_changeInfo);
 </script>
 <script src="/public/js/decimal.min.js"></script>
 <script src="/public/js/zh_calc.js"></script>