瀏覽代碼

本期计量台账,部分明细输入数据后,点击切换台账节点,数据因提交成功

MaiXinRong 6 年之前
父節點
當前提交
47867010b8

+ 4 - 2
app/public/js/spreadjs_rela/spreadjs_zh.js

@@ -29,6 +29,8 @@ proto.dottedLine = function (x1, y1, x2, y2, interval = 4) {
 
 // 简写Spread常量
 const spreadNS = GC.Spread.Sheets;
+// 授权码
+spreadNS.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";
 
 // SpreadJs常用方法
 const SpreadJsObj = {
@@ -585,9 +587,9 @@ const SpreadJsObj = {
         } else if (sheet.zh_dataType) {
             const sel = sheet.getSelections()[0];
             if (sheet.zh_dataType === this.DataType.Tree) {
-                return sheet.zh_tree.nodes[sel.row];
+                return sel ? sheet.zh_tree.nodes[sel.row] : null;
             } else if (sheet.zh_dataType === this.DataType.Data) {
-                return sheet.zh_data[sel.row];
+                return sel ? sheet.zh_data[sel.row] : null;
             } else {
                 return null;
             }

+ 15 - 5
app/public/js/stage.js

@@ -311,10 +311,12 @@ $(document).ready(() => {
                     html.push('</tr>');
                 }
                 // 变更类型
-                const cType = change.type.split(',');
-                $('input[name="type"]').prop("checked", false);
-                for (const c of cType) {
-                    $('input[name="type"][value='+ c +']').prop("checked", true);
+                if (change.type) {
+                    const cType = change.type.split(',');
+                    $('input[name="type"]').prop("checked", false);
+                    for (const c of cType) {
+                        $('input[name="type"][value='+ c +']').prop("checked", true);
+                    }
                 }
                 // 变更类别
                 $('select[name=class]').val(change.class);
@@ -587,7 +589,8 @@ $(document).ready(() => {
                     return ;
                 }
                 // 不同节点下,部位明细检查输入
-                const node = SpreadJsObj.getSelectObject(slSpread.getActiveSheet());
+                //const node = SpreadJsObj.getSelectObject(slSpread.getActiveSheet());
+                const node = stagePosSpreadObj.stageTreeNode;
                 if (!node) {
                     toast('数据错误, 请刷新页面后再试', 'warning');
                     SpreadJsObj.reLoadRowData(info.sheet, info.row);
@@ -640,6 +643,9 @@ $(document).ready(() => {
                 });
             }
         },
+        editStarting: function (e, info) {
+            stagePosSpreadObj.stageTreeNode = SpreadJsObj.getSelectObject(slSpread.getActiveSheet());
+        },
         clipboardPasting: function (e, info) {
             if (info.sheet.zh_setting) {
                 const sortData = info.sheet.zh_data;
@@ -770,6 +776,9 @@ $(document).ready(() => {
                 }
             }
         },
+        leaveCell: function (e, info) {
+            console.log(1);
+        },
     };
     // 加载上下窗口resizer
     $.divResizer({
@@ -797,6 +806,7 @@ $(document).ready(() => {
     spSpread.bind(spreadNS.Events.EditEnded, stagePosSpreadObj.editEnded);
     spSpread.bind(spreadNS.Events.ClipboardPasting, stagePosSpreadObj.clipboardPasting);
     spSpread.bind(spreadNS.Events.ClipboardPasted, stagePosSpreadObj.clipboardPasted);
+    spSpread.bind(spreadNS.Events.EditStarting, stagePosSpreadObj.editStarting);
     SpreadJsObj.addDeleteBind(spSpread, stagePosSpreadObj.deletePress);
 
     $('#row-view').on('show.bs.modal', function () {

+ 6 - 4
app/public/js/stage_change.js

@@ -214,10 +214,12 @@ $(document).ready(() => {
                     html.push('</tr>');
                 }
                 // 变更类型
-                const cType = change.type.split(',');
-                $('input[name="type"]').prop("checked", false);
-                for (const c of cType) {
-                    $('input[name="type"][value='+ c +']').prop("checked", true);
+                if (change.type) {
+                    const cType = change.type.split(',');
+                    $('input[name="type"]').prop("checked", false);
+                    for (const c of cType) {
+                        $('input[name="type"][value='+ c +']').prop("checked", true);
+                    }
                 }
                 // 变更类别
                 $('select[name=class]').val(change.class);

+ 0 - 1
app/service/change.js

@@ -739,7 +739,6 @@ module.exports = app => {
                         [lastStage.order, lastStage.order, lastStage.times, lastStage.times, curAuditor.order - 1]);
                 }
             }
-            console.log(filter);
             const sql = 'SELECT C.*, Sum(U.utp) As used_tp, Round(Sum(U.utp) / C.total_price * 100, 2) As used_pt' +
                 '  FROM ' + this.tableName + ' As C' +
                 '  LEFT JOIN (SELECT sc.tid, sc.cid, sc.cbid, Round(SUM(sc.qty) * cb.unit_price, ?) As utp' +

+ 0 - 1
app/service/stage_pos.js

@@ -316,7 +316,6 @@ module.exports = app => {
                 '  ) As Gather';
             const param = [tid, sid, lid];
             const sqlParam = param.concat(param);
-            console.log(this.db.format(calcQtySql, sqlParam));
             if (transaction) {
                 return await transaction.queryOne(calcQtySql, sqlParam);
             } else {