浏览代码

修复调差部分bug

laiguoran 2 年之前
父节点
当前提交
532227a103

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

@@ -141,7 +141,7 @@ $(document).ready(() => {
     materialSpreadSettingCols = _.concat(materialSpreadSettingCols, [
         {title: '上涨 幅度(%)', colSpan: '1', rowSpan: '2', field: 'm_up_risk', hAlign: 2, width: 50, type: 'Number', readOnly: 'readOnly.isEdit'},
         {title: '下跌 幅度(%)', colSpan: '1', rowSpan: '2', field: 'm_down_risk', hAlign: 2, width: 50, type: 'Number', readOnly: 'readOnly.isEdit'},
-        {title: '基准价', colSpan: '1', rowSpan: '2', field: 'basic_price', hAlign: 2, width: 50, type: 'Number', readOnly: 'readOnly.isEdit'},
+        {title: '基准价', colSpan: '1', rowSpan: '2', field: 'basic_price', hAlign: 2, width: 60, type: 'Number', readOnly: 'readOnly.isEdit'},
         {title: '基准时间', colSpan: '1', rowSpan: '2', field: 'basic_times', hAlign: 0, width: 70, formatter: '@', readOnly: 'readOnly.isEdit'},
         {title: '本期信息价|单价', colSpan: '3|1', rowSpan: '1|1', field: 'msg_tp', hAlign: 2, width: 60, type: 'Number', readOnly: 'readOnly.msg_tp'},
         {title: '|时间', colSpan: '|1', rowSpan: '|1', field: 'msg_times', hAlign: 0, width: 80, formatter: '@', readOnly: 'readOnly.remark'},

+ 2 - 2
app/public/js/material_checklist.js

@@ -138,8 +138,8 @@ $(document).ready(() => {
             // updateBillsData(ms_id);
             const newGclGatherListData = [];
             for (const [index, s] of result.ledgerListData.entries()) {
-                gclGatherModel.loadLedgerData(ledger, s);
-                gclGatherModel.loadPosData(pos, result.posListData[index]);
+                gclGatherModel.loadLedgerData(_.cloneDeep(ledger), s);
+                gclGatherModel.loadPosData(_.cloneDeep(pos), result.posListData[index]);
                 const oneGclGatherData = gclGatherModel.gatherGclData().filter(item => {
                     return item.qc_qty || item.contract_qty
                 });

+ 2 - 2
app/public/js/material_list.js

@@ -270,8 +270,8 @@ $(document).ready(() => {
                     updateBillsData(ms_id);
                     const newGclGatherListData = [];
                     for (const [index, s] of result.ledgerListData.entries()) {
-                        gclGatherModel.loadLedgerData(ledger, s);
-                        gclGatherModel.loadPosData(pos, result.posListData[index]);
+                        gclGatherModel.loadLedgerData(_.cloneDeep(ledger), s);
+                        gclGatherModel.loadPosData(_.cloneDeep(pos), result.posListData[index]);
                         const oneGclGatherData = gclGatherModel.gatherGclData().filter(item => {
                             return item.qc_qty || item.contract_qty
                         });

+ 3 - 0
app/public/js/measure_material.js

@@ -234,6 +234,9 @@ $(function () {
             $('#show_order').show();
             $('#s_order').val(order_array.join(','));
             if (stageList.length > 1) {
+                if($('#material_unitPrice').is(':hidden')){
+                    $('#unitPrice_dl').prop('checked', true);
+                }
                 $('#material_unitPrice').show();
             } else {
                 $('#material_unitPrice').hide();