Skip to content

J
Jz-Php
提交 094d6308 authored 作者: chengye's avatar chengye
浏览文件
操作

打印错误

上级 d34a48c4
隐藏空白字符变更
内嵌 并排
正在显示 包含 50 行增加 和 13 行删除
.idea/workspace.xml
浏览文件 @ 094d6308
...@@ -2,8 +2,7 @@ ...@@ -2,8 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f51c1393-9404-4c81-be85-d91ed40531b3" name="默认更改列表" comment=""> <list default="true" id="f51c1393-9404-4c81-be85-d91ed40531b3" name="默认更改列表" comment="">
<change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" /> <change beforePath="$PROJECT_DIR$/application/em/model/EmInvoice.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/em/model/EmInvoice.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -16,15 +15,24 @@ ...@@ -16,15 +15,24 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="351"> <state relative-caret-position="403">
<caret line="13" column="6" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" /> <caret line="13" column="6" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="44" column="18" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
...@@ -40,6 +48,7 @@ ...@@ -40,6 +48,7 @@
<list> <list>
<option value="$PROJECT_DIR$/application/em/view/useage/special.html" /> <option value="$PROJECT_DIR$/application/em/view/useage/special.html" />
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/application/em/model/EmInvoice.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -55,10 +64,10 @@ ...@@ -55,10 +64,10 @@
</include_path> </include_path>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="987" /> <option name="x" value="1358" />
<option name="y" value="195" /> <option name="y" value="-125" />
<option name="width" value="2181" /> <option name="width" value="1936" />
<option name="height" value="1716" /> <option name="height" value="1056" />
</component> </component>
<component name="ProjectView"> <component name="ProjectView">
<navigator proportions="" version="1"> <navigator proportions="" version="1">
...@@ -72,6 +81,24 @@ ...@@ -72,6 +81,24 @@
<item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" /> <item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" />
<item name="Jz-Php" type="462c0819:PsiDirectoryNode" /> <item name="Jz-Php" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" />
<item name="Jz-Php" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" />
<item name="Jz-Php" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="em" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Jz-Php" type="b2602c69:ProjectViewProjectNode" />
<item name="Jz-Php" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="em" type="462c0819:PsiDirectoryNode" />
<item name="model" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
...@@ -80,6 +107,7 @@ ...@@ -80,6 +107,7 @@
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
...@@ -109,17 +137,18 @@ ...@@ -109,17 +137,18 @@
<updated>1578039975763</updated> <updated>1578039975763</updated>
<workItem from="1578039979308" duration="88000" /> <workItem from="1578039979308" duration="88000" />
<workItem from="1578817951649" duration="618000" /> <workItem from="1578817951649" duration="618000" />
<workItem from="1578900535997" duration="48000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="706000" /> <option name="totallyTimeSpent" value="754000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-7" y="-7" width="2575" height="1415" extended-state="6" /> <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25188717" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25452608" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
...@@ -174,10 +203,17 @@ ...@@ -174,10 +203,17 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="351"> <state relative-caret-position="403">
<caret line="13" column="6" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" /> <caret line="13" column="6" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="44" column="18" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
application/em/model/EmInvoice.php
浏览文件 @ 094d6308
...@@ -42,9 +42,9 @@ class EmInvoice extends Base ...@@ -42,9 +42,9 @@ class EmInvoice extends Base
->page($Nowpage, $limits) ->page($Nowpage, $limits)
->select() ->select()
->toarray(); ->toarray();
dd($data);
foreach ($data as &$item){ foreach ($data as &$item){
$item['paid_amount'] = $item['payment_amount'] - $item['payment_balance']; $item['paid_amount'] = $item['payment_amount'] - $item['payment_balance'];
if(is_int($item['settle_amount']) && $item['settle_balance']){ if(is_int($item['settle_amount']) && $item['settle_balance']){
$item['sett_amount'] = $item['settle_amount'] - $item['settle_balance']; $item['sett_amount'] = $item['settle_amount'] - $item['settle_balance'];
} else { } else {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论