|
|
@@ -920,6 +920,11 @@ $(document).ready(() => {
|
|
|
if (nodePos && nodePos.length > 0) {
|
|
|
$('#bills-expr').val('').attr('readOnly', true);
|
|
|
} else {
|
|
|
+ if ((!data.is_tp && col.field.indexOf('tp') >= 0) || (data.is_tp && col.field.indexOf('tp') < 0)) {
|
|
|
+ $('#bills-expr').val('').attr('readOnly', true);
|
|
|
+ $('#bills-expr').removeAttr('data-row');
|
|
|
+ return;
|
|
|
+ }
|
|
|
const exprInfo = getExprInfo(col.field);
|
|
|
const value = exprInfo && data[exprInfo.expr] ? data[exprInfo.expr] : data[col.field];
|
|
|
$('#bills-expr').val(value).attr('field', col.field).attr('org', data[col.field]);
|
|
|
@@ -1296,12 +1301,6 @@ $(document).ready(() => {
|
|
|
if (!info.sheet.zh_setting || !info.sheet.zh_tree) return;
|
|
|
const col = info.sheet.zh_setting.cols[info.col];
|
|
|
const node = info.sheet.zh_tree.nodes[info.row];
|
|
|
- const exprInfo = getExprInfo(col.field);
|
|
|
- if (exprInfo) {
|
|
|
- if (node[exprInfo.expr] && node[exprInfo.expr] !== '') {
|
|
|
- info.sheet.getCell(info.row, info.col).text(node[exprInfo.expr]);
|
|
|
- }
|
|
|
- }
|
|
|
switch (col.field) {
|
|
|
case 'contract_qty':
|
|
|
case 'qc_qty':
|
|
|
@@ -1315,6 +1314,15 @@ $(document).ready(() => {
|
|
|
info.cancel = true;
|
|
|
break;
|
|
|
}
|
|
|
+
|
|
|
+ if (!info.cancel) {
|
|
|
+ const exprInfo = getExprInfo(col.field);
|
|
|
+ if (exprInfo) {
|
|
|
+ if (node[exprInfo.expr] && node[exprInfo.expr] !== '') {
|
|
|
+ info.sheet.getCell(info.row, info.col).text(node[exprInfo.expr]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
buttonClicked: function (e, info) {
|
|
|
if (info.sheet.zh_setting) {
|
|
|
@@ -1673,7 +1681,7 @@ $(document).ready(() => {
|
|
|
return !node || !!node.b_code;
|
|
|
}
|
|
|
},
|
|
|
- 'remainByExprAll4': {
|
|
|
+ 'remainByExprAll': {
|
|
|
name: '计算本期合同计量',
|
|
|
icon: 'fa-forward',
|
|
|
callback: function(key, opt) {
|
