提交 187f904b authored 作者: chengye's avatar chengye

修改用电量小数计算错误

上级 d0b50f9c
...@@ -224,6 +224,7 @@ class Useage extends Base ...@@ -224,6 +224,7 @@ class Useage extends Base
$useage = (new \app\em\model\Useage)->alias('u') $useage = (new \app\em\model\Useage)->alias('u')
->field('u.*') ->field('u.*')
->field('(u.current_sum_numb - u.last_sum_numb) as u.repo_numb')
->field('emr.pricing_type') ->field('emr.pricing_type')
->leftJoin(['em'],'em.id=u.em_id') ->leftJoin(['em'],'em.id=u.em_id')
->leftJoin(['em_rule'=>'emr'],'emr.em_id=em.id') ->leftJoin(['em_rule'=>'emr'],'emr.em_id=em.id')
......
...@@ -41,6 +41,7 @@ class Useage extends Base ...@@ -41,6 +41,7 @@ class Useage extends Base
$data = self::alias('ue') $data = self::alias('ue')
->field('ue.*') ->field('ue.*')
->field('(ue.current_sum_numb - ue.last_sum_numb) as ue.repo_numb')
->field('station.station_name') ->field('station.station_name')
->field('em.em_numb') ->field('em.em_numb')
->join(['em'],'em.id=ue.em_id') ->join(['em'],'em.id=ue.em_id')
......
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
用电量 用电量
</label> </label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="repo_numb" name="repo_numb" autocomplete="off" class="layui-input" value="" disabled="disabled"> <input type="text" id="repo_numb" name="repo_numb" autocomplete="off" class="layui-input" value="{$useage.repo_numb}" disabled="disabled">
</div> </div>
<div class="layui-form-mid layui-word-aux"> <div class="layui-form-mid layui-word-aux">
...@@ -246,12 +246,6 @@ ...@@ -246,12 +246,6 @@
return false; return false;
}); });
var rn = $('#repo_numb');
var lNv = Number($('#last_numb').val())*10000;
var cNv = Number($('#current_numb').val())*10000;
var reN = ((cNv - lNv)/10000)*Number($('#rate').val());
rn.val(reN)
}); });
</script> </script>
{/block} {/block}
\ No newline at end of file
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
用电量 用电量
</label> </label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" id="repo_numb" name="repo_numb" autocomplete="off" class="layui-input" value="" disabled="disabled"> <input type="text" id="repo_numb" name="repo_numb" autocomplete="off" class="layui-input" value="{$useage.repo_numb}" disabled="disabled">
</div> </div>
<div class="layui-form-mid layui-word-aux"> <div class="layui-form-mid layui-word-aux">
...@@ -262,13 +262,6 @@ ...@@ -262,13 +262,6 @@
}); });
return false; return false;
}); });
var rn = $('#repo_numb');
var lNv = Number($('#last_numb').val())*10000;
var cNv = Number($('#current_numb').val())*10000;
var reN = ((cNv - lNv)/10000)*Number($('#rate').val());
rn.val(reN)
}); });
</script> </script>
{/block} {/block}
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论