Browse Source

spread颜色调整

MaiXinRong 3 years ago
parent
commit
8659b20eb6

+ 11 - 0
app/public/js/global.js

@@ -1152,6 +1152,17 @@ function hpackArrBack(data) {
     return result;
     return result;
 }
 }
 
 
+const spreadColor = {
+    stage: {
+        over: '#FF9595', //'#ff6f5c', '#f8d7da'
+        differ: '#F2DEDE',
+    },
+    gcl: {
+        differ: '#FFE699', // 同编号时,名称、单位、单价存在不同
+        calc_differ: '#f8d7da', //
+    },
+};
+
 $(document).ready(function () {
 $(document).ready(function () {
   $('.modal').draggable({handle: '.modal-header'});
   $('.modal').draggable({handle: '.modal-header'});
 });
 });

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

@@ -65,9 +65,9 @@ $(document).ready(() => {
         getColor: function (sheet, data, row, col, defaultColor) {
         getColor: function (sheet, data, row, col, defaultColor) {
             return data
             return data
                 ? $('#compare-tag')[0].checked && data.compare_differ
                 ? $('#compare-tag')[0].checked && data.compare_differ
-                    ? '#f8d7da'
-                    : (data.differ ? '#FFE699' : '#ffffff')
-                : '#ffffff';
+                    ? spreadColor.gcl.calc_differ
+                    : (data.differ ? spreadColor.gcl.differ : defaultColor)
+                : defaultColor;
         }
         }
     };
     };
     if (thousandth) sjsSettingObj.setTpThousandthFormat(gclSpreadSetting);
     if (thousandth) sjsSettingObj.setTpThousandthFormat(gclSpreadSetting);

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

@@ -389,12 +389,12 @@ $(document).ready(() => {
                     if (col.field === 'uamount') {
                     if (col.field === 'uamount') {
                         if (data.bamount > 0) {
                         if (data.bamount > 0) {
                             const usedAmount = ZhCalc.add(data.uamount, data.pre_amount);
                             const usedAmount = ZhCalc.add(data.uamount, data.pre_amount);
-                            return usedAmount < 0 || usedAmount > data.bamount ? '#ff6f5c' : defaultColor;
+                            return usedAmount < 0 || usedAmount > data.bamount ? spreadColor.stage.over : defaultColor;
                         } else if (data.bamount < 0) {
                         } else if (data.bamount < 0) {
                             const usedAmount = ZhCalc.add(data.uamount, data.pre_amount);
                             const usedAmount = ZhCalc.add(data.uamount, data.pre_amount);
-                            return usedAmount > 0 || usedAmount < data.bamount ? '#ff6f5c' : defaultColor;
+                            return usedAmount > 0 || usedAmount < data.bamount ? spreadColor.stage.over : defaultColor;
                         } else {
                         } else {
-                            return data.uamount ? '#ff6f5c' : defaultColor;
+                            return data.uamount ? spreadColor.stage.over : defaultColor;
                         }
                         }
                     } else {
                     } else {
                         return defaultColor;
                         return defaultColor;

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

@@ -68,7 +68,7 @@ $(document).ready(function () {
                 if ((base || compare) && (compare !== base)) return true;
                 if ((base || compare) && (compare !== base)) return true;
             }
             }
         }
         }
-        return data.children.length === 0 && checkDiffer(data) ? '#F2DEDE' : defaultColor;
+        return data.children.length === 0 && checkDiffer(data) ? spreadColor.stage.differ : defaultColor;
     };
     };
     posSpreadSetting.getColor = function (sheet, data, row, col, defaultColor) {
     posSpreadSetting.getColor = function (sheet, data, row, col, defaultColor) {
         function checkDiffer(data) {
         function checkDiffer(data) {
@@ -80,7 +80,7 @@ $(document).ready(function () {
                 if ((base || compare) && (compare!== base)) return true;
                 if ((base || compare) && (compare!== base)) return true;
             }
             }
         }
         }
-        return checkDiffer(data) ? '#F2DEDE' : defaultColor;
+        return checkDiffer(data) ? spreadColor.stage.differ : defaultColor;
     };
     };
     // 初始化台账
     // 初始化台账
     const ledgerSpread = SpreadJsObj.createNewSpread($('#ledger-spread')[0]);
     const ledgerSpread = SpreadJsObj.createNewSpread($('#ledger-spread')[0]);

+ 1 - 1
app/public/js/stage_gather.js

@@ -58,7 +58,7 @@ $(document).ready(function () {
     gclSheet.options.frozenlineColor = '#93b5e4';
     gclSheet.options.frozenlineColor = '#93b5e4';
     gclSpreadSetting.getColor = function (sheet, data, row, col, defaultColor) {
     gclSpreadSetting.getColor = function (sheet, data, row, col, defaultColor) {
         if (!data) return defaultColor;
         if (!data) return defaultColor;
-        return data.overRange && hintOver ? '#f8d7da' : data.differ ? '#FFE699' : defaultColor;
+        return data.overRange && hintOver ? spreadColor.stage.over : data.differ ? spreadColor.gcl.differ : defaultColor;
     };
     };
     if (thousandth) sjsSettingObj.setTpThousandthFormat(gclSpreadSetting);
     if (thousandth) sjsSettingObj.setTpThousandthFormat(gclSpreadSetting);
     SpreadJsObj.initSheet(gclSpread.getActiveSheet(), gclSpreadSetting);
     SpreadJsObj.initSheet(gclSpread.getActiveSheet(), gclSpreadSetting);