Browse Source

加权系数开放修改和展开收起侧边栏记忆,删除标段包含指数调差内容

laiguoran 4 years ago
parent
commit
7fbee7dfba
2 changed files with 19 additions and 7 deletions
  1. 17 7
      app/public/js/material_exponent.js
  2. 2 0
      app/service/tender.js

+ 17 - 7
app/public/js/material_exponent.js

@@ -50,7 +50,7 @@ $(document).ready(() => {
     const materialExponentBase = {
         isUsed: function (data) {
             if (data.type === 2) {
-                return data.mid === materialID || data.weight_num === null;
+                return data.mid === materialID || data.basic_price === null;
             } else {
                 return false;
             }
@@ -80,7 +80,8 @@ $(document).ready(() => {
                 return !(!readOnly && data.type === 2);
             },
             isConstant: function (data) {
-                return !(!readOnly && materialExponentBase.isConstant(data));
+                // return !(!readOnly && materialExponentBase.isConstant(data));
+                return readOnly;
             }
         },
     };
@@ -423,7 +424,7 @@ $(document).ready(() => {
         callback: function () {
             materialExponentSpread.refresh();
             const width = (($('#right-view').width()/$('#right-view').parent('div').width())*100).toFixed();
-            // setLocalCache('material_month_' + materialID, width);
+            setLocalCache('material_exponent_' + materialID, width);
         }
     });
 
@@ -439,16 +440,25 @@ $(document).ready(() => {
             showSideTools(tab.hasClass('active'));
             if (tab.attr('content') === '#base-tab') {
                 const width = (($('#right-view').width()/$('#right-view').parent('div').width())*100).toFixed();
-                // setLocalCache('material_month_' + materialID, width);
-                // materialMonthSpread.refresh();
+                setLocalCache('material_exponent_' + materialID, width);
             }
         } else {
-            // removeLocalCache('material_month_' + materialID);
+            removeLocalCache('material_exponent_' + materialID);
             tab.removeClass('active');
             tabPanel.removeClass('active');
             showSideTools(tab.hasClass('active'));
         }
-        // materialSpread.refresh();
         materialExponentSpread.refresh();
     });
+    // 根据浏览器记录展开收起
+    if (getLocalCache('material_exponent_' + materialID)) {
+        const tab = $('.right-nav a[content="#base-tab"]'), tabPanel = $(tab.attr('content'));
+        $('a', '.side-menu').removeClass('active');
+        $('.tab-content .tab-select-show').removeClass('active');
+        tab.addClass('active');
+        tabPanel.addClass('active');
+        $('#right-view').width(getLocalCache('material_exponent_' + materialID) + '%');
+        showSideTools(tab.hasClass('active'));
+        materialExponentSpread.refresh();
+    }
 });

+ 2 - 0
app/service/tender.js

@@ -312,6 +312,8 @@ module.exports = app => {
                 await transaction.delete(this.ctx.service.materialBillsHistory.tableName, { tid: id });
                 await transaction.delete(this.ctx.service.materialList.tableName, { tid: id });
                 await transaction.delete(this.ctx.service.materialListNotjoin.tableName, { tid: id });
+                await transaction.delete(this.ctx.service.materialExponent.tableName, { tid: id });
+                await transaction.delete(this.ctx.service.materialExponentHistory.tableName, { tid: id });
 
 
                 await transaction.delete(this.ctx.service.materialFile.tableName, { tid: id });