|
@@ -645,7 +645,8 @@ $(document).ready(() => {
|
|
|
return item.qc_qty || item.contract_qty
|
|
|
});
|
|
|
const nRow = leafXmjs.indexOf(leafXmjSelect);
|
|
|
- return [index, iRow, nRow, leafXmjSheet, leafXmjSelect];
|
|
|
+ const leafXmjColor = findNotJoinLeafXmj(leafXmjSelect) ? '#d6d8db' : '';
|
|
|
+ return [index, iRow, nRow, leafXmjSheet, leafXmjSelect, leafXmjColor];
|
|
|
},
|
|
|
checkJoinMaterial: function (type) {
|
|
|
const [iGclRow, iRow, nRow, sheet, select] = leafXmjSpreadObj.getSelect();
|
|
@@ -1213,10 +1214,11 @@ $(document).ready(() => {
|
|
|
sheet.setSelection(index > 0 ? index - 1 : 0, sel.length > 0 ? sel[0].col : 0, 1, 1);
|
|
|
const materialListIndex = materialListData.indexOf(select);
|
|
|
materialListData.splice(materialListIndex, 1);
|
|
|
- const [iGclRow, iRow, nRow, lsheet, lselect] = leafXmjSpreadObj.getSelect();
|
|
|
+ const [iGclRow, iRow, nRow, lsheet, lselect, color] = leafXmjSpreadObj.getSelect();
|
|
|
gclGatherData[iGclRow].leafXmjs[iRow].jiacha = calcOneBQJC(lselect);
|
|
|
calculateJiaCha(gclGatherData, iGclRow);
|
|
|
SpreadJsObj.reLoadRowData(lsheet, nRow);
|
|
|
+ lsheet.getRange(nRow, -1, 1, -1).backColor(color);
|
|
|
SpreadJsObj.reLoadRowData(ledgerSpread.getActiveSheet(), iGclRow);
|
|
|
});
|
|
|
},
|
|
@@ -1286,10 +1288,12 @@ $(document).ready(() => {
|
|
|
materialListData.splice(materialListIndex, 1, select);
|
|
|
materialList.indexOf(index, 1, select);
|
|
|
SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
- const [iGclRow, iRow, nRow, sheet, lselect] = leafXmjSpreadObj.getSelect();
|
|
|
+ const [iGclRow, iRow, nRow, sheet, lselect, color] = leafXmjSpreadObj.getSelect();
|
|
|
gclGatherData[iGclRow].leafXmjs[iRow].jiacha = calcOneBQJC(lselect);
|
|
|
calculateJiaCha(gclGatherData, iGclRow);
|
|
|
SpreadJsObj.reLoadRowData(sheet, nRow);
|
|
|
+ console.log(lselect, color);
|
|
|
+ sheet.getRange(nRow, -1, 1, -1).backColor(color);
|
|
|
SpreadJsObj.reLoadRowData(ledgerSpread.getActiveSheet(), iGclRow);
|
|
|
}, function () {
|
|
|
SpreadJsObj.reLoadRowData(info.sheet, info.row);
|