Переглянути джерело

1. 部位台账,计算问题
2. 质量管理相关

MaiXinRong 3 тижнів тому
батько
коміт
948128e659

+ 1 - 1
app/lib/bills_pos_convert.js

@@ -95,7 +95,7 @@ class BillsPosConvert {
                 let end_contract_qty = data.contract_qty;
                 activeQty = this.ctx.helper.add(activeQty, data.pre_qc_minus_qty);
                 end_contract_qty = this.ctx.helper.add(end_contract_qty, data.pre_contract_qty);
-                const end_contract_tp = this.ctx.helper.mul(end_contract_qty, data.total_price, info.decimal.tp);
+                const end_contract_tp = this.ctx.helper.mul(end_contract_qty, node.unit_price, info.decimal.tp);
                 return activeQty === end_contract_qty ? this.ctx.helper.sub(end_contract_tp, data.pre_contract_tp) : this.ctx.helper.mul(node.unit_price, data.contract_qty, info.decimal.tp);
             } else {
                 return this.ctx.helper.mul(node.unit_price, data.contract_qty, info.decimal.tp);

+ 1 - 1
app/public/js/quality_info.js

@@ -4,7 +4,7 @@ $(document).ready(() => {
     const xmjSheet = xmjSpread.getActiveSheet();
     const xmjSpreadSetting = {
         cols: [
-            { title: '工程编号', colSpan: '1', rowSpan: '1', field: 'code', hAlign: 0, width: 135, formatter: '@', cellType: 'tree' },
+            { title: '工程编号', colSpan: '1', rowSpan: '1', field: 'code', hAlign: 0, width: 200, formatter: '@', cellType: 'tree' },
             { title: '工程名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 195, formatter: '@' },
         ],
         emptyRows: 0,

+ 8 - 2
app/public/js/quality_rule.js

@@ -68,8 +68,10 @@ $(() => {
         };
         const loadGroupRules = function(group) {
             const html = [];
-            for (const rule of group.rules) {
-                html.push(`<tr class="text-center" ruleId = "${rule.id}">`, getRuleHtml(rule), '</tr>');
+            if (group) {
+                for (const rule of group.rules) {
+                    html.push(`<tr class="text-center" ruleId = "${rule.id}">`, getRuleHtml(rule), '</tr>');
+                }
             }
             $('#ruleOptions').html(html.join(''));
         };
@@ -115,6 +117,10 @@ $(() => {
                 $(`dd[groupId=${result.del}]`).remove();
                 const groupIndex = groups.findIndex(x => { return x.group_id === group_id; });
                 groups.splice(groupIndex, 1);
+                if (curGroup.group_id === group_id) {
+                    curGroup = null;
+                    loadGroupRules();
+                }
             });
         };