Browse Source

费率界面,对于手动修改的费率值(与后台设置的默认值不一样)标红显示

vian 5 years ago
parent
commit
46099e0777

+ 1 - 0
modules/all_models/fee_rates.js

@@ -33,6 +33,7 @@ let ratesSchema = new Schema({
     ParentID: Number,
     name: String,
     rate: Number,
+    originalRate: Number,
     memo: String,
     subFeeRate:subFeeRatesSchema
 },{versionKey:false,_id: false});

+ 1 - 0
modules/fee_rates/facade/fee_rates_facade.js

@@ -295,6 +295,7 @@ async function newFeeRateFile(userId, updateData){
                 let newFeeRate = {};
                 newFeeRate.ID =uuidV1();
                 newFeeRate.rates=template.rates;
+                (newFeeRate.rates || []).forEach(item => item.originalRate = item.rate);
                 await feeRateModel.create(newFeeRate);
                 doc.libID = libID;
                 doc.libName = template.libName;

+ 2 - 0
web/building_saas/main/js/models/fee_rate.js

@@ -149,6 +149,8 @@ var FeeRate = {
             CommonAjax.post('/feeRates/updateRates', data, function (result) {
                 _.forEach(items,function (t) {
                     feeRateObject.mainFeeRateSheet.setValue(t.rateIndex, 1, t.rate.rate);
+                    const foreColor = commonUtil.isDef(t.rate.originalRate) && t.rate.originalRate !== +t.rate.rate ? 'red' : 'black';
+                    feeRateObject.mainFeeRateSheet.getCell(t.rateIndex, 1).foreColor(foreColor);
                  });
                  me.onFeeRateFileChange();
                 $.bootstrapLoading.end();

+ 5 - 1
web/building_saas/main/js/views/fee_rate_view.js

@@ -178,6 +178,8 @@ var feeRateObject={
                     sheet.getCell(row, 0).cellType(treeType);
                     visibleMap[data[row].ID] = treeType.collapsed;
                     feeRateObject.setRowVisible(data,row,visibleMap,sheet);
+                } else if (col === 1 && commonUtil.isDef(data[row].originalRate) && data[row].originalRate !== +val) {
+                    sheet.getCell(row, col).foreColor('red');
                 }
             }
         }
@@ -630,7 +632,7 @@ var feeRateObject={
             }
             temData[fieldID] = value ;
             updateDatas.push({rateID:recode.ID,doc:temData});
-            refreshA.push({col:c.col,row:c.row,fieldID:fieldID,value:value,rateID:recode.ID});
+            refreshA.push({col:c.col,row:c.row,fieldID:fieldID,value:value,originalRate:recode.originalRate,rateID:recode.ID});
         }
         if(updateDatas.length > 0){
             $.bootstrapLoading.start();
@@ -639,6 +641,8 @@ var feeRateObject={
                 for(let r of refreshA){
                     me.mainFeeRateSheet.setValue(r.row, r.col, r.value);
                     if(r.fieldID == 'rate'){
+                        const foreColor = commonUtil.isDef(r.originalRate) && r.originalRate !== +r.value ? 'red' : 'black';
+                        me.mainFeeRateSheet.getCell(r.row, r.col).foreColor(foreColor);
                         feerateInfo.push({rateID:r.rateID,value:r.value});
                     }
                 }