diff --git a/erp_web/js/pages/bill/bill_detail.js b/erp_web/js/pages/bill/bill_detail.js index de92aa41..d1fdd67b 100644 --- a/erp_web/js/pages/bill/bill_detail.js +++ b/erp_web/js/pages/bill/bill_detail.js @@ -307,7 +307,7 @@ $("#bill .back-amount-show").text(0); } } - if(listSubType === "销售出库" || listSubType === "销售退货"){ + if(listSubType === "销售订单" || listSubType === "销售出库" || listSubType === "销售退货"){ var salesManInfo = data.salesMan; if(salesManInfo){ var arr = salesManInfo.split(","); diff --git a/erp_web/pages/bill/purchase_in_list.html b/erp_web/pages/bill/purchase_in_list.html index e942e426..e62bcb1d 100644 --- a/erp_web/pages/bill/purchase_in_list.html +++ b/erp_web/pages/bill/purchase_in_list.html @@ -554,6 +554,7 @@ var res = $('#linkBillData').datagrid('getChecked')[0]; $('#OrganId').combobox('setValue', res.organId); $("#LinkNumber").textbox("setValue",res.number); //关联订单号 + $("#Remark").val(res.remark); $("#DiscountLastMoney").val(res.totalPrice); //优惠后金额 $("#ChangeAmount").val(res.totalPrice).attr("data-changeamount", res.totalPrice); depotHeadID = res.id; diff --git a/erp_web/pages/bill/sale_out_list.html b/erp_web/pages/bill/sale_out_list.html index 9c9abc14..e526fca0 100644 --- a/erp_web/pages/bill/sale_out_list.html +++ b/erp_web/pages/bill/sale_out_list.html @@ -564,6 +564,17 @@ var res = $('#linkBillData').datagrid('getChecked')[0]; $('#OrganId').combobox('setValue', res.organId); $("#LinkNumber").textbox("setValue",res.number); //关联订单号 + $("#Remark").val(res.remark); + if(res.salesMan){ + var arr = res.salesMan.split(","); + var salesmanArray = []; + for(var i=0;i","")); + } + } + $("#Salesman").combobox('setValues', salesmanArray); + } $("#DiscountLastMoney").val(res.totalPrice); //优惠后金额 $("#ChangeAmount").val(res.totalPrice).attr("data-changeamount", res.totalPrice); depotHeadID = res.id;