purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移动单据页面其它费用的位置

Browse Source
This commit is contained in:
季圣华
2020-06-19 00:01:39 +08:00
parent 79487b42f5
commit 41d495ab6e
7 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erp_web/js/pages/materials/bill_detail.js
View File

@@ -254,7 +254,7 @@
}
}
}
$("#bill .OtherMoneyShow:visible").text(otherMoneyShow +"总计："+ otherMoney.replace("undefined","0") + "元 "); //采购费用、销售费用
$("#bill .OtherMoneyShow:visible").text(otherMoneyShow +"总计："+ otherMoney.replace("undefined","0") + "元 "); //其它费用
}
$("#bill .payTypeShow").text(data.payType);
var TotalPrice = data.totalprice;

18
erp_web/js/pages/materials/in_out.js
View File

@@ -1422,7 +1422,7 @@
//采购入库、销售出库的费用数据加载
if(res.othermoneylist && res.othermoneyitem){
$("#OtherMoney").val(res.othermoney); //采购费用、销售费用
$("#OtherMoney").val(res.othermoney); //其它费用
var itemArr = res.othermoneylist.split(",");
var itemMoneyArr = res.othermoneyitem.split(",");
$("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr); //json数据存储
@@ -1473,7 +1473,7 @@
$("#DebtShow").text((res.discountlastmoney-res.changeamount).toFixed(2));
$("#AccountDayShow").text(res.accountday); //结算天数
$("#LinkNumberShow").text(res.linknumber); //关联订单号
if(res.othermoneylist && res.othermoneyitem){
if(res.othermoney && res.othermoneylist && res.othermoneyitem){
var itemArr = res.othermoneylist.split(","); //支出项目id列表
var itemMoneyArr = null;
if(res.othermoneyitem!=null) {
@@ -1498,10 +1498,10 @@
}
}
}
$("#OtherMoneyShow").text(otherMoneyShow +"总计："+ res.othermoney + "元 "); //采购费用、销售费用
$("#OtherMoneyShow").text(otherMoneyShow +"总计："+ res.othermoney + "元 "); //其它费用
}
else {
$("#OtherMoneyShow").text(res.othermoney); //采购费用、销售费用
$("#OtherMoneyShow").text(res.othermoney); //其它费用
}
$("#payTypeShow").text(res.paytype);
var TotalPrice = res.totalprice;
@@ -1810,7 +1810,7 @@
Discount: $.trim($("#Discount").val()),
DiscountMoney: $.trim($("#DiscountMoney").val()),
DiscountLastMoney: $.trim($("#DiscountLastMoney").val()),
OtherMoney: $.trim($("#OtherMoney").val()), //采购费用、销售费用
OtherMoney: $.trim($("#OtherMoney").val()), //其它费用
OtherMoneyList: $("#OtherMoney").attr("data-itemarr"), //支出项目列表-涉及费用
OtherMoneyItem: $("#OtherMoney").attr("data-itemmoneyarr"), //支出项目金额列表-涉及费用
AccountDay: $("#AccountDay").val() //结算天数
@@ -2055,9 +2055,9 @@
}
});
//点击采购费用、销售费用的事件
//点击其它费用的事件
$(".other-money-ico").off("click").on("click",function(){
$('#otherMoneyDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;'+ listSubType +'费用');
$('#otherMoneyDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;其它费用');
$("#otherMoneyDlg .money-dlg .money-content-tmp").remove(); //先移除输入栏目
$("#otherMoneyTotalDlg").text(0); //将合计初始化为0
for(var i=0; i<6; i++) {
@@ -2139,7 +2139,7 @@
if(itemArr.length && itemMoneyArr.length) {
$("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",JSON.stringify(itemMoneyArr)); //json数据存储
}
$("#OtherMoney").val(otherMoneyTotal); //给采购费用、销售费用赋值
$("#OtherMoney").val(otherMoneyTotal); //给其它费用赋值
$("#otherMoneyDlg").dialog('close');
});
@@ -2163,7 +2163,7 @@
cancelFun();
});
//给弹窗赋值-采购费用、销售费用数据
//给弹窗赋值-其它费用数据
var itemArr = $("#OtherMoney").attr("data-itemArr");
itemArr = JSON.parse(itemArr);
var itemMoneyArr = $("#OtherMoney").attr("data-itemMoneyArr");

48
erp_web/pages/materials/bill_detail.html
View File

@@ -208,9 +208,9 @@
<td>
<span class="DiscountLastMoneyShow" style="width: 120px;"></span>
</td>
<td>本次付款：</td>
<td>其它费用：</td>
<td style="padding:5px">
<span class="ChangeAmountShow"></span>
<span class="OtherMoneyShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
@@ -219,14 +219,14 @@
<td style="padding:5px">
<span class="AccountIdShow"></span>
</td>
<td>本次付款：</td>
<td style="padding:5px">
<span class="ChangeAmountShow"></span>
</td>
<td>本次欠款：</td>
<td style="padding:5px">
<span class="DebtShow"></span>
</td>
<td>采购费用：</td>
<td style="padding:5px">
<span class="OtherMoneyShow"></span>
</td>
<td></td>
<td style="padding:5px"></td>
<td style="width:100px;"></td>
@@ -280,9 +280,9 @@
<td>
<span class="DiscountLastMoneyShow" style="width: 120px;"></span>
</td>
<td>本次付款：</td>
<td>其它费用：</td>
<td style="padding:5px">
<span class="ChangeAmountShow"></span>
<span class="OtherMoneyShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
@@ -291,14 +291,14 @@
<td style="padding:5px">
<span class="AccountIdShow"></span>
</td>
<td>本次付款：</td>
<td style="padding:5px">
<span class="ChangeAmountShow"></span>
</td>
<td>本次欠款：</td>
<td style="padding:5px">
<span class="DebtShow"></span>
</td>
<td>采购费用：</td>
<td style="padding:5px">
<span class="OtherMoneyShow"></span>
</td>
<td></td>
<td style="padding:5px">
</td>
@@ -355,9 +355,9 @@
<td>
<span class="DiscountLastMoneyShow" style="width: 120px;"></span>
</td>
<td>本次收款：</td>
<td>其它费用：</td>
<td style="padding:5px">
<span class="ChangeAmountShow"></span>
<span class="OtherMoneyShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
@@ -366,14 +366,14 @@
<td style="padding:5px">
<span class="AccountIdShow"></span>
</td>
<td>本次收款：</td>
<td style="padding:5px">
<span class="ChangeAmountShow"></span>
</td>
<td>本次欠款：</td>
<td style="padding:5px">
<span class="DebtShow"></span>
</td>
<td>销售费用：</td>
<td style="padding:5px">
<span class="OtherMoneyShow"></span>
</td>
<td>销售人员：</td>
<td style="padding:5px">
<span class="SalesmanShow"></span>
@@ -429,9 +429,9 @@
<td>
<span class="DiscountLastMoneyShow" style="width: 120px;"></span>
</td>
<td>本次退款：</td>
<td>其它费用：</td>
<td style="padding:5px">
<span class="ChangeAmountShow"></span>
<span class="OtherMoneyShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
@@ -440,14 +440,14 @@
<td style="padding:5px">
<span class="AccountIdShow"></span>
</td>
<td>本次退款：</td>
<td style="padding:5px">
<span class="ChangeAmountShow"></span>
</td>
<td>本次欠款：</td>
<td style="padding:5px">
<span class="DebtShow"></span>
</td>
<td>销售费用：</td>
<td style="padding:5px">
<span class="OtherMoneyShow"></span>
</td>
<td>销售人员：</td>
<td style="padding:5px">
<span class="SalesmanShow"></span>

26
erp_web/pages/materials/purchase_back_list.html
View File

@@ -105,9 +105,10 @@
<td style="padding:5px">
<input id="DiscountLastMoney" name="DiscountLastMoney" class="radius-ui" readonly="readonly" style="width:120px;"/>
</td>
<td>本次退款</td>
<td>其它费用</td>
<td style="padding:5px">
<input id="ChangeAmount" name="ChangeAmount" class="radius-ui" data-changeamount="0" style="width:120px;"/>
<input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui/themes/icons/filelist.jpg"/>
</td>
<td style="width:100px;"></td>
</tr>
@@ -118,15 +119,14 @@
<img class="many-account-ico" src="/js/easyui/themes/icons/filelist.jpg"
style="display: none;"/>
</td>
<td>本次退款</td>
<td style="padding:5px">
<input id="ChangeAmount" name="ChangeAmount" class="radius-ui" data-changeamount="0" style="width:120px;"/>
</td>
<td>本次欠款</td>
<td style="padding:5px">
<input id="Debt" name="Debt" class="radius-ui" readonly="readonly" style="width:120px;"/>
</td>
<td>采购费用</td>
<td style="padding:5px">
<input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui/themes/icons/filelist.jpg"/>
</td>
<td></td>
<td style="padding:5px">
</td>
@@ -187,9 +187,9 @@
<td>
<span id="DiscountLastMoneyShow" style="width: 120px;"></span>
</td>
<td>本次付款：</td>
<td>其它费用：</td>
<td style="padding:5px">
<span id="ChangeAmountShow"></span>
<span id="OtherMoneyShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
@@ -198,14 +198,14 @@
<td style="padding:5px">
<span id="AccountIdShow"></span>
</td>
<td>本次付款：</td>
<td style="padding:5px">
<span id="ChangeAmountShow"></span>
</td>
<td>本次欠款：</td>
<td style="padding:5px">
<span id="DebtShow"></span>
</td>
<td>采购费用：</td>
<td style="padding:5px">
<span id="OtherMoneyShow"></span>
</td>
<td></td>
<td style="padding:5px">
</td>

30
erp_web/pages/materials/purchase_in_list.html
View File

@@ -112,9 +112,12 @@
<td style="padding:5px">
<input id="DiscountLastMoney" name="DiscountLastMoney" class="radius-ui" readonly="readonly" style="width:120px;"/>
</td>
<td>本次付款</td>
<td>其它费用</td>
<td style="padding:5px">
<input id="ChangeAmount" name="ChangeAmount" class="radius-ui" data-changeamount="0" style="width:120px;"/>
<div class="other-money-list">
<input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
</div>
<img class="other-money-ico" src="/js/easyui/themes/icons/filelist.jpg"/>
</td>
<td style="width:100px;"></td>
</tr>
@@ -131,17 +134,14 @@
<img class="many-account-ico" src="/js/easyui/themes/icons/filelist.jpg"
style="display: none;"/>
</td>
<td>本次付款</td>
<td style="padding:5px">
<input id="ChangeAmount" name="ChangeAmount" class="radius-ui" data-changeamount="0" style="width:120px;"/>
</td>
<td>本次欠款</td>
<td style="padding:5px">
<input id="Debt" name="Debt" class="radius-ui" readonly="readonly" style="width:120px;"/>
</td>
<td>采购费用</td>
<td style="padding:5px">
<div class="other-money-list">
<input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
</div>
<img class="other-money-ico" src="/js/easyui/themes/icons/filelist.jpg"/>
</td>
<td></td>
<td style="padding:5px">
</td>
@@ -204,9 +204,9 @@
<td>
<span id="DiscountLastMoneyShow" style="width: 120px;"></span>
</td>
<td>本次付款：</td>
<td>其它费用：</td>
<td style="padding:5px">
<span id="ChangeAmountShow"></span>
<span id="OtherMoneyShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
@@ -215,14 +215,14 @@
<td style="padding:5px">
<span id="AccountIdShow"></span>
</td>
<td>本次付款：</td>
<td style="padding:5px">
<span id="ChangeAmountShow"></span>
</td>
<td>本次欠款：</td>
<td style="padding:5px">
<span id="DebtShow"></span>
</td>
<td>采购费用：</td>
<td style="padding:5px">
<span id="OtherMoneyShow"></span>
</td>
<td></td>
<td style="padding:5px"></td>
<td style="width:100px;"></td>

26
erp_web/pages/materials/sale_back_list.html
View File

@@ -104,9 +104,10 @@
<td style="padding:5px">
<input id="DiscountLastMoney" name="DiscountLastMoney" class="radius-ui" readonly="readonly" style="width:120px;"/>
</td>
<td>本次退款</td>
<td>其它费用</td>
<td style="padding:5px">
<input id="ChangeAmount" name="ChangeAmount" class="radius-ui" data-changeamount="0" style="width:120px;"/>
<input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui/themes/icons/filelist.jpg"/>
</td>
<td style="width:100px;"></td>
</tr>
@@ -117,15 +118,14 @@
<img class="many-account-ico" src="/js/easyui/themes/icons/filelist.jpg"
style="display: none;"/>
</td>
<td>本次退款</td>
<td style="padding:5px">
<input id="ChangeAmount" name="ChangeAmount" class="radius-ui" data-changeamount="0" style="width:120px;"/>
</td>
<td>本次欠款</td>
<td style="padding:5px">
<input id="Debt" name="Debt" class="radius-ui" readonly="readonly" style="width:120px;"/>
</td>
<td>销售费用</td>
<td style="padding:5px">
<input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui/themes/icons/filelist.jpg"/>
</td>
<td>销售人员</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" class="radius-ui" style="width:120px;"/>
@@ -186,9 +186,9 @@
<td>
<span id="DiscountLastMoneyShow" style="width: 120px;"></span>
</td>
<td>本次退款：</td>
<td>其它费用：</td>
<td style="padding:5px">
<span id="ChangeAmountShow"></span>
<span id="OtherMoneyShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
@@ -197,14 +197,14 @@
<td style="padding:5px">
<span id="AccountIdShow"></span>
</td>
<td>本次退款：</td>
<td style="padding:5px">
<span id="ChangeAmountShow"></span>
</td>
<td>本次欠款：</td>
<td style="padding:5px">
<span id="DebtShow"></span>
</td>
<td>销售费用：</td>
<td style="padding:5px">
<span id="OtherMoneyShow"></span>
</td>
<td>销售人员：</td>
<td style="padding:5px">
<span id="SalesmanShow"></span>

30
erp_web/pages/materials/sale_out_list.html
View File

@@ -112,9 +112,12 @@
<td style="padding:5px">
<input id="DiscountLastMoney" name="DiscountLastMoney" class="radius-ui" readonly="readonly" style="width:120px;"/>
</td>
<td>本次收款</td>
<td>其它费用</td>
<td style="padding:5px">
<input id="ChangeAmount" name="ChangeAmount" class="radius-ui" data-changeamount="0" style="width:120px;"/>
<div class="other-money-list">
<input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
</div>
<img class="other-money-ico" src="/js/easyui/themes/icons/filelist.jpg"/>
</td>
<td style="width:100px;"></td>
</tr>
@@ -131,17 +134,14 @@
<img class="many-account-ico" src="/js/easyui/themes/icons/filelist.jpg"
style="display: none;"/>
</td>
<td>本次收款</td>
<td style="padding:5px">
<input id="ChangeAmount" name="ChangeAmount" class="radius-ui" data-changeamount="0" style="width:120px;"/>
</td>
<td>本次欠款</td>
<td style="padding:5px">
<input id="Debt" name="Debt" class="radius-ui" readonly="readonly" style="width:120px;"/>
</td>
<td>销售费用</td>
<td style="padding:5px">
<div class="other-money-list">
<input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
</div>
<img class="other-money-ico" src="/js/easyui/themes/icons/filelist.jpg"/>
</td>
<td>销售人员</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" class="radius-ui" style="width:120px;"/>
@@ -204,9 +204,9 @@
<td>
<span id="DiscountLastMoneyShow" style="width: 120px;"></span>
</td>
<td>本次收款：</td>
<td>其它费用：</td>
<td style="padding:5px">
<span id="ChangeAmountShow"></span>
<span id="OtherMoneyShow"></span>
</td>
<td style="width:100px;"></td>
</tr>
@@ -215,14 +215,14 @@
<td style="padding:5px">
<span id="AccountIdShow"></span>
</td>
<td>本次收款：</td>
<td style="padding:5px">
<span id="ChangeAmountShow"></span>
</td>
<td>本次欠款：</td>
<td style="padding:5px">
<span id="DebtShow"></span>
</td>
<td>销售费用：</td>
<td style="padding:5px">
<span id="OtherMoneyShow"></span>
</td>
<td>销售人员：</td>
<td style="padding:5px">
<span id="SalesmanShow"></span>