Commit e7782312 authored by 季圣华's avatar 季圣华
Browse files

优化供应商、客户的累计应收等信息

parent cd38395a
...@@ -608,6 +608,8 @@ ...@@ -608,6 +608,8 @@
email : supplierInfo[4].replace("undefined",""), email : supplierInfo[4].replace("undefined",""),
BeginNeedGet : supplierInfo[5], BeginNeedGet : supplierInfo[5],
BeginNeedPay : supplierInfo[6], BeginNeedPay : supplierInfo[6],
AllNeedGet: "",
AllNeedPay: "",
description : supplierInfo[8].replace("undefined",""), description : supplierInfo[8].replace("undefined",""),
type : supplierInfo[9], type : supplierInfo[9],
fax : supplierInfo[10].replace("undefined",""), fax : supplierInfo[10].replace("undefined",""),
...@@ -654,12 +656,14 @@ ...@@ -654,12 +656,14 @@
var money = moneyA+moneyB; var money = moneyA+moneyB;
var moneyBeginNeedGet = $("#BeginNeedGet").val()-0; //期初应收 var moneyBeginNeedGet = $("#BeginNeedGet").val()-0; //期初应收
var moneyBeginNeedPay = $("#BeginNeedPay").val()-0; //期初应付 var moneyBeginNeedPay = $("#BeginNeedPay").val()-0; //期初应付
money = money + moneyBeginNeedPay - moneyBeginNeedGet; money = (money + moneyBeginNeedPay - moneyBeginNeedGet).toFixed(2);
if(money>0) { if(money>0) {
$("#AllNeedGet").val(""); //累计应收-置空
$("#AllNeedPay").val(money); //累计应付 $("#AllNeedPay").val(money); //累计应付
} }
else { else {
$("#AllNeedGet").val(-money); //累计应收 $("#AllNeedGet").val(-money); //累计应收
$("#AllNeedPay").val(""); //累计应付-置空
} }
} }
}, },
......
...@@ -1941,7 +1941,7 @@ ...@@ -1941,7 +1941,7 @@
} }
var OrganId = null, ProjectId = null,AllocationProjectId = null; var OrganId = null, ProjectId = null,AllocationProjectId = null;
var ChangeAmount = $.trim($("#ChangeAmount").val()); var ChangeAmount = $.trim($("#ChangeAmount").val())-0;
var TotalPrice = $("#depotHeadFM .datagrid-footer [field='AllPrice'] div").text(); var TotalPrice = $("#depotHeadFM .datagrid-footer [field='AllPrice'] div").text();
if($('#OrganId').length){ if($('#OrganId').length){
OrganId = $('#OrganId').combobox('getValue'); OrganId = $('#OrganId').combobox('getValue');
......
...@@ -100,21 +100,21 @@ ...@@ -100,21 +100,21 @@
<tr> <tr>
<td>期初应收</td> <td>期初应收</td>
<td style="padding:1px"> <td style="padding:1px">
<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input> <input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" />
</td> </td>
<td>期初应付</td> <td>期初应付</td>
<td style="padding:1px"> <td style="padding:1px">
<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input> <input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td>累计应收</td> <td>累计应收</td>
<td style="padding:1px"> <td style="padding:1px">
<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input> <input name="AllNeedGet" id="AllNeedGet" type="text" style="width: 160px;height: 20px" readonly="readonly" />
</td> </td>
<td>累计应付</td> <td>累计应付</td>
<td style="padding:1px"> <td style="padding:1px">
<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input> <input name="AllNeedPay" id="AllNeedPay" type="text" style="width: 160px;height: 20px" readonly="readonly" />
</td> </td>
</tr> </tr>
<tr> <tr>
......
...@@ -100,21 +100,21 @@ ...@@ -100,21 +100,21 @@
<tr> <tr>
<td>期初应收</td> <td>期初应收</td>
<td style="padding:1px"> <td style="padding:1px">
<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input> <input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" />
</td> </td>
<td>期初应付</td> <td>期初应付</td>
<td style="padding:1px"> <td style="padding:1px">
<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input> <input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td>累计应收</td> <td>累计应收</td>
<td style="padding:1px"> <td style="padding:1px">
<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input> <input name="AllNeedGet" id="AllNeedGet" type="text" style="width: 160px;height: 20px" readonly="readonly" />
</td> </td>
<td>累计应付</td> <td>累计应付</td>
<td style="padding:1px"> <td style="padding:1px">
<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input> <input name="AllNeedPay" id="AllNeedPay" type="text" style="width: 160px;height: 20px" readonly="readonly" />
</td> </td>
</tr> </tr>
<tr> <tr>
......
...@@ -100,21 +100,21 @@ ...@@ -100,21 +100,21 @@
<tr> <tr>
<td>期初应收</td> <td>期初应收</td>
<td style="padding:1px"> <td style="padding:1px">
<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input> <input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" />
</td> </td>
<td>期初应付</td> <td>期初应付</td>
<td style="padding:1px"> <td style="padding:1px">
<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px"></input> <input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" />
</td> </td>
</tr> </tr>
<tr> <tr>
<td>累计应收</td> <td>累计应收</td>
<td style="padding:1px"> <td style="padding:1px">
<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input> <input name="AllNeedGet" id="AllNeedGet" type="text" style="width: 160px;height: 20px" readonly="readonly" />
</td> </td>
<td>累计应付</td> <td>累计应付</td>
<td style="padding:1px"> <td style="padding:1px">
<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox" data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input> <input name="AllNeedPay" id="AllNeedPay" type="text" style="width: 160px;height: 20px" readonly="readonly" />
</td> </td>
</tr> </tr>
<tr> <tr>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment