From 619d4cbe288c47937f724d5d3301337352c4e2be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 12 Aug 2020 22:57:03 +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=E5=8D=95?=
 =?UTF-8?q?=E9=81=87=E5=88=B0=E7=9A=84=E5=8D=95=E5=8F=B7=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/pages/materials/in_out.js | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index 1ad89562..0ecec9e9 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -1335,22 +1335,12 @@
 			return;
 		}
         var TotalPrice = res.totalPrice; //合计金额
-        if(pageType === "skip") { //从订单跳转过来
-            buildNumber(); //生成单据编号
-            var thisDateTime = getNowFormatDateTime(); //当前时间
-            $("#OperTime").val(thisDateTime);
-            $("#LinkNumber").val(res.number);  //关联订单号
-            $("#AccountId").val(defaultAccountId); //初始化默认的账户Id
-            $("#DiscountLastMoney").val(TotalPrice); //优惠后金额
-            $("#ChangeAmount").val(TotalPrice).attr("data-changeamount", TotalPrice);
-        } else {
-            $("#Number").val(res.number).attr("data-defaultNumber",res.number);
-            $("#OperTime").val(res.operTimeStr);
-            $("#LinkNumber").val(res.linkNumber); //关联订单号
-            $("#AccountId").val(res.accountId); //账户Id
-            $("#DiscountLastMoney").val(res.discountLastMoney); //优惠后金额
-            $("#ChangeAmount").val(res.changeAmount).attr("data-changeamount", res.changeAmount);
-		}
+		$("#Number").val(res.number).attr("data-defaultNumber",res.number);
+		$("#OperTime").val(res.operTimeStr);
+		$("#LinkNumber").val(res.linkNumber); //关联订单号
+		$("#AccountId").val(res.accountId); //账户Id
+		$("#DiscountLastMoney").val(res.discountLastMoney); //优惠后金额
+		$("#ChangeAmount").val(res.changeAmount).attr("data-changeamount", res.changeAmount);
 	    $('#OrganId').combobox('setValue', res.organId);
 	    $("#HandsPersonId").val(res.handsPersonId);
 	    $("#Remark").val(res.remark);