|
|
@@ -32,7 +32,12 @@ $(document).ready(() => {
|
|
|
font: '12px 微软雅黑',
|
|
|
readOnly: true,
|
|
|
getColor: function (sheet, data, col, defaultColor) {
|
|
|
- return data && data.differ ? '#FFE699' : defaultColor;
|
|
|
+ return data
|
|
|
+ ? $('#compare-tag')[0].checked && data.compare_differ
|
|
|
+ ? '#f8d7da'
|
|
|
+ : (data.differ ? '#FFE699' : defaultColor)
|
|
|
+ : defaultColor;
|
|
|
+ //return data && data.differ ? '#FFE699' : defaultColor;
|
|
|
}
|
|
|
});
|
|
|
const gclSheet = gclSpread.getActiveSheet();
|
|
|
@@ -125,7 +130,7 @@ $(document).ready(() => {
|
|
|
for (const gcl of gclGatherData) {
|
|
|
gcl.compare_qty = ZhCalc.sub(gcl.deal_bills_qty, gcl.quantity);
|
|
|
gcl.compare_tp = ZhCalc.sub(gcl.deal_bills_tp, gcl.total_price);
|
|
|
- gcl.compare_differ = checkZero(gcl.compare_qty) && checkZero(gcl.compare_tp);
|
|
|
+ gcl.compare_differ = !checkZero(gcl.compare_qty) || !checkZero(gcl.compare_tp);
|
|
|
}
|
|
|
SpreadJsObj.loadSheetData(gclSheet, SpreadJsObj.DataType.Data, gclGatherData);
|
|
|
checkCompareData();
|
|
|
@@ -138,7 +143,9 @@ $(document).ready(() => {
|
|
|
generateChapterHtml(chapterData);
|
|
|
}, null, true);
|
|
|
|
|
|
- $('#compare-tag').click(checkCompareData);
|
|
|
+ $('#compare-tag').click(() => {
|
|
|
+ SpreadJsObj.reLoadSheetData(gclSheet);
|
|
|
+ });
|
|
|
|
|
|
// 展开收起附件
|
|
|
$('a', '.right-nav').bind('click', function () {
|
