Jelajahi Sumber

默认选中和bug修复

laiguoran 4 tahun lalu
induk
melakukan
18009ed730

+ 1 - 1
app/const/material.js

@@ -46,7 +46,7 @@ const ex_calc = [
         code: 'bqwc',
         text: '本期完成计量金额',
         value: '',
-        select: false,
+        select: true,
     },
 ];
 

+ 3 - 0
app/controller/material_controller.js

@@ -400,6 +400,9 @@ module.exports = app => {
                             return bq.code === item.code;
                         });
                         bq.value = calc.value;
+                        if (calc.code === 'bqwc') {
+                            ctx.material.ex_expr = calc.value.toString() + '*[0-1]';
+                        }
                     }
                 } else {
                     renderData.ex_calc = JSON.parse(ctx.material.ex_calc);

+ 2 - 1
app/view/material/exponent.ejs

@@ -48,7 +48,7 @@
                         </div>
                     </div>
                     <div class="sp-wrap">
-                        <div class="col-4 p-0">
+                        <div class="col-7 p-0">
                             <table class="table table-sm table-bordered">
                                 <tr><th rowspan="2"></th><th colspan="2">信息价</th><th colspan="2">价格指数</th></tr>
                                 <tr class="text-center"><th>本期金额</th><th>截止本期金额</th><th>本期金额</th><th>截止本期金额</th></tr>
@@ -118,5 +118,6 @@
     const ex_pre_tp_hs = <%= ex_pre_tp_hs !== null ? ex_pre_tp_hs : 0 %>;
     const materialType = JSON.parse('<%- JSON.stringify(materialType) %>');
     const ex_calc = JSON.parse('<%- JSON.stringify(ex_calc) %>');
+    let ex_expr = '<%- material.ex_expr %>';
     let materialExponentData = JSON.parse('<%- JSON.stringify(materialExponentData) %>');
 </script>

+ 1 - 1
app/view/material/info.ejs

@@ -50,7 +50,7 @@
                         </div>
                     </div>
                     <div class="sp-wrap">
-                        <div class="col-4 p-0">
+                        <div class="col-7 p-0">
                             <table class="table table-sm table-bordered">
                                 <tr><th rowspan="2"></th><th colspan="2">信息价</th><th colspan="2">价格指数</th></tr>
                                 <tr class="text-center"><th>本期金额</th><th>截止本期金额</th><th>本期金额</th><th>截止本期金额</th></tr>