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

解决销售订单转销售出库没有备注信息的bug

Browse Source
This commit is contained in:
季圣华
2020-12-27 18:13:22 +08:00
parent 8d85df5dbd
commit 5921e95ddd
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -307,7 +307,7 @@
$("#bill .back-amount-show").text(0); $("#bill .back-amount-show").text(0);
} }
} }
if(listSubType === "销售出库" || listSubType === "销售退货"){ if(listSubType === "销售订单" || listSubType === "销售出库" || listSubType === "销售退货"){
var salesManInfo = data.salesMan; var salesManInfo = data.salesMan;
if(salesManInfo){ if(salesManInfo){
var arr = salesManInfo.split(","); var arr = salesManInfo.split(",");

1
erp_web/pages/bill/purchase_in_list.html
View File

@@ -554,6 +554,7 @@
var res = $('#linkBillData').datagrid('getChecked')[0]; var res = $('#linkBillData').datagrid('getChecked')[0];
$('#OrganId').combobox('setValue', res.organId); $('#OrganId').combobox('setValue', res.organId);
$("#LinkNumber").textbox("setValue",res.number); //关联订单号 $("#LinkNumber").textbox("setValue",res.number); //关联订单号
$("#Remark").val(res.remark);
$("#DiscountLastMoney").val(res.totalPrice); //优惠后金额 $("#DiscountLastMoney").val(res.totalPrice); //优惠后金额
$("#ChangeAmount").val(res.totalPrice).attr("data-changeamount", res.totalPrice); $("#ChangeAmount").val(res.totalPrice).attr("data-changeamount", res.totalPrice);
depotHeadID = res.id; depotHeadID = res.id;

11
erp_web/pages/bill/sale_out_list.html
View File

@@ -564,6 +564,17 @@
var res = $('#linkBillData').datagrid('getChecked')[0]; var res = $('#linkBillData').datagrid('getChecked')[0];
$('#OrganId').combobox('setValue', res.organId); $('#OrganId').combobox('setValue', res.organId);
$("#LinkNumber").textbox("setValue",res.number); //关联订单号 $("#LinkNumber").textbox("setValue",res.number); //关联订单号
$("#Remark").val(res.remark);
if(res.salesMan){
var arr = res.salesMan.split(",");
var salesmanArray = [];
for(var i=0;i<arr.length;i++){
if(arr[i]){
salesmanArray.push(arr[i].replace("<","").replace(">",""));
}
}
$("#Salesman").combobox('setValues', salesmanArray);
}
$("#DiscountLastMoney").val(res.totalPrice); //优惠后金额 $("#DiscountLastMoney").val(res.totalPrice); //优惠后金额
$("#ChangeAmount").val(res.totalPrice).attr("data-changeamount", res.totalPrice); $("#ChangeAmount").val(res.totalPrice).attr("data-changeamount", res.totalPrice);
depotHeadID = res.id; depotHeadID = res.id;