Commit 5921e95d authored by 季圣华's avatar 季圣华
Browse files

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

parent 8d85df5d
...@@ -307,7 +307,7 @@ ...@@ -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(",");
......
...@@ -554,6 +554,7 @@ ...@@ -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;
......
...@@ -564,6 +564,17 @@ ...@@ -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;
......
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