From c5ac7f09acb6ee3d60930c23df18741bdd0d799d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 10 Dec 2020 00:02:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E4=B8=BB?=
=?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
erp_web/pages/bill/other_in_list.html | 14 +++++++++-----
erp_web/pages/bill/other_out_list.html | 14 +++++++++-----
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/erp_web/pages/bill/other_in_list.html b/erp_web/pages/bill/other_in_list.html
index 8fa2bc8d..da65566b 100644
--- a/erp_web/pages/bill/other_in_list.html
+++ b/erp_web/pages/bill/other_in_list.html
@@ -117,15 +117,15 @@
|
|
- 单据编号： |
-
+ | 单据编号： |
+
|
关联单号： |
-
+ |
|
-
+ |
|
@@ -430,7 +430,11 @@
$("#DebtShow").text(debt);
$("#AccountDayShow").text(res.accountDay); //结算天数
$("#LinkNumberShow").text(res.linkNumber); //关联订单号
- $("#billTypeShow").text(res.billType); //单据类型
+ if(res.billType && res.billType!="undefined"){
+ $("#billTypeShow").text("单据类型："+res.billType); //单据类型
+ } else {
+ $("#billTypeShow").text("");
+ }
var otherMoney = res.otherMoney?res.otherMoney:0;
if(otherMoney!=0 && res.otherMoneyList && res.otherMoneyItem){
var itemArr = res.otherMoneyList.split(","); //支出项目id列表
diff --git a/erp_web/pages/bill/other_out_list.html b/erp_web/pages/bill/other_out_list.html
index 84d0f671..9432ebde 100644
--- a/erp_web/pages/bill/other_out_list.html
+++ b/erp_web/pages/bill/other_out_list.html
@@ -111,15 +111,15 @@
|
- 单据编号： |
-
+ | 单据编号： |
+
|
关联单号： |
-
+ |
|
-
+ |
|
@@ -423,7 +423,11 @@
$("#DebtShow").text(debt);
$("#AccountDayShow").text(res.accountDay); //结算天数
$("#LinkNumberShow").text(res.linkNumber); //关联订单号
- $("#billTypeShow").text(res.billType); //单据类型
+ if(res.billType && res.billType!="undefined"){
+ $("#billTypeShow").text("单据类型："+res.billType); //单据类型
+ } else {
+ $("#billTypeShow").text("");
+ }
var otherMoney = res.otherMoney?res.otherMoney:0;
if(otherMoney!=0 && res.otherMoneyList && res.otherMoneyItem){
var itemArr = res.otherMoneyList.split(","); //支出项目id列表