|
|
@@ -2188,7 +2188,7 @@ $(document).ready(() => {
|
|
|
? (data[exprInfo.expr] ? data[exprInfo.expr] : data[col.field])
|
|
|
: data[col.field];
|
|
|
$('#pos-expr').val(value).attr('field', col.field).attr('org', data[col.field])
|
|
|
- .attr('readOnly', readOnly || (!data.formc && cell.locked()) || data.settle_status === settleStatus.finish).attr('data-row', sel.row);
|
|
|
+ .attr('readOnly', readOnly || !data.formc || data.settle_status === settleStatus.finish).attr('data-row', sel.row);
|
|
|
} else {
|
|
|
$('#pos-expr').val('').attr('readOnly', true);
|
|
|
$('#pos-expr').removeAttr('data-row');
|
|
|
@@ -2350,7 +2350,7 @@ $(document).ready(() => {
|
|
|
info.sheet.endEdit(true);
|
|
|
}
|
|
|
const is_change = info.sheet.getValue(info.row, info.col) ? 1 : 0;
|
|
|
- const valutaionCol = _.findIndex(info.sheet.zh_setting.cols, { field: 'is_valuation' });
|
|
|
+ // const valutaionCol = _.findIndex(info.sheet.zh_setting.cols, { field: 'is_valuation' });
|
|
|
if (is_change) {
|
|
|
makeGclGatherData();
|
|
|
const gclInfo = _.find(gclGatherData, function (item) {
|
|
|
@@ -2387,9 +2387,9 @@ $(document).ready(() => {
|
|
|
postData('/tender/' + window.location.pathname.split('/')[2] + '/change/' + window.location.pathname.split('/')[4] + '/information/save', {type: 'add-change-list', postData: [data]}, function (result) {
|
|
|
changeList = result.changeList;
|
|
|
select.is_change = 1;
|
|
|
- select.is_valuation = data.is_valuation;
|
|
|
+ select.is_valuation = data.is_valuation !== undefined ? data.is_valuation : 1;
|
|
|
SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
- info.sheet.setValue(info.row, valutaionCol, data.is_valuation);
|
|
|
+ // info.sheet.setValue(info.row, valutaionCol, data.is_valuation !== undefined ? data.is_valuation : 1);
|
|
|
if (_.findIndex(changeList, { gcl_id: select.lid }) !== -1) {
|
|
|
const billsNode = SpreadJsObj.getSelectObject(billsSheet);
|
|
|
billsNode.is_change = 1;
|
|
|
@@ -2422,7 +2422,7 @@ $(document).ready(() => {
|
|
|
select.is_change = 0;
|
|
|
select.is_valuation = 0;
|
|
|
SpreadJsObj.reLoadRowData(info.sheet, info.row);
|
|
|
- info.sheet.setValue(info.row, valutaionCol, 0);
|
|
|
+ // info.sheet.setValue(info.row, valutaionCol, 0);
|
|
|
const billsNode = SpreadJsObj.getSelectObject(billsSheet);
|
|
|
billsTreeSpreadObj.reCalcCamount(billsNode);
|
|
|
// 判断是否只剩一个，并同步去勾
|
