1. 台账分解、修订，表达式框，清除数据报错

2. 台账分解、修订，表达式框，只读控制

app/public/js/ledger.js

@@ -97,8 +97,12 @@ $(document).ready(function() {
             if (col.type === 'Number') {
                 const data = SpreadJsObj.getSelectObject(sheet);
                 if (data) {
-                    $('#bills-expr').val(data[col.field]).attr('field', col.field).attr('org', data[col.field])
-                        .attr('readOnly', readOnly || cell.locked() || (data.children && data.children.length > 0));
+                    $('#bills-expr').val(data[col.field]).attr('field', col.field).attr('org', data[col.field]);
+                    if (col.field.indexOf('dgn') >= 0) {
+                        $('#bills-expr').attr('readOnly', readOnly || cell.locked() || data.b_code);
+                    } else {
+                        $('#bills-expr').attr('readOnly', readOnly || cell.locked() || (data.children && data.children.length > 0));
+                    }
                 } else {
                     $('#bills-expr').val('').attr('readOnly', true);
                 }
@@ -883,16 +887,20 @@ $(document).ready(function() {
                 tender_id: select.tender_id,
                 ledger_id: select.ledger_id
             };
-            const num = _.toNumber(newValue);
-            if (num) {
-                data[field] = num;
-            } else {
-                try {
-                    data[field] = math.evaluate(transExpr(newValue));
-                } catch (err) {
-                    toastr.error('输入的表达式非法');
-                    return;
+            if (newValue !== '') {
+                const num = _.toNumber(newValue);
+                if (num) {
+                    data[field] = num;
+                } else {
+                    try {
+                        data[field] = math.evaluate(transExpr(newValue));
+                    } catch (err) {
+                        toastr.error('输入的表达式非法');
+                        return;
+                    }
                 }
+            } else {
+                data[field] = null;
             }
 
             // 更新至服务器
@@ -1375,16 +1383,20 @@ $(document).ready(function() {
             if (orgValue === newValue || (!orgValue && newValue == '')) { return; }
 
             const data = {id: select.id};
-            const num = _.toNumber(newValue);
-            if (num) {
-                data[field] = num;
-            } else {
-                try {
-                    data[field] = math.evaluate(transExpr(newValue));
-                } catch (err) {
-                    toastr.error('输入的表达式非法');
-                    return;
+            if (newValue !== '') {
+                const num = _.toNumber(newValue);
+                if (num) {
+                    data[field] = num;
+                } else {
+                    try {
+                        data[field] = math.evaluate(transExpr(newValue));
+                    } catch (err) {
+                        toastr.error('输入的表达式非法');
+                        return;
+                    }
                 }
+            } else {
+                data[field] = null;
             }
 
             // 更新至服务器

app/public/js/revise.js

@@ -59,8 +59,15 @@ $(document).ready(() => {
             if (col.type === 'Number') {
                 const data = SpreadJsObj.getSelectObject(sheet);
                 if (data) {
-                    $('#bills-expr').val(data[col.field]).attr('field', col.field).attr('org', data[col.field])
-                        .attr('readOnly', readOnly || cell.locked() || (data.children && data.children.length > 0));
+                    $('#bills-expr').val(data[col.field]).attr('field', col.field).attr('org', data[col.field]);
+
+                    if (col.field.indexOf('dgn') >= 0) {
+                        $('#bills-expr').attr('readOnly', readOnly || cell.locked() || data.b_code);
+                    } else if (col.field === 'unit_price') {
+                        $('#bills-expr').attr('readOnly', readOnly || cell.locked() || (data.children && data.children.length > 0) || node.used);
+                    } else {
+                        $('#bills-expr').attr('readOnly', readOnly || cell.locked() || (data.children && data.children.length > 0));
+                    }
                 } else {
                     $('#bills-expr').val('').attr('readOnly', true);
                 }
@@ -563,6 +570,12 @@ $(document).ready(() => {
         $('a[name="base-opr"]').click(function () {
             billsTreeSpreadObj.baseOpr(billsSheet, this.getAttribute('type'));
         });
+        $('a[name=cpc]').click(function () {
+            billsSpread.commandManager().execute({
+                cmd: this.getAttribute('type'),
+                sheetName: billsSpread.getActiveSheet().name()
+            });
+        });
 
         $('#bills-expr').bind('change mouseleave', function () {
             if (this.readOnly) return;
@@ -577,16 +590,20 @@ $(document).ready(() => {
                 tender_id: select.tender_id,
                 ledger_id: select.ledger_id
             };
-            const num = _.toNumber(newValue);
-            if (num) {
-                data[field] = num;
-            } else {
-                try {
-                    data[field] = math.evaluate(transExpr(newValue));
-                } catch (err) {
-                    toastr.error('输入的表达式非法');
-                    return;
+            if (newValue !== '') {
+                const num = _.toNumber(newValue);
+                if (num) {
+                    data[field] = num;
+                } else {
+                    try {
+                        data[field] = math.evaluate(transExpr(newValue));
+                    } catch (err) {
+                        toastr.error('输入的表达式非法');
+                        return;
+                    }
                 }
+            } else {
+                data[field] = null;
             }
 
             // 更新至服务器
@@ -1001,16 +1018,20 @@ $(document).ready(() => {
             if (orgValue === newValue || (!orgValue && newValue == '')) { return; }
 
             const data = {id: select.id};
-            const num = _.toNumber(newValue);
-            if (num) {
-                data[field] = num;
-            } else {
-                try {
-                    data[field] = math.evaluate(transExpr(newValue));
-                } catch (err) {
-                    toastr.error('输入的表达式非法');
-                    return;
+            if (newValue !== '') {
+                const num = _.toNumber(newValue);
+                if (num) {
+                    data[field] = num;
+                } else {
+                    try {
+                        data[field] = math.evaluate(transExpr(newValue));
+                    } catch (err) {
+                        toastr.error('输入的表达式非法');
+                        return;
+                    }
                 }
+            } else {
+                data[field] = null;
             }
 
             // 更新至服务器

app/view/revise/info.ejs

@@ -29,9 +29,9 @@
                     <a href="javascript: void(0);" name="base-opr" type="down-level" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
                     <a href="javascript: void(0);" name="base-opr" type="down-move" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
                     <a href="javascript: void(0);" name="base-opr" type="up-move" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
-                    <a href="javascript: void(0);" id="copy" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="复制"><i class="fa fa-files-o" aria-hidden="true"></i></a>
-                    <a href="javascript: void(0);" id="cut" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="剪切"><i class="fa fa-scissors" aria-hidden="true"></i></a>
-                    <a href="javascript: void(0);" id="paste" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="粘贴"><i class="fa fa-clipboard" aria-hidden="true"></i></a>
+                    <a href="javascript: void(0);" name="cpc" type="copy" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="复制"><i class="fa fa-files-o" aria-hidden="true"></i></a>
+                    <a href="javascript: void(0);" name="cpc" type="cut" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="剪切"><i class="fa fa-scissors" aria-hidden="true"></i></a>
+                    <a href="javascript: void(0);" name="cpc" type="paste" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="粘贴"><i class="fa fa-clipboard" aria-hidden="true"></i></a>
                 </div>
                 <div class="d-inline-block">
                     <div class="input-group input-group-sm ml-2">