From 5921e95ddd02a7de0e1060cb3847535f0b2904fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 27 Dec 2020 18:13:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=BD=AC=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/bill/bill_detail.js     |  2 +-
 erp_web/pages/bill/purchase_in_list.html |  1 +
 erp_web/pages/bill/sale_out_list.html    | 11 +++++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

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<arr.length;i++){
+                                    if(arr[i]){
+                                        salesmanArray.push(arr[i].replace("<","").replace(">",""));
+                                    }
+                                }
+                                $("#Salesman").combobox('setValues', salesmanArray);
+                            }
                             $("#DiscountLastMoney").val(res.totalPrice); //优惠后金额
                             $("#ChangeAmount").val(res.totalPrice).attr("data-changeamount", res.totalPrice);
                             depotHeadID = res.id;